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

support 4-byte address format for VARIABLE_SIZE dummy flash device

Browse Source 
This patch adds a support of 4-byte address format for VARIABLE_SIZE
dummy flash device, so that it can emulate an flash size larger than
16 MBytes.
- assigned a feature bits FEATURE_4BA to VARIABLE_SIZE flash config.
- added codes handling two commands, JEDEC_READ_4BA and
JEDEC_BYTE_PROGRAM_4BA.
- changed blockeraser to use Chip-Erase command so that it can be
free from flash address byte format.

TEST=ran the command line below:
$ flashrom -p dummy:image=${TMP_FILE},size=33554432, \
emulate=VARIABLE_SIZE -w ${IMG_32MB} -V -f

$ flashrom -p dummy:image=${TMP_FILE},size=16777216, \
emulate=VARIABLE_SIZE -w ${IMG_16MB} -V -f

$ flashrom -p dummy:image=${TMP_FILE},size=8388608, \
emulate=VARIABLE_SIZE -w ${IMG_8MB} -V -f

Signed-off-by: Namyoon Woo <namyoon@google.com>
Change-Id: Ia59eecfcbe798d50f8dacea98c3c508edf8ec77e
Reviewed-on: https://review.coreboot.org/c/flashrom/+/44881
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Namyoon Woo 2020-08-27 16:27:49 -07:00 committed by Edward O'Callaghan
parent 84fc9e889d
commit 79da18f869
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dummyflasher.c
View File

@ -686,6 +686,13 @@ static int emulate_spi_chip_response(unsigned int writecnt,
if (readcnt > 0) if (readcnt > 0)
memcpy(readarr, flashchip_contents + offs, readcnt); memcpy(readarr, flashchip_contents + offs, readcnt);
break; break;
case JEDEC_READ_4BA:
offs = writearr[1] << 24 | writearr[2] << 16 | writearr[3] << 8 | writearr[4];
/* Truncate to emu_chip_size. */
offs %= emu_chip_size;
if (readcnt > 0)
memcpy(readarr, flashchip_contents + offs, readcnt);
break;
case JEDEC_BYTE_PROGRAM: case JEDEC_BYTE_PROGRAM:
offs = writearr[1] << 16 | writearr[2] << 8 | writearr[3]; offs = writearr[1] << 16 | writearr[2] << 8 | writearr[3];
/* Truncate to emu_chip_size. */ /* Truncate to emu_chip_size. */
@ -701,6 +708,21 @@ static int emulate_spi_chip_response(unsigned int writecnt,
memcpy(flashchip_contents + offs, writearr + 4, writecnt - 4); memcpy(flashchip_contents + offs, writearr + 4, writecnt - 4);
emu_modified = 1; emu_modified = 1;
break; break;
case JEDEC_BYTE_PROGRAM_4BA:
offs = writearr[1] << 24 | writearr[2] << 16 | writearr[3] << 8 | writearr[4];
/* Truncate to emu_chip_size. */
offs %= emu_chip_size;
if (writecnt < 6) {
msg_perr("BYTE PROGRAM size too short!\n");
return 1;
}
if (writecnt - 5 > emu_max_byteprogram_size) {
msg_perr("Max BYTE PROGRAM size exceeded!\n");
return 1;
}
memcpy(flashchip_contents + offs, writearr + 5, writecnt - 5);
emu_modified = 1;
break;
case JEDEC_AAI_WORD_PROGRAM: case JEDEC_AAI_WORD_PROGRAM:
if (!emu_max_aai_size) if (!emu_max_aai_size)
break; break;
@ -949,8 +971,8 @@ int probe_variable_size(struct flashctx *flash)
if (!eraser->block_erase) if (!eraser->block_erase)
break; break;
eraser->eraseblocks[0].count = emu_chip_size / eraser->eraseblocks[0].count = 1;
eraser->eraseblocks[0].size; eraser->eraseblocks[0].size = emu_chip_size;
msg_cdbg("%s: eraser.size=%d, .count=%d\n", msg_cdbg("%s: eraser.size=%d, .count=%d\n",
__func__, eraser->eraseblocks[0].size, __func__, eraser->eraseblocks[0].size,
eraser->eraseblocks[0].count); eraser->eraseblocks[0].count);

3
flashchips.c
View File

@ -18765,13 +18765,14 @@ const struct flashchip flashchips[] = {
.model_id = PROGDEV_ID, .model_id = PROGDEV_ID,
.total_size = 64, /* This size is set temporarily */ .total_size = 64, /* This size is set temporarily */
.page_size = 256, .page_size = 256,
.feature_bits = FEATURE_4BA,
.tested = TEST_OK_PREW, .tested = TEST_OK_PREW,
.probe = probe_variable_size, .probe = probe_variable_size,
.block_erasers = .block_erasers =
{ {
{ {
.eraseblocks = { {64 * 1024, 1} }, .eraseblocks = { {64 * 1024, 1} },
.block_erase = spi_block_erase_d8, .block_erase = spi_block_erase_c7,
} }
}, },
.write = spi_chip_write_256, .write = spi_chip_write_256,