October 2012 - flashrom - mail.coreboot.org

[commit] r1620 - trunk
by repository service Oct. 28, 2012

Oct. 28, 2012

Author: stefanct Date: Sun Oct 28 02:50:08 2012 New Revision: 1620 URL: http://flashrom.org/trac/flashrom/changeset/1620 Log: Add support for Winbond W39F010/W39L010/W39L020. W39F010 is a 128kB parallel 5V flash chip, 16k bootblocks. W39L010 is a 128kB parallel 3.3V flash chip, 8k bootblocks. W39L020 is a 256kB parallel 3.3V flash chip, 64k/16k bootblocks. The W39F010 code was tested with a satasii programmer. The first write attempt after an erase returned with verify failure, but the second write attempt was succesful: http://paste.flashrom.org/view.php?id=1418 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/chipdrivers.h trunk/flashchips.c trunk/flashchips.h trunk/w39.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Sat Oct 27 17:36:56 2012 (r1619) +++ trunk/chipdrivers.h Sun Oct 28 02:50:08 2012 (r1620) @@ -143,6 +143,9 @@ int unlock_sst_fwhub(struct flashctx *flash); /* w39.c */ +int printlock_w39f010(struct flashctx * flash); +int printlock_w39l010(struct flashctx * flash); +int printlock_w39l020(struct flashctx * flash); int printlock_w39l040(struct flashctx * flash); int printlock_w39v040a(struct flashctx *flash); int printlock_w39v040b(struct flashctx *flash); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sat Oct 27 17:36:56 2012 (r1619) +++ trunk/flashchips.c Sun Oct 28 02:50:08 2012 (r1620) @@ -9436,6 +9436,93 @@ { .vendor = "Winbond", + .name = "W39F010", + .bustype = BUS_PARALLEL, + .manufacture_id = WINBOND_ID, + .model_id = WINBOND_W39F010, + .total_size = 128, + .page_size = 4 * 1024, + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_OK_PREW, + .probe = probe_jedec, + .probe_timing = 10, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 32} }, + .block_erase = erase_block_jedec, + }, { + .eraseblocks = { {128 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + }, + .printlock = printlock_w39f010, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {4500, 5500}, + }, + + { + .vendor = "Winbond", + .name = "W39L010", + .bustype = BUS_PARALLEL, + .manufacture_id = WINBOND_ID, + .model_id = WINBOND_W39L010, + .total_size = 128, + .page_size = 4 * 1024, + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = 10, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 32} }, + .block_erase = erase_block_jedec, + }, { + .eraseblocks = { {128 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + }, + .printlock = printlock_w39l010, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {3000, 3600}, + }, + + { + .vendor = "Winbond", + .name = "W39L020", + .bustype = BUS_PARALLEL, + .manufacture_id = WINBOND_ID, + .model_id = WINBOND_W39L020, + .total_size = 256, + .page_size = 4 * 1024, + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = 10, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 64} }, + .block_erase = erase_block_jedec, + }, { + .eraseblocks = { {64 * 1024, 4} }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {256 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + }, + .printlock = printlock_w39l020, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {3000, 3600}, + }, + + { + .vendor = "Winbond", .name = "W39L040", .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, Modified: trunk/flashchips.h ============================================================================== --- trunk/flashchips.h Sat Oct 27 17:36:56 2012 (r1619) +++ trunk/flashchips.h Sun Oct 28 02:50:08 2012 (r1620) @@ -653,6 +653,7 @@ #define WINBOND_W29C020 0x45 /* Same as W29C020C, W29C022 and ASD AE29F2008 */ #define WINBOND_W29C040 0x46 /* Same as W29C040P */ #define WINBOND_W29C512A 0xC8 /* Same as W29EE512 */ +#define WINBOND_W39F010 0xA1 #define WINBOND_W39L010 0x31 #define WINBOND_W39L020 0xB5 #define WINBOND_W39L040 0xB6 Modified: trunk/w39.c ============================================================================== --- trunk/w39.c Sat Oct 27 17:36:56 2012 (r1619) +++ trunk/w39.c Sun Oct 28 02:50:08 2012 (r1620) @@ -115,6 +115,15 @@ return 0; } +static int printlock_w39_single_bootblock(uint8_t lock, uint16_t kB) +{ + msg_cdbg("Software %d kB bootblock locking is %sactive.\n", kB, (lock & 0x03) ? "" : "not "); + if (lock & 0x03) + return -1; + + return 0; +} + static int printlock_w39_bootblock_64k16k(uint8_t lock) { msg_cdbg("Software 64 kB bootblock locking is %sactive.\n", @@ -160,6 +169,54 @@ return 0; } +int printlock_w39f010(struct flashctx *flash) +{ + uint8_t lock; + int ret; + + lock = w39_idmode_readb(flash, 0x00002); + msg_cdbg("Bottom boot block:\n"); + ret = printlock_w39_single_bootblock(lock, 16); + + lock = w39_idmode_readb(flash, 0x1fff2); + msg_cdbg("Top boot block:\n"); + ret |= printlock_w39_single_bootblock(lock, 16); + + return ret; +} + +int printlock_w39l010(struct flashctx *flash) +{ + uint8_t lock; + int ret; + + lock = w39_idmode_readb(flash, 0x00002); + msg_cdbg("Bottom boot block:\n"); + ret = printlock_w39_single_bootblock(lock, 8); + + lock = w39_idmode_readb(flash, 0x1fff2); + msg_cdbg("Top boot block:\n"); + ret |= printlock_w39_single_bootblock(lock, 8); + + return ret; +} + +int printlock_w39l020(struct flashctx *flash) +{ + uint8_t lock; + int ret; + + lock = w39_idmode_readb(flash, 0x00002); + msg_cdbg("Bottom boot block:\n"); + ret = printlock_w39_bootblock_64k16k(lock); + + lock = w39_idmode_readb(flash, 0x3fff2); + msg_cdbg("Top boot block:\n"); + ret |= printlock_w39_bootblock_64k16k(lock); + + return ret; +} + int printlock_w39l040(struct flashctx *flash) { uint8_t lock;

1 0

[PATCH] Add chips Winbond W39F010/L010/L020
by Kyösti Mälkki Oct. 28, 2012

Oct. 28, 2012

W39F010 is 128kB parallel 5V flash chip, 16k bootblocks. W39L010 is 128kB parallel 3V flash chip, 8k bootblocks. W39L020 is 256kB parallel 3V flash chip, 64k/16k bootblocks. Considering the test of W39F010, on the platform [1] the first write attempt after erase returned with verify failure. Second write attempt and following read-verify was succesful. [1] "Silicon Image SiI 3124 PCI-X SATA Ctrl" (1095:3124, BDF 07:04.0). Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> diff --git a/chipdrivers.h b/chipdrivers.h index b43e16e..854269d 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -137,6 +137,9 @@ int printlock_sst_fwhub(struct flashctx *flash); int unlock_sst_fwhub(struct flashctx *flash); /* w39.c */ +int printlock_w39f010(struct flashctx * flash); +int printlock_w39l010(struct flashctx * flash); +int printlock_w39l020(struct flashctx * flash); int printlock_w39l040(struct flashctx * flash); int printlock_w39v040a(struct flashctx *flash); int printlock_w39v040b(struct flashctx *flash); diff --git a/flashchips.c b/flashchips.c index 1afed36..56333eb 100644 --- a/flashchips.c +++ b/flashchips.c @@ -9102,6 +9102,93 @@ const struct flashchip flashchips[] = { { .vendor = "Winbond", + .name = "W39F010", + .bustype = BUS_PARALLEL, + .manufacture_id = WINBOND_ID, + .model_id = WINBOND_W39F010, + .total_size = 128, + .page_size = 4 * 1024, + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_OK_PREW, + .probe = probe_jedec, + .probe_timing = 10, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 32} }, + .block_erase = erase_block_jedec, + }, { + .eraseblocks = { {128 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + }, + .printlock = printlock_w39f010, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {4500, 5500}, + }, + + { + .vendor = "Winbond", + .name = "W39L010", + .bustype = BUS_PARALLEL, + .manufacture_id = WINBOND_ID, + .model_id = WINBOND_W39L010, + .total_size = 128, + .page_size = 4 * 1024, + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = 10, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 32} }, + .block_erase = erase_block_jedec, + }, { + .eraseblocks = { {128 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + }, + .printlock = printlock_w39l010, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {3000, 3600}, + }, + + { + .vendor = "Winbond", + .name = "W39L020", + .bustype = BUS_PARALLEL, + .manufacture_id = WINBOND_ID, + .model_id = WINBOND_W39L020, + .total_size = 256, + .page_size = 4 * 1024, + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = 10, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 64} }, + .block_erase = erase_block_jedec, + }, { + .eraseblocks = { {64 * 1024, 4} }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {256 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + }, + .printlock = printlock_w39l020, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {3000, 3600}, + }, + + { + .vendor = "Winbond", .name = "W39L040", .bustype = BUS_PARALLEL, .manufacture_id = WINBOND_ID, diff --git a/flashchips.h b/flashchips.h index e6c74c4..3a8e655 100644 --- a/flashchips.h +++ b/flashchips.h @@ -648,6 +648,7 @@ #define WINBOND_W29C020 0x45 /* Same as W29C020C, W29C022 and ASD AE29F2008 */ #define WINBOND_W29C040 0x46 /* Same as W29C040P */ #define WINBOND_W29C512A 0xC8 /* Same as W29EE512 */ +#define WINBOND_W39F010 0xA1 #define WINBOND_W39L010 0x31 #define WINBOND_W39L020 0xB5 #define WINBOND_W39L040 0xB6 diff --git a/w39.c b/w39.c index da61d23..d6504ff 100644 --- a/w39.c +++ b/w39.c @@ -115,6 +115,26 @@ static int printlock_w39_tblwp(uint8_t lock) return 0; } +static int printlock_w39_bootblock_8k(uint8_t lock) +{ + msg_cdbg("Software 8 kB bootblock locking is %sactive.\n", + (lock & 0x03) ? "" : "not "); + if (lock & 0x03) + return -1; + + return 0; +} + +static int printlock_w39_bootblock_16k(uint8_t lock) +{ + msg_cdbg("Software 16 kB bootblock locking is %sactive.\n", + (lock & 0x03) ? "" : "not "); + if (lock & 0x03) + return -1; + + return 0; +} + static int printlock_w39_bootblock_64k16k(uint8_t lock) { msg_cdbg("Software 64 kB bootblock locking is %sactive.\n", @@ -160,6 +180,54 @@ static int unlock_w39_fwh(struct flashctx *flash) return 0; } +int printlock_w39f010(struct flashctx *flash) +{ + uint8_t lock; + int ret; + + lock = w39_idmode_readb(flash, 0x00002); + msg_cdbg("Bottom boot block:\n"); + ret = printlock_w39_bootblock_16k(lock); + + lock = w39_idmode_readb(flash, 0x1fff2); + msg_cdbg("Top boot block:\n"); + ret |= printlock_w39_bootblock_16k(lock); + + return ret; +} + +int printlock_w39l010(struct flashctx *flash) +{ + uint8_t lock; + int ret; + + lock = w39_idmode_readb(flash, 0x00002); + msg_cdbg("Bottom boot block:\n"); + ret = printlock_w39_bootblock_8k(lock); + + lock = w39_idmode_readb(flash, 0x1fff2); + msg_cdbg("Top boot block:\n"); + ret |= printlock_w39_bootblock_8k(lock); + + return ret; +} + +int printlock_w39l020(struct flashctx *flash) +{ + uint8_t lock; + int ret; + + lock = w39_idmode_readb(flash, 0x00002); + msg_cdbg("Bottom boot block:\n"); + ret = printlock_w39_bootblock_64k16k(lock); + + lock = w39_idmode_readb(flash, 0x3fff2); + msg_cdbg("Top boot block:\n"); + ret |= printlock_w39_bootblock_64k16k(lock); + + return ret; +} + int printlock_w39l040(struct flashctx *flash) { uint8_t lock;

2 1

Micro-Star International (MSI) G33M (MS-7357) mainboard sucsessfully flashed with flashrom v0.9.6.1-r1564
by alex Oct. 28, 2012

Oct. 28, 2012

Micro-Star International (MSI) G33M (MS-7357) mainboard sucsessfully readed, tested & flashed with flashrom v0.9.6.1-r1564

2 1

Re: [flashrom] ft2232: TI Stellaris DevKit / Dediprog SF100 IF / SPI Chip
by Stefan Tauner Oct. 27, 2012

Oct. 27, 2012

Hello Philipp, thanks for sharing. On Sat, 27 Oct 2012 15:44:51 +0200 Philipp Wiesner <wiesnerph(a)fh-bingen.de> wrote: > I had to make > some customizations to ft2232.c add support for this programmer. I had to > build a cable which connects the JTAG interface with the on-board SF100 > interface. But it is just a plain cable without logic, i presume i.e. there are no hardware modifications necessary for the TI board nor the iEi mainboard, right? > I like to share as much of the knowledge I acquired as possible with the > community. The least thing I can do is send a patch with my modifications > for the TI development board. I still need to read the instructions on how > to prepare and send patches as I haven't done this in a long time. How did you obtain the flashrom source (file archive, subversion, git...)? Depending on that the way to obtain a usable diff/patch vary a lot. If you need further help you can also ask us on our IRC channel, #flashrom on freenode, available also via this website: http://webchat.freenode.net/?channels=flashrom&uio=d4 -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Re: [flashrom] [PATCH 1/3] Do not read the flash chip twice in verification mode.
by Carl-Daniel Hailfinger Oct. 27, 2012

Oct. 27, 2012

Am 23.07.2012 15:33 schrieb Stefan Tauner: > Kyösti Mälkki noticed that we unnecessarily read the flash chip twice when > called with --verify. The first one is the mandatory read before everything > (to be able to detect the seriousness of errors), but the second one is not > necessary because we can just use the former for the comparison. Indeed. > This introduces a small output change: previously we printed ERASE or > VERIFY depending on the callee. This special case has been dropped > because it is unnecessary to print it (and wrong for the verification > function to need to know why it is verifying exactly). > If an erase fails we mention that fact explicitly already, similar for verify. I'm not convinced yet. I'll try to compare the failure output with and without this patch before I ack. > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > flash.h | 2 +- > flashrom.c | 86 +++++++++++++++++++++++++++--------------------------------- > jedec.c | 2 +- > 3 files changed, 41 insertions(+), 49 deletions(-) > > diff --git a/flash.h b/flash.h > index d669512..5bb1211 100644 > --- a/flash.h > +++ b/flash.h > @@ -241,7 +241,7 @@ int min(int a, int b); > int max(int a, int b); > void tolower_string(char *str); > char *extract_param(char **haystack, const char *needle, const char *delim); > -int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len, const char *message); > +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); > char *strcat_realloc(char *dest, const char *src); > void print_version(void); > diff --git a/flashrom.c b/flashrom.c > index fc52c4a..70687ff 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -548,6 +548,26 @@ 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) Make this function static? > +{ > + int ret = 0, failcount = 0; > + unsigned int i; > + for (i = 0; i < len; i++) { > + if (wantbuf[i] != havebuf[i]) { > + /* Only print the first failure. */ > + if (!failcount++) > + msg_cerr("FAILED at 0x%08x! Expected=0x%02x, Found=0x%02x,", > + start + i, wantbuf[i], havebuf[i]); > + } > + } > + if (failcount) { > + msg_cerr(" failed byte count from 0x%08x-0x%08x: 0x%x\n", > + start, start + len - 1, failcount); > + ret = -1; > + } > + return ret; > +} > + > /* start is an offset to the base address of the flash chip */ > int check_erased_range(struct flashctx *flash, unsigned int start, > unsigned int len) > @@ -560,7 +580,7 @@ int check_erased_range(struct flashctx *flash, unsigned int start, > exit(1); > } > memset(cmpbuf, 0xff, len); > - ret = verify_range(flash, cmpbuf, start, len, "ERASE"); > + ret = verify_range(flash, cmpbuf, start, len); > free(cmpbuf); > return ret; > } > @@ -570,15 +590,12 @@ int check_erased_range(struct flashctx *flash, unsigned int start, > * flash content at location start > * @start offset to the base address of the flash chip > * @len length of the verified area > - * @message string to print in the "FAILED" message > * @return 0 for success, -1 for failure > */ > -int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, > - unsigned int len, const char *message) > +int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len) > { > - unsigned int i; > uint8_t *readbuf = malloc(len); > - int ret = 0, failcount = 0; > + int ret = 0; > > if (!len) > goto out_free; > @@ -599,8 +616,6 @@ int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, > ret = -1; > goto out_free; > } > - if (!message) > - message = "VERIFY"; > > ret = flash->read(flash, readbuf, start, len); > if (ret) { > @@ -609,22 +624,7 @@ int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, > return ret; > } > > - for (i = 0; i < len; i++) { > - if (cmpbuf[i] != readbuf[i]) { > - /* Only print the first failure. */ > - if (!failcount++) > - msg_cerr("%s FAILED at 0x%08x! " > - "Expected=0x%02x, Read=0x%02x,", > - message, start + i, cmpbuf[i], > - readbuf[i]); > - } > - } > - if (failcount) { > - msg_cerr(" failed byte count from 0x%08x-0x%08x: 0x%x\n", > - start, start + len - 1, failcount); > - ret = -1; > - } > - > + ret = compare_range(cmpbuf, readbuf, start, len); Good idea to refactor this. > out_free: > free(readbuf); > return ret; > @@ -1060,21 +1060,6 @@ notfound: > return flash - flashchips; > } > > -int verify_flash(struct flashctx *flash, uint8_t *buf) > -{ > - int ret; > - unsigned int total_size = flash->total_size * 1024; > - > - msg_cinfo("Verifying flash... "); > - > - ret = verify_range(flash, buf, 0, total_size, NULL); > - > - if (!ret) > - msg_cinfo("VERIFIED. \n"); > - > - return ret; > -} I believe that this hunk conflicts with some of your layout patches. Maybe not a direct patch hunk conflict, but having a standalone function which verifies the flash chip according to some layout rules is a good thing. I'd keep verify_flash for now. OTOH, the hunk below makes it painfully obvious that the current verify_flash abstraction is not the right abstraction. Two functions compare_all_ranges() defaulting to a full chip range and verify_all_ranges() with similar characteristics would IMHO be a good abstraction, especially in light of the pending improved layout support. > - > int read_buf_from_file(unsigned char *buf, unsigned long size, > const char *filename) > { > @@ -1838,15 +1823,22 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, > } > > if (verify_it) { > - /* Work around chips which need some time to calm down. */ > - if (write_it) > + msg_cinfo("Verifying flash... "); > + > + if (write_it) { > + /* Work around chips which need some time to calm down. */ > programmer_delay(1000*1000); > - ret = verify_flash(flash, newcontents); > - /* If we tried to write, and verification now fails, we > - * might have an emergency situation. > - */ > - if (ret && write_it) > - emergency_help_message(); > + ret = verify_range(flash, newcontents, 0, size); > + /* If we tried to write, and verification now fails, we > + * might have an emergency situation. > + */ > + if (ret) > + emergency_help_message(); > + } else { > + ret = compare_range(newcontents, oldcontents, 0, size); > + } > + if (!ret) > + msg_cinfo("VERIFIED.\n"); > } > > out: > diff --git a/jedec.c b/jedec.c > index 69c0c0c..1fa1a10 100644 > --- a/jedec.c > +++ b/jedec.c > @@ -409,7 +409,7 @@ retry: > > dst = d; > src = s; > - failed = verify_range(flash, src, start, page_size, NULL); > + failed = verify_range(flash, src, start, page_size); > > if (failed && tried++ < MAX_REFLASH_TRIES) { > msg_cerr("retrying.\n"); I agree with the direction of the patch, I'm just not yet sure about the implementation. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 3

Re: [flashrom] [PATCH] Add support for Atmel AT26DF041.
by Stefan Tauner Oct. 27, 2012

Oct. 27, 2012

On Sun, 7 Oct 2012 06:23:26 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Wicked chip: > No WRSR, no write enable command, auto-erasing page write (but even > without that page writes are recommended to write the whole page > i.e. operate on a completely erased page), mad requirements on block > refreshments if only partly written. > > Found on my Intel D946GZIS and tested with my serprog in situ. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> committed in r1616. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH] serprog: add opcode to control the programmer's output drivers.
by Stefan Tauner Oct. 27, 2012

Oct. 27, 2012

On Wed, 10 Oct 2012 08:08:36 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Also, move the macro list to its own file. i have splitted the previous patch into two and committed them in r1617 and r1618. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1619 - trunk
by repository service Oct. 27, 2012

Oct. 27, 2012

Author: stefanct Date: Sat Oct 27 17:36:56 2012 New Revision: 1619 URL: http://flashrom.org/trac/flashrom/changeset/1619 Log: Do not read the flash chip twice in verification mode. Kyösti Mälkki noticed that we unnecessarily read the flash chip twice when called with --verify. The first one is the mandatory read before everything (to be able to detect the seriousness of errors), but the second one is not necessary because we can just use the former for the comparison. This introduces a small output change: previously we printed ERASE or VERIFY depending on the callee. This special case has been dropped because it is unnecessary to print it (and wrong for the verification function to need to know why it is verifying exactly). If an erase fails we mention that fact explicitly already, similar for verify. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/flash.h trunk/flashrom.c trunk/jedec.c Modified: trunk/flash.h ============================================================================== --- trunk/flash.h Sat Oct 27 02:34:23 2012 (r1618) +++ trunk/flash.h Sat Oct 27 17:36:56 2012 (r1619) @@ -231,7 +231,7 @@ int max(int a, int b); void tolower_string(char *str); char *extract_param(char **haystack, const char *needle, const char *delim); -int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len, const char *message); +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); char *strcat_realloc(char *dest, const char *src); void print_version(void); Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Oct 27 02:34:23 2012 (r1618) +++ trunk/flashrom.c Sat Oct 27 17:36:56 2012 (r1619) @@ -544,6 +544,26 @@ return usable_erasefunctions; } +int compare_range(uint8_t *wantbuf, uint8_t *havebuf, unsigned int start, unsigned int len) +{ + int ret = 0, failcount = 0; + unsigned int i; + for (i = 0; i < len; i++) { + if (wantbuf[i] != havebuf[i]) { + /* Only print the first failure. */ + if (!failcount++) + msg_cerr("FAILED at 0x%08x! Expected=0x%02x, Found=0x%02x,", + start + i, wantbuf[i], havebuf[i]); + } + } + if (failcount) { + msg_cerr(" failed byte count from 0x%08x-0x%08x: 0x%x\n", + start, start + len - 1, failcount); + ret = -1; + } + return ret; +} + /* start is an offset to the base address of the flash chip */ int check_erased_range(struct flashctx *flash, unsigned int start, unsigned int len) @@ -556,7 +576,7 @@ exit(1); } memset(cmpbuf, 0xff, len); - ret = verify_range(flash, cmpbuf, start, len, "ERASE"); + ret = verify_range(flash, cmpbuf, start, len); free(cmpbuf); return ret; } @@ -566,15 +586,12 @@ * flash content at location start * @start offset to the base address of the flash chip * @len length of the verified area - * @message string to print in the "FAILED" message * @return 0 for success, -1 for failure */ -int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, - unsigned int len, const char *message) +int verify_range(struct flashctx *flash, uint8_t *cmpbuf, unsigned int start, unsigned int len) { - unsigned int i; uint8_t *readbuf = malloc(len); - int ret = 0, failcount = 0; + int ret = 0; if (!len) goto out_free; @@ -595,8 +612,6 @@ ret = -1; goto out_free; } - if (!message) - message = "VERIFY"; ret = flash->chip->read(flash, readbuf, start, len); if (ret) { @@ -605,22 +620,7 @@ return ret; } - for (i = 0; i < len; i++) { - if (cmpbuf[i] != readbuf[i]) { - /* Only print the first failure. */ - if (!failcount++) - msg_cerr("%s FAILED at 0x%08x! " - "Expected=0x%02x, Read=0x%02x,", - message, start + i, cmpbuf[i], - readbuf[i]); - } - } - if (failcount) { - msg_cerr(" failed byte count from 0x%08x-0x%08x: 0x%x\n", - start, start + len - 1, failcount); - ret = -1; - } - + ret = compare_range(cmpbuf, readbuf, start, len); out_free: free(readbuf); return ret; @@ -1054,21 +1054,6 @@ return chip - flashchips; } -int verify_flash(struct flashctx *flash, uint8_t *buf) -{ - int ret; - unsigned int total_size = flash->chip->total_size * 1024; - - msg_cinfo("Verifying flash... "); - - ret = verify_range(flash, buf, 0, total_size, NULL); - - if (!ret) - msg_cinfo("VERIFIED. \n"); - - return ret; -} - int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename) { @@ -1424,10 +1409,8 @@ { msg_gerr("Your flash chip is in an unknown state.\n" "Get help on IRC at chat.freenode.net (channel #flashrom) or\n" - "mail flashrom(a)flashrom.org with the subject " - "\"FAILED: <your board name>\"!\n" - "-------------------------------------------------------------" - "------------------\n" + "mail flashrom(a)flashrom.org with the subject \"FAILED: <your board name>\"!\n" + "-------------------------------------------------------------------------------\n" "DO NOT REBOOT OR POWEROFF!\n"); } @@ -1860,15 +1843,22 @@ } if (verify_it) { - /* Work around chips which need some time to calm down. */ - if (write_it) + msg_cinfo("Verifying flash... "); + + if (write_it) { + /* Work around chips which need some time to calm down. */ programmer_delay(1000*1000); - ret = verify_flash(flash, newcontents); - /* If we tried to write, and verification now fails, we - * might have an emergency situation. - */ - if (ret && write_it) - emergency_help_message(); + ret = verify_range(flash, newcontents, 0, size); + /* If we tried to write, and verification now fails, we + * might have an emergency situation. + */ + if (ret) + emergency_help_message(); + } else { + ret = compare_range(newcontents, oldcontents, 0, size); + } + if (!ret) + msg_cinfo("VERIFIED.\n"); } out: Modified: trunk/jedec.c ============================================================================== --- trunk/jedec.c Sat Oct 27 02:34:23 2012 (r1618) +++ trunk/jedec.c Sat Oct 27 17:36:56 2012 (r1619) @@ -410,7 +410,7 @@ dst = d; src = s; - failed = verify_range(flash, src, start, page_size, NULL); + failed = verify_range(flash, src, start, page_size); if (failed && tried++ < MAX_REFLASH_TRIES) { msg_cerr("retrying.\n");

1 0

ft2232: TI Stellaris DevKit / Dediprog SF100 IF / SPI Chip
by Philipp Wiesner Oct. 27, 2012

Oct. 27, 2012

Hi I had to flash a BIOS chip via SPI. The board i was flashing was the mainboard of a 'iEi TANK-800-D525' computer (it's a rugged industrial sff computer). I don't have access to the machine ATM so I can't tell what the exact name of the board is, but it's a custom mainboard only used in this computer AFAIK. It has a SST25VF016B BIOS-chip (which is well supported) and an interface designed for the Dediprog SF100 programmer, which essentially is a SPI interface with an optional IO line. (Documentation is available online, for users as well as for hardware developers, so the interface is well documented). The programmer I used was a Texas Instruments DK-LM3S9B96 Stellaris development kit. It has a JTAG-Interface, which is externally accessable via pin header. The interface is provided by a FTDI ft2232 chip together with some glue logic (essentially bus buffers, some logic). I had to make some customizations to ft2232.c add support for this programmer. I had to build a cable which connects the JTAG interface with the on-board SF100 interface. Needless to say, I was successful. I like to share as much of the knowledge I acquired as possible with the community. The least thing I can do is send a patch with my modifications for the TI development board. I still need to read the instructions on how to prepare and send patches as I haven't done this in a long time. IMHO other TI Stellaris development boards share the same JTAG interface concept, but I can't name them. If someone has suggestions, I could check those boards for compatibility (by schematics). BTW, vid=0x0403 (FTDI default), pid=0xbcd9. In fact, a lot of USB-JTAG-Interfaces on development boards should be capable of doing this. The board needs to be flashed while completely off. At least I was not successful using the optional IO-line to claim exclusive access to the chip while in standby/running. I'm going to send a follow-up if I have specific questions. In the meantime you can ask questions if you think anything I did can be useful for you / for everyone. Kind regards, P. Wiesner

1 0

[commit] r1616 - trunk
by repository service Oct. 27, 2012

Oct. 27, 2012

Author: stefanct Date: Sat Oct 27 02:06:02 2012 New Revision: 1616 URL: http://flashrom.org/trac/flashrom/changeset/1616 Log: Add support for Atmel AT26DF041. Wicked chip: No WRSR, no write enable command (but swallows our default one without a problem), supports an auto-erasing page write (but even without that page writes are recommended to write the whole page i.e. operate on a completely erased page), mad requirements on block refreshments if only partly written. Found on my Intel D946GZIS and tested with my serprog in situ. Using the page write by setting JEDEC_BYTE_PROGRAM to 0x11 and using the spi_chip_write_256 command greatly improves performance and works flawlessly. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/chipdrivers.h trunk/flashchips.c trunk/spi.h trunk/spi25.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Fri Oct 26 18:49:15 2012 (r1615) +++ trunk/chipdrivers.h Sat Oct 27 02:06:02 2012 (r1616) @@ -41,7 +41,9 @@ int spi_write_enable(struct flashctx *flash); int spi_write_disable(struct flashctx *flash); int spi_block_erase_20(struct flashctx *flash, unsigned int addr, unsigned int blocklen); +int spi_block_erase_50(struct flashctx *flash, unsigned int addr, unsigned int blocklen); int spi_block_erase_52(struct flashctx *flash, unsigned int addr, unsigned int blocklen); +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_60(struct flashctx *flash, unsigned int addr, unsigned int blocklen); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Fri Oct 26 18:49:15 2012 (r1615) +++ trunk/flashchips.c Sat Oct 27 02:06:02 2012 (r1616) @@ -1795,18 +1795,24 @@ .total_size = 512, .page_size = 256, /* does not support EWSR nor WREN and has no writable status register bits whatsoever */ - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = { { + .eraseblocks = { {256, 2048} }, + .block_erase = spi_block_erase_81, + }, { + .eraseblocks = { {2 * 1024, 256} }, + .block_erase = spi_block_erase_50, + }, { .eraseblocks = { {4 * 1024, 128} }, .block_erase = spi_block_erase_20, } - }, - .write = NULL /* Incompatible Page write */, - .read = spi_chip_read, + }, /* Supports also an incompatible page write (of exactly 256 B) and an auto-erasing write. */ + .write = spi_chip_write_1, + .read = spi_chip_read, /* Fast read (0x0B) supported */ .voltage = {2700, 3600}, /* 3.0-3.6V for higher speed, 2.7-3.6V normal */ }, Modified: trunk/spi.h ============================================================================== --- trunk/spi.h Fri Oct 26 18:49:15 2012 (r1615) +++ trunk/spi.h Sat Oct 27 02:06:02 2012 (r1616) @@ -76,11 +76,21 @@ #define JEDEC_CE_C7_OUTSIZE 0x01 #define JEDEC_CE_C7_INSIZE 0x00 +/* Block Erase 0x50 is supported by Atmel AT26DF chips. */ +#define JEDEC_BE_50 0x50 +#define JEDEC_BE_50_OUTSIZE 0x04 +#define JEDEC_BE_50_INSIZE 0x00 + /* Block Erase 0x52 is supported by SST and old Atmel chips. */ #define JEDEC_BE_52 0x52 #define JEDEC_BE_52_OUTSIZE 0x04 #define JEDEC_BE_52_INSIZE 0x00 +/* Block Erase 0x81 is supported by Atmel AT26DF chips. */ +#define JEDEC_BE_81 0x81 +#define JEDEC_BE_81_OUTSIZE 0x04 +#define JEDEC_BE_81_INSIZE 0x00 + /* Block Erase 0xd8 is supported by EON/Macronix chips. */ #define JEDEC_BE_D8 0xd8 #define JEDEC_BE_D8_OUTSIZE 0x04 Modified: trunk/spi25.c ============================================================================== --- trunk/spi25.c Fri Oct 26 18:49:15 2012 (r1615) +++ trunk/spi25.c Sat Oct 27 02:06:02 2012 (r1616) @@ -741,6 +741,86 @@ return 0; } +int spi_block_erase_50(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_50_OUTSIZE, + .writearr = (const unsigned char[]){ + JEDEC_BE_50, + (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 10 ms, so wait in 1 ms steps. + */ + while (spi_read_status_register(flash) & SPI_SR_WIP) + programmer_delay(1 * 1000); + /* FIXME: Check the status register for errors. */ + return 0; +} + +int spi_block_erase_81(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_81_OUTSIZE, + .writearr = (const unsigned char[]){ + JEDEC_BE_81, + (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 8 ms, so wait in 1 ms steps. + */ + while (spi_read_status_register(flash) & SPI_SR_WIP) + programmer_delay(1 * 1000); + /* FIXME: Check the status register for errors. */ + return 0; +} + int spi_block_erase_60(struct flashctx *flash, unsigned int addr, unsigned int blocklen) {

2 1