flashrom March 2013

flashrom@flashrom.org

47 participants
163 discussions

Re: [flashrom] AMD - SP5100 - take SPI ownership (1/2)
by Rudolf Marek 28 Mar '13

28 Mar '13

That's interesting, I can't comment on that yet and there isn't a lot of debug code in there yet, so running with additional -V parameters won't help much I guess. It helps please go on. I need to check the IMC mailbox and SIO addreses. We can continue with some other programs to verify that IMC accepts at least some commands. Thanks Rudolf > -- > Kind regards/Mit freundlichen Grüßen, Stefan Tauner >

1 0

Re: [flashrom] AMD - SP5100 - take SPI ownership (1/2)
by Stefan Tauner 28 Mar '13

28 Mar '13

On Wed, 27 Mar 2013 16:28:22 +0000 "Racine, Michel" <michel.racine(a)hp.com> wrote: > With your patch, I had a small compile issue (imc.c, function mbox_wait_ack, commented call to msg_pwarn). Hello, thanks for testing it. What kind of compile issue? There should not be any problem with calls to msg_pwarn with that patch. > I attempted to use the exe, but it cannot turn off IMC. Not sure what you need from here. I can change the code, or gather any data you want. That's interesting, I can't comment on that yet and there isn't a lot of debug code in there yet, so running with additional -V parameters won't help much I guess. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

[PATCH] Rename spi_chip_write_256 to spi_chip_write_page
by Mark Marshall 28 Mar '13

28 Mar '13

It seems that the spi_chip_write_256 function writes a page of data (not always 256 bytes), so rename the function to indicate what it does. Signed-off-by: Mark Marshall <mark.marshall(a)omicron.at> --- bitbang_spi.c | 2 +- buspirate_spi.c | 2 +- chipdrivers.h | 2 +- dediprog.c | 4 +- dummyflasher.c | 18 ++-- flashchips.c | 314 +++++++++++++++++++++++++++--------------------------- ft2232_spi.c | 2 +- ichspi.c | 6 +- it85spi.c | 2 +- it87spi.c | 6 +- jedec.c | 5 +- linux_spi.c | 6 +- programmer.h | 4 +- sb600spi.c | 2 +- serprog.c | 2 +- sfdp.c | 2 +- spi.c | 10 +- spi25.c | 2 +- usbblaster_spi.c | 2 +- wbsio_spi.c | 2 +- 20 files changed, 198 insertions(+), 197 deletions(-) diff --git a/bitbang_spi.c b/bitbang_spi.c index b10fc26..20f9a3f 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -70,7 +70,7 @@ static const struct spi_programmer spi_programmer_bitbang = { .command = bitbang_spi_send_command, .multicommand = default_spi_send_multicommand, .read = default_spi_read, - .write_256 = default_spi_write_256, + .write_page = default_spi_write_page, .write_aai = default_spi_write_aai, }; diff --git a/buspirate_spi.c b/buspirate_spi.c index d2ebc75..c0e5b0d 100644 --- a/buspirate_spi.c +++ b/buspirate_spi.c @@ -141,7 +141,7 @@ static struct spi_programmer spi_programmer_buspirate = { .command = NULL, .multicommand = default_spi_send_multicommand, .read = default_spi_read, - .write_256 = default_spi_write_256, + .write_page = default_spi_write_page, .write_aai = default_spi_write_aai, }; diff --git a/chipdrivers.h b/chipdrivers.h index e9d0b7f..83524ee 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -29,7 +29,7 @@ /* spi.c */ int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); -int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); +int spi_chip_write_page(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len); /* spi25.c */ diff --git a/dediprog.c b/dediprog.c index ae86810..fe035eb 100644 --- a/dediprog.c +++ b/dediprog.c @@ -415,7 +415,7 @@ static int dediprog_spi_write(struct flashctx *flash, uint8_t *buf, return 0; } -static int dediprog_spi_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) +static int dediprog_spi_write_page(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { return dediprog_spi_write(flash, buf, start, len, DEDI_SPI_CMD_PAGEWRITE); } @@ -751,7 +751,7 @@ static const struct spi_programmer spi_programmer_dediprog = { .command = dediprog_spi_send_command, .multicommand = default_spi_send_multicommand, .read = dediprog_spi_read, - .write_256 = dediprog_spi_write_256, + .write_page = dediprog_spi_write_page, .write_aai = dediprog_spi_write_aai, }; diff --git a/dummyflasher.c b/dummyflasher.c index 5cb1c35..dea00d0 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -94,13 +94,13 @@ static const uint8_t sfdp_table[] = { #endif #endif -static unsigned int spi_write_256_chunksize = 256; +static unsigned int spi_write_page_chunksize = 256; static int dummy_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -static int dummy_spi_write_256(struct flashctx *flash, const uint8_t *buf, +static int dummy_spi_write_page(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); static void dummy_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); @@ -126,7 +126,7 @@ static const struct spi_programmer spi_programmer_dummyflasher = { .command = dummy_spi_send_command, .multicommand = default_spi_send_multicommand, .read = default_spi_read, - .write_256 = dummy_spi_write_256, + .write_page = dummy_spi_write_page, .write_aai = default_spi_write_aai, }; @@ -202,12 +202,12 @@ int dummy_init(void) msg_pdbg("Support for all flash bus types disabled.\n"); free(bustext); - tmp = extract_programmer_param("spi_write_256_chunksize"); + tmp = extract_programmer_param("spi_write_page_chunksize"); if (tmp) { - spi_write_256_chunksize = atoi(tmp); + spi_write_page_chunksize = atoi(tmp); free(tmp); - if (spi_write_256_chunksize < 1) { - msg_perr("invalid spi_write_256_chunksize\n"); + if (spi_write_page_chunksize < 1) { + msg_perr("invalid spi_write_page_chunksize\n"); return 1; } } @@ -846,9 +846,9 @@ static int dummy_spi_send_command(struct flashctx *flash, unsigned int writecnt, return 0; } -static int dummy_spi_write_256(struct flashctx *flash, const uint8_t *buf, +static int dummy_spi_write_page(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return spi_write_chunked(flash, buf, start, len, - spi_write_256_chunksize); + spi_write_page_chunksize); } diff --git a/flashchips.c b/flashchips.c index a7e6d8b..4d01c0e 100644 --- a/flashchips.c +++ b/flashchips.c @@ -566,7 +566,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -600,7 +600,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -635,7 +635,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -670,7 +670,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -705,7 +705,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -740,7 +740,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -780,7 +780,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -815,7 +815,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -850,7 +850,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -888,7 +888,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -926,7 +926,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -958,7 +958,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -990,7 +990,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1022,7 +1022,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1054,7 +1054,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1086,7 +1086,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1118,7 +1118,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1157,7 +1157,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_amic_a25l032, .unlock = NULL, /* Two status reg bytes (read with 0x35 and 0x05) */ - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1196,7 +1196,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_amic_a25l032, .unlock = NULL, /* Two status reg bytes (read with 0x35 and 0x05) */ - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1354,7 +1354,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at25df, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, /* 2.3-3.6V & 2.7-3.6V models available */ }, @@ -1392,7 +1392,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at25df, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, /* 2.3-3.6V & 2.7-3.6V models available */ }, @@ -1430,7 +1430,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at25df, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {1600, 2000}, /* Datasheet says range is 1.65-1.95 V */ }, @@ -1468,7 +1468,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at25df_sec, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1506,7 +1506,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at25df_sec, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1544,7 +1544,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect_at25df, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1583,7 +1583,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at25df_sec, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1621,7 +1621,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at25df_sec, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1660,7 +1660,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25df_sec, .unlock = spi_disable_blockprotect_at25df_sec, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1689,7 +1689,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25f, .unlock = spi_disable_blockprotect_at25f, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1719,7 +1719,7 @@ const struct flashchip flashchips[] = { .printlock = spi_prettyprint_status_register_at25f512a, /* FIXME: It is not correct to use this one, because the BP1 bit is N/A. */ .unlock = spi_disable_blockprotect_at25f512a, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1761,7 +1761,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25f512b, .unlock = spi_disable_blockprotect_at25f512b, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1792,7 +1792,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25f, .unlock = spi_disable_blockprotect_at25f, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1821,7 +1821,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25f, .unlock = spi_disable_blockprotect_at25f, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1850,7 +1850,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25f4096, .unlock = spi_disable_blockprotect_at25f4096, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1891,7 +1891,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25fs010, .unlock = spi_disable_blockprotect_at25fs010, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1929,7 +1929,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25fs040, .unlock = spi_disable_blockprotect_at25fs040, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -1999,7 +1999,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at26df081a, .unlock = spi_disable_blockprotect_at25df, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2037,7 +2037,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at25df, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2075,7 +2075,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_at26df081a, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2095,7 +2095,7 @@ const struct flashchip flashchips[] = { .probe_timing = TIMING_ZERO, .printlock = spi_prettyprint_status_register_at26df081a, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, },*/ @@ -2808,7 +2808,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2842,7 +2842,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2876,7 +2876,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2910,7 +2910,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2945,7 +2945,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -2980,7 +2980,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3015,7 +3015,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3050,7 +3050,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3085,7 +3085,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3120,7 +3120,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3155,7 +3155,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3190,7 +3190,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3225,7 +3225,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3260,7 +3260,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3295,7 +3295,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3330,7 +3330,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3368,7 +3368,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3406,7 +3406,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3444,7 +3444,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3479,7 +3479,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3514,7 +3514,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3549,7 +3549,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3584,7 +3584,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3619,7 +3619,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3655,7 +3655,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3691,7 +3691,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3733,7 +3733,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3769,7 +3769,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3805,7 +3805,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3841,7 +3841,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, }, @@ -3877,7 +3877,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -3914,7 +3914,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4203,7 +4203,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4241,7 +4241,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4280,7 +4280,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4319,7 +4319,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4358,7 +4358,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4397,7 +4397,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4436,7 +4436,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -4475,7 +4475,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {1700, 1950}, }, @@ -4605,7 +4605,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_s33, .unlock = spi_disable_blockprotect_s33, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -4644,7 +4644,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_s33, .unlock = spi_disable_blockprotect_s33, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -4683,7 +4683,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_s33, .unlock = spi_disable_blockprotect_s33, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -4722,7 +4722,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_s33, .unlock = spi_disable_blockprotect_s33, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -4761,7 +4761,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_s33, .unlock = spi_disable_blockprotect_s33, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -4800,7 +4800,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_s33, .unlock = spi_disable_blockprotect_s33, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* also fast read 0x0B */ .voltage = {2700, 3600}, }, @@ -5103,7 +5103,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) supported, MX25L512E supports dual I/O */ .voltage = {2700, 3600}, /* 2.35-3.6V for MX25V512(C) */ }, @@ -5139,7 +5139,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) supported, MX25L1006E supports dual I/O */ .voltage = {2700, 3600}, }, @@ -5177,7 +5177,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -5215,7 +5215,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -5253,7 +5253,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 2.35-3.6V for MX25V8005 */ }, @@ -5288,7 +5288,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, /* bit6: error flag */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -5327,7 +5327,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* MX25L1605A bp2 only */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -5362,7 +5362,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* bit6: Continously Program (CP) mode */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B), dual I/O supported */ .voltage = {2700, 3600}, }, @@ -5398,7 +5398,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -5434,7 +5434,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -5469,7 +5469,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp2, /* bit6: error flag */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -5505,7 +5505,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* bit6: CP mode */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ .voltage = {2700, 3600}, }, @@ -5544,7 +5544,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and dual I/O supported */ .voltage = {2700, 3600}, }, @@ -5580,7 +5580,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5616,7 +5616,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 has different meanings */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5652,7 +5652,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 for 36E is quad enable */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -5692,7 +5692,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -5728,7 +5728,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* MX25L12805D: Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -5769,7 +5769,7 @@ const struct flashchip flashchips[] = { /* TODO: security register */ .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -5811,7 +5811,7 @@ const struct flashchip flashchips[] = { /* TODO: security register */ .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -5853,7 +5853,7 @@ const struct flashchip flashchips[] = { /* TODO: security register */ .printlock = spi_prettyprint_status_register_default_bp3, /* bit6 is quad enable */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1650, 2000}, }, @@ -6258,7 +6258,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -6290,7 +6290,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -6322,7 +6322,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -6354,7 +6354,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -6386,7 +6386,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -6422,7 +6422,7 @@ const struct flashchip flashchips[] = { } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -6455,7 +6455,7 @@ const struct flashchip flashchips[] = { } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -6488,7 +6488,7 @@ const struct flashchip flashchips[] = { } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6521,7 +6521,7 @@ const struct flashchip flashchips[] = { } }, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {1700, 2000}, }, @@ -6555,7 +6555,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) and multi I/O supported */ .voltage = {2700, 3600}, }, @@ -6587,7 +6587,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -6625,7 +6625,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -6657,7 +6657,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -6689,7 +6689,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -6727,7 +6727,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -6759,7 +6759,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -7033,7 +7033,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, }, @@ -7124,7 +7124,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -7153,7 +7153,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -7182,7 +7182,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -7211,7 +7211,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -7240,7 +7240,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -7269,7 +7269,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -7479,7 +7479,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_sst25, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -8580,7 +8580,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -8643,7 +8643,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -8702,7 +8702,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8731,7 +8731,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp1, .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, }, @@ -8760,7 +8760,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -8789,7 +8789,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, }, @@ -8817,7 +8817,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -8846,7 +8846,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -8875,7 +8875,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -8904,7 +8904,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -8933,7 +8933,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_default_bp3, /* TODO: check */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -8966,7 +8966,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, }, @@ -8997,7 +8997,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -9029,7 +9029,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, }, @@ -9847,7 +9847,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -9886,7 +9886,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -9925,7 +9925,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -9964,7 +9964,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, }, @@ -10002,7 +10002,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, }, @@ -10033,7 +10033,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10065,7 +10065,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10097,7 +10097,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10129,7 +10129,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10167,7 +10167,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10205,7 +10205,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, @@ -10243,7 +10243,7 @@ const struct flashchip flashchips[] = { }, .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ .unlock = spi_disable_blockprotect, - .write = spi_chip_write_256, + .write = spi_chip_write_page, .read = spi_chip_read, .voltage = {2700, 3600}, }, diff --git a/ft2232_spi.c b/ft2232_spi.c index 81be051..5ddfd84 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -151,7 +151,7 @@ static const struct spi_programmer spi_programmer_ft2232 = { .command = ft2232_spi_send_command, .multicommand = default_spi_send_multicommand, .read = default_spi_read, - .write_256 = default_spi_write_256, + .write_page = default_spi_write_page, .write_aai = default_spi_write_aai, }; diff --git a/ichspi.c b/ichspi.c index 72942f6..6b7aa94 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1521,7 +1521,7 @@ static const struct spi_programmer spi_programmer_ich7 = { .command = ich_spi_send_command, .multicommand = ich_spi_send_multicommand, .read = default_spi_read, - .write_256 = default_spi_write_256, + .write_page = default_spi_write_page, .write_aai = default_spi_write_aai, }; @@ -1532,7 +1532,7 @@ static const struct spi_programmer spi_programmer_ich9 = { .command = ich_spi_send_command, .multicommand = ich_spi_send_multicommand, .read = default_spi_read, - .write_256 = default_spi_write_256, + .write_page = default_spi_write_page, .write_aai = default_spi_write_aai, }; @@ -1837,7 +1837,7 @@ static const struct spi_programmer spi_programmer_via = { .command = ich_spi_send_command, .multicommand = ich_spi_send_multicommand, .read = default_spi_read, - .write_256 = default_spi_write_256, + .write_page = default_spi_write_page, .write_aai = default_spi_write_aai, }; diff --git a/it85spi.c b/it85spi.c index 0b074eb..d2cf3ab 100644 --- a/it85spi.c +++ b/it85spi.c @@ -283,7 +283,7 @@ static const struct spi_programmer spi_programmer_it85xx = { .command = it85xx_spi_send_command, .multicommand = default_spi_send_multicommand, .read = default_spi_read, - .write_256 = default_spi_write_256, + .write_page = default_spi_write_page, .write_aai = default_spi_write_aai, }; diff --git a/it87spi.c b/it87spi.c index 5320bc7..f2949c7 100644 --- a/it87spi.c +++ b/it87spi.c @@ -107,7 +107,7 @@ static int it8716f_spi_send_command(struct flashctx *flash, unsigned char *readarr); static int it8716f_spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, +static int it8716f_spi_chip_write_page(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); static const struct spi_programmer spi_programmer_it87xx = { @@ -117,7 +117,7 @@ static const struct spi_programmer spi_programmer_it87xx = { .command = it8716f_spi_send_command, .multicommand = default_spi_send_multicommand, .read = it8716f_spi_chip_read, - .write_256 = it8716f_spi_chip_write_256, + .write_page = it8716f_spi_chip_write_page, .write_aai = default_spi_write_aai, }; @@ -361,7 +361,7 @@ static int it8716f_spi_chip_read(struct flashctx *flash, uint8_t *buf, return 0; } -static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, +static int it8716f_spi_chip_write_page(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { const struct flashchip *chip = flash->chip; diff --git a/jedec.c b/jedec.c index 7bc9133..8445bd9 100644 --- a/jedec.c +++ b/jedec.c @@ -381,8 +381,9 @@ int write_jedec_1(struct flashctx *flash, uint8_t *src, unsigned int start, return failed; } -int write_page_write_jedec_common(struct flashctx *flash, uint8_t *src, - unsigned int start, unsigned int page_size) +static int write_page_write_jedec_common(struct flashctx *flash, uint8_t *src, + unsigned int start, + unsigned int page_size) { int i, tried = 0, failed; uint8_t *s = src; diff --git a/linux_spi.c b/linux_spi.c index a09d06b..7e18306 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -43,7 +43,7 @@ static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned char *rxbuf); static int linux_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -static int linux_spi_write_256(struct flashctx *flash, const uint8_t *buf, +static int linux_spi_write_page(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); static const struct spi_programmer spi_programmer_linux = { @@ -53,7 +53,7 @@ static const struct spi_programmer spi_programmer_linux = { .command = linux_spi_send_command, .multicommand = default_spi_send_multicommand, .read = linux_spi_read, - .write_256 = linux_spi_write_256, + .write_page = linux_spi_write_page, .write_aai = default_spi_write_aai, }; @@ -174,7 +174,7 @@ static int linux_spi_read(struct flashctx *flash, uint8_t *buf, (unsigned int)getpagesize()); } -static int linux_spi_write_256(struct flashctx *flash, const uint8_t *buf, +static int linux_spi_write_page(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return spi_write_chunked(flash, buf, start, len, diff --git a/programmer.h b/programmer.h index 5ba5855..80f9cee 100644 --- a/programmer.h +++ b/programmer.h @@ -536,7 +536,7 @@ struct spi_programmer { /* Optimized functions for this programmer */ int (*read)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); - int (*write_256)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); + int (*write_page)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*write_aai)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); const void *data; }; @@ -545,7 +545,7 @@ int default_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsi const unsigned char *writearr, unsigned char *readarr); int default_spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds); int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); +int default_spi_write_page(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int register_spi_programmer(const struct spi_programmer *programmer); diff --git a/sb600spi.c b/sb600spi.c index fe60aa9..acade2c 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -201,7 +201,7 @@ static const struct spi_programmer spi_programmer_sb600 = { .command = sb600_spi_send_command, .multicommand = default_spi_send_multicommand, .read = default_spi_read, - .write_256 = default_spi_write_256, + .write_page = default_spi_write_page, .write_aai = default_spi_write_aai, }; diff --git a/serprog.c b/serprog.c index c36c93d..82149a5 100644 --- a/serprog.c +++ b/serprog.c @@ -322,7 +322,7 @@ static struct spi_programmer spi_programmer_serprog = { .command = serprog_spi_send_command, .multicommand = default_spi_send_multicommand, .read = serprog_spi_read, - .write_256 = default_spi_write_256, + .write_page = default_spi_write_page, .write_aai = default_spi_write_aai, }; diff --git a/sfdp.c b/sfdp.c index bc69dd0..7232414 100644 --- a/sfdp.c +++ b/sfdp.c @@ -187,7 +187,7 @@ static int sfdp_fill_flash(struct flashchip *chip, uint8_t *buf, uint16_t len) if (tmp32 & (1 << 2)) { msg_cdbg2("at least 64 B.\n"); chip->page_size = 64; - chip->write = spi_chip_write_256; + chip->write = spi_chip_write_page; } else { msg_cdbg2("1 B only.\n"); chip->page_size = 256; diff --git a/spi.c b/spi.c index 2b10eab..7c49fba 100644 --- a/spi.c +++ b/spi.c @@ -88,7 +88,7 @@ int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, return spi_read_chunked(flash, buf, start, len, max_data); } -int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, +int default_spi_write_page(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { unsigned int max_data = flash->pgm->spi.max_data_write; @@ -134,13 +134,13 @@ int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, * Program chip using page (256 bytes) programming. * Some SPI masters can't do this, they use single byte programming instead. * The redirect to single byte programming is achieved by setting - * .write_256 = spi_chip_write_1 + * .write_page = spi_chip_write_1 */ /* real chunksize is up to 256, logical chunksize is 256 */ -int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, +int spi_chip_write_page(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { - return flash->pgm->spi.write_256(flash, buf, start, len); + return flash->pgm->spi.write_page(flash, buf, start, len); } /* @@ -174,7 +174,7 @@ int register_spi_programmer(const struct spi_programmer *pgm) { struct registered_programmer rpgm; - if (!pgm->write_aai || !pgm->write_256 || !pgm->read || !pgm->command || + if (!pgm->write_aai || !pgm->write_page || !pgm->read || !pgm->command || !pgm->multicommand || ((pgm->command == default_spi_send_command) && (pgm->multicommand == default_spi_send_multicommand))) { diff --git a/spi25.c b/spi25.c index 06584bc..174bdcf 100644 --- a/spi25.c +++ b/spi25.c @@ -974,7 +974,7 @@ int spi_write_chunked(struct flashctx *flash, const uint8_t *buf, unsigned int pos, j, lenhere, towrite, page_end; /* FIXME: page_size is the wrong variable. We need max_writechunk_size * in struct flashctx to do this properly. All chips using - * spi_chip_write_256 have page_size set to max_writechunk_size, so + * spi_chip_write_page have page_size set to max_writechunk_size, so * we're OK for now. */ unsigned int page_size = flash->chip->page_size; diff --git a/usbblaster_spi.c b/usbblaster_spi.c index 86fd573..fd3734d 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -218,7 +218,7 @@ static const struct spi_programmer spi_programmer_usbblaster = { .command = usbblaster_spi_send_command, .multicommand = default_spi_send_multicommand, .read = default_spi_read, - .write_256 = default_spi_write_256, + .write_page = default_spi_write_page, .write_aai = default_spi_write_aai, }; diff --git a/wbsio_spi.c b/wbsio_spi.c index 7d4bb2a..0cfe31c 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -75,7 +75,7 @@ static const struct spi_programmer spi_programmer_wbsio = { .command = wbsio_spi_send_command, .multicommand = default_spi_send_multicommand, .read = wbsio_spi_read, - .write_256 = spi_chip_write_1, + .write_page = spi_chip_write_1, .write_aai = default_spi_write_aai, };

1 0

[PATCH] Add a write granularity of 512 bytes
by Mark Marshall 28 Mar '13

28 Mar '13

I think this is needed for SPI Flash that has a page size of 512. I have also changed the loop condition in a few places. If the length is not a multiple of stride we need to round up the result of the divide. (Either we need to round up the divide or we should replace the lines "limit = min(stride, len - i * stride);" with "limit = stride;". Rounding up the result of the divide seems to be the correct thing to do.). Signed-off-by: Mark Marshall <mark.marshall(a)omicron.at> --- flash.h | 2 ++ flashrom.c | 38 +++++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/flash.h b/flash.h index 0181798..876fdfd 100644 --- a/flash.h +++ b/flash.h @@ -66,11 +66,13 @@ enum chipbustype { * - 128 bytes: If less than 128 bytes are written, the rest will be erased. Each write to a 128-byte region * will trigger an automatic erase before anything is written. Very uncommon behaviour. * - 256 bytes: If less than 256 bytes are written, the contents of the unwritten bytes are undefined. + * - 512 bytes: If less than 512 bytes are written, the contents of the unwritten bytes are undefined. */ enum write_granularity { write_gran_256bytes = 0, /* We assume 256 byte granularity by default. */ write_gran_1bit, write_gran_1byte, + write_gran_512bytes, }; /* diff --git a/flashrom.c b/flashrom.c index b682923..8413a4b 100644 --- a/flashrom.c +++ b/flashrom.c @@ -706,6 +706,13 @@ int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum { int result = 0; unsigned int i, j, limit; + static uint8_t all_ffs[512]; + static int all_ffs_init = 0; + + if (!all_ffs_init) { + memset(all_ffs, 0xff, sizeof(all_ffs)); + all_ffs_init = 1; + } switch (gran) { case write_gran_1bit: @@ -723,21 +730,31 @@ int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum } break; case write_gran_256bytes: - for (j = 0; j < len / 256; j++) { + for (j = 0; j < (len + 255) / 256; j++) { limit = min (256, len - j * 256); /* Are 'have' and 'want' identical? */ if (!memcmp(have + j * 256, want + j * 256, limit)) continue; - /* have needs to be in erased state. */ - for (i = 0; i < limit; i++) - if (have[j * 256 + i] != 0xff) { - result = 1; - break; - } - if (result) + /* 'have' needs to be in erased state. */ + if (memcmp(have + j * 256, all_ffs, limit)) { + result = 1; break; + } } break; + case write_gran_512bytes: + for (j = 0; j < (len + 511) / 512; j++) { + limit = min (512, len - j * 512); + /* Are 'have' and 'want' identical? */ + if (!memcmp(have + j * 512, want + j * 512, limit)) + continue; + /* 'have' needs to be in erased state. */ + if (memcmp(have + j * 512, all_ffs, limit)) { + result = 1; + break; + } + } + break; default: msg_cerr("%s: Unsupported granularity! Please report a bug at " "flashrom(a)flashrom.org\n", __func__); @@ -784,6 +801,9 @@ static unsigned int get_next_write(const uint8_t *have, const uint8_t *want, uns case write_gran_256bytes: stride = 256; break; + case write_gran_512bytes: + stride = 512; + break; default: msg_cerr("%s: Unsupported granularity! Please report a bug at " "flashrom(a)flashrom.org\n", __func__); @@ -792,7 +812,7 @@ static unsigned int get_next_write(const uint8_t *have, const uint8_t *want, uns */ return 0; } - for (i = 0; i < len / stride; i++) { + for (i = 0; i < (len + stride - 1) / stride; i++) { limit = min(stride, len - i * stride); /* Are 'have' and 'want' identical? */ if (memcmp(have + i * stride, want + i * stride, limit)) {

1 0

[PATCH] Add const to many function prototypes
by Mark Marshall 28 Mar '13

28 Mar '13

Add 'const' to the data block passed to 'write' functions. This is as much for documentation as anything else, but should allow the compiler to make a few basic checks for us. Signed-off-by: Mark Marshall <mark.marshall(a)omicron.at> --- 82802ab.c | 4 ++-- chipdrivers.h | 24 ++++++++++++------------ dummyflasher.c | 8 ++++---- en29lv640b.c | 4 ++-- flash.h | 12 ++++++------ flashrom.c | 26 +++++++++++++------------- ichspi.c | 2 +- it87spi.c | 6 +++--- layout.c | 4 ++-- linux_spi.c | 4 ++-- m29f400bt.c | 4 ++-- opaque.c | 2 +- programmer.c | 2 +- programmer.h | 16 ++++++++-------- serial.c | 2 +- spi.c | 8 ++++---- spi25.c | 16 +++++++++------- sst28sf040.c | 4 ++-- 18 files changed, 75 insertions(+), 73 deletions(-) diff --git a/82802ab.c b/82802ab.c index 608995d..a1096ea 100644 --- a/82802ab.c +++ b/82802ab.c @@ -141,8 +141,8 @@ int erase_block_82802ab(struct flashctx *flash, unsigned int page, } /* chunksize is 1 */ -int write_82802ab(struct flashctx *flash, uint8_t *src, unsigned int start, - unsigned int len) +int write_82802ab(struct flashctx *flash, const uint8_t *src, + unsigned int start, unsigned int len) { int i; chipaddr dst = flash->virtual_memory + start; diff --git a/chipdrivers.h b/chipdrivers.h index 244d421..e9d0b7f 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -28,8 +28,8 @@ #include "flash.h" /* for chipaddr and flashctx */ /* spi.c */ -int spi_aai_write(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int spi_chip_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); +int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len); /* spi25.c */ @@ -52,12 +52,12 @@ int spi_block_erase_60(struct flashctx *flash, unsigned int addr, unsigned int b int spi_block_erase_62(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_c7(struct flashctx *flash, unsigned int addr, unsigned int blocklen); erasefunc_t *spi_get_erasefn_from_opcode(uint8_t opcode); -int spi_chip_write_1(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int spi_chip_write_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int spi_byte_program(struct flashctx *flash, unsigned int addr, uint8_t databyte); -int spi_nbyte_program(struct flashctx *flash, unsigned int addr, uint8_t *bytes, unsigned int len); +int spi_nbyte_program(struct flashctx *flash, unsigned int addr, const uint8_t *bytes, unsigned int len); int spi_nbyte_read(struct flashctx *flash, unsigned int addr, uint8_t *bytes, unsigned int len); int spi_read_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize); -int spi_write_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize); +int spi_write_chunked(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize); /* spi25_statusreg.c */ uint8_t spi_read_status_register(struct flashctx *flash); @@ -97,14 +97,14 @@ int probe_spi_sfdp(struct flashctx *flash); /* opaque.c */ int probe_opaque(struct flashctx *flash); int read_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int write_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_opaque(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int erase_opaque(struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen); /* 82802ab.c */ uint8_t wait_82802ab(struct flashctx *flash); int probe_82802ab(struct flashctx *flash); int erase_block_82802ab(struct flashctx *flash, unsigned int page, unsigned int pagesize); -int write_82802ab(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_82802ab(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); void print_status_82802ab(uint8_t status); int unlock_82802ab(struct flashctx *flash); int unlock_28f004s5(struct flashctx *flash); @@ -117,8 +117,8 @@ void data_polling_jedec(struct flashctx *flash, chipaddr dst, uint8_t data); int write_byte_program_jedec(struct flashctx *flash, chipaddr bios, uint8_t *src, chipaddr dst); int probe_jedec(struct flashctx *flash); -int write_jedec(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int write_jedec_1(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_jedec(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); +int write_jedec_1(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int erase_sector_jedec(struct flashctx *flash, unsigned int page, unsigned int pagesize); int erase_block_jedec(struct flashctx *flash, unsigned int page, unsigned int blocksize); int erase_chip_block_jedec(struct flashctx *flash, unsigned int page, unsigned int blocksize); @@ -127,7 +127,7 @@ int erase_chip_block_jedec(struct flashctx *flash, unsigned int page, unsigned i int probe_m29f400bt(struct flashctx *flash); int block_erase_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len); int block_erase_chip_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len); -int write_m29f400bt(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_m29f400bt(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); void protect_m29f400bt(struct flashctx *flash, chipaddr bios); /* pm49fl00x.c */ @@ -137,7 +137,7 @@ int lock_49fl00x(struct flashctx *flash); /* sst28sf040.c */ int erase_chip_28sf040(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int erase_sector_28sf040(struct flashctx *flash, unsigned int address, unsigned int sector_size); -int write_28sf040(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_28sf040(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int unprotect_28sf040(struct flashctx *flash); int protect_28sf040(struct flashctx *flash); @@ -178,6 +178,6 @@ int unlock_stm50flw0x0x(struct flashctx *flash); int probe_en29lv640b(struct flashctx *flash); int block_erase_en29lv640b(struct flashctx *flash, unsigned int start, unsigned int len); int block_erase_chip_en29lv640b(struct flashctx *flash, unsigned int start, unsigned int len); -int write_en29lv640b(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int write_en29lv640b(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); #endif /* !__CHIPDRIVERS_H__ */ diff --git a/dummyflasher.c b/dummyflasher.c index 383ca58..5cb1c35 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -100,7 +100,7 @@ static int dummy_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); -static int dummy_spi_write_256(struct flashctx *flash, uint8_t *buf, +static int dummy_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); static void dummy_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); @@ -108,7 +108,7 @@ static void dummy_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); static void dummy_chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr); -static void dummy_chip_writen(const struct flashctx *flash, uint8_t *buf, +static void dummy_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len); static uint8_t dummy_chip_readb(const struct flashctx *flash, const chipaddr addr); @@ -443,7 +443,7 @@ static void dummy_chip_writel(const struct flashctx *flash, uint32_t val, msg_pspew("%s: addr=0x%lx, val=0x%08x\n", __func__, addr, val); } -static void dummy_chip_writen(const struct flashctx *flash, uint8_t *buf, +static void dummy_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len) { size_t i; @@ -846,7 +846,7 @@ static int dummy_spi_send_command(struct flashctx *flash, unsigned int writecnt, return 0; } -static int dummy_spi_write_256(struct flashctx *flash, uint8_t *buf, +static int dummy_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return spi_write_chunked(flash, buf, start, len, diff --git a/en29lv640b.c b/en29lv640b.c index e79415a..eb53630 100644 --- a/en29lv640b.c +++ b/en29lv640b.c @@ -31,8 +31,8 @@ */ /* chunksize is 1 */ -int write_en29lv640b(struct flashctx *flash, uint8_t *src, unsigned int start, - unsigned int len) +int write_en29lv640b(struct flashctx *flash, const uint8_t *src, + unsigned int start, unsigned int len) { int i; chipaddr bios = flash->virtual_memory; diff --git a/flash.h b/flash.h index f73f12e..0181798 100644 --- a/flash.h +++ b/flash.h @@ -157,7 +157,7 @@ struct flashchip { int (*printlock) (struct flashctx *flash); int (*unlock) (struct flashctx *flash); - int (*write) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); + int (*write) (struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*read) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); struct voltage { uint16_t min; @@ -209,7 +209,7 @@ extern const struct flashchip flashchips[]; void chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); void chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); void chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr); -void chip_writen(const struct flashctx *flash, uint8_t *buf, chipaddr addr, size_t len); +void chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len); uint8_t chip_readb(const struct flashctx *flash, const chipaddr addr); uint16_t chip_readw(const struct flashctx *flash, const chipaddr addr); uint32_t chip_readl(const struct flashctx *flash, const chipaddr addr); @@ -234,8 +234,8 @@ int min(int a, int b); int max(int a, int b); void tolower_string(char *str); char *extract_param(const char *const *haystack, const char *needle, const char *delim); -int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len); -int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum write_granularity gran); +int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len); +int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran); char *strcat_realloc(char *dest, const char *src); void print_version(void); void print_buildinfo(void); @@ -244,7 +244,7 @@ void list_programmers_linebreak(int startcol, int cols, int paren); int selfcheck(void); int doit(struct flashctx *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it); int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); -int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename); +int write_buf_to_file(const unsigned char *buf, unsigned long size, const char *filename); enum test_state { OK = 0, @@ -303,7 +303,7 @@ int print(enum msglevel level, const char *fmt, ...) __attribute__((format(print /* layout.c */ int register_include_arg(char *name); int process_include_args(void); -int read_romlayout(char *name); +int read_romlayout(const char *name); int handle_romentries(const struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); /* spi.c */ diff --git a/flashrom.c b/flashrom.c index 6a117b2..b682923 100644 --- a/flashrom.c +++ b/flashrom.c @@ -443,7 +443,7 @@ void chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr) flash->pgm->par.chip_writel(flash, val, addr); } -void chip_writen(const struct flashctx *flash, uint8_t *buf, chipaddr addr, +void chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len) { flash->pgm->par.chip_writen(flash, buf, addr, len); @@ -606,7 +606,7 @@ static unsigned int count_usable_erasers(const struct flashctx *flash) return usable_erasefunctions; } -int compare_range(uint8_t *wantbuf, uint8_t *havebuf, unsigned int start, unsigned int len) +static int compare_range(const uint8_t *wantbuf, const uint8_t *havebuf, unsigned int start, unsigned int len) { int ret = 0, failcount = 0; unsigned int i; @@ -650,7 +650,7 @@ int check_erased_range(struct flashctx *flash, unsigned int start, * @len length of the verified area * @return 0 for success, -1 for failure */ -int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len) +int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len) { uint8_t *readbuf = malloc(len); int ret = 0; @@ -702,7 +702,7 @@ out_free: * @gran write granularity (enum, not count) * @return 0 if no erase is needed, 1 otherwise */ -int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum write_granularity gran) +int need_erase(const uint8_t *have, const uint8_t *want, unsigned int len, enum write_granularity gran) { int result = 0; unsigned int i, j, limit; @@ -768,9 +768,9 @@ int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum write_granul * in relation to the max write length of the programmer and the max write * length of the chip. */ -static unsigned int get_next_write(uint8_t *have, uint8_t *want, unsigned int len, - unsigned int *first_start, - enum write_granularity gran) +static unsigned int get_next_write(const uint8_t *have, const uint8_t *want, unsigned int len, + unsigned int *first_start, + enum write_granularity gran) { int need_write = 0; unsigned int rel_start = 0, first_len = 0; @@ -1151,7 +1151,7 @@ int read_buf_from_file(unsigned char *buf, unsigned long size, return 0; } -int write_buf_to_file(unsigned char *buf, unsigned long size, +int write_buf_to_file(const unsigned char *buf, unsigned long size, const char *filename) { unsigned long numbytes; @@ -1278,7 +1278,7 @@ static int selfcheck_eraseblocks(const struct flashchip *chip) static int erase_and_write_block_helper(struct flashctx *flash, unsigned int start, unsigned int len, uint8_t *curcontents, - uint8_t *newcontents, + const uint8_t *newcontents, int (*erasefn) (struct flashctx *flash, unsigned int addr, unsigned int len)) @@ -1330,12 +1330,12 @@ static int walk_eraseregions(struct flashctx *flash, int erasefunction, unsigned int addr, unsigned int len, uint8_t *param1, - uint8_t *param2, + const uint8_t *param2, int (*erasefn) ( struct flashctx *flash, unsigned int addr, unsigned int len)), - void *param1, void *param2) + void *param1, const void *param2) { int i, j; unsigned int start = 0; @@ -1389,8 +1389,8 @@ static int check_block_eraser(const struct flashctx *flash, int k, int log) return 0; } -int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, - uint8_t *newcontents) +int erase_and_write_flash(struct flashctx *flash, const uint8_t *oldcontents, + const uint8_t *newcontents) { int k, ret = 1; uint8_t *curcontents; diff --git a/ichspi.c b/ichspi.c index 12f4584..72942f6 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1319,7 +1319,7 @@ static int ich_hwseq_read(struct flashctx *flash, uint8_t *buf, return 0; } -static int ich_hwseq_write(struct flashctx *flash, uint8_t *buf, +static int ich_hwseq_write(struct flashctx *flash, const uint8_t *buf, unsigned int addr, unsigned int len) { uint16_t hsfc; diff --git a/it87spi.c b/it87spi.c index 8e4e0ad..5320bc7 100644 --- a/it87spi.c +++ b/it87spi.c @@ -107,7 +107,7 @@ static int it8716f_spi_send_command(struct flashctx *flash, unsigned char *readarr); static int it8716f_spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -static int it8716f_spi_chip_write_256(struct flashctx *flash, uint8_t *buf, +static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); static const struct spi_programmer spi_programmer_it87xx = { @@ -315,7 +315,7 @@ static int it8716f_spi_send_command(struct flashctx *flash, } /* Page size is usually 256 bytes */ -static int it8716f_spi_page_program(struct flashctx *flash, uint8_t *buf, +static int it8716f_spi_page_program(struct flashctx *flash, const uint8_t *buf, unsigned int start) { unsigned int i; @@ -361,7 +361,7 @@ static int it8716f_spi_chip_read(struct flashctx *flash, uint8_t *buf, return 0; } -static int it8716f_spi_chip_write_256(struct flashctx *flash, uint8_t *buf, +static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { const struct flashchip *chip = flash->chip; diff --git a/layout.c b/layout.c index 1bd3152..2bc7749 100644 --- a/layout.c +++ b/layout.c @@ -45,7 +45,7 @@ static int num_include_args = 0; /* the number of valid entries. */ static romlayout_t rom_entries[MAX_ROMLAYOUT]; #ifndef __LIBPAYLOAD__ -int read_romlayout(char *name) +int read_romlayout(const char *name) { FILE *romlayout; char tempstr[256]; @@ -101,7 +101,7 @@ int read_romlayout(char *name) #endif /* returns the index of the entry (or a negative value if it is not found) */ -int find_include_arg(const char *const name) +static int find_include_arg(const char *const name) { unsigned int i; for (i = 0; i < num_include_args; i++) { diff --git a/linux_spi.c b/linux_spi.c index 2f46463..a09d06b 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -43,7 +43,7 @@ static int linux_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsigned char *rxbuf); static int linux_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -static int linux_spi_write_256(struct flashctx *flash, uint8_t *buf, +static int linux_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); static const struct spi_programmer spi_programmer_linux = { @@ -174,7 +174,7 @@ static int linux_spi_read(struct flashctx *flash, uint8_t *buf, (unsigned int)getpagesize()); } -static int linux_spi_write_256(struct flashctx *flash, uint8_t *buf, +static int linux_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return spi_write_chunked(flash, buf, start, len, diff --git a/m29f400bt.c b/m29f400bt.c index 8f0329e..407caf7 100644 --- a/m29f400bt.c +++ b/m29f400bt.c @@ -28,8 +28,8 @@ functions. */ /* chunksize is 1 */ -int write_m29f400bt(struct flashctx *flash, uint8_t *src, unsigned int start, - unsigned int len) +int write_m29f400bt(struct flashctx *flash, const uint8_t *src, + unsigned int start, unsigned int len) { int i; chipaddr bios = flash->virtual_memory; diff --git a/opaque.c b/opaque.c index 6acaa63..c63919f 100644 --- a/opaque.c +++ b/opaque.c @@ -40,7 +40,7 @@ int read_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsign return flash->pgm->opaque.read(flash, buf, start, len); } -int write_opaque(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) +int write_opaque(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return flash->pgm->opaque.write(flash, buf, start, len); } diff --git a/programmer.c b/programmer.c index 3b4def0..ffa0d48 100644 --- a/programmer.c +++ b/programmer.c @@ -78,7 +78,7 @@ uint32_t fallback_chip_readl(const struct flashctx *flash, const chipaddr addr) return val; } -void fallback_chip_writen(const struct flashctx *flash, uint8_t *buf, +void fallback_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len) { size_t i; diff --git a/programmer.h b/programmer.h index b10f568..5ba5855 100644 --- a/programmer.h +++ b/programmer.h @@ -536,8 +536,8 @@ struct spi_programmer { /* Optimized functions for this programmer */ int (*read)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); - int (*write_256)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); - int (*write_aai)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); + int (*write_256)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); + int (*write_aai)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); const void *data; }; @@ -545,8 +545,8 @@ int default_spi_send_command(struct flashctx *flash, unsigned int writecnt, unsi const unsigned char *writearr, unsigned char *readarr); int default_spi_send_multicommand(struct flashctx *flash, struct spi_command *cmds); int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int default_spi_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); -int default_spi_write_aai(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); +int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); +int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int register_spi_programmer(const struct spi_programmer *programmer); /* The following enum is needed by ich_descriptor_tool and ich* code. */ @@ -597,7 +597,7 @@ struct opaque_programmer { /* Specific functions for this programmer */ int (*probe) (struct flashctx *flash); int (*read) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); - int (*write) (struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); + int (*write) (struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); int (*erase) (struct flashctx *flash, unsigned int blockaddr, unsigned int blocklen); const void *data; }; @@ -610,7 +610,7 @@ void fallback_unmap(void *virt_addr, size_t len); void noop_chip_writeb(const struct flashctx *flash, uint8_t val, chipaddr addr); void fallback_chip_writew(const struct flashctx *flash, uint16_t val, chipaddr addr); void fallback_chip_writel(const struct flashctx *flash, uint32_t val, chipaddr addr); -void fallback_chip_writen(const struct flashctx *flash, uint8_t *buf, chipaddr addr, size_t len); +void fallback_chip_writen(const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len); uint16_t fallback_chip_readw(const struct flashctx *flash, const chipaddr addr); uint32_t fallback_chip_readl(const struct flashctx *flash, const chipaddr addr); void fallback_chip_readn(const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len); @@ -618,7 +618,7 @@ struct par_programmer { void (*chip_writeb) (const struct flashctx *flash, uint8_t val, chipaddr addr); void (*chip_writew) (const struct flashctx *flash, uint16_t val, chipaddr addr); void (*chip_writel) (const struct flashctx *flash, uint32_t val, chipaddr addr); - void (*chip_writen) (const struct flashctx *flash, uint8_t *buf, chipaddr addr, size_t len); + void (*chip_writen) (const struct flashctx *flash, const uint8_t *buf, chipaddr addr, size_t len); uint8_t (*chip_readb) (const struct flashctx *flash, const chipaddr addr); uint16_t (*chip_readw) (const struct flashctx *flash, const chipaddr addr); uint32_t (*chip_readl) (const struct flashctx *flash, const chipaddr addr); @@ -659,7 +659,7 @@ void __attribute__((noreturn)) sp_die(char *msg); extern fdtype sp_fd; /* expose serialport_shutdown as it's currently used by buspirate */ int serialport_shutdown(void *data); -int serialport_write(unsigned char *buf, unsigned int writecnt); +int serialport_write(const unsigned char *buf, unsigned int writecnt); int serialport_read(unsigned char *buf, unsigned int readcnt); /* Serial port/pin mapping: diff --git a/serial.c b/serial.c index 9446ce3..d2a9a8e 100644 --- a/serial.c +++ b/serial.c @@ -255,7 +255,7 @@ int serialport_shutdown(void *data) return 0; } -int serialport_write(unsigned char *buf, unsigned int writecnt) +int serialport_write(const unsigned char *buf, unsigned int writecnt) { #ifdef _WIN32 DWORD tmp = 0; diff --git a/spi.c b/spi.c index f670c8f..2b10eab 100644 --- a/spi.c +++ b/spi.c @@ -88,7 +88,7 @@ int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, return spi_read_chunked(flash, buf, start, len, max_data); } -int default_spi_write_256(struct flashctx *flash, uint8_t *buf, +int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { unsigned int max_data = flash->pgm->spi.max_data_write; @@ -137,8 +137,8 @@ int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, * .write_256 = spi_chip_write_1 */ /* real chunksize is up to 256, logical chunksize is 256 */ -int spi_chip_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, - unsigned int len) +int spi_chip_write_256(struct flashctx *flash, const uint8_t *buf, + unsigned int start, unsigned int len) { return flash->pgm->spi.write_256(flash, buf, start, len); } @@ -164,7 +164,7 @@ uint32_t spi_get_valid_read_addr(struct flashctx *flash) } } -int spi_aai_write(struct flashctx *flash, uint8_t *buf, +int spi_aai_write(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len) { return flash->pgm->spi.write_aai(flash, buf, start, len); diff --git a/spi25.c b/spi25.c index 3beab3a..06584bc 100644 --- a/spi25.c +++ b/spi25.c @@ -829,8 +829,8 @@ int spi_byte_program(struct flashctx *flash, unsigned int addr, return result; } -int spi_nbyte_program(struct flashctx *flash, unsigned int addr, uint8_t *bytes, - unsigned int len) +int spi_nbyte_program(struct flashctx *flash, unsigned int addr, + const uint8_t *bytes, unsigned int len) { int result; uint8_t cmd[JEDEC_4_BYTE_PROGRAM_OUTSIZE - 1 + 512]; @@ -966,8 +966,9 @@ int spi_read_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, * FIXME: Use the chunk code from Michael Karcher instead. * Each page is written separately in chunks with a maximum size of chunksize. */ -int spi_write_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, - unsigned int len, unsigned int chunksize) +int spi_write_chunked(struct flashctx *flash, const uint8_t *buf, + unsigned int start, unsigned int len, + unsigned int chunksize) { int rc = 0; unsigned int pos, j, lenhere, towrite, page_end; @@ -1009,8 +1010,8 @@ int spi_write_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, * (e.g. due to size constraints in IT87* for over 512 kB) */ /* real chunksize is 1, logical chunksize is 1 */ -int spi_chip_write_1(struct flashctx *flash, uint8_t *buf, unsigned int start, - unsigned int len) +int spi_chip_write_1(struct flashctx *flash, const uint8_t *buf, + unsigned int start, unsigned int len) { unsigned int i; int result = 0; @@ -1026,7 +1027,8 @@ int spi_chip_write_1(struct flashctx *flash, uint8_t *buf, unsigned int start, return 0; } -int default_spi_write_aai(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) +int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, + unsigned int start, unsigned int len) { uint32_t pos = start; int result; diff --git a/sst28sf040.c b/sst28sf040.c index 52e4256..3715b61 100644 --- a/sst28sf040.c +++ b/sst28sf040.c @@ -77,8 +77,8 @@ int erase_sector_28sf040(struct flashctx *flash, unsigned int address, } /* chunksize is 1 */ -int write_28sf040(struct flashctx *flash, uint8_t *src, unsigned int start, - unsigned int len) +int write_28sf040(struct flashctx *flash, const uint8_t *src, + unsigned int start, unsigned int len) { int i; chipaddr bios = flash->virtual_memory;

1 0

[PATCH] Add support for Spansion S25FL512S SPI Flash
by Mark Marshall 28 Mar '13

28 Mar '13

This SPI Flash is 64 MBytes, and therefore needs 4-byte-address commands. Signed-off-by: Mark Marshall <mark.marshall(a)omicron.at> --- flashchips.c | 29 +++++++++++++++++++++++++++++ flashchips.h | 1 + 2 files changed, 30 insertions(+) diff --git a/flashchips.c b/flashchips.c index 16726ad..a7e6d8b 100644 --- a/flashchips.c +++ b/flashchips.c @@ -7246,6 +7246,35 @@ const struct flashchip flashchips[] = { }, { + .vendor = "Spansion", + .name = "S25FL512S", + .bustype = BUS_SPI, + .manufacture_id = SPANSION_ID, + .model_id = SPANSION_S25FL512S, + .total_size = 65536, + .page_size = 512, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {256 * 1024, 256} }, + .block_erase = spi_block_erase_dc, + }, { + .eraseblocks = { {64 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {2700, 3600}, + }, + + { .vendor = "SST", .name = "SST25LF040A", .bustype = BUS_SPI, diff --git a/flashchips.h b/flashchips.h index 4eebc95..343e537 100644 --- a/flashchips.h +++ b/flashchips.h @@ -498,6 +498,7 @@ #define SPANSION_S25FL016A 0x0214 #define SPANSION_S25FL032A 0x0215 /* Same as S25FL032P, but the latter supports EDI and CFI */ #define SPANSION_S25FL064A 0x0216 /* Same as S25FL064P, but the latter supports EDI and CFI */ +#define SPANSION_S25FL512S 0x0220 /* * SST25 chips are SPI, first byte of device ID is memory type, second

1 0

[PATCH] Add support for 4-address-byte commands and block-erase 0xDC
by Mark Marshall 28 Mar '13

28 Mar '13

To support flashes that are larger than 16 MBytes we need to support '4-byte-address' program and erase commands. Signed-off-by: Mark Marshall <mark.marshall(a)omicron.at> --- chipdrivers.h | 1 + spi.h | 13 +++++ spi25.c | 175 +++++++++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 147 insertions(+), 42 deletions(-) diff --git a/chipdrivers.h b/chipdrivers.h index f0223ae..244d421 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -47,6 +47,7 @@ int spi_block_erase_52(struct flashctx *flash, unsigned int addr, unsigned int b int spi_block_erase_81(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_d7(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_d8(struct flashctx *flash, unsigned int addr, unsigned int blocklen); +int spi_block_erase_dc(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_60(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_62(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_c7(struct flashctx *flash, unsigned int addr, unsigned int blocklen); diff --git a/spi.h b/spi.h index 297125e..359756a 100644 --- a/spi.h +++ b/spi.h @@ -101,6 +101,11 @@ #define JEDEC_BE_D7_OUTSIZE 0x04 #define JEDEC_BE_D7_INSIZE 0x00 +/* Block Erase 0xdc is supported by Spansion chips. */ +#define JEDEC_BE_DC 0xdc +#define JEDEC_BE_DC_OUTSIZE 0x05 +#define JEDEC_BE_DC_INSIZE 0x00 + /* Sector Erase 0x20 is supported by Macronix/SST chips. */ #define JEDEC_SE 0x20 #define JEDEC_SE_OUTSIZE 0x04 @@ -131,11 +136,19 @@ #define JEDEC_READ_OUTSIZE 0x04 /* JEDEC_READ_INSIZE : any length */ +#define JEDEC_4_READ 0x13 +#define JEDEC_4_READ_OUTSIZE 0x05 +/* JEDEC_4_READ_INSIZE : any length */ + /* Write memory byte */ #define JEDEC_BYTE_PROGRAM 0x02 #define JEDEC_BYTE_PROGRAM_OUTSIZE 0x05 #define JEDEC_BYTE_PROGRAM_INSIZE 0x00 +#define JEDEC_4_BYTE_PROGRAM 0x12 +#define JEDEC_4_BYTE_PROGRAM_OUTSIZE 0x06 +#define JEDEC_4_BYTE_PROGRAM_INSIZE 0x00 + /* Write AAI word (SST25VF080B) */ #define JEDEC_AAI_WORD_PROGRAM 0xad #define JEDEC_AAI_WORD_PROGRAM_OUTSIZE 0x06 diff --git a/spi25.c b/spi25.c index 911dc4e..3beab3a 100644 --- a/spi25.c +++ b/spi25.c @@ -453,6 +453,50 @@ int spi_block_erase_52(struct flashctx *flash, unsigned int addr, return 0; } +/* Block size is usually 256k */ +int spi_block_erase_dc(struct flashctx *flash, unsigned int addr, + unsigned int blocklen) +{ + int result; + struct spi_command cmds[] = { + { + .writecnt = JEDEC_WREN_OUTSIZE, + .writearr = (const unsigned char[]){ JEDEC_WREN }, + .readcnt = 0, + .readarr = NULL, + }, { + .writecnt = JEDEC_BE_DC_OUTSIZE, + .writearr = (const unsigned char[]){ + JEDEC_BE_DC, + (addr >> 24) & 0xff, + (addr >> 16) & 0xff, + (addr >> 8) & 0xff, + (addr & 0xff) + }, + .readcnt = 0, + .readarr = NULL, + }, { + .writecnt = 0, + .writearr = NULL, + .readcnt = 0, + .readarr = NULL, + }}; + + result = spi_send_multicommand(flash, cmds); + if (result) { + msg_cerr("%s failed during command execution at address 0x%x\n", + __func__, addr); + return result; + } + /* Wait until the Write-In-Progress bit is cleared. + * This usually takes 100-4000 ms, so wait in 100 ms steps. + */ + while (spi_read_status_register(flash) & SPI_SR_WIP) + programmer_delay(100 * 1000); + /* FIXME: Check the status register for errors. */ + return 0; +} + /* Block size is usually * 64k for Macronix * 32k for SST @@ -719,6 +763,8 @@ erasefunc_t *spi_get_erasefn_from_opcode(uint8_t opcode) return &spi_block_erase_d7; case 0xd8: return &spi_block_erase_d8; + case 0xdc: + return &spi_block_erase_dc; default: msg_cinfo("%s: unknown erase opcode (0x%02x). Please report " "this at flashrom(a)flashrom.org\n", __func__, opcode); @@ -730,6 +776,7 @@ int spi_byte_program(struct flashctx *flash, unsigned int addr, uint8_t databyte) { int result; + uint8_t cmd[JEDEC_4_BYTE_PROGRAM_OUTSIZE]; struct spi_command cmds[] = { { .writecnt = JEDEC_WREN_OUTSIZE, @@ -737,14 +784,8 @@ int spi_byte_program(struct flashctx *flash, unsigned int addr, .readcnt = 0, .readarr = NULL, }, { - .writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE, - .writearr = (const unsigned char[]){ - JEDEC_BYTE_PROGRAM, - (addr >> 16) & 0xff, - (addr >> 8) & 0xff, - (addr & 0xff), - databyte - }, + .writecnt = 0, + .writearr = NULL, .readcnt = 0, .readarr = NULL, }, { @@ -754,6 +795,32 @@ int spi_byte_program(struct flashctx *flash, unsigned int addr, .readarr = NULL, }}; + /* We always use the 4-byte commands for chips bigger than 16 + * MB as we don't know what's in the 'bank address + * register'. */ + if (flash->chip->total_size > 16 * 1024) { + + cmds[1].writecnt = JEDEC_4_BYTE_PROGRAM_OUTSIZE; + cmds[1].writearr = cmd; + + cmd[0] = JEDEC_4_BYTE_PROGRAM; + cmd[1] = (addr >> 24) & 0xff; + cmd[2] = (addr >> 16) & 0xff; + cmd[3] = (addr >> 8) & 0xff; + cmd[4] = (addr >> 0) & 0xff; + cmd[5] = databyte; + } else { + + cmds[1].writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE; + cmds[1].writearr = cmd; + + cmd[0] = JEDEC_BYTE_PROGRAM; + cmd[1] = (addr >> 16) & 0xff; + cmd[2] = (addr >> 8) & 0xff; + cmd[3] = (addr >> 0) & 0xff; + cmd[4] = databyte; + } + result = spi_send_multicommand(flash, cmds); if (result) { msg_cerr("%s failed during command execution at address 0x%x\n", @@ -766,13 +833,7 @@ int spi_nbyte_program(struct flashctx *flash, unsigned int addr, uint8_t *bytes, unsigned int len) { int result; - /* FIXME: Switch to malloc based on len unless that kills speed. */ - unsigned char cmd[JEDEC_BYTE_PROGRAM_OUTSIZE - 1 + 256] = { - JEDEC_BYTE_PROGRAM, - (addr >> 16) & 0xff, - (addr >> 8) & 0xff, - (addr >> 0) & 0xff, - }; + uint8_t cmd[JEDEC_4_BYTE_PROGRAM_OUTSIZE - 1 + 512]; struct spi_command cmds[] = { { .writecnt = JEDEC_WREN_OUTSIZE, @@ -780,8 +841,8 @@ int spi_nbyte_program(struct flashctx *flash, unsigned int addr, uint8_t *bytes, .readcnt = 0, .readarr = NULL, }, { - .writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE - 1 + len, - .writearr = cmd, + .writecnt = 0, + .writearr = NULL, .readcnt = 0, .readarr = NULL, }, { @@ -795,33 +856,69 @@ int spi_nbyte_program(struct flashctx *flash, unsigned int addr, uint8_t *bytes, msg_cerr("%s called for zero-length write\n", __func__); return 1; } - if (len > 256) { + if (len > 512) { msg_cerr("%s called for too long a write\n", __func__); return 1; } - memcpy(&cmd[4], bytes, len); + /* We always use the 4-byte commands for chips bigger than 16 + * MB as we don't know what's in the 'bank address + * register'. */ + if (flash->chip->total_size > 16 * 1024) { + cmds[1].writecnt = JEDEC_4_BYTE_PROGRAM_OUTSIZE - 1 + len; + cmds[1].writearr = cmd; + + cmd[0] = JEDEC_4_BYTE_PROGRAM; + cmd[1] = (addr >> 24) & 0xff; + cmd[2] = (addr >> 16) & 0xff; + cmd[3] = (addr >> 8) & 0xff; + cmd[4] = (addr >> 0) & 0xff; + + memcpy(&cmd[5], bytes, len); + } else { + cmds[1].writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE - 1 + len; + cmds[1].writearr = cmd; + + cmd[0] = JEDEC_BYTE_PROGRAM; + cmd[1] = (addr >> 16) & 0xff; + cmd[2] = (addr >> 8) & 0xff; + cmd[3] = (addr >> 0) & 0xff; + + memcpy(&cmd[4], bytes, len); + } result = spi_send_multicommand(flash, cmds); if (result) { msg_cerr("%s failed during command execution at address 0x%x\n", __func__, addr); } + return result; } int spi_nbyte_read(struct flashctx *flash, unsigned int address, uint8_t *bytes, unsigned int len) { - const unsigned char cmd[JEDEC_READ_OUTSIZE] = { - JEDEC_READ, - (address >> 16) & 0xff, - (address >> 8) & 0xff, - (address >> 0) & 0xff, - }; + unsigned char cmd[JEDEC_4_READ_OUTSIZE]; + unsigned int cmd_len; + + if (flash->chip->total_size > 16 * 1024) { + cmd[0] = JEDEC_4_READ; + cmd[1] = (address >> 24) & 0xff; + cmd[2] = (address >> 16) & 0xff; + cmd[3] = (address >> 8) & 0xff; + cmd[4] = (address >> 0) & 0xff; + cmd_len = JEDEC_4_READ_OUTSIZE; + } else { + cmd[0] = JEDEC_READ; + cmd[1] = (address >> 16) & 0xff; + cmd[2] = (address >> 8) & 0xff; + cmd[3] = (address >> 0) & 0xff; + cmd_len = JEDEC_READ_OUTSIZE; + } /* Send Read */ - return spi_send_command(flash, sizeof(cmd), len, cmd, bytes); + return spi_send_command(flash, cmd_len, len, cmd, bytes); } /* @@ -873,7 +970,7 @@ int spi_write_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len, unsigned int chunksize) { int rc = 0; - unsigned int i, j, starthere, lenhere, towrite; + unsigned int pos, j, lenhere, towrite, page_end; /* FIXME: page_size is the wrong variable. We need max_writechunk_size * in struct flashctx to do this properly. All chips using * spi_chip_write_256 have page_size set to max_writechunk_size, so @@ -881,24 +978,18 @@ int spi_write_chunked(struct flashctx *flash, uint8_t *buf, unsigned int start, */ unsigned int page_size = flash->chip->page_size; - /* Warning: This loop has a very unusual condition and body. - * The loop needs to go through each page with at least one affected - * byte. The lowest page number is (start / page_size) since that - * division rounds down. The highest page number we want is the page - * where the last byte of the range lives. That last byte has the - * address (start + len - 1), thus the highest page number is - * (start + len - 1) / page_size. Since we want to include that last - * page as well, the loop condition uses <=. - */ - for (i = start / page_size; i <= (start + len - 1) / page_size; i++) { - /* Byte position of the first byte in the range in this page. */ - /* starthere is an offset to the base address of the chip. */ - starthere = max(start, i * page_size); + if (page_size & (page_size - 1)) { + msg_cerr("page_size not a power of 2 (%u)?\n", page_size); + } + + for (pos = start; pos < (start + len); pos += lenhere) { + /* This is the end of the current page (start of the next page). */ + page_end = (pos & ~(page_size - 1)) + page_size; /* Length of bytes in the range in this page. */ - lenhere = min(start + len, (i + 1) * page_size) - starthere; + lenhere = min(start + len, page_end) - pos; for (j = 0; j < lenhere; j += chunksize) { towrite = min(chunksize, lenhere - j); - rc = spi_nbyte_program(flash, starthere + j, buf + starthere - start + j, towrite); + rc = spi_nbyte_program(flash, pos + j, buf + pos - start + j, towrite); if (rc) break; while (spi_read_status_register(flash) & SPI_SR_WIP)

1 0

Re: [flashrom] [PATCH] Refine granularity handling in preparation of AT45DB series support.
by Mark Marshall 28 Mar '13

28 Mar '13

Hi. I'm currently struggling to understand what the write granularity is for and how it interacts with the page size? I'm also a little confused by flashrom's use of page size? I am mainly interested in SPI flash chips. For most SPI chips the "page size" is 256 bytes. I have a chip where the page size is 512 bytes. The "page size" is the amount that writes using the PP command have to be chunked by. So "spi_nbyte_program" must be used to write no more than "page size" bytes and must not cross a "page size" boundary. So far this all makes sense, apart from the "spi_chip_write_256" function, which should be named "spi_chip_write_page"? (as all chips currently have a page size of 256 this is correct at the moment, but I'm about to add one that doesn't). I think that the "chunksize" parameter in spi_write_chunked is to do with possible restrictions of some programmer hardware? This also makes sense, apart from all of the comments which are very out of date? According to the manuals of the SPI Flash chips I've looked at, when using the PP command you can program any part of a page, and the correct thing will happen (1's can only be written to 0's). So I don't see how this matches up with "write granularity", which claims that the other bytes in the granularity region will be "undefined"? Is write granularity for something else? Is there a post somewhere that I missed that explains all of this? Thanks for any help, Mark M. On 14 March 2013 12:13, Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at>wrote: > This adds a number of new granularities in a rather inelegant way. > Until we figure out how to better handle various granularities this has > to be accepted. > > It also refactors the handling of n-byte granularities by extracting the > checking code into a helper function which reduces the pain of the above > significantly. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > This is one possibility to solve the granularity issue and i think the > most likely to get the patch series in fastest... > > flash.h | 24 +++++++++++++---------- > flashrom.c | 64 > ++++++++++++++++++++++++++++++++++++++++++++++-------------- > 2 files changed, 63 insertions(+), 25 deletions(-) > > diff --git a/flash.h b/flash.h > index 9c4b0ac..845d898 100644 > --- a/flash.h > +++ b/flash.h > @@ -59,18 +59,22 @@ enum chipbustype { > }; > > /* > - * The following write granularities are known: > - * - 1 bit: Each bit can be cleared individually. > - * - 1 byte: A byte can be written once. Further writes to an already > written byte cause its contents to be > - * either undefined or to stay unchanged. > - * - 128 bytes: If less than 128 bytes are written, the rest will be > erased. Each write to a 128-byte region > - * will trigger an automatic erase before anything is written. Very > uncommon behaviour. > - * - 256 bytes: If less than 256 bytes are written, the contents of the > unwritten bytes are undefined. > + * The following enum defines possible write granularities of flash > chips. These tend to reflect the properties > + * of the actual hardware not necesserily the write function(s) defined > by the respective struct flashchip. > + * The latter might (and should) be more precisely specified, e.g. they > might bail out early if their execution > + * would result in undefined chip contents. > */ > enum write_granularity { > - write_gran_256bytes = 0, /* We assume 256 byte granularity by > default. */ > - write_gran_1bit, > - write_gran_1byte, > + /* We assume 256 byte granularity by default. */ > + write_gran_256bytes = 0,/* If less than 256 bytes are written, the > unwritten bytes are undefined. */ > + write_gran_1bit, /* Each bit can be cleared individually. */ > + write_gran_1byte, /* A byte can be written once. Further > writes to an already written byte cause > + * its contents to be either undefined or > to stay unchanged. */ > + write_gran_264bytes, /* If less than 264 bytes are written, the > unwritten bytes are undefined. */ > + write_gran_512bytes, /* If less than 512 bytes are written, the > unwritten bytes are undefined. */ > + write_gran_528bytes, /* If less than 528 bytes are written, the > unwritten bytes are undefined. */ > + write_gran_1024bytes, /* If less than 1024 bytes are written, > the unwritten bytes are undefined. */ > + write_gran_1056bytes, /* If less than 1056 bytes are written, > the unwritten bytes are undefined. */ > }; > > /* > diff --git a/flashrom.c b/flashrom.c > index 225b6f0..4e5f484 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -676,6 +676,23 @@ out_free: > return ret; > } > > +/* Helper function for need_erase() that focuses on granularities of n > bytes. */ > +static int need_erase_n_bytes(uint8_t *have, uint8_t *want, unsigned int > len, unsigned int n) > +{ > + unsigned int i, j, limit; > + for (j = 0; j < len / n; j++) { > + limit = min (n, len - j * n); > + /* Are 'have' and 'want' identical? */ > + if (!memcmp(have + j * n, want + j * n, limit)) > + continue; > + /* have needs to be in erased state. */ > + for (i = 0; i < limit; i++) > + if (have[j * n + i] != 0xff) > + return 1; > + } > + return 0; > +} > + > /* > * Check if the buffer @have can be programmed to the content of @want > without > * erasing. This is only possible if all chunks of size @gran are either > kept > @@ -693,7 +710,7 @@ out_free: > int need_erase(uint8_t *have, uint8_t *want, unsigned int len, enum > write_granularity gran) > { > int result = 0; > - unsigned int i, j, limit; > + unsigned int i; > > switch (gran) { > case write_gran_1bit: > @@ -711,20 +728,22 @@ int need_erase(uint8_t *have, uint8_t *want, > unsigned int len, enum write_granul > } > break; > case write_gran_256bytes: > - for (j = 0; j < len / 256; j++) { > - limit = min (256, len - j * 256); > - /* Are 'have' and 'want' identical? */ > - if (!memcmp(have + j * 256, want + j * 256, limit)) > - continue; > - /* have needs to be in erased state. */ > - for (i = 0; i < limit; i++) > - if (have[j * 256 + i] != 0xff) { > - result = 1; > - break; > - } > - if (result) > - break; > - } > + result = need_erase_n_bytes(have, want, len, 256); > + break; > + case write_gran_264bytes: > + result = need_erase_n_bytes(have, want, len, 264); > + break; > + case write_gran_512bytes: > + result = need_erase_n_bytes(have, want, len, 512); > + break; > + case write_gran_528bytes: > + result = need_erase_n_bytes(have, want, len, 528); > + break; > + case write_gran_1024bytes: > + result = need_erase_n_bytes(have, want, len, 1024); > + break; > + case write_gran_1056bytes: > + result = need_erase_n_bytes(have, want, len, 1056); > break; > default: > msg_cerr("%s: Unsupported granularity! Please report a bug > at " > @@ -772,6 +791,21 @@ static unsigned int get_next_write(uint8_t *have, > uint8_t *want, unsigned int le > case write_gran_256bytes: > stride = 256; > break; > + case write_gran_264bytes: > + stride = 264; > + break; > + case write_gran_512bytes: > + stride = 512; > + break; > + case write_gran_528bytes: > + stride = 528; > + break; > + case write_gran_1024bytes: > + stride = 1024; > + break; > + case write_gran_1056bytes: > + stride = 1056; > + break; > default: > msg_cerr("%s: Unsupported granularity! Please report a bug > at " > "flashrom(a)flashrom.org\n", __func__); > -- > Kind regards, Stefan Tauner > > > _______________________________________________ > flashrom mailing list > flashrom(a)flashrom.org > http://www.flashrom.org/mailman/listinfo/flashrom >

1 0

SPI issue on FTDI
by chethan kumar 28 Mar '13

28 Mar '13

Hi I have a question on FTDI. We are using FTDI2232H chip for programming the flash. After programming the flash we want to put the FTDI SPI lines in the MPSSE mode to tri state. Could you please let me know what should we do in order to achieve this. Is there any APIs to put FTDI lines to tri state mode? Is there any document that we can refer? Regards, Chethan

1 0

Re: [flashrom] AMD - SP5100 - take SPI ownership (1/2)
by Racine, Michel 27 Mar '13

27 Mar '13

Hello Rudolf, With your patch, I had a small compile issue (imc.c, function mbox_wait_ack, commented call to msg_pwarn). I attempted to use the exe, but it cannot turn off IMC. Not sure what you need from here. I can change the code, or gather any data you want. Output of flashrom execution: ./flashrom_imcpatch -p internal flashrom v0.9.6.1-r1564 on Linux 2.6.32-5-686 (i686) flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OK. Found chipset "AMD SB7x0/SB8x0/SB9x0". Enabling flash write... (Shutting down IMC failed!) FAILED! FATAL ERROR! Error: Programmer initialization failed. Please let me know what you suggest we do next. Thanks, Michel. -----Original Message----- From: Racine, Michel Sent: Wednesday, March 27, 2013 9:36 AM To: Rudolf Marek; roxfan Cc: frederic.temporelli(a)bull.net; wmkamp(a)datakamp.de; flashrom(a)flashrom.org; Racine, Michel Subject: RE: [flashrom] AMD - SP5100 - take SPI ownership (1/2) Hello Rudolf, I'm assuming I only need to apply the a.patch you sent (not the imc.patch) to the source for 0.9.6.1. I will test this on an AMD Persimmon board (it won't boot currently, I need a dediProg because I bricked it). I'll update soon, Cheers, Michel. -----Original Message----- From: Rudolf Marek [mailto:r.marek@assembler.cz] Sent: Tuesday, March 26, 2013 9:36 AM To: roxfan Cc: frederic.temporelli(a)bull.net; wmkamp(a)datakamp.de; flashrom(a)flashrom.org; Racine, Michel Subject: Re: [flashrom] AMD - SP5100 - take SPI ownership (1/2) Hi all I tried with IMC activated on coreboot (Hudson chipset) and it works as expected. Attached patch only tweaks messages and removes now redundant check from sb600 SPI. If IMC is active and firmware handoff fails, then it exits with fatal error. Signed-off-by: Rudolf Marek <r.marek(a)assembler.cz> It would be nice if someone else could test this (and dont forget to be able to recover from bad flash) Thanks Rudolf

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom March 2013