sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/renesas: split flash preparation and termination logic to prepare/done functions

This commit is contained in:
Rafael Silva 2022-08-23 13:06:13 +01:00 committed by Rachel Mant
parent 78296deffb
commit 2f3c2c20a1
1 changed files with 42 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
src/target/renesas.c
View File

@ -474,6 +474,34 @@ static bool renesas_rv40_error_check(target *t, uint32_t error_bits)
return error; return error;
} }
static bool renesas_rv40_prepare(target_flash_s *f)
{
target *t = f->t;
if (!(target_mem_read32(t, RV40_FSTATR) & RV40_FSTATR_RDY) || target_mem_read16(t, RV40_FENTRYR) != 0) {
DEBUG_WARN("flash is not ready, may be hanging mid unfinished command due to something going wrong, "
"please power on reset the device\n");
return false;
}
/* code flash or data flash operation */
const bool code_flash = f->start < RENESAS_CF_END;
/* Transition to PE mode */
const pe_mode_e pe_mode = code_flash ? PE_MODE_CF : PE_MODE_DF;
return renesas_rv40_pe_mode(t, pe_mode) && !renesas_rv40_error_check(t, RV40_FSTATR_ILGLERR);
}
static bool renesas_rv40_done(target_flash_s *f)
{
target *t = f->t;
/* return to read mode */
return renesas_rv40_pe_mode(t, PE_MODE_READ);
}
/* !TODO: implement blank check */ /* !TODO: implement blank check */
static int renesas_rv40_flash_erase(target_flash_s *f, target_addr_t addr, size_t len) static int renesas_rv40_flash_erase(target_flash_s *f, target_addr_t addr, size_t len)
{ {
@ -482,21 +510,9 @@ static int renesas_rv40_flash_erase(target_flash_s *f, target_addr_t addr, size_
/* code flash or data flash operation */ /* code flash or data flash operation */
const bool code_flash = addr < RENESAS_CF_END; const bool code_flash = addr < RENESAS_CF_END;
if (!(target_mem_read32(t, RV40_FSTATR) & RV40_FSTATR_RDY) || target_mem_read16(t, RV40_FENTRYR) != 0) {
DEBUG_WARN("flash is not ready, may be hanging mid unfinished command due to something going wrong, "
"please power on reset the device\n");
}
/* Transition to PE mode */
const pe_mode_e pe_mode = code_flash ? PE_MODE_CF : PE_MODE_DF;
if (!renesas_rv40_pe_mode(t, pe_mode))
return -1;
/* Set Erasure Priority Mode */ /* Set Erasure Priority Mode */
target_mem_write16(t, RV40_FCPSR, RV40_FCPSR_ESUSPMD); target_mem_write16(t, RV40_FCPSR, RV40_FCPSR_ESUSPMD);
int result = 0;
while (len) { while (len) {
/* Set block start address*/ /* Set block start address*/
target_mem_write32(t, RV40_FSADDR, addr); target_mem_write32(t, RV40_FSADDR, addr);
@ -524,24 +540,15 @@ static int renesas_rv40_flash_erase(target_flash_s *f, target_addr_t addr, size_
/* Wait until the operation has completed or timeout */ /* Wait until the operation has completed or timeout */
/* Read FRDY bit until it has been set to 1 indicating that the current operation is complete.*/ /* Read FRDY bit until it has been set to 1 indicating that the current operation is complete.*/
while (!(target_mem_read32(t, RV40_FSTATR) & RV40_FSTATR_RDY)) { while (!(target_mem_read32(t, RV40_FSTATR) & RV40_FSTATR_RDY)) {
if (target_check_error(t) || platform_timeout_is_expired(&timeout)) { if (target_check_error(t) || platform_timeout_is_expired(&timeout))
result = -1; return -1;
goto exit;
}
} }
if (renesas_rv40_error_check(t, RV40_FSTATR_ERSERR | RV40_FSTATR_ILGLERR)) { if (renesas_rv40_error_check(t, RV40_FSTATR_ERSERR | RV40_FSTATR_ILGLERR))
result = -1; return -1;
goto exit;
}
} }
exit: return 0;
/* return to read mode */
renesas_rv40_pe_mode(t, PE_MODE_READ);
return result;
} }
static int renesas_rv40_flash_write(target_flash_s *f, target_addr_t dest, const void *src, size_t len) static int renesas_rv40_flash_write(target_flash_s *f, target_addr_t dest, const void *src, size_t len)
@ -554,18 +561,6 @@ static int renesas_rv40_flash_write(target_flash_s *f, target_addr_t dest, const
/* write size for code flash / data flash */ /* write size for code flash / data flash */
const uint8_t write_size = code_flash ? RV40_CF_WRITE_SIZE : RV40_DF_WRITE_SIZE; const uint8_t write_size = code_flash ? RV40_CF_WRITE_SIZE : RV40_DF_WRITE_SIZE;
if (!(target_mem_read32(t, RV40_FSTATR) & RV40_FSTATR_RDY) || target_mem_read16(t, RV40_FENTRYR) != 0) {
DEBUG_WARN("flash is not ready, may be hanging mid unfinished command due to something going wrong, "
"please power on reset the device\n");
}
/* transition to PE mode */
const pe_mode_t pe_mode = code_flash ? PE_MODE_CF : PE_MODE_DF;
if (!renesas_rv40_pe_mode(t, pe_mode))
return -1;
int result = 0;
while (len) { while (len) {
/* set block start address */ /* set block start address */
target_mem_write32(t, RV40_FSADDR, dest); target_mem_write32(t, RV40_FSADDR, dest);
@ -591,10 +586,8 @@ static int renesas_rv40_flash_write(target_flash_s *f, target_addr_t dest, const
target_mem_write16(t, RV40_CMD, *(uint16_t *)src); target_mem_write16(t, RV40_CMD, *(uint16_t *)src);
while (target_mem_read32(t, RV40_FSTATR) & RV40_FSTATR_DBFULL) { while (target_mem_read32(t, RV40_FSTATR) & RV40_FSTATR_DBFULL) {
if (target_check_error(t) || platform_timeout_is_expired(&timeout)) { if (target_check_error(t) || platform_timeout_is_expired(&timeout))
result = -1; return -1;
goto exit;
}
} }
/* 2 bytes of data */ /* 2 bytes of data */
@ -607,24 +600,15 @@ static int renesas_rv40_flash_write(target_flash_s *f, target_addr_t dest, const
/* wait until the operation has completed or timeout */ /* wait until the operation has completed or timeout */
/* read FRDY bit until it has been set to 1 indicating that the current operation is complete.*/ /* read FRDY bit until it has been set to 1 indicating that the current operation is complete.*/
while (!(target_mem_read32(t, RV40_FSTATR) & RV40_FSTATR_RDY)) { while (!(target_mem_read32(t, RV40_FSTATR) & RV40_FSTATR_RDY)) {
if (target_check_error(t) || platform_timeout_is_expired(&timeout)) { if (target_check_error(t) || platform_timeout_is_expired(&timeout))
result = -1; return -1;
goto exit;
}
}
if (renesas_rv40_error_check(t, RV40_FSTATR_PRGERR | RV40_FSTATR_ILGLERR)) {
result = -1;
goto exit;
} }
} }
exit: if (renesas_rv40_error_check(t, RV40_FSTATR_PRGERR | RV40_FSTATR_ILGLERR))
return -1;
/* return to read mode*/ return 0;
renesas_rv40_pe_mode(t, PE_MODE_READ);
return result;
} }
static void renesas_add_rv40_flash(target *t, target_addr_t addr, size_t length) static void renesas_add_rv40_flash(target *t, target_addr_t addr, size_t length)
@ -640,6 +624,8 @@ static void renesas_add_rv40_flash(target *t, target_addr_t addr, size_t length)
f->erased = 0xffU; f->erased = 0xffU;
f->erase = renesas_rv40_flash_erase; f->erase = renesas_rv40_flash_erase;
f->write = renesas_rv40_flash_write; f->write = renesas_rv40_flash_write;
f->prepare = renesas_rv40_prepare;
f->done = renesas_rv40_done;
if (code_flash) { if (code_flash) {
f->blocksize = RV40_CF_REGION1_BLOCK_SIZE; f->blocksize = RV40_CF_REGION1_BLOCK_SIZE;