December 2010 - flashrom - mail.coreboot.org

Chip unkown state?
by VICKI LUTHER Dec. 9, 2010

Dec. 9, 2010

Flash image seems to be a legacy BIOS. Disabling checks. Writing flash chip... Erasing flash chip... DONE BLOCK 0x0 DONE BLOCK 0x10000 DONE BLOCK 0x20000 DONE BLOCK 0x30000 DONE BLOCK 0x40000 DONE BLOCK 0x50000 DONE BLOCK 0x60000 ERASE FAILED at 0x00070000! Expected=0xff, Read=0xaa, failed byte count from 0x00070000-0x0007ffff: 0xff60 ERASE FAILED! FAILED! ERASE FAILED! FAILED! Your flash chip is in an unknown state. Get help on IRC at irc.freenode.net (channel #flashrom) or mail flashrom(a)flashrom.org! hp vectra vl 400 trying to update to latest version bios to version 1.08 form 1.03 i backed up the original bios version1.03 using this line sudo flashrom -r original.rom thanks Dan

2 1

Re: [flashrom] [coreboot] FLASHROM: Add support for M25P16.RES
by Carl-Daniel Hailfinger Dec. 7, 2010

Dec. 7, 2010

Hi Sven, [adding flashrom(a)flashrom.org to CC] thanks for your patch. Please note that a huge number of incompatible chips share the same RES ID. A quick glance at my datasheet collection (I stopped after 5 minutes) resulted in the following matches: AMIC A25L016, A25L16P Eon EN25P16 ESMT F25L016A Generalplus GPR25L161B Macronix MX25L1605*, MX25L1635* PMC Pm25LV016B Spansion S25FL016A ST M25P16 Winbond W25Q16* Are you 100% sure you have a ST M25P16? Regards, Carl-Daniel Your mail follows unqoted so flashrom patchwork will pick it up. On 06.12.2010 17:04, Sven Schnelle wrote: i've tried using flashrom for reading the SPI Flash of my Thinkpad X60s. It seems like it is using the (yet) unsupported M25P16.RES. I've added the few lines required to get it working, and at least reading the Flash works. Haven't tried writing the Flash (yes, i know about the risk regarding EC and friends) ;-) Signed-off-by: Sven Schnelle <svens(a)stackframe.org> Index: flashchips.c =================================================================== --- flashchips.c (revision 1246) +++ flashchips.c (working copy) @@ -6188,9 +6188,33 @@ .write = spi_chip_write_256, .read = spi_chip_read, }, - { .vendor = "ST", + .name = "M25P16.RES", + .bustype = CHIP_BUSTYPE_SPI, + .manufacture_id = 0, /* Unused */ + .model_id = ST_M25P16_RES, + .total_size = 2048, + .page_size = 256, + .tested = TEST_OK_PR, + .probe = probe_spi_res1, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 32} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {2 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + }, + { + .vendor = "ST", .name = "M25P32", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = ST_ID, Index: flashchips.h =================================================================== --- flashchips.h (revision 1246) +++ flashchips.h (working copy) @@ -528,6 +528,7 @@ #define ST_M25P40_RES 0x12 #define ST_M25P80 0x2014 #define ST_M25P16 0x2015 +#define ST_M25P16_RES 0x14 #define ST_M25P32 0x2016 #define ST_M25P64 0x2017 #define ST_M25P128 0x2018

2 1

Test results for flashrom on Winfast MCP61SM2MA-ERS2H
by Paul Brookman Dec. 6, 2010

Dec. 6, 2010

These are from attempts to flash a Winbond chip on a MCP61 chipset board (failed). The chip was previously hot-flashed with the latest bios for the Winfast MCP61 board using flashrom successfully on another board (Foxconn RC4107MA). Transferred to the Winfast board, the rom chip enabled the board to be booted successfully, but could not then be erased. Many thanks, Paul Brookman

2 2

[PATCH] Simplify get_next_write
by Carl-Daniel Hailfinger Dec. 6, 2010

Dec. 6, 2010

Simplify get_next_write in the partial write code. Suggested by Michael Karcher. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-partial_write_get_next_write_simplify/flashrom.c =================================================================== --- flashrom-partial_write_get_next_write_simplify/flashrom.c (Revision 1245) +++ flashrom-partial_write_get_next_write_simplify/flashrom.c (Arbeitskopie) @@ -928,13 +928,11 @@ /* First location where have and want * do not differ anymore. */ - first_len = i * stride - rel_start; break; } } } - /* Did the loop terminate without setting first_len? */ - if (need_write && ! first_len) + if (need_write) first_len = min(i * stride - rel_start, len); *first_start += rel_start; return first_len; -- http://www.hailfinger.org/

2 2

[commit] r1246 - trunk
by repository service Dec. 6, 2010

Dec. 6, 2010

Author: hailfinger Date: Mon Dec 6 14:05:44 2010 New Revision: 1246 URL: http://flashrom.org/trac/flashrom/changeset/1246 Log: Simplify get_next_write in the partial write code. Suggested by Michael Karcher. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Modified: trunk/flashrom.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Dec 5 17:33:59 2010 (r1245) +++ trunk/flashrom.c Mon Dec 6 14:05:44 2010 (r1246) @@ -928,13 +928,11 @@ /* First location where have and want * do not differ anymore. */ - first_len = i * stride - rel_start; break; } } } - /* Did the loop terminate without setting first_len? */ - if (need_write && ! first_len) + if (need_write) first_len = min(i * stride - rel_start, len); *first_start += rel_start; return first_len;

1 0

[PATCH] Handle erase failure in partial write, clean up
by Carl-Daniel Hailfinger Dec. 5, 2010

Dec. 5, 2010

Handle erase failure in partial write. Clean up erase function checking. Update a few comments and messages to improve readability. The erase failure handling is a genuine bugfix which is needed on locked down chipsets and in the unlikely case that write fails halfway through or an incorrect chip definition is used. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-cleanup_erase_and_write/flashrom.c =================================================================== --- flashrom-cleanup_erase_and_write/flashrom.c (Revision 1236) +++ flashrom-cleanup_erase_and_write/flashrom.c (Arbeitskopie) @@ -1429,57 +1429,84 @@ return 0; } +static int check_block_eraser(struct flashchip *flash, int k, int log) +{ + struct block_eraser eraser = flash->block_erasers[k]; + + if (log) + msg_cdbg("Looking at blockwise erase function %i... ", k); + if (!eraser.block_erase && !eraser.eraseblocks[0].count) { + if (log) + msg_cdbg("not defined. "); + return 1; + } + if (!eraser.block_erase && eraser.eraseblocks[0].count) { + if (log) + msg_cdbg("eraseblock layout is known, but no " + "matching block erase function found. "); + return 1; + } + if (eraser.block_erase && !eraser.eraseblocks[0].count) { + if (log) + msg_cdbg("block erase function found, but " + "eraseblock layout is unknown. "); + return 1; + } + return 0; +} + int erase_and_write_flash(struct flashchip *flash, uint8_t *oldcontents, uint8_t *newcontents) { - int k, ret = 0, found = 0; + int k, ret = 0; uint8_t *curcontents; unsigned long size = flash->total_size * 1024; + int usable_erasefunctions = 0; + for (k = 0; k < NUM_ERASEFUNCTIONS; k++) + if (!check_block_eraser(flash, k, 0)) + usable_erasefunctions++; + msg_cinfo("Erasing and writing flash chip... "); + if (!usable_erasefunctions) { + msg_cerr("ERROR: flashrom has no erase function for this flash " + "chip.\n"); + return 1; + } + curcontents = (uint8_t *) malloc(size); /* Copy oldcontents to curcontents to avoid clobbering oldcontents. */ memcpy(curcontents, oldcontents, size); - msg_cinfo("Erasing and writing flash chip... "); for (k = 0; k < NUM_ERASEFUNCTIONS; k++) { - struct block_eraser eraser = flash->block_erasers[k]; - - msg_cdbg("Looking at blockwise erase function %i... ", k); - if (!eraser.block_erase && !eraser.eraseblocks[0].count) { - msg_cdbg("not defined. " - "Looking for another erase function.\n"); + if (check_block_eraser(flash, k, 1) && usable_erasefunctions) { + msg_cdbg("Looking for another erase function.\n"); continue; } - if (!eraser.block_erase && eraser.eraseblocks[0].count) { - msg_cdbg("eraseblock layout is known, but no " - "matching block erase function found. " - "Looking for another erase function.\n"); - continue; - } - if (eraser.block_erase && !eraser.eraseblocks[0].count) { - msg_cdbg("block erase function found, but " - "eraseblock layout is unknown. " - "Looking for another erase function.\n"); - continue; - } - found = 1; + usable_erasefunctions--; msg_cdbg("trying... "); ret = walk_eraseregions(flash, k, &erase_and_write_block_helper, curcontents, newcontents); msg_cdbg("\n"); /* If everything is OK, don't try another erase function. */ if (!ret) break; - /* FIXME: Reread the whole chip here so we know the current - * chip contents? curcontents might be up to date, but this - * code is only reached if something failed, and then we don't - * know exactly what failed, and how. + /* Write/erase failed, so try to find out what the current chip + * contents are. If no usable erase functions remain, we could + * abort the loop instead of continuing, the effect is the same. + * The only difference is whether the reason for other unusable + * functions is printed or not. If in doubt, verbosity wins. */ + if (!usable_erasefunctions) + continue; + if (flash->read(flash, curcontents, 0, size)) { + /* Now we are truly screwed. Read failed as well. */ + msg_cerr("Can't read anymore!\n"); + /* We have no idea about the flash chip contents, so + * retrying with another erase function is pointless. + */ + break; + } } /* Free the scratchpad. */ free(curcontents); - if (!found) { - msg_cerr("ERROR: flashrom has no erase function for this flash chip.\n"); - return 1; - } if (ret) { msg_cerr("FAILED!\n"); @@ -1827,18 +1854,15 @@ * preserved, but in that case we might perform unneeded erase which * takes time as well. */ - msg_cdbg("Reading old flash chip contents...\n"); + msg_cdbg("Reading current flash chip contents...\n"); if (flash->read(flash, oldcontents, 0, size)) { ret = 1; goto out; } - // This should be moved into each flash part's code to do it - // cleanly. This does the job. + /* Build a new image from the given layout. */ handle_romentries(flash, oldcontents, newcontents); - // //////////////////////////////////////////////////////////// - if (write_it) { if (erase_and_write_flash(flash, oldcontents, newcontents)) { msg_cerr("Uh oh. Erase/write failed. Checking if " -- http://www.hailfinger.org/

2 6

[PATCH] Print lock status for Winbond W39*
by Carl-Daniel Hailfinger Dec. 5, 2010

Dec. 5, 2010

Print lock status for all supported Winbond W39* chips: W39V040A W39V040(F)B W39V040(F)C W39V040FA W39V080A W39V080FA W39V080FA (dual mode) Please note that the W39V040B/W39V040FB pair has identical IDs, identical read/write/erase, but locking differs. Right now they have a common chip definition, but that will have to change in the future. For chipsets which support LPC and FWH, separating the chips will be really painful because both variants will be detected and the user will have to choose. Same problem appears for W39V040C/W39V040FC. A better evil twin handling (patch available) will resolve that problem. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Please run "svn mv w39v080fa.c w39.c" before applying this patch. Index: flashrom-w39_printlock/w39.c =================================================================== --- flashrom-w39_printlock/w39.c (Revision 1241) +++ flashrom-w39_printlock/w39.c (Arbeitskopie) @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2008 coresystems GmbH + * Copyright (C) 2010 Carl-Daniel Hailfinger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,67 +22,78 @@ #include "flash.h" #include "chipdrivers.h" -static int unlock_block_winbond_fwhub(struct flashchip *flash, int offset) +static int printlock_w39_fwh_block(struct flashchip *flash, int offset) { chipaddr wrprotect = flash->virtual_registers + offset + 2; uint8_t locking; - msg_cdbg("Trying to unlock block @0x%08x = 0x%02x\n", offset, - chip_readb(wrprotect)); - locking = chip_readb(wrprotect); + msg_cdbg("Lock status of block at 0x%08x is ", offset); switch (locking & 0x7) { case 0: msg_cdbg("Full Access.\n"); - return 0; + break; case 1: msg_cdbg("Write Lock (Default State).\n"); - chip_writeb(0, wrprotect); - return 0; + break; case 2: msg_cdbg("Locked Open (Full Access, Lock Down).\n"); - return 0; + break; case 3: msg_cerr("Error: Write Lock, Locked Down.\n"); - return -1; + break; case 4: msg_cdbg("Read Lock.\n"); - chip_writeb(0, wrprotect); - return 0; + break; case 5: msg_cdbg("Read/Write Lock.\n"); - chip_writeb(0, wrprotect); - return 0; + break; case 6: msg_cerr("Error: Read Lock, Locked Down.\n"); - return -1; + break; case 7: msg_cerr("Error: Read/Write Lock, Locked Down.\n"); - return -1; + break; } - /* We will never reach this point, but GCC doesn't know */ - return -1; + /* Read or write lock present? */ + return (locking & ((1 << 2) | (1 << 0))) ? -1 : 0; } -int unlock_winbond_fwhub(struct flashchip *flash) +static int unlock_w39_fwh_block(struct flashchip *flash, int offset) { - int i, total_size = flash->total_size * 1024; - chipaddr bios = flash->virtual_memory; + chipaddr wrprotect = flash->virtual_registers + offset + 2; uint8_t locking; - /* Are there any hardware restrictions that we can't overcome? - * If flashrom fail here, someone's got to check all those GPIOs. - */ + locking = chip_readb(wrprotect); + /* Read or write lock present? */ + if (locking & ((1 << 2) | (1 << 0))) { + /* Lockdown active? */ + if (locking & (1 << 1)) { + msg_cerr("Can't unlock block at 0x%x!\n", offset); + return -1; + } else { + msg_cdbg("Unlocking block at 0x%x\n", offset); + chip_writeb(0, wrprotect); + } + } + return 0; +} + +static uint8_t w39_idmode_readb(struct flashchip *flash, int offset) +{ + chipaddr bios = flash->virtual_memory; + uint8_t val; + /* Product Identification Entry */ chip_writeb(0xAA, bios + 0x5555); chip_writeb(0x55, bios + 0x2AAA); chip_writeb(0x90, bios + 0x5555); programmer_delay(10); - /* Read Hardware Lock Bits */ - locking = chip_readb(bios + 0xffff2); + /* Read something, maybe hardware lock bits */ + val = chip_readb(bios + offset); /* Product Identification Exit */ chip_writeb(0xAA, bios + 0x5555); @@ -89,25 +101,164 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(10); - msg_cdbg("Lockout bits:\n"); + return val; +} - if (locking & (1 << 2)) - msg_cerr("Error: hardware bootblock locking (#TBL).\n"); - else - msg_cdbg("No hardware bootblock locking (good!)\n"); +static int printlock_w39_wblwp(uint8_t lock) +{ + msg_cdbg("Hardware bootblock locking (#TBL) is %sactive.\n", + (lock & (1 << 2)) ? "" : "not "); + msg_cdbg("Hardware remaining chip locking (#WP) is %sactive..\n", + (lock & (1 << 3)) ? "" : "not "); + if (lock & ((1 << 2) | (1 << 3))) + return -1; - if (locking & (1 << 3)) - msg_cerr("Error: hardware block locking (#WP).\n"); - else - msg_cdbg("No hardware block locking (good!)\n"); + return 0; +} - if (locking & ((1 << 2) | (1 << 3))) +static int printlock_w39_bootblock_64k16k(uint8_t lock) +{ + msg_cdbg("Software 64 kB bootblock locking is %sactive.\n", + (lock & (1 << 0)) ? "" : "not "); + msg_cdbg("Software 16 kB bootblock locking is %sactive.\n", + (lock & (1 << 1)) ? "" : "not "); + if (lock & ((1 << 1) | (1 << 0))) return -1; + return 0; +} + +static int printlock_w39_common(struct flashchip *flash, int offset) +{ + uint8_t lock; + + lock = w39_idmode_readb(flash, offset); + msg_cdbg("Lockout bits:\n"); + return printlock_w39_wblwp(lock); +} + +static int printlock_w39_fwh(struct flashchip *flash) +{ + int i, total_size = flash->total_size * 1024; + + /* Print lock status of the complete chip */ + for (i = 0; i < total_size; i += flash->page_size) + if (printlock_w39_fwh_block(flash, i)) + return -1; + + return 0; +} + +static int unlock_w39_fwh(struct flashchip *flash) +{ + int i, total_size = flash->total_size * 1024; + /* Unlock the complete chip */ for (i = 0; i < total_size; i += flash->page_size) - if (unlock_block_winbond_fwhub(flash, i)) + if (unlock_w39_fwh_block(flash, i)) return -1; return 0; } + +int printlock_w39v040a(struct flashchip *flash) +{ + uint8_t lock; + int ret = 0; + + /* The W39V040A datasheet contradicts itself on the lock register + * location: 0x00002 and 0x7fff2 are both mentioned. Pick the one + * which is similar to the other chips of the same family. + */ + lock = w39_idmode_readb(flash, 0x7fff2); + msg_cdbg("Lockout bits:\n"); + + ret = printlock_w39_wblwp(lock); + ret |= printlock_w39_bootblock_64k16k(lock); + + return ret; +} + +int printlock_w39v040b(struct flashchip *flash) +{ + return printlock_w39_common(flash, 0x7fff2); +} + +int printlock_w39v040c(struct flashchip *flash) +{ + return printlock_w39_common(flash, 0xfff2); +} + +int printlock_w39v040fa(struct flashchip *flash) +{ + int ret = 0; + + ret = printlock_w39v040a(flash); + ret |= printlock_w39_fwh(flash); + + return ret; +} + +/* Unused because W39V040B and W39V040FB can not be distinguished from each + * other based on ID. + */ +int printlock_w39v040fb(struct flashchip *flash) +{ + int ret = 0; + + ret = printlock_w39v040b(flash); + ret |= printlock_w39_fwh(flash); + + return ret; +} + +/* Unused because W39V040C and W39V040FC can not be distinguished from each + * other based on ID. + */ +int printlock_w39v040fc(struct flashchip *flash) +{ + int ret = 0; + + /* W39V040C and W39V040FC use different WP/TBL offsets. */ + ret = printlock_w39_common(flash, 0x7fff2); + ret |= printlock_w39_fwh(flash); + + return ret; +} + +int printlock_w39v080a(struct flashchip *flash) +{ + return printlock_w39_common(flash, 0xffff2); +} + +int printlock_w39v080fa(struct flashchip *flash) +{ + int ret = 0; + + ret = printlock_w39v080a(flash); + ret |= printlock_w39_fwh(flash); + + return ret; +} + +int printlock_w39v080fa_dual(struct flashchip *flash) +{ + msg_cinfo("Block locking for W39V080FA in dual mode is " + "undocumented.\n"); + /* Better safe than sorry. */ + return -1; +} + +int unlock_w39v080fa(struct flashchip *flash) +{ + if (unlock_w39_fwh(flash)) + return -1; + /* The soft bootblock locks may have been deactivated by the unlock + * above, so check them last. + */ + if (printlock_w39_common(flash, 0xffff2)) + return -1; + + return 0; +} + Index: flashrom-w39_printlock/Makefile =================================================================== --- flashrom-w39_printlock/Makefile (Revision 1241) +++ flashrom-w39_printlock/Makefile (Arbeitskopie) @@ -82,7 +82,7 @@ endif endif -CHIP_OBJS = jedec.o stm50flw0x0x.o w39v040c.o w39v080fa.o w29ee011.o \ +CHIP_OBJS = jedec.o stm50flw0x0x.o w39.o w29ee011.o \ sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \ sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o sharplhf00l04.o Index: flashrom-w39_printlock/w39v040c.c =================================================================== --- flashrom-w39_printlock/w39v040c.c (Revision 1241) +++ flashrom-w39_printlock/w39v040c.c (Arbeitskopie) @@ -1,48 +0,0 @@ -/* - * This file is part of the flashrom project. - * - * Copyright (C) 2008 Peter Stuge <peter(a)stuge.se> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "flash.h" -#include "chipdrivers.h" - -int printlock_w39v040c(struct flashchip *flash) -{ - chipaddr bios = flash->virtual_memory; - uint8_t lock; - - chip_writeb(0xAA, bios + 0x5555); - programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); - programmer_delay(10); - chip_writeb(0x90, bios + 0x5555); - programmer_delay(10); - - lock = chip_readb(bios + 0xfff2); - - chip_writeb(0xAA, bios + 0x5555); - programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); - programmer_delay(10); - chip_writeb(0xF0, bios + 0x5555); - programmer_delay(40); - - msg_cdbg("%s: Boot block #TBL is %slocked, rest of chip #WP is %slocked.\n", - __func__, lock & 0x4 ? "" : "un", lock & 0x8 ? "" : "un"); - return 0; -} Index: flashrom-w39_printlock/flashchips.c =================================================================== --- flashrom-w39_printlock/flashchips.c (Revision 1241) +++ flashrom-w39_printlock/flashchips.c (Arbeitskopie) @@ -7593,6 +7593,7 @@ .block_erase = erase_chip_block_jedec, } }, + .printlock = printlock_w39v040a, .write = write_jedec_1, .read = read_memmapped, }, @@ -7600,7 +7601,7 @@ { .vendor = "Winbond", .name = "W39V040(F)B", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040B, .total_size = 512, @@ -7619,6 +7620,7 @@ .block_erase = erase_chip_block_jedec, } }, + .printlock = printlock_w39v040b, .write = write_jedec_1, .read = read_memmapped, }, @@ -7626,7 +7628,7 @@ { .vendor = "Winbond", .name = "W39V040(F)C", - .bustype = CHIP_BUSTYPE_LPC, + .bustype = CHIP_BUSTYPE_LPC | CHIP_BUSTYPE_FWH, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040C, .total_size = 512, @@ -7634,7 +7636,7 @@ .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = 10, .block_erasers = { { @@ -7675,7 +7677,7 @@ .block_erase = erase_chip_block_jedec, } }, - .printlock = printlock_sst_fwhub, + .printlock = printlock_w39v040fa, .unlock = unlock_sst_fwhub, .write = write_jedec_1, .read = read_memmapped, @@ -7703,6 +7705,7 @@ .block_erase = erase_chip_block_jedec, } }, + .printlock = printlock_w39v080a, .write = write_jedec_1, .read = read_memmapped, }, @@ -7834,7 +7837,7 @@ .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PRE, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = 10, .block_erasers = { { @@ -7845,7 +7848,8 @@ .block_erase = erase_chip_block_jedec, } }, - .unlock = unlock_winbond_fwhub, + .printlock = printlock_w39v080fa, + .unlock = unlock_w39v080fa, .write = write_jedec_1, .read = read_memmapped, }, @@ -7861,7 +7865,7 @@ .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = 10, .block_erasers = { { @@ -7872,7 +7876,7 @@ .block_erase = erase_chip_block_jedec, } }, - .unlock = unlock_winbond_fwhub, + .printlock = printlock_w39v080fa_dual, .write = write_jedec_1, .read = read_memmapped, }, Index: flashrom-w39_printlock/w39v080fa.c =================================================================== --- flashrom-w39_printlock/w39v080fa.c (Revision 1241) +++ flashrom-w39_printlock/w39v080fa.c (Arbeitskopie) @@ -1,113 +0,0 @@ -/* - * This file is part of the flashrom project. - * - * Copyright (C) 2008 coresystems GmbH - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "flash.h" -#include "chipdrivers.h" - -static int unlock_block_winbond_fwhub(struct flashchip *flash, int offset) -{ - chipaddr wrprotect = flash->virtual_registers + offset + 2; - uint8_t locking; - - msg_cdbg("Trying to unlock block @0x%08x = 0x%02x\n", offset, - chip_readb(wrprotect)); - - locking = chip_readb(wrprotect); - switch (locking & 0x7) { - case 0: - msg_cdbg("Full Access.\n"); - return 0; - case 1: - msg_cdbg("Write Lock (Default State).\n"); - chip_writeb(0, wrprotect); - return 0; - case 2: - msg_cdbg("Locked Open (Full Access, Lock Down).\n"); - return 0; - case 3: - msg_cerr("Error: Write Lock, Locked Down.\n"); - return -1; - case 4: - msg_cdbg("Read Lock.\n"); - chip_writeb(0, wrprotect); - return 0; - case 5: - msg_cdbg("Read/Write Lock.\n"); - chip_writeb(0, wrprotect); - return 0; - case 6: - msg_cerr("Error: Read Lock, Locked Down.\n"); - return -1; - case 7: - msg_cerr("Error: Read/Write Lock, Locked Down.\n"); - return -1; - } - - /* We will never reach this point, but GCC doesn't know */ - return -1; -} - -int unlock_winbond_fwhub(struct flashchip *flash) -{ - int i, total_size = flash->total_size * 1024; - chipaddr bios = flash->virtual_memory; - uint8_t locking; - - /* Are there any hardware restrictions that we can't overcome? - * If flashrom fail here, someone's got to check all those GPIOs. - */ - - /* Product Identification Entry */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0x90, bios + 0x5555); - programmer_delay(10); - - /* Read Hardware Lock Bits */ - locking = chip_readb(bios + 0xffff2); - - /* Product Identification Exit */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); - programmer_delay(10); - - msg_cdbg("Lockout bits:\n"); - - if (locking & (1 << 2)) - msg_cerr("Error: hardware bootblock locking (#TBL).\n"); - else - msg_cdbg("No hardware bootblock locking (good!)\n"); - - if (locking & (1 << 3)) - msg_cerr("Error: hardware block locking (#WP).\n"); - else - msg_cdbg("No hardware block locking (good!)\n"); - - if (locking & ((1 << 2) | (1 << 3))) - return -1; - - /* Unlock the complete chip */ - for (i = 0; i < total_size; i += flash->page_size) - if (unlock_block_winbond_fwhub(flash, i)) - return -1; - - return 0; -} Index: flashrom-w39_printlock/chipdrivers.h =================================================================== --- flashrom-w39_printlock/chipdrivers.h (Revision 1241) +++ flashrom-w39_printlock/chipdrivers.h (Arbeitskopie) @@ -109,12 +109,16 @@ int printlock_sst_fwhub(struct flashchip *flash); int unlock_sst_fwhub(struct flashchip *flash); -/* w39v040c.c */ +/* w39.c */ +int printlock_w39v040a(struct flashchip *flash); +int printlock_w39v040b(struct flashchip *flash); int printlock_w39v040c(struct flashchip *flash); +int printlock_w39v040fa(struct flashchip *flash); +int printlock_w39v080a(struct flashchip *flash); +int printlock_w39v080fa(struct flashchip *flash); +int printlock_w39v080fa_dual(struct flashchip *flash); +int unlock_w39v080fa(struct flashchip *flash); -/* w39V080fa.c */ -int unlock_winbond_fwhub(struct flashchip *flash); - /* w29ee011.c */ int probe_w29ee011(struct flashchip *flash); -- http://www.hailfinger.org/

3 6

[commit] r1245 - trunk
by repository service Dec. 5, 2010

Dec. 5, 2010

Author: hailfinger Date: Sun Dec 5 17:33:59 2010 New Revision: 1245 URL: http://flashrom.org/trac/flashrom/changeset/1245 Log: Add support for Winbond W39V040FB and W39V040FC. Print lock status for all supported Winbond W39* chips: W39V040A, W39V040B, W39V040C, W39V040FA, W39V040FB, W39V040FC, W39V080A, W39V080FA, W39V080FA (dual mode). Fill in correct probe timing for Winbond W39V040C and W39V080FA. Please note that the W39V040B/W39V040FB pair has identical IDs, identical read/write/erase, but locking differs. Same applies to W39V040C/W39V040FC. This causes double detection on chipsets which support LPC and FWH, making flashing more difficult because the user has to select the correct chip. This is called the evil twin problem. A better evil twin handling (patch available) will resolve that problem. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Added: trunk/w39.c - copied, changed from r1241, trunk/w39v080fa.c Deleted: trunk/w39v040c.c trunk/w39v080fa.c Modified: trunk/Makefile trunk/chipdrivers.h trunk/flashchips.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Dec 5 16:14:44 2010 (r1244) +++ trunk/Makefile Sun Dec 5 17:33:59 2010 (r1245) @@ -82,7 +82,7 @@ endif endif -CHIP_OBJS = jedec.o stm50flw0x0x.o w39v040c.o w39v080fa.o w29ee011.o \ +CHIP_OBJS = jedec.o stm50flw0x0x.o w39.o w29ee011.o \ sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \ sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o sharplhf00l04.o Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Sun Dec 5 16:14:44 2010 (r1244) +++ trunk/chipdrivers.h Sun Dec 5 17:33:59 2010 (r1245) @@ -109,11 +109,17 @@ int printlock_sst_fwhub(struct flashchip *flash); int unlock_sst_fwhub(struct flashchip *flash); -/* w39v040c.c */ +/* w39.c */ +int printlock_w39v040a(struct flashchip *flash); +int printlock_w39v040b(struct flashchip *flash); int printlock_w39v040c(struct flashchip *flash); - -/* w39V080fa.c */ -int unlock_winbond_fwhub(struct flashchip *flash); +int printlock_w39v040fa(struct flashchip *flash); +int printlock_w39v040fb(struct flashchip *flash); +int printlock_w39v040fc(struct flashchip *flash); +int printlock_w39v080a(struct flashchip *flash); +int printlock_w39v080fa(struct flashchip *flash); +int printlock_w39v080fa_dual(struct flashchip *flash); +int unlock_w39v080fa(struct flashchip *flash); /* w29ee011.c */ int probe_w29ee011(struct flashchip *flash); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sun Dec 5 16:14:44 2010 (r1244) +++ trunk/flashchips.c Sun Dec 5 17:33:59 2010 (r1245) @@ -7593,13 +7593,14 @@ .block_erase = erase_chip_block_jedec, } }, + .printlock = printlock_w39v040a, .write = write_jedec_1, .read = read_memmapped, }, { .vendor = "Winbond", - .name = "W39V040(F)B", + .name = "W39V040B", .bustype = CHIP_BUSTYPE_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040B, @@ -7619,13 +7620,14 @@ .block_erase = erase_chip_block_jedec, } }, + .printlock = printlock_w39v040b, .write = write_jedec_1, .read = read_memmapped, }, { .vendor = "Winbond", - .name = "W39V040(F)C", + .name = "W39V040C", .bustype = CHIP_BUSTYPE_LPC, .manufacture_id = WINBOND_ID, .model_id = WINBOND_W39V040C, @@ -7634,7 +7636,7 @@ .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = 10, .block_erasers = { { @@ -7675,7 +7677,7 @@ .block_erase = erase_chip_block_jedec, } }, - .printlock = printlock_sst_fwhub, + .printlock = printlock_w39v040fa, .unlock = unlock_sst_fwhub, .write = write_jedec_1, .read = read_memmapped, @@ -7683,6 +7685,60 @@ { .vendor = "Winbond", + .name = "W39V040FB", + .bustype = CHIP_BUSTYPE_FWH, + .manufacture_id = WINBOND_ID, + .model_id = WINBOND_W39V040B, + .total_size = 512, + .page_size = 64 * 1024, + .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, + .tested = TEST_OK_PRE, + .probe = probe_jedec, + .probe_timing = 10, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 8} }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + }, + .printlock = printlock_w39v040fb, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Winbond", + .name = "W39V040FC", + .bustype = CHIP_BUSTYPE_FWH, + .manufacture_id = WINBOND_ID, + .model_id = WINBOND_W39V040C, + .total_size = 512, + .page_size = 64 * 1024, + .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = 10, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 8} }, + .block_erase = erase_sector_jedec, + }, { + .eraseblocks = { {512 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + }, + .printlock = printlock_w39v040fc, + .write = write_jedec_1, + .read = read_memmapped, + }, + + { + .vendor = "Winbond", .name = "W39V080A", .bustype = CHIP_BUSTYPE_LPC, .manufacture_id = WINBOND_ID, @@ -7703,6 +7759,7 @@ .block_erase = erase_chip_block_jedec, } }, + .printlock = printlock_w39v080a, .write = write_jedec_1, .read = read_memmapped, }, @@ -7834,7 +7891,7 @@ .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_OK_PRE, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = 10, .block_erasers = { { @@ -7845,7 +7902,8 @@ .block_erase = erase_chip_block_jedec, } }, - .unlock = unlock_winbond_fwhub, + .printlock = printlock_w39v080fa, + .unlock = unlock_w39v080fa, .write = write_jedec_1, .read = read_memmapped, }, @@ -7861,7 +7919,7 @@ .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = 10, .block_erasers = { { @@ -7872,7 +7930,7 @@ .block_erase = erase_chip_block_jedec, } }, - .unlock = unlock_winbond_fwhub, + .printlock = printlock_w39v080fa_dual, .write = write_jedec_1, .read = read_memmapped, }, Copied and modified: trunk/w39.c (from r1241, trunk/w39v080fa.c) ============================================================================== --- trunk/w39v080fa.c Fri Dec 3 15:48:11 2010 (r1241, copy source) +++ trunk/w39.c Sun Dec 5 17:33:59 2010 (r1245) @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2008 coresystems GmbH + * Copyright (C) 2010 Carl-Daniel Hailfinger * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,58 +22,69 @@ #include "flash.h" #include "chipdrivers.h" -static int unlock_block_winbond_fwhub(struct flashchip *flash, int offset) +static int printlock_w39_fwh_block(struct flashchip *flash, int offset) { chipaddr wrprotect = flash->virtual_registers + offset + 2; uint8_t locking; - msg_cdbg("Trying to unlock block @0x%08x = 0x%02x\n", offset, - chip_readb(wrprotect)); - locking = chip_readb(wrprotect); + msg_cdbg("Lock status of block at 0x%08x is ", offset); switch (locking & 0x7) { case 0: msg_cdbg("Full Access.\n"); - return 0; + break; case 1: msg_cdbg("Write Lock (Default State).\n"); - chip_writeb(0, wrprotect); - return 0; + break; case 2: msg_cdbg("Locked Open (Full Access, Lock Down).\n"); - return 0; + break; case 3: msg_cerr("Error: Write Lock, Locked Down.\n"); - return -1; + break; case 4: msg_cdbg("Read Lock.\n"); - chip_writeb(0, wrprotect); - return 0; + break; case 5: msg_cdbg("Read/Write Lock.\n"); - chip_writeb(0, wrprotect); - return 0; + break; case 6: msg_cerr("Error: Read Lock, Locked Down.\n"); - return -1; + break; case 7: msg_cerr("Error: Read/Write Lock, Locked Down.\n"); - return -1; + break; } - /* We will never reach this point, but GCC doesn't know */ - return -1; + /* Read or write lock present? */ + return (locking & ((1 << 2) | (1 << 0))) ? -1 : 0; } -int unlock_winbond_fwhub(struct flashchip *flash) +static int unlock_w39_fwh_block(struct flashchip *flash, int offset) { - int i, total_size = flash->total_size * 1024; - chipaddr bios = flash->virtual_memory; + chipaddr wrprotect = flash->virtual_registers + offset + 2; uint8_t locking; - /* Are there any hardware restrictions that we can't overcome? - * If flashrom fail here, someone's got to check all those GPIOs. - */ + locking = chip_readb(wrprotect); + /* Read or write lock present? */ + if (locking & ((1 << 2) | (1 << 0))) { + /* Lockdown active? */ + if (locking & (1 << 1)) { + msg_cerr("Can't unlock block at 0x%x!\n", offset); + return -1; + } else { + msg_cdbg("Unlocking block at 0x%x\n", offset); + chip_writeb(0, wrprotect); + } + } + + return 0; +} + +static uint8_t w39_idmode_readb(struct flashchip *flash, int offset) +{ + chipaddr bios = flash->virtual_memory; + uint8_t val; /* Product Identification Entry */ chip_writeb(0xAA, bios + 0x5555); @@ -80,8 +92,8 @@ chip_writeb(0x90, bios + 0x5555); programmer_delay(10); - /* Read Hardware Lock Bits */ - locking = chip_readb(bios + 0xffff2); + /* Read something, maybe hardware lock bits */ + val = chip_readb(bios + offset); /* Product Identification Exit */ chip_writeb(0xAA, bios + 0x5555); @@ -89,25 +101,155 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(10); - msg_cdbg("Lockout bits:\n"); + return val; +} - if (locking & (1 << 2)) - msg_cerr("Error: hardware bootblock locking (#TBL).\n"); - else - msg_cdbg("No hardware bootblock locking (good!)\n"); - - if (locking & (1 << 3)) - msg_cerr("Error: hardware block locking (#WP).\n"); - else - msg_cdbg("No hardware block locking (good!)\n"); +static int printlock_w39_tblwp(uint8_t lock) +{ + msg_cdbg("Hardware bootblock locking (#TBL) is %sactive.\n", + (lock & (1 << 2)) ? "" : "not "); + msg_cdbg("Hardware remaining chip locking (#WP) is %sactive..\n", + (lock & (1 << 3)) ? "" : "not "); + if (lock & ((1 << 2) | (1 << 3))) + return -1; - if (locking & ((1 << 2) | (1 << 3))) + return 0; +} + +static int printlock_w39_bootblock_64k16k(uint8_t lock) +{ + msg_cdbg("Software 64 kB bootblock locking is %sactive.\n", + (lock & (1 << 0)) ? "" : "not "); + msg_cdbg("Software 16 kB bootblock locking is %sactive.\n", + (lock & (1 << 1)) ? "" : "not "); + if (lock & ((1 << 1) | (1 << 0))) return -1; + return 0; +} + +static int printlock_w39_common(struct flashchip *flash, int offset) +{ + uint8_t lock; + + lock = w39_idmode_readb(flash, offset); + msg_cdbg("Lockout bits:\n"); + return printlock_w39_tblwp(lock); +} + +static int printlock_w39_fwh(struct flashchip *flash) +{ + int i, total_size = flash->total_size * 1024; + int ret = 0; + + /* Print lock status of the complete chip */ + for (i = 0; i < total_size; i += flash->page_size) + ret |= printlock_w39_fwh_block(flash, i); + + return ret; +} + +static int unlock_w39_fwh(struct flashchip *flash) +{ + int i, total_size = flash->total_size * 1024; + /* Unlock the complete chip */ for (i = 0; i < total_size; i += flash->page_size) - if (unlock_block_winbond_fwhub(flash, i)) + if (unlock_w39_fwh_block(flash, i)) return -1; return 0; } + +int printlock_w39v040a(struct flashchip *flash) +{ + uint8_t lock; + int ret = 0; + + /* The W39V040A datasheet contradicts itself on the lock register + * location: 0x00002 and 0x7fff2 are both mentioned. Pick the one + * which is similar to the other chips of the same family. + */ + lock = w39_idmode_readb(flash, 0x7fff2); + msg_cdbg("Lockout bits:\n"); + + ret = printlock_w39_tblwp(lock); + ret |= printlock_w39_bootblock_64k16k(lock); + + return ret; +} + +int printlock_w39v040b(struct flashchip *flash) +{ + return printlock_w39_common(flash, 0x7fff2); +} + +int printlock_w39v040c(struct flashchip *flash) +{ + /* Typo in the datasheet? The other chips use 0x7fff2. */ + return printlock_w39_common(flash, 0xfff2); +} + +int printlock_w39v040fa(struct flashchip *flash) +{ + int ret = 0; + + ret = printlock_w39v040a(flash); + ret |= printlock_w39_fwh(flash); + + return ret; +} + +int printlock_w39v040fb(struct flashchip *flash) +{ + int ret = 0; + + ret = printlock_w39v040b(flash); + ret |= printlock_w39_fwh(flash); + + return ret; +} + +int printlock_w39v040fc(struct flashchip *flash) +{ + int ret = 0; + + /* W39V040C and W39V040FC use different WP/TBL offsets. */ + ret = printlock_w39_common(flash, 0x7fff2); + ret |= printlock_w39_fwh(flash); + + return ret; +} + +int printlock_w39v080a(struct flashchip *flash) +{ + return printlock_w39_common(flash, 0xffff2); +} + +int printlock_w39v080fa(struct flashchip *flash) +{ + int ret = 0; + + ret = printlock_w39v080a(flash); + ret |= printlock_w39_fwh(flash); + + return ret; +} + +int printlock_w39v080fa_dual(struct flashchip *flash) +{ + msg_cinfo("Block locking for W39V080FA in dual mode is " + "undocumented.\n"); + /* Better safe than sorry. */ + return -1; +} + +int unlock_w39v080fa(struct flashchip *flash) +{ + if (unlock_w39_fwh(flash)) + return -1; + if (printlock_w39_common(flash, 0xffff2)) + return -1; + + return 0; +}

1 0

[commit] r1244 - trunk
by repository service Dec. 5, 2010

Dec. 5, 2010

Author: hailfinger Date: Sun Dec 5 16:14:44 2010 New Revision: 1244 URL: http://flashrom.org/trac/flashrom/changeset/1244 Log: Clean up erase function checking. Update a few comments and messages to improve readability. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Modified: trunk/flashrom.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Dec 4 12:56:52 2010 (r1243) +++ trunk/flashrom.c Sun Dec 5 16:14:44 2010 (r1244) @@ -1455,39 +1455,58 @@ return 0; } +static int check_block_eraser(struct flashchip *flash, int k, int log) +{ + struct block_eraser eraser = flash->block_erasers[k]; + + if (!eraser.block_erase && !eraser.eraseblocks[0].count) { + if (log) + msg_cdbg("not defined. "); + return 1; + } + if (!eraser.block_erase && eraser.eraseblocks[0].count) { + if (log) + msg_cdbg("eraseblock layout is known, but matching " + "block erase function is not implemented. "); + return 1; + } + if (eraser.block_erase && !eraser.eraseblocks[0].count) { + if (log) + msg_cdbg("block erase function found, but " + "eraseblock layout is not defined. "); + return 1; + } + return 0; +} + int erase_and_write_flash(struct flashchip *flash, uint8_t *oldcontents, uint8_t *newcontents) { - int k, ret = 0, found = 0; + int k, ret = 0; uint8_t *curcontents; unsigned long size = flash->total_size * 1024; + int usable_erasefunctions = 0; + + for (k = 0; k < NUM_ERASEFUNCTIONS; k++) + if (!check_block_eraser(flash, k, 0)) + usable_erasefunctions++; + msg_cinfo("Erasing and writing flash chip... "); + if (!usable_erasefunctions) { + msg_cerr("ERROR: flashrom has no erase function for this flash " + "chip.\n"); + return 1; + } curcontents = (uint8_t *) malloc(size); /* Copy oldcontents to curcontents to avoid clobbering oldcontents. */ memcpy(curcontents, oldcontents, size); - msg_cinfo("Erasing and writing flash chip... "); for (k = 0; k < NUM_ERASEFUNCTIONS; k++) { - struct block_eraser eraser = flash->block_erasers[k]; - msg_cdbg("Looking at blockwise erase function %i... ", k); - if (!eraser.block_erase && !eraser.eraseblocks[0].count) { - msg_cdbg("not defined. " - "Looking for another erase function.\n"); - continue; - } - if (!eraser.block_erase && eraser.eraseblocks[0].count) { - msg_cdbg("eraseblock layout is known, but no " - "matching block erase function found. " - "Looking for another erase function.\n"); + if (check_block_eraser(flash, k, 1) && usable_erasefunctions) { + msg_cdbg("Looking for another erase function.\n"); continue; } - if (eraser.block_erase && !eraser.eraseblocks[0].count) { - msg_cdbg("block erase function found, but " - "eraseblock layout is unknown. " - "Looking for another erase function.\n"); - continue; - } - found = 1; + usable_erasefunctions--; msg_cdbg("trying... "); ret = walk_eraseregions(flash, k, &erase_and_write_block_helper, curcontents, newcontents); msg_cdbg("\n"); @@ -1500,6 +1519,8 @@ * The only difference is whether the reason for other unusable * functions is printed or not. If in doubt, verbosity wins. */ + if (!usable_erasefunctions) + continue; if (flash->read(flash, curcontents, 0, size)) { /* Now we are truly screwed. Read failed as well. */ msg_cerr("Can't read anymore!\n"); @@ -1511,10 +1532,6 @@ } /* Free the scratchpad. */ free(curcontents); - if (!found) { - msg_cerr("ERROR: flashrom has no erase function for this flash chip.\n"); - return 1; - } if (ret) { msg_cerr("FAILED!\n");

1 0

[PATCH] Avoid buffer overflow for excessive layouts
by Carl-Daniel Hailfinger Dec. 4, 2010

Dec. 4, 2010

Stop reading layout info when the max layout count has been reached. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-layout_overflow/layout.c =================================================================== --- flashrom-layout_overflow/layout.c (Revision 1238) +++ flashrom-layout_overflow/layout.c (Arbeitskopie) @@ -152,6 +152,14 @@ while (!feof(romlayout)) { char *tstr1, *tstr2; + + if (romimages >= MAX_ROMLAYOUT) { + msg_gerr("Maximum number of ROM images (%i) in layout " + "file reached before end of layout file.\n", + MAX_ROMLAYOUT); + msg_gerr("Ignoring the rest of the layout file.\n"); + break; + } if (2 != fscanf(romlayout, "%s %s\n", tempstr, rom_entries[romimages].name)) continue; #if 0 -- http://www.hailfinger.org/

2 2