cleanup tabs
This commit is contained in:
mean
Rachel Mant
parent
fb216a2a98
commit
a3feae60aa
|
|
@ -10,18 +10,18 @@
|
|||
*
|
||||
*/
|
||||
#if PC_HOSTED == 1
|
||||
#define DEBUG_CH DEBUG_INFO
|
||||
#define ERROR_CH DEBUG_WARN
|
||||
#define DEBUG_CH DEBUG_INFO
|
||||
#define ERROR_CH DEBUG_WARN
|
||||
#else
|
||||
#define DEBUG_CH(...) {} //DEBUG_WARN //(...) {}
|
||||
#define ERROR_CH DEBUG_WARN //DEBUG_WARN
|
||||
#define DEBUG_CH(...) {} //DEBUG_WARN //(...) {}
|
||||
#define ERROR_CH DEBUG_WARN //DEBUG_WARN
|
||||
#endif
|
||||
|
||||
|
||||
static int ch32f1_flash_erase(struct target_flash *f,
|
||||
target_addr addr, size_t len);
|
||||
target_addr addr, size_t len);
|
||||
static int ch32f1_flash_write(struct target_flash *f,
|
||||
target_addr dest, const void *src, size_t len);
|
||||
target_addr dest, const void *src, size_t len);
|
||||
#define FLASH_MODEKEYR_CH32 (FPEC_BASE+0x24) // Fast mode for CH32F10x
|
||||
|
||||
#define FLASH_CR_FLOCK_CH32 (1<<15) // fast unlock
|
||||
|
|
@ -36,26 +36,25 @@
|
|||
static volatile uint32_t magic,sr,ct;
|
||||
|
||||
/**
|
||||
\fn ch32f1_add_flash
|
||||
\brief "fast" flash driver for CH32F10x chips
|
||||
\fn ch32f1_add_flash
|
||||
\brief "fast" flash driver for CH32F10x chips
|
||||
*/
|
||||
static void ch32f1_add_flash(target *t,
|
||||
uint32_t addr, size_t length, size_t erasesize)
|
||||
static void ch32f1_add_flash(target *t, uint32_t addr, size_t length, size_t erasesize)
|
||||
{
|
||||
struct target_flash *f = calloc(1, sizeof(*f));
|
||||
if (!f) { /* calloc failed: heap exhaustion */
|
||||
DEBUG_WARN("calloc: failed in %s\n", __func__);
|
||||
return;
|
||||
}
|
||||
struct target_flash *f = calloc(1, sizeof(*f));
|
||||
if (!f) { /* calloc failed: heap exhaustion */
|
||||
DEBUG_WARN("calloc: failed in %s\n", __func__);
|
||||
return;
|
||||
}
|
||||
|
||||
f->start = addr;
|
||||
f->length = length;
|
||||
f->blocksize = erasesize;
|
||||
f->erase = ch32f1_flash_erase;
|
||||
f->write = ch32f1_flash_write;
|
||||
f->buf_size = erasesize;
|
||||
f->erased = 0xff;
|
||||
target_add_flash(t, f);
|
||||
f->start = addr;
|
||||
f->length = length;
|
||||
f->blocksize = erasesize;
|
||||
f->erase = ch32f1_flash_erase;
|
||||
f->write = ch32f1_flash_write;
|
||||
f->buf_size = erasesize;
|
||||
f->erased = 0xff;
|
||||
target_add_flash(t, f);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -63,37 +62,37 @@ static void ch32f1_add_flash(target *t,
|
|||
|
||||
|
||||
#define WAIT_BUSY() do { \
|
||||
sr = target_mem_read32(t, FLASH_SR); \
|
||||
if(target_check_error(t)) { \
|
||||
ERROR_CH("ch32f1 flash write: comm error\n"); \
|
||||
return -1; \
|
||||
} \
|
||||
} while (sr & FLASH_SR_BSY);
|
||||
sr = target_mem_read32(t, FLASH_SR); \
|
||||
if(target_check_error(t)) { \
|
||||
ERROR_CH("ch32f1 flash write: comm error\n"); \
|
||||
return -1; \
|
||||
} \
|
||||
} while (sr & FLASH_SR_BSY);
|
||||
|
||||
#define WAIT_EOP() do { \
|
||||
sr = target_mem_read32(t, FLASH_SR); \
|
||||
if(target_check_error(t)) { \
|
||||
ERROR_CH("ch32f1 flash write: comm error\n"); \
|
||||
return -1; \
|
||||
} \
|
||||
} while (!(sr & FLASH_SR_EOP));
|
||||
sr = target_mem_read32(t, FLASH_SR); \
|
||||
if(target_check_error(t)) { \
|
||||
ERROR_CH("ch32f1 flash write: comm error\n"); \
|
||||
return -1; \
|
||||
} \
|
||||
} while (!(sr & FLASH_SR_EOP));
|
||||
|
||||
#define CLEAR_EOP() target_mem_write32(t, FLASH_SR,FLASH_SR_EOP)
|
||||
|
||||
#define SET_CR(bit) { ct = target_mem_read32(t, FLASH_CR); \
|
||||
ct|=(bit); \
|
||||
target_mem_write32(t, FLASH_CR, ct);}
|
||||
ct|=(bit); \
|
||||
target_mem_write32(t, FLASH_CR, ct);}
|
||||
|
||||
|
||||
#define CLEAR_CR(bit) {ct = target_mem_read32(t, FLASH_CR); \
|
||||
ct&=~(bit); \
|
||||
target_mem_write32(t, FLASH_CR, ct);}
|
||||
ct&=~(bit); \
|
||||
target_mem_write32(t, FLASH_CR, ct);}
|
||||
|
||||
// Which one is the right value ?
|
||||
#define MAGIC_WORD 0x100
|
||||
// #define MAGIC_WORD 0x100
|
||||
#define MAGIC(adr) { magic=target_mem_read32(t,(adr) ^ MAGIC_WORD); \
|
||||
target_mem_write32(t, FLASH_MAGIC , magic); }
|
||||
target_mem_write32(t, FLASH_MAGIC , magic); }
|
||||
|
||||
/**
|
||||
\fn ch32f1_flash_unlock
|
||||
|
|
@ -101,63 +100,61 @@ static void ch32f1_add_flash(target *t,
|
|||
*/
|
||||
static int ch32f1_flash_unlock(target *t)
|
||||
{
|
||||
DEBUG_CH("CH32: flash unlock \n");
|
||||
DEBUG_CH("CH32: flash unlock \n");
|
||||
|
||||
target_mem_write32(t, FLASH_KEYR , KEY1);
|
||||
target_mem_write32(t, FLASH_KEYR , KEY2);
|
||||
// fast mode
|
||||
target_mem_write32(t, FLASH_MODEKEYR_CH32 , KEY1);
|
||||
target_mem_write32(t, FLASH_MODEKEYR_CH32 , KEY2);
|
||||
uint32_t cr = target_mem_read32(t, FLASH_CR);
|
||||
if (cr & FLASH_CR_FLOCK_CH32)
|
||||
{
|
||||
ERROR_CH("Fast unlock failed, cr: 0x%08" PRIx32 "\n", cr);
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
target_mem_write32(t, FLASH_KEYR , KEY1);
|
||||
target_mem_write32(t, FLASH_KEYR , KEY2);
|
||||
// fast mode
|
||||
target_mem_write32(t, FLASH_MODEKEYR_CH32 , KEY1);
|
||||
target_mem_write32(t, FLASH_MODEKEYR_CH32 , KEY2);
|
||||
uint32_t cr = target_mem_read32(t, FLASH_CR);
|
||||
if (cr & FLASH_CR_FLOCK_CH32)
|
||||
{
|
||||
ERROR_CH("Fast unlock failed, cr: 0x%08" PRIx32 "\n", cr);
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
static int ch32f1_flash_lock(target *t)
|
||||
{
|
||||
DEBUG_CH("CH32: flash lock \n");
|
||||
SET_CR(FLASH_CR_LOCK);
|
||||
return 0;
|
||||
DEBUG_CH("CH32: flash lock \n");
|
||||
SET_CR(FLASH_CR_LOCK);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
\brief identify the ch32f1 chip
|
||||
Actually grab all cortex m3 with designer = arm not caught earlier...
|
||||
\brief identify the ch32f1 chip
|
||||
Actually grab all cortex m3 with designer = arm not caught earlier...
|
||||
*/
|
||||
|
||||
bool ch32f1_probe(target *t)
|
||||
{
|
||||
t->idcode = target_mem_read32(t, DBGMCU_IDCODE) & 0xfff;
|
||||
if ((t->cpuid & CPUID_PARTNO_MASK) != CORTEX_M3)
|
||||
return false;
|
||||
if(t->idcode !=0x410) // only ch32f103
|
||||
{
|
||||
return false;
|
||||
}
|
||||
t->idcode = target_mem_read32(t, DBGMCU_IDCODE) & 0xfff;
|
||||
if ((t->cpuid & CPUID_PARTNO_MASK) != CORTEX_M3)
|
||||
return false;
|
||||
if(t->idcode !=0x410) { // only ch32f103
|
||||
return false;
|
||||
}
|
||||
|
||||
// try to flock
|
||||
ch32f1_flash_lock(t);
|
||||
// if this fails it is not a CH32 chip
|
||||
if(ch32f1_flash_unlock(t))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
// try to flock
|
||||
ch32f1_flash_lock(t);
|
||||
// if this fails it is not a CH32 chip
|
||||
if(ch32f1_flash_unlock(t)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
uint32_t signature= target_mem_read32(t, FLASHSIZE);
|
||||
uint32_t flashSize=signature & 0xFFFF;
|
||||
uint32_t signature= target_mem_read32(t, FLASHSIZE);
|
||||
uint32_t flashSize=signature & 0xFFFF;
|
||||
|
||||
target_add_ram(t, 0x20000000, 0x5000);
|
||||
ch32f1_add_flash(t, FLASH_BEGIN_ADDRESS_CH32, flashSize*1024, 128);
|
||||
target_add_commands(t, stm32f1_cmd_list, "STM32 LD/MD/VL-LD/VL-MD");
|
||||
t->driver = "CH32F1 medium density (stm32f1 clone)";
|
||||
target_add_ram(t, 0x20000000, 0x5000);
|
||||
ch32f1_add_flash(t, FLASH_BEGIN_ADDRESS_CH32, flashSize*1024, 128);
|
||||
target_add_commands(t, stm32f1_cmd_list, "STM32 LD/MD/VL-LD/VL-MD");
|
||||
t->driver = "CH32F1 medium density (stm32f1 clone)";
|
||||
|
||||
// make sure we have 2 wait states
|
||||
//target_mem_write32(t, FLASH_ACR,2);
|
||||
return true;
|
||||
// make sure we have 2 wait states
|
||||
//target_mem_write32(t, FLASH_ACR,2);
|
||||
return true;
|
||||
}
|
||||
/**
|
||||
\fn ch32f1_flash_erase
|
||||
|
|
@ -165,49 +162,46 @@ bool ch32f1_probe(target *t)
|
|||
*/
|
||||
int ch32f1_flash_erase (struct target_flash *f, target_addr addr, size_t len)
|
||||
{
|
||||
target *t = f->t;
|
||||
DEBUG_CH("CH32: flash erase \n");
|
||||
target *t = f->t;
|
||||
DEBUG_CH("CH32: flash erase \n");
|
||||
|
||||
// Make sure we have 2 wait states, prefetch disabled
|
||||
//target_mem_write32(t, FLASH_ACR , 2);
|
||||
//target_mem_write32(t, FLASH_ACR , 2);
|
||||
|
||||
if (ch32f1_flash_unlock(t))
|
||||
{
|
||||
ERROR_CH("CH32: Unlock failed\n");
|
||||
return -1;
|
||||
}
|
||||
// Fast Erase 128 bytes pages (ch32 mode)
|
||||
while(len)
|
||||
{
|
||||
SET_CR(FLASH_CR_FTER_CH32);// CH32 PAGE_ER
|
||||
/* write address to FMA */
|
||||
target_mem_write32(t, FLASH_AR , addr);
|
||||
/* Flash page erase start instruction */
|
||||
SET_CR( FLASH_CR_STRT );
|
||||
WAIT_EOP();
|
||||
CLEAR_EOP();
|
||||
CLEAR_CR( FLASH_CR_STRT );
|
||||
// Magic
|
||||
MAGIC(addr);
|
||||
if (len > 128)
|
||||
len -= 128;
|
||||
else
|
||||
len = 0;
|
||||
addr += 128;
|
||||
}
|
||||
sr = target_mem_read32(t, FLASH_SR);
|
||||
ch32f1_flash_lock(t);
|
||||
if ((sr & SR_ERROR_MASK))
|
||||
{
|
||||
ERROR_CH("ch32f1 flash erase error 0x%" PRIx32 "\n", sr);
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
if (ch32f1_flash_unlock(t)) {
|
||||
ERROR_CH("CH32: Unlock failed\n");
|
||||
return -1;
|
||||
}
|
||||
// Fast Erase 128 bytes pages (ch32 mode)
|
||||
while(len) {
|
||||
SET_CR(FLASH_CR_FTER_CH32);// CH32 PAGE_ER
|
||||
/* write address to FMA */
|
||||
target_mem_write32(t, FLASH_AR , addr);
|
||||
/* Flash page erase start instruction */
|
||||
SET_CR( FLASH_CR_STRT );
|
||||
WAIT_EOP();
|
||||
CLEAR_EOP();
|
||||
CLEAR_CR( FLASH_CR_STRT );
|
||||
// Magic
|
||||
MAGIC(addr);
|
||||
if (len > 128)
|
||||
len -= 128;
|
||||
else
|
||||
len = 0;
|
||||
addr += 128;
|
||||
}
|
||||
sr = target_mem_read32(t, FLASH_SR);
|
||||
ch32f1_flash_lock(t);
|
||||
if ((sr & SR_ERROR_MASK)) {
|
||||
ERROR_CH("ch32f1 flash erase error 0x%" PRIx32 "\n", sr);
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
\fn waitFlashReady
|
||||
\brief poll the beginning of a block till it is fffff, meaning we can proceeed
|
||||
\fn waitFlashReady
|
||||
\brief poll the beginning of a block till it is fffff, meaning we can proceeed
|
||||
|
||||
*/
|
||||
|
||||
|
|
@ -220,10 +214,9 @@ static bool waitFlashReady(target *t,uint32_t adr)
|
|||
// these are the data from the previous operation and they could be ffff)
|
||||
uint32_t ff;
|
||||
for(int i=0;i<32;i++) ff=target_mem_read32(t,adr);
|
||||
if(ff!=0xffffffffUL)
|
||||
{
|
||||
ERROR_CH("ch32f1 Not erased properly at %x or flash access issue\n",adr);
|
||||
return false;
|
||||
if(ff!=0xffffffffUL) {
|
||||
ERROR_CH("ch32f1 Not erased properly at %x or flash access issue\n",adr);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
@ -234,24 +227,24 @@ static bool waitFlashReady(target *t,uint32_t adr)
|
|||
|
||||
static int upload(target *t, uint32_t dest, const void *src, uint32_t offset)
|
||||
{
|
||||
const uint32_t *ss=(const uint32_t *)(src+offset);
|
||||
uint32_t dd=dest+offset;
|
||||
const uint32_t *ss=(const uint32_t *)(src+offset);
|
||||
uint32_t dd=dest+offset;
|
||||
|
||||
SET_CR(FLASH_CR_FTPG_CH32);
|
||||
target_mem_write32(t, dd+0,ss[0]);
|
||||
target_mem_write32(t, dd+4,ss[1]);
|
||||
target_mem_write32(t, dd+8,ss[2]);
|
||||
target_mem_write32(t, dd+12,ss[3]);
|
||||
SET_CR(FLASH_CR_BUF_LOAD_CH32); /* BUF LOAD */
|
||||
WAIT_EOP();
|
||||
CLEAR_EOP();
|
||||
CLEAR_CR(FLASH_CR_FTPG_CH32);
|
||||
MAGIC((dest+offset));
|
||||
return 0;
|
||||
SET_CR(FLASH_CR_FTPG_CH32);
|
||||
target_mem_write32(t, dd+0,ss[0]);
|
||||
target_mem_write32(t, dd+4,ss[1]);
|
||||
target_mem_write32(t, dd+8,ss[2]);
|
||||
target_mem_write32(t, dd+12,ss[3]);
|
||||
SET_CR(FLASH_CR_BUF_LOAD_CH32); /* BUF LOAD */
|
||||
WAIT_EOP();
|
||||
CLEAR_EOP();
|
||||
CLEAR_CR(FLASH_CR_FTPG_CH32);
|
||||
MAGIC((dest+offset));
|
||||
return 0;
|
||||
}
|
||||
/**
|
||||
\fn ch32_buffer_clear
|
||||
\brief clear the write buffer
|
||||
\fn ch32_buffer_clear
|
||||
\brief clear the write buffer
|
||||
*/
|
||||
int ch32_buffer_clear(target *t)
|
||||
{
|
||||
|
|
@ -267,84 +260,79 @@ int ch32_buffer_clear(target *t)
|
|||
|
||||
*/
|
||||
static int ch32f1_flash_write(struct target_flash *f,
|
||||
target_addr dest, const void *src, size_t len)
|
||||
target_addr dest, const void *src, size_t len)
|
||||
{
|
||||
target *t = f->t;
|
||||
size_t length = len;
|
||||
target *t = f->t;
|
||||
size_t length = len;
|
||||
#ifdef CH32_VERIFY
|
||||
target_addr orgDest=dest;
|
||||
const void *orgSrc=src;
|
||||
target_addr orgDest=dest;
|
||||
const void *orgSrc=src;
|
||||
#endif
|
||||
DEBUG_CH("CH32: flash write 0x%x ,size=%d\n",dest,len);
|
||||
DEBUG_CH("CH32: flash write 0x%x ,size=%d\n",dest,len);
|
||||
|
||||
while(length>0)
|
||||
{
|
||||
if(ch32f1_flash_unlock(t))
|
||||
{
|
||||
ERROR_CH("ch32f1 cannot fast unlock\n");
|
||||
return -1;
|
||||
}
|
||||
WAIT_BUSY();
|
||||
while(length>0)
|
||||
{
|
||||
if(ch32f1_flash_unlock(t)) {
|
||||
ERROR_CH("ch32f1 cannot fast unlock\n");
|
||||
return -1;
|
||||
}
|
||||
WAIT_BUSY();
|
||||
|
||||
// Buffer reset...
|
||||
ch32_buffer_clear(t);
|
||||
// Load 128 bytes to buffer
|
||||
if(!waitFlashReady(t,dest))
|
||||
{
|
||||
return -1;
|
||||
}
|
||||
for(int i=0;i<8;i++)
|
||||
{
|
||||
if(upload(t,dest,src, 16*i))
|
||||
{
|
||||
ERROR_CH("Cannot upload to buffer\n");
|
||||
}
|
||||
}
|
||||
// Buffer reset...
|
||||
ch32_buffer_clear(t);
|
||||
// Load 128 bytes to buffer
|
||||
if(!waitFlashReady(t,dest)) {
|
||||
return -1;
|
||||
}
|
||||
for(int i=0;i<8;i++) {
|
||||
if(upload(t,dest,src, 16*i)) {
|
||||
ERROR_CH("Cannot upload to buffer\n");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
// write buffer
|
||||
SET_CR(FLASH_CR_FTPG_CH32);
|
||||
target_mem_write32(t, FLASH_AR, dest); // 10
|
||||
SET_CR(FLASH_CR_STRT); // 11 Start
|
||||
WAIT_EOP(); // 12
|
||||
CLEAR_EOP();
|
||||
CLEAR_CR(FLASH_CR_FTPG_CH32);
|
||||
|
||||
// write buffer
|
||||
SET_CR(FLASH_CR_FTPG_CH32);
|
||||
target_mem_write32(t, FLASH_AR, dest); // 10
|
||||
SET_CR(FLASH_CR_STRT); // 11 Start
|
||||
WAIT_EOP(); // 12
|
||||
CLEAR_EOP();
|
||||
CLEAR_CR(FLASH_CR_FTPG_CH32);
|
||||
MAGIC((dest));
|
||||
|
||||
MAGIC((dest));
|
||||
// next
|
||||
if(length>128)
|
||||
length-=128;
|
||||
else
|
||||
length=0;
|
||||
dest+=128;
|
||||
src+=128;
|
||||
|
||||
// next
|
||||
if(length>128)
|
||||
length-=128;
|
||||
else
|
||||
length=0;
|
||||
dest+=128;
|
||||
src+=128;
|
||||
sr = target_mem_read32(t, FLASH_SR); // 13
|
||||
ch32f1_flash_lock(t);
|
||||
if ((sr & SR_ERROR_MASK) ) {
|
||||
ERROR_CH("ch32f1 flash write error 0x%" PRIx32 "\n", sr);
|
||||
return -1;
|
||||
}
|
||||
|
||||
sr = target_mem_read32(t, FLASH_SR); // 13
|
||||
ch32f1_flash_lock(t);
|
||||
if ((sr & SR_ERROR_MASK) )
|
||||
{
|
||||
ERROR_CH("ch32f1 flash write error 0x%" PRIx32 "\n", sr);
|
||||
return -1;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
#ifdef CH32_VERIFY
|
||||
DEBUG_CH("Verifying\n");
|
||||
int i=0;
|
||||
for(i=0;i<(int)len;i+=4)
|
||||
{
|
||||
uint32_t mem=target_mem_read32(t, orgDest+i);
|
||||
uint32_t mem2=*(uint32_t *)(orgSrc+i);
|
||||
if(mem!=mem2)
|
||||
{
|
||||
ERROR_CH(">>>>write mistmatch at address 0x%x\n",orgDest+i);
|
||||
ERROR_CH(">>>>expected 0x%x\n",mem2);
|
||||
ERROR_CH(">>>>flash 0x%x\n",mem);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
DEBUG_CH("Verifying\n");
|
||||
int i=0;
|
||||
for(i=0;i<(int)len;i+=4)
|
||||
{
|
||||
uint32_t mem=target_mem_read32(t, orgDest+i);
|
||||
uint32_t mem2=*(uint32_t *)(orgSrc+i);
|
||||
if(mem!=mem2)
|
||||
{
|
||||
ERROR_CH(">>>>write mistmatch at address 0x%x\n",orgDest+i);
|
||||
ERROR_CH(">>>>expected 0x%x\n",mem2);
|
||||
ERROR_CH(">>>>flash 0x%x\n",mem);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
// EOF
|
||||
|
|
|
|||
Loading…
Reference in New Issue