flashrom

flashrom@flashrom.org

7 participants
9163 discussions

[commit] r1740 - trunk
by repository service 12 Sep '13

12 Sep '13

Author: stefanct Date: Thu Sep 12 16:04:31 2013 New Revision: 1740 URL: http://flashrom.org/trac/flashrom/changeset/1740 Log: Makefile: Warn if user tries to compile for libpayload w/o crossgcc. While flashrom is not as picky on compilers as coreboot, there is still a high probablilty of breakage when one combines libpayload and distribution compilers. Print a warning if we detect that to give the daring user a hint how to resolve the explosions potentially following below it. 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/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Sep 12 10:38:23 2013 (r1739) +++ trunk/Makefile Thu Sep 12 16:04:31 2013 (r1740) @@ -734,6 +734,11 @@ @echo $(TARGET_OS)|wc -w|grep -q '^[[:blank:]]*1[[:blank:]]*$$' || \ ( echo "unknown. Aborting."; exit 1) @printf "%s\n" '$(TARGET_OS)' +ifeq ($(TARGET_OS), libpayload) + @$(CC) --version 2>&1 | grep -q coreboot || \ + ( echo "Warning: It seems you are not using coreboot's reference compiler."; \ + echo "This might work but usually does not, please beware." ) +endif define LIBPCI_TEST /* Avoid a failing test due to libpci header symbol shadowing breakage */

1 0

Re: [flashrom] [PATCH] nicintel_eeprom: New programmer for Intel Nics eeproms
by Stefan Tauner 12 Sep '13

12 Sep '13

On Thu, 12 Sep 2013 11:25:39 +0200 Ricardo Ribalda Delgado <ricardo.ribalda(a)gmail.com> wrote: > ping? Hi Ricardo, I would have hoped for a more generic patch that adds some eeprom-specific infrastructure, but your approach seems to be legit when implementing this with the current infrastructure in flashrom. Sorry for not mentioning the opaque API before, that is of course the easiest way to get such things to work. Would it be even possible to probe for IDs of the EEPROMs with the interface on the Intel NICs? What EEPROM model(s) do see on your boards? I have not reviewed your patch in detail yet. There are probably a few coding style issues etc., but we can fix that ourselves if we have to. The bigger question is if we want to add something like it at all. I don't see good reason why we should not, but I need to discuss this with my colleague(s) (and that usually takes more time than one would expect). In any case your code is out there and can be used even if it does not get merged into vanilla flashrom eventually and your work is much appreciated, thank you. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Re: [flashrom] [PATCH] Fix ROM decoding on VIA VT82C596 and VT82C686A/B.
by Stefan Tauner 12 Sep '13

12 Sep '13

On Mon, 12 Aug 2013 22:19:50 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > These support an additional bit which we did not turn on yet. > Without this patch they decode up to 512 kB, with this up to 1 MB. > > Disentangle the enables of unrelated but mostly compatible chipsets > too, add some more debug output and set the max_rom_decode limits. > Also, make warnings really only warnings. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Self-acked and committed in r1739. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1739 - trunk
by repository service 12 Sep '13

12 Sep '13

Author: stefanct Date: Thu Sep 12 10:38:23 2013 New Revision: 1739 URL: http://flashrom.org/trac/flashrom/changeset/1739 Log: Fix ROM decoding on VIA VT82C596 and VT82C686A/B. These support an additional bit which we did not turn on yet. Without this patch they decode up to 512 kB, with this up to 1 MB. Disentangle the enables of unrelated but mostly compatible chipsets too, add some more debug output and set the max_rom_decode limits. Also, make warnings really only warnings. 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/chipset_enable.c Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Thu Sep 12 10:29:06 2013 (r1738) +++ trunk/chipset_enable.c Thu Sep 12 10:38:23 2013 (r1739) @@ -884,22 +884,29 @@ return 0; } -/* Works for AMD-8111, VIA VT82C586A/B, VIA VT82C686A/B. */ -static int enable_flash_amd8111(struct pci_dev *dev, const char *name) +/* Works for AMD-768, AMD-8111, VIA VT82C586A/B, VIA VT82C596, VIA VT82C686A/B. + * + * ROM decode control register matrix + * AMD-768 AMD-8111 VT82C586A/B VT82C596 VT82C686A/B + * 7 FFC0_0000h–FFFF_FFFFh <- FFFE0000h-FFFEFFFFh <- <- + * 6 FFB0_0000h–FFBF_FFFFh <- FFF80000h-FFFDFFFFh <- <- + * 5 00E8... <- <- FFF00000h-FFF7FFFFh <- + */ +static int enable_flash_amd_via(struct pci_dev *dev, const char *name, uint8_t decode_val) { #define AMD_MAPREG 0x43 #define AMD_ENREG 0x40 uint8_t old, new; - /* Enable decoding at 0xffb00000 to 0xffffffff. */ old = pci_read_byte(dev, AMD_MAPREG); - new = old | 0xC0; + new = old | decode_val; if (new != old) { rpci_write_byte(dev, AMD_MAPREG, new); if (pci_read_byte(dev, AMD_MAPREG) != new) { - msg_pinfo("Setting register 0x%x to 0x%02x on %s failed (WARNING ONLY).\n", + msg_pwarn("Setting register 0x%x to 0x%02x on %s failed (WARNING ONLY).\n", AMD_MAPREG, new, name); - } + } else + msg_pdbg("Changed ROM decode range to 0x%02x successfully.\n", new); } /* Enable 'ROM write' bit. */ @@ -910,14 +917,37 @@ rpci_write_byte(dev, AMD_ENREG, new); if (pci_read_byte(dev, AMD_ENREG) != new) { - msg_pinfo("Setting register 0x%x to 0x%02x on %s failed (WARNING ONLY).\n", + msg_pwarn("Setting register 0x%x to 0x%02x on %s failed (WARNING ONLY).\n", AMD_ENREG, new, name); - return -1; + return ERROR_NONFATAL; } + msg_pdbg2("Set ROM enable bit successfully.\n"); return 0; } +static int enable_flash_amd_768_8111(struct pci_dev *dev, const char *name) +{ + /* Enable decoding of 0xFFB00000 to 0xFFFFFFFF (5 MB). */ + max_rom_decode.lpc = 5 * 1024 * 1024; + return enable_flash_amd_via(dev, name, 0xC0); +} + +static int enable_flash_vt82c586(struct pci_dev *dev, const char *name) +{ + /* Enable decoding of 0xFFF80000 to 0xFFFFFFFF. (512 kB) */ + max_rom_decode.parallel = 512 * 1024; + return enable_flash_amd_via(dev, name, 0xC0); +} + +/* Works for VT82C686A/B too. */ +static int enable_flash_vt82c596(struct pci_dev *dev, const char *name) +{ + /* Enable decoding of 0xFFF80000 to 0xFFFFFFFF. (1 MB) */ + max_rom_decode.parallel = 1024 * 1024; + return enable_flash_amd_via(dev, name, 0xE0); +} + static int enable_flash_sb600(struct pci_dev *dev, const char *name) { uint32_t prot; @@ -1304,8 +1334,8 @@ {0x1022, 0x2080, OK, "AMD", "CS5536", enable_flash_cs5536}, {0x1022, 0x2090, OK, "AMD", "CS5536", enable_flash_cs5536}, {0x1022, 0x3000, OK, "AMD", "Elan SC520", get_flashbase_sc520}, - {0x1022, 0x7440, OK, "AMD", "AMD-768", enable_flash_amd8111}, - {0x1022, 0x7468, OK, "AMD", "AMD8111", enable_flash_amd8111}, + {0x1022, 0x7440, OK, "AMD", "AMD-768", enable_flash_amd_768_8111}, + {0x1022, 0x7468, OK, "AMD", "AMD-8111", enable_flash_amd_768_8111}, {0x1022, 0x780e, OK, "AMD", "FCH", enable_flash_sb600}, {0x1039, 0x0406, NT, "SiS", "501/5101/5501", enable_flash_sis501}, {0x1039, 0x0496, NT, "SiS", "85C496+497", enable_flash_sis85c496}, @@ -1390,9 +1420,9 @@ {0x1106, 0x0691, OK, "VIA", "VT82C69x", via_no_byte_merge}, {0x1106, 0x8601, NT, "VIA", "VT8601T", via_no_byte_merge}, /* VIA southbridges */ - {0x1106, 0x0586, OK, "VIA", "VT82C586A/B", enable_flash_amd8111}, - {0x1106, 0x0596, OK, "VIA", "VT82C596", enable_flash_amd8111}, - {0x1106, 0x0686, OK, "VIA", "VT82C686A/B", enable_flash_amd8111}, + {0x1106, 0x0586, OK, "VIA", "VT82C586A/B", enable_flash_vt82c586}, + {0x1106, 0x0596, OK, "VIA", "VT82C596", enable_flash_vt82c596}, + {0x1106, 0x0686, OK, "VIA", "VT82C686A/B", enable_flash_vt82c596}, {0x1106, 0x3074, OK, "VIA", "VT8233", enable_flash_vt823x}, {0x1106, 0x3147, OK, "VIA", "VT8233A", enable_flash_vt823x}, {0x1106, 0x3177, OK, "VIA", "VT8235", enable_flash_vt823x},

1 0

Re: [flashrom] [PATCH] Enable sector erase function for selected ST M50 chips.
by Stefan Tauner 12 Sep '13

12 Sep '13

On Tue, 27 Aug 2013 12:43:07 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Affected chips: M50FLW040A, M50FLW040B, M50FLW080A, M50FLW080B. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Self-acked and committed in r1738. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 2/2] Add support for ST M50LPW080.
by Stefan Tauner 12 Sep '13

12 Sep '13

On Mon, 26 Aug 2013 22:40:15 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Self-acked and committed in r1737. The user did not reply in time. :( -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

Re: [flashrom] [PATCH 1/2] Cleanup ST M50 driver.
by Stefan Tauner 12 Sep '13

12 Sep '13

On Mon, 26 Aug 2013 22:40:14 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > There are two locking strategies used by this umbrella family, one uniform > and one that matches the sector layout of the chip. Refactor the functions > involved and rename the overly complicated file to just stm50.c and the > functions accordingly. > > This fixes unlocking for some of the non-uniform chips, gets rid of the abuse > of page_size > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Self-acked and committed in r1736. The user did not reply in time. :( -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1738 - trunk
by repository service 12 Sep '13

12 Sep '13

Author: stefanct Date: Thu Sep 12 10:29:06 2013 New Revision: 1738 URL: http://flashrom.org/trac/flashrom/changeset/1738 Log: Enable sector erase function for selected ST M50 chips. Affected chips: M50FLW040A, M50FLW040B, M50FLW080A, M50FLW080B. 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/flashchips.c trunk/stm50.c Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Thu Sep 12 10:29:00 2013 (r1737) +++ trunk/flashchips.c Thu Sep 12 10:29:06 2013 (r1738) @@ -11022,7 +11022,7 @@ {4 * 1024, 16}, /* sector */ {4 * 1024, 16}, /* sector */ }, - .block_erase = NULL, + .block_erase = erase_sector_stm50, }, { .eraseblocks = { {64 * 1024, 8}, }, .block_erase = erase_block_82802ab, @@ -11055,7 +11055,7 @@ {64 * 1024, 5}, /* block */ {4 * 1024, 16}, /* sector */ }, - .block_erase = NULL, + .block_erase = erase_sector_stm50, }, { .eraseblocks = { {64 * 1024, 8}, }, .block_erase = erase_block_82802ab, @@ -11088,7 +11088,7 @@ {4 * 1024, 16}, /* sector */ {4 * 1024, 16}, /* sector */ }, - .block_erase = NULL, + .block_erase = erase_sector_stm50, }, { .eraseblocks = { {64 * 1024, 16}, }, .block_erase = erase_block_82802ab, @@ -11121,7 +11121,7 @@ {64 * 1024, 13}, /* block */ {4 * 1024, 16}, /* sector */ }, - .block_erase = NULL, + .block_erase = erase_sector_stm50, }, { .eraseblocks = { {64 * 1024, 16}, }, .block_erase = erase_block_82802ab, Modified: trunk/stm50.c ============================================================================== --- trunk/stm50.c Thu Sep 12 10:29:00 2013 (r1737) +++ trunk/stm50.c Thu Sep 12 10:29:06 2013 (r1738) @@ -84,10 +84,9 @@ return 0; } -/* This function is unused. */ -int erase_sector_stm50(struct flashctx *flash, unsigned int sector, unsigned int sectorsize) +static int stm50_erase_sector(struct flashctx *flash, unsigned int addr) { - chipaddr bios = flash->virtual_memory + sector; + chipaddr bios = flash->virtual_memory + addr; // clear status register chip_writeb(flash, 0x50, bios); @@ -96,8 +95,21 @@ chip_writeb(flash, 0xd0, bios); programmer_delay(10); - wait_82802ab(flash); + uint8_t status = wait_82802ab(flash); + print_status_82802ab(status); - /* FIXME: Check the status register for errors. */ - return 0; + return status == 0x80; +} + +/* Some ST M50* chips do support erasing of sectors. This function will derive the erase function to use from + * the length of the of the block. For calls that apparently do not address a sector (but a block) we just call + * the block erase function instead. FIXME: This duplicates the behavior of the remaining erasers for blocks and + * might be fixed when flashrom supports multiple functions per eraser or erasers that do erase parts of the + * chip only. */ +int erase_sector_stm50(struct flashctx *flash, unsigned int addr, unsigned int len) +{ + if (len == 4096) + return stm50_erase_sector(flash, addr); + else + return erase_block_82802ab(flash, addr, len); }

1 0

[commit] r1737 - trunk
by repository service 12 Sep '13

12 Sep '13

Author: stefanct Date: Thu Sep 12 10:29:00 2013 New Revision: 1737 URL: http://flashrom.org/trac/flashrom/changeset/1737 Log: Add support for ST M50LPW080. 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/flashchips.c trunk/flashchips.h Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Thu Sep 12 10:28:56 2013 (r1736) +++ trunk/flashchips.c Thu Sep 12 10:29:00 2013 (r1737) @@ -11240,6 +11240,31 @@ { .vendor = "ST", + .name = "M50LPW080", + .bustype = BUS_LPC, /* A/A Mux */ + .manufacture_id = ST_ID, + .model_id = ST_M50LPW080, + .total_size = 1024, + .page_size = 0, + .feature_bits = FEATURE_REGISTERMAP, + .tested = TEST_UNTESTED, + .probe = probe_82802ab, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 16}, }, + .block_erase = erase_block_82802ab, + } + }, + .unlock = unlock_stm50_uniform, + .write = write_82802ab, + .read = read_memmapped, + .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ + }, + + { + .vendor = "ST", .name = "M50LPW116", .bustype = BUS_LPC, /* A/A Mux */ .manufacture_id = ST_ID, Modified: trunk/flashchips.h ============================================================================== --- trunk/flashchips.h Thu Sep 12 10:28:56 2013 (r1736) +++ trunk/flashchips.h Thu Sep 12 10:29:00 2013 (r1737) @@ -668,6 +668,7 @@ #define ST_M50FW040 0x2C #define ST_M50FW080 0x2D #define ST_M50FW016 0x2E +#define ST_M50LPW080 0x2F #define ST_M50LPW116 0x30 #define ST_M29F002B 0x34 /* Same as M29F002BB */ #define ST_M29F002T 0xB0 /* Same as M29F002BT/M29F002NT/M29F002BNT */

1 0

[commit] r1736 - trunk
by repository service 12 Sep '13

12 Sep '13

Author: stefanct Date: Thu Sep 12 10:28:56 2013 New Revision: 1736 URL: http://flashrom.org/trac/flashrom/changeset/1736 Log: Cleanup ST M50 driver. There are two locking strategies used by this umbrella family, one uniform and one that matches the sector layout of the chip. Refactor the functions involved and rename the overly complicated file to just stm50.c and the functions accordingly. This fixes unlocking of some of the non-uniform chips and gets rid of the abuse of page_size. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Added: trunk/stm50.c (contents, props changed) Deleted: trunk/stm50flw0x0x.c Modified: trunk/82802ab.c trunk/Makefile trunk/chipdrivers.h trunk/flashchips.c Modified: trunk/82802ab.c ============================================================================== --- trunk/82802ab.c Thu Sep 12 01:35:03 2013 (r1735) +++ trunk/82802ab.c Thu Sep 12 10:28:56 2013 (r1736) @@ -89,6 +89,7 @@ return 1; } +/* FIXME: needs timeout */ uint8_t wait_82802ab(struct flashctx *flash) { uint8_t status; Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu Sep 12 01:35:03 2013 (r1735) +++ trunk/Makefile Thu Sep 12 10:28:56 2013 (r1736) @@ -320,7 +320,7 @@ ############################################################################### # Flash chip drivers and bus support infrastructure. -CHIP_OBJS = jedec.o stm50flw0x0x.o w39.o w29ee011.o \ +CHIP_OBJS = jedec.o stm50.o w39.o w29ee011.o \ sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \ sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o spi25_statusreg.o \ opaque.o sfdp.o en29lv640b.o at45db.o Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Thu Sep 12 01:35:03 2013 (r1735) +++ trunk/chipdrivers.h Thu Sep 12 10:28:56 2013 (r1736) @@ -193,9 +193,10 @@ /* w29ee011.c */ int probe_w29ee011(struct flashctx *flash); -/* stm50flw0x0x.c */ -int erase_sector_stm50flw0x0x(struct flashctx *flash, unsigned int block, unsigned int blocksize); -int unlock_stm50flw0x0x(struct flashctx *flash); +/* stm50.c */ +int erase_sector_stm50(struct flashctx *flash, unsigned int block, unsigned int blocksize); +int unlock_stm50_uniform(struct flashctx *flash); +int unlock_stm50_nonuniform(struct flashctx *flash); /* en29lv640b.c */ int probe_en29lv640b(struct flashctx *flash); Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Thu Sep 12 01:35:03 2013 (r1735) +++ trunk/flashchips.c Thu Sep 12 10:28:56 2013 (r1736) @@ -11008,7 +11008,7 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW040A, .total_size = 512, - .page_size = 64 * 1024, + .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, @@ -11028,8 +11028,8 @@ .block_erase = erase_block_82802ab, } }, - .unlock = unlock_stm50flw0x0x, .write = write_82802ab, + .unlock = unlock_stm50_uniform, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -11041,7 +11041,7 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW040B, .total_size = 512, - .page_size = 64 * 1024, + .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, @@ -11061,8 +11061,8 @@ .block_erase = erase_block_82802ab, } }, - .unlock = unlock_stm50flw0x0x, .write = write_82802ab, + .unlock = unlock_stm50_uniform, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ }, @@ -11074,7 +11074,7 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW080A, .total_size = 1024, - .page_size = 64 * 1024, + .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PRE, .probe = probe_82802ab, @@ -11094,7 +11094,7 @@ .block_erase = erase_block_82802ab, } }, - .unlock = unlock_stm50flw0x0x, + .unlock = unlock_stm50_nonuniform, .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ @@ -11107,7 +11107,7 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW080B, .total_size = 1024, - .page_size = 64 * 1024, + .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, @@ -11127,7 +11127,7 @@ .block_erase = erase_block_82802ab, } }, - .unlock = unlock_stm50flw0x0x, + .unlock = unlock_stm50_nonuniform, .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ @@ -11140,7 +11140,7 @@ .manufacture_id = ST_ID, .model_id = ST_M50FW002, .total_size = 256, - .page_size = 64 * 1024, + .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, @@ -11157,7 +11157,7 @@ .block_erase = erase_block_82802ab, } }, - .unlock = unlock_stm50flw0x0x, + .unlock = unlock_stm50_nonuniform, .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ @@ -11170,7 +11170,7 @@ .manufacture_id = ST_ID, .model_id = ST_M50FW016, .total_size = 2048, - .page_size = 64 * 1024, + .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, @@ -11182,7 +11182,7 @@ .block_erase = erase_block_82802ab, } }, - .unlock = unlock_stm50flw0x0x, + .unlock = unlock_stm50_uniform, .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ @@ -11195,7 +11195,7 @@ .manufacture_id = ST_ID, .model_id = ST_M50FW040, .total_size = 512, - .page_size = 64 * 1024, + .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PR, .probe = probe_82802ab, @@ -11207,7 +11207,7 @@ .block_erase = erase_block_82802ab, } }, - .unlock = unlock_stm50flw0x0x, + .unlock = unlock_stm50_uniform, .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ @@ -11220,7 +11220,7 @@ .manufacture_id = ST_ID, .model_id = ST_M50FW080, .total_size = 1024, - .page_size = 64 * 1024, + .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PREW, .probe = probe_82802ab, @@ -11232,7 +11232,7 @@ .block_erase = erase_block_82802ab, } }, - .unlock = unlock_stm50flw0x0x, + .unlock = unlock_stm50_uniform, .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ @@ -11245,7 +11245,7 @@ .manufacture_id = ST_ID, .model_id = ST_M50LPW116, .total_size = 2048, - .page_size = 64 * 1024, + .page_size = 0, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_82802ab, @@ -11263,7 +11263,7 @@ .block_erase = erase_block_82802ab, } }, - .unlock = unlock_stm50flw0x0x, + .unlock = unlock_stm50_nonuniform, .write = write_82802ab, .read = read_memmapped, .voltage = {3000, 3600}, /* Also has 12V fast program & erase */ Added: trunk/stm50.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/stm50.c Thu Sep 12 10:28:56 2013 (r1736) @@ -0,0 +1,103 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2008 Claus Gindhart <claus.gindhart(a)kontron.com> + * Copyright (C) 2009 Sean Nelson <audiohacked(a)gmail.com> + * Copyright (C) 2013 Stefan Tauner + * + * 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 + */ + +/* + * All ST M50 chips are locked on startup. Most of them have a uniform 64 kB block layout, but some have + * a non-uniform block/sector segmentation which has to be handled with more care. Some of the non-uniform + * chips support erasing of the 4 kB sectors with another command. + */ + +#include "flash.h" +#include "flashchips.h" +#include "chipdrivers.h" + +static int stm50_unlock_address(struct flashctx *flash, int offset) +{ + chipaddr wrprotect = flash->virtual_registers + 2; + static const uint8_t unlock_sector = 0x00; + msg_cdbg("unlocking at 0x%x\n", offset); + chip_writeb(flash, unlock_sector, wrprotect + offset); + if (chip_readb(flash, wrprotect + offset) != unlock_sector) { + msg_cerr("Cannot unlock address 0x%x\n", offset); + return -1; + } + return 0; +} + +/* Chips known to use a non-uniform block and sector layout for locking (as well as for erasing): + * Name Size Address range of lock registers + * M50FLW080A 1MB FFB00002 - FFBFF002 + * M50FLW080B 1MB FFB00002 - FFBFF002 + * M50FW002 256k FFBC0002 - FFBFC002 + * M50LPW116 2MB FFA00002 - FFBFC002 + */ +int unlock_stm50_nonuniform(struct flashctx *flash) +{ + int i; + struct eraseblock *eraseblocks = flash->chip->block_erasers[0].eraseblocks; + unsigned int done = 0; + for (i = 0; i < NUM_ERASEREGIONS && eraseblocks[i].count != 0; i++) { + unsigned int block_size = eraseblocks[i].size; + unsigned int block_count = eraseblocks[i].count; + + int j; + for (j = 0; j < block_count; j++) { + if (stm50_unlock_address(flash, done)) { + msg_cerr("UNLOCK FAILED!\n"); + return -1; + } + done += block_count * block_size; + } + } + return 0; +} + +/* Unlocking for uniform 64 kB blocks starting at offset 2 of the feature registers. */ +int unlock_stm50_uniform(struct flashctx *flash) +{ + int i; + for (i = 0; i < flash->chip->total_size * 1024; i+= 64 * 1024) { + if (stm50_unlock_address(flash, i)) { + msg_cerr("UNLOCK FAILED!\n"); + return -1; + } + } + return 0; +} + +/* This function is unused. */ +int erase_sector_stm50(struct flashctx *flash, unsigned int sector, unsigned int sectorsize) +{ + chipaddr bios = flash->virtual_memory + sector; + + // clear status register + chip_writeb(flash, 0x50, bios); + // now start it + chip_writeb(flash, 0x32, bios); + chip_writeb(flash, 0xd0, bios); + programmer_delay(10); + + wait_82802ab(flash); + + /* FIXME: Check the status register for errors. */ + return 0; +}

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom