openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

jedec.c: Rewrite control flow procedurally

Browse Source 
Drop goto usage in fav of loop constructs.

Change-Id: I0927ed40e54cc7e114a57dc40e3614f4825a0ca9
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/72608
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Edward O'Callaghan 2023-01-30 22:28:18 +11:00 committed by Edward O'Callaghan
parent 86babd0627
commit 707cd6bc73
1 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
jedec.c
View File

@ -347,15 +347,15 @@ int erase_chip_block_jedec(struct flashctx *flash, unsigned int addr, unsigned i
static int write_byte_program_jedec_common(const struct flashctx *flash, const uint8_t *src, static int write_byte_program_jedec_common(const struct flashctx *flash, const uint8_t *src,
chipaddr dst, unsigned int mask) chipaddr dst, unsigned int mask)
{ {
int tried = 0, failed = 0; int tries = 0;
chipaddr bios = flash->virtual_memory;
/* If the data is 0xFF, don't program it and don't complain. */ /* If the data is 0xFF, don't program it and don't complain. */
if (*src == 0xFF) { if (*src == 0xFF) {
return 0; return 0;
} }
retry: for (; tries < MAX_REFLASH_TRIES; tries++) {
const chipaddr bios = flash->virtual_memory;
/* Issue JEDEC Byte Program command */ /* Issue JEDEC Byte Program command */
start_program_jedec_common(flash, mask); start_program_jedec_common(flash, mask);
@ -363,14 +363,11 @@ retry:
chip_writeb(flash, *src, dst); chip_writeb(flash, *src, dst);
toggle_ready_jedec(flash, bios); toggle_ready_jedec(flash, bios);
if (chip_readb(flash, dst) != *src && tried++ < MAX_REFLASH_TRIES) { if (chip_readb(flash, dst) == *src)
goto retry; break;
} }
if (tried >= MAX_REFLASH_TRIES) return (tries >= MAX_REFLASH_TRIES) ? 1 : 0;
failed = 1;
return failed;
} }
/* chunksize is 1 */ /* chunksize is 1 */
@ -399,20 +396,19 @@ int write_jedec_1(struct flashctx *flash, const uint8_t *src, unsigned int start
static int write_page_write_jedec_common(struct flashctx *flash, const uint8_t *src, static int write_page_write_jedec_common(struct flashctx *flash, const uint8_t *src,
unsigned int start, unsigned int page_size) unsigned int start, unsigned int page_size)
{ {
unsigned int i; int tries = 0, failed;
int tried = 0, failed;
const uint8_t *s = src; const uint8_t *s = src;
chipaddr bios = flash->virtual_memory; const chipaddr bios = flash->virtual_memory;
chipaddr dst = bios + start; chipaddr dst = bios + start;
chipaddr d = dst; chipaddr d = dst;
const unsigned int mask = getaddrmask(flash->chip); const unsigned int mask = getaddrmask(flash->chip);
retry: for (; tries < MAX_REFLASH_TRIES; tries++) {
/* Issue JEDEC Start Program command */ /* Issue JEDEC Start Program command */
start_program_jedec_common(flash, mask); start_program_jedec_common(flash, mask);
/* transfer data from source to destination */ /* transfer data from source to destination */
for (i = 0; i < page_size; i++) { for (unsigned int i = 0; i < page_size; i++) {
/* If the data is 0xFF, don't program it */ /* If the data is 0xFF, don't program it */
if (*src != 0xFF) if (*src != 0xFF)
chip_writeb(flash, *src, dst); chip_writeb(flash, *src, dst);
@ -425,14 +421,16 @@ retry:
dst = d; dst = d;
src = s; src = s;
failed = verify_range(flash, src, start, page_size); failed = verify_range(flash, src, start, page_size);
if (!failed)
break;
if (failed && tried++ < MAX_REFLASH_TRIES) {
msg_cerr("retrying.\n"); msg_cerr("retrying.\n");
goto retry;
} }
if (failed) { if (failed) {
msg_cerr(" page 0x%" PRIxPTR " failed!\n", (d - bios) / page_size); msg_cerr(" page 0x%" PRIxPTR " failed!\n", (d - bios) / page_size);
} }
return failed; return failed;
} }