flashrom

flashrom@flashrom.org

5 participants
9154 discussions

more flashchips.c .probe_timing updates ...
by Putlinuxonit 05 Sep '09

05 Sep '09

Hi All, Just found a datasheet for the PMC Pm49FL002 / 004 and updated the flaschips.c file . find attached, the full diff against r701. - Udu E. Ogah .~~~~~~~~~~.

2 2

[commit] r718 - trunk
by svn＠flashrom.org 05 Sep '09

05 Sep '09

Author: hailfinger Date: 2009-09-05 03:31:32 +0200 (Sat, 05 Sep 2009) New Revision: 718 Modified: trunk/flashchips.c Log: Update probe timings for dozens of flash chips. Signed-off-by: Udu Ogah <putlinuxonit(a)gmail.com> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flashchips.c =================================================================== --- trunk/flashchips.c 2009-09-05 01:16:30 UTC (rev 717) +++ trunk/flashchips.c 2009-09-05 01:31:32 UTC (rev 718) @@ -58,7 +58,7 @@ .page_size = 16 * 1024, .tested = TEST_OK_PREW, .probe = probe_29f040b, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, .erase = erase_29f040b, .write = write_pm29f002, .read = read_memmapped, @@ -74,7 +74,7 @@ .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, .erase = erase_chip_jedec, .write = write_en29f002a, .read = read_memmapped, @@ -90,7 +90,7 @@ .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, .erase = erase_chip_jedec, .write = write_en29f002a, .read = read_memmapped, @@ -138,7 +138,7 @@ .page_size = 64 * 1024, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, .erase = erase_29f040b, .write = write_29f040b, .read = read_memmapped, @@ -668,7 +668,7 @@ .page_size = 64, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped, @@ -684,7 +684,7 @@ .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, /* doc1008.pdf dont says anything about probe timing */ + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped, @@ -700,7 +700,7 @@ .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, /* doc1008.pdf dont says anything about probe timing */ + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped, @@ -780,7 +780,7 @@ .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_49fl00x, - .probe_timing = TIMING_FIXME, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ + .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ .erase = erase_49fl00x, .write = write_49fl00x, .read = read_memmapped, @@ -796,7 +796,7 @@ .page_size = 4096, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped, @@ -1068,7 +1068,7 @@ .page_size = 256, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_en29f002a, .read = read_memmapped, @@ -1084,7 +1084,7 @@ .page_size = 256, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_en29f002a, .read = read_memmapped, @@ -1100,7 +1100,7 @@ .page_size = 64 * 1024, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = NULL, .write = NULL, .read = read_memmapped, @@ -1116,7 +1116,7 @@ .page_size = 64 * 1024, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = NULL, .write = NULL, .read = read_memmapped, @@ -1164,7 +1164,7 @@ .page_size = 128 * 1024, /* 8k + 2x4k + 112k */ .tested = TEST_BAD_ERASE|TEST_BAD_WRITE, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = NULL, .write = NULL, .read = read_memmapped, @@ -1180,7 +1180,7 @@ .page_size = 128 * 1024, /* 112k + 2x4k + 8k */ .tested = TEST_OK_PR|TEST_BAD_ERASE|TEST_BAD_WRITE, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = NULL, .write = NULL, .read = read_memmapped, @@ -1692,7 +1692,7 @@ .page_size = 4096, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped, @@ -1708,7 +1708,7 @@ .page_size = 16 * 1024, .tested = TEST_OK_PREW, .probe = probe_49fl00x, - .probe_timing = TIMING_FIXME, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ + .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ .erase = erase_49fl00x, .write = write_49fl00x, .read = read_memmapped, @@ -1724,7 +1724,7 @@ .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_49fl00x, - .probe_timing = TIMING_FIXME, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ + .probe_timing = TIMING_ZERO, /* routine is wrapper to probe_jedec (pm49fl00x.c) */ .erase = erase_49fl00x, .write = write_49fl00x, .read = read_memmapped, @@ -1916,7 +1916,7 @@ .page_size = 128, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = 10, .erase = erase_chip_jedec, .write = write_jedec, .read = read_memmapped, @@ -2076,7 +2076,7 @@ .page_size = 16 * 1024, .tested = TEST_OK_PREW, .probe = probe_sst_fwhub, - .probe_timing = TIMING_FIXME, /* routine is wrapper to probe_jedec (sst_fwhub.c) */ + .probe_timing = 1, /* 150 ns | routine is wrapper to probe_jedec (sst_fwhub.c) */ .erase = erase_sst_fwhub, .write = write_sst_fwhub, .read = read_memmapped, @@ -2092,7 +2092,7 @@ .page_size = 64 * 1024, .tested = TEST_OK_PROBE, .probe = probe_sst_fwhub, - .probe_timing = TIMING_FIXME, /* routine is wrapper to probe_jedec (sst_fwhub.c) */ + .probe_timing = 1, /* 150 ns | routine is wrapper to probe_jedec (sst_fwhub.c) */ .erase = erase_sst_fwhub, .write = write_sst_fwhub, .read = read_memmapped, @@ -2108,7 +2108,7 @@ .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_sst_fwhub, - .probe_timing = TIMING_FIXME, /* routine is wrapper to probe_jedec (sst_fwhub.c) */ + .probe_timing = 1, /* 150 ns | routine is wrapper to probe_jedec (sst_fwhub.c) */ .erase = erase_sst_fwhub, .write = write_sst_fwhub, .read = read_memmapped, @@ -2140,7 +2140,7 @@ .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_sst_fwhub, - .probe_timing = TIMING_FIXME, /* routine is wrapper to probe_jedec (sst_fwhub.c) */ + .probe_timing = 1, /* 150 ns | routine is wrapper to probe_jedec (sst_fwhub.c) */ .erase = erase_sst_fwhub, .write = write_sst_fwhub, .read = read_memmapped, @@ -2236,7 +2236,7 @@ .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_sst_fwhub, - .probe_timing = TIMING_FIXME, /* routine is wrapper to probe_jedec (sst_fwhub.c) */ + .probe_timing = 1, /* 150ns | routine is wrapper to probe_jedec (sst_fwhub.c) */ .erase = erase_sst_fwhub, .write = write_sst_fwhub, .read = read_memmapped, @@ -2482,7 +2482,7 @@ .page_size = 64 * 1024, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_m29f002, .write = write_m29f002b, .read = read_memmapped, @@ -2498,7 +2498,7 @@ .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_m29f002, .write = write_m29f002t, .read = read_memmapped, @@ -2546,7 +2546,7 @@ .page_size = 16 * 1024, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_jedec, .read = read_memmapped, @@ -2562,7 +2562,7 @@ .page_size = 64 * 1024, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_jedec, .read = read_memmapped, @@ -2706,7 +2706,7 @@ .page_size = 64 * 1024, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_jedec, .read = read_memmapped, @@ -2722,7 +2722,7 @@ .page_size = 128, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped, @@ -2738,7 +2738,7 @@ .page_size = 128, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped, @@ -2754,7 +2754,7 @@ .page_size = 128, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped, @@ -2770,7 +2770,7 @@ .page_size = 128, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped, @@ -2786,7 +2786,7 @@ .page_size = 16384, /* Non-uniform sectors */ .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = NULL, .write = NULL, .read = read_memmapped, @@ -2802,7 +2802,7 @@ .page_size = 16384, /* Non-uniform sectors */ .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ .erase = NULL, .write = NULL, .read = read_memmapped, @@ -2898,7 +2898,7 @@ .page_size = 128, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = 10, /* used datasheet for the W29C011A */ .erase = erase_chip_jedec, .write = write_jedec, .read = read_memmapped, @@ -3042,7 +3042,7 @@ .page_size = 128, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = 10, .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped, @@ -3074,7 +3074,7 @@ .page_size = 128, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_FIXME, + .probe_timing = 10, .erase = erase_chip_jedec, .write = write_49f002, .read = read_memmapped,

1 0

[PATCH] Reduce probe code duplication, fix 82802AB
by Carl-Daniel Hailfinger 05 Sep '09

05 Sep '09

Quite a few probe functions in flashrom are copies of probe_jedec with additional lock bit printing or other glue. Make them call probe_jedec instead. Use the correct reset sequence for 82802AB. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-call_probe_jedec/w39v040c.c =================================================================== --- flashrom-call_probe_jedec/w39v040c.c (Revision 674) +++ flashrom-call_probe_jedec/w39v040c.c (Arbeitskopie) @@ -23,8 +23,12 @@ int probe_w39v040c(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; - uint8_t id1, id2, lock; + int result = probe_jedec(flash); + uint8_t lock; + if (!result) + return result; + chip_writeb(0xAA, bios + 0x5555); programmer_delay(10); chip_writeb(0x55, bios + 0x2AAA); @@ -32,8 +36,6 @@ chip_writeb(0x90, bios + 0x5555); programmer_delay(10); - id1 = chip_readb(bios); - id2 = chip_readb(bios + 1); lock = chip_readb(bios + 0xfff2); chip_writeb(0xAA, bios + 0x5555); @@ -43,17 +45,9 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(40); - printf_debug("%s: id1 0x%02x, id2 0x%02x", __func__, id1, id2); - if (!oddparity(id1)) - printf_debug(", id1 parity violation"); - printf_debug("\n"); - if (flash->manufacture_id == id1 && flash->model_id == id2) { - printf("%s: Boot block #TBL is %slocked, rest of chip #WP is %slocked.\n", - __func__, lock & 0x4 ? "" : "un", lock & 0x8 ? "" : "un"); - return 1; - } - - return 0; + printf("%s: Boot block #TBL is %slocked, rest of chip #WP is %slocked.\n", + __func__, lock & 0x4 ? "" : "un", lock & 0x8 ? "" : "un"); + return 1; } int erase_w39v040c(struct flashchip *flash) Index: flashrom-call_probe_jedec/stm50flw0x0x.c =================================================================== --- flashrom-call_probe_jedec/stm50flw0x0x.c (Revision 674) +++ flashrom-call_probe_jedec/stm50flw0x0x.c (Arbeitskopie) @@ -42,50 +42,11 @@ int probe_stm50flw0x0x(struct flashchip *flash) { - chipaddr bios = flash->virtual_memory; - uint8_t id1, id2; - uint32_t largeid1, largeid2; + int result = probe_jedec(flash); - /* Issue JEDEC Product ID Entry command */ - chip_writeb(0xAA, bios + 0x5555); - programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); - programmer_delay(10); - chip_writeb(0x90, bios + 0x5555); - programmer_delay(40); + if (!result) + return result; - /* Read product ID */ - id1 = chip_readb(bios); - id2 = chip_readb(bios + 0x01); - largeid1 = id1; - largeid2 = id2; - - /* Check if it is a continuation ID, this should be a while loop. */ - if (id1 == 0x7F) { - largeid1 <<= 8; - id1 = chip_readb(bios + 0x100); - largeid1 |= id1; - } - if (id2 == 0x7F) { - largeid2 <<= 8; - id2 = chip_readb(bios + 0x101); - largeid2 |= id2; - } - - /* Issue JEDEC Product ID Exit command */ - chip_writeb(0xAA, bios + 0x5555); - programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); - programmer_delay(10); - chip_writeb(0xF0, bios + 0x5555); - programmer_delay(40); - - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __FUNCTION__, largeid1, - largeid2); - - if (largeid1 != flash->manufacture_id || largeid2 != flash->model_id) - return 0; - map_flash_registers(flash); return 1; Index: flashrom-call_probe_jedec/w39v080fa.c =================================================================== --- flashrom-call_probe_jedec/w39v080fa.c (Revision 674) +++ flashrom-call_probe_jedec/w39v080fa.c (Arbeitskopie) @@ -22,30 +22,11 @@ int probe_winbond_fwhub(struct flashchip *flash) { - chipaddr bios = flash->virtual_memory; - uint8_t id1, id2; + int result = probe_jedec(flash); - /* Product Identification Entry */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0x90, bios + 0x5555); - programmer_delay(10); + if (!result) + return result; - /* Read product ID */ - id1 = chip_readb(bios); - id2 = chip_readb(bios + 0x01); - - /* Product Identifixation Exit */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); - programmer_delay(10); - - printf_debug("%s: id1 0x%x, id2 0x%x\n", __FUNCTION__, id1, id2); - - if (id1 != flash->manufacture_id || id2 != flash->model_id) - return 0; - map_flash_registers(flash); return 1; Index: flashrom-call_probe_jedec/82802ab.c =================================================================== --- flashrom-call_probe_jedec/82802ab.c (Revision 674) +++ flashrom-call_probe_jedec/82802ab.c (Arbeitskopie) @@ -47,14 +47,11 @@ chipaddr bios = flash->virtual_memory; uint8_t id1, id2; -#if 0 - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0x90, bios + 0x5555); -#endif - - chip_writeb(0xff, bios); + /* Reset to get a clean state */ + chip_writeb(0xFF, bios); programmer_delay(10); + + /* Enter ID mode */ chip_writeb(0x90, bios); programmer_delay(10); @@ -62,9 +59,7 @@ id2 = chip_readb(bios + 0x01); /* Leave ID mode */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); + chip_writeb(0xFF, bios); programmer_delay(10); @@ -81,7 +76,6 @@ uint8_t wait_82802ab(chipaddr bios) { uint8_t status; - uint8_t id1, id2; chip_writeb(0x70, bios); if ((chip_readb(bios) & 0x80) == 0) { // it's busy @@ -90,19 +84,9 @@ status = chip_readb(bios); - // put another command to get out of status register mode + /* Reset to get a clean state */ + chip_writeb(0xFF, bios); - chip_writeb(0x90, bios); - programmer_delay(10); - - id1 = chip_readb(bios); - id2 = chip_readb(bios + 0x01); - - // this is needed to jam it out of "read id" mode - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); - return status; } -- http://www.hailfinger.org/

2 3

[commit] r717 - trunk
by svn＠flashrom.org 05 Sep '09

05 Sep '09

Author: hailfinger Date: 2009-09-05 03:16:30 +0200 (Sat, 05 Sep 2009) New Revision: 717 Modified: trunk/82802ab.c trunk/stm50flw0x0x.c trunk/w39v040c.c trunk/w39v080fa.c Log: Quite a few probe functions in flashrom are copies of probe_jedec with additional lock bit printing or other glue. Make them call probe_jedec instead. Use the correct reset sequence for 82802AB. Detailed explanation: The reset sequence before ID reading was correct, so ID always worked. But the reset sequence after ID reading was a copy-paste leftover from probe_jedec and didn't have any effect. I dug up flash_and_burn from the freebios-v1 tree and found out that 82802ab.c was indeed a copy of jedec.c with lots of experimental unannotated #if 0 and #if 1. About the wait_82802ab change: Before the patch, wait_82802ab entered read status mode, switched to ID mode, then tried an incorrect and unsupported JEDEC command to exit ID mode. Nobody ever saw that this failed because all subsequent function calls had the correct reset sequence at the beginning. With the patch, wait_82802ab enters read status mode, then switches back to read mode with the official reset command. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/82802ab.c =================================================================== --- trunk/82802ab.c 2009-09-05 01:12:07 UTC (rev 716) +++ trunk/82802ab.c 2009-09-05 01:16:30 UTC (rev 717) @@ -47,14 +47,11 @@ chipaddr bios = flash->virtual_memory; uint8_t id1, id2; -#if 0 - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0x90, bios + 0x5555); -#endif - - chip_writeb(0xff, bios); + /* Reset to get a clean state */ + chip_writeb(0xFF, bios); programmer_delay(10); + + /* Enter ID mode */ chip_writeb(0x90, bios); programmer_delay(10); @@ -62,9 +59,7 @@ id2 = chip_readb(bios + 0x01); /* Leave ID mode */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); + chip_writeb(0xFF, bios); programmer_delay(10); @@ -81,7 +76,6 @@ uint8_t wait_82802ab(chipaddr bios) { uint8_t status; - uint8_t id1, id2; chip_writeb(0x70, bios); if ((chip_readb(bios) & 0x80) == 0) { // it's busy @@ -90,19 +84,9 @@ status = chip_readb(bios); - // put another command to get out of status register mode + /* Reset to get a clean state */ + chip_writeb(0xFF, bios); - chip_writeb(0x90, bios); - programmer_delay(10); - - id1 = chip_readb(bios); - id2 = chip_readb(bios + 0x01); - - // this is needed to jam it out of "read id" mode - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); - return status; } Modified: trunk/stm50flw0x0x.c =================================================================== --- trunk/stm50flw0x0x.c 2009-09-05 01:12:07 UTC (rev 716) +++ trunk/stm50flw0x0x.c 2009-09-05 01:16:30 UTC (rev 717) @@ -42,50 +42,11 @@ int probe_stm50flw0x0x(struct flashchip *flash) { - chipaddr bios = flash->virtual_memory; - uint8_t id1, id2; - uint32_t largeid1, largeid2; + int result = probe_jedec(flash); - /* Issue JEDEC Product ID Entry command */ - chip_writeb(0xAA, bios + 0x5555); - programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); - programmer_delay(10); - chip_writeb(0x90, bios + 0x5555); - programmer_delay(40); + if (!result) + return result; - /* Read product ID */ - id1 = chip_readb(bios); - id2 = chip_readb(bios + 0x01); - largeid1 = id1; - largeid2 = id2; - - /* Check if it is a continuation ID, this should be a while loop. */ - if (id1 == 0x7F) { - largeid1 <<= 8; - id1 = chip_readb(bios + 0x100); - largeid1 |= id1; - } - if (id2 == 0x7F) { - largeid2 <<= 8; - id2 = chip_readb(bios + 0x101); - largeid2 |= id2; - } - - /* Issue JEDEC Product ID Exit command */ - chip_writeb(0xAA, bios + 0x5555); - programmer_delay(10); - chip_writeb(0x55, bios + 0x2AAA); - programmer_delay(10); - chip_writeb(0xF0, bios + 0x5555); - programmer_delay(40); - - printf_debug("%s: id1 0x%02x, id2 0x%02x\n", __func__, largeid1, - largeid2); - - if (largeid1 != flash->manufacture_id || largeid2 != flash->model_id) - return 0; - map_flash_registers(flash); return 1; Modified: trunk/w39v040c.c =================================================================== --- trunk/w39v040c.c 2009-09-05 01:12:07 UTC (rev 716) +++ trunk/w39v040c.c 2009-09-05 01:16:30 UTC (rev 717) @@ -23,8 +23,12 @@ int probe_w39v040c(struct flashchip *flash) { chipaddr bios = flash->virtual_memory; - uint8_t id1, id2, lock; + int result = probe_jedec(flash); + uint8_t lock; + if (!result) + return result; + chip_writeb(0xAA, bios + 0x5555); programmer_delay(10); chip_writeb(0x55, bios + 0x2AAA); @@ -32,8 +36,6 @@ chip_writeb(0x90, bios + 0x5555); programmer_delay(10); - id1 = chip_readb(bios); - id2 = chip_readb(bios + 1); lock = chip_readb(bios + 0xfff2); chip_writeb(0xAA, bios + 0x5555); @@ -43,17 +45,9 @@ chip_writeb(0xF0, bios + 0x5555); programmer_delay(40); - printf_debug("%s: id1 0x%02x, id2 0x%02x", __func__, id1, id2); - if (!oddparity(id1)) - printf_debug(", id1 parity violation"); - printf_debug("\n"); - if (flash->manufacture_id == id1 && flash->model_id == id2) { - printf("%s: Boot block #TBL is %slocked, rest of chip #WP is %slocked.\n", - __func__, lock & 0x4 ? "" : "un", lock & 0x8 ? "" : "un"); - return 1; - } - - return 0; + printf("%s: Boot block #TBL is %slocked, rest of chip #WP is %slocked.\n", + __func__, lock & 0x4 ? "" : "un", lock & 0x8 ? "" : "un"); + return 1; } int erase_w39v040c(struct flashchip *flash) Modified: trunk/w39v080fa.c =================================================================== --- trunk/w39v080fa.c 2009-09-05 01:12:07 UTC (rev 716) +++ trunk/w39v080fa.c 2009-09-05 01:16:30 UTC (rev 717) @@ -22,30 +22,11 @@ int probe_winbond_fwhub(struct flashchip *flash) { - chipaddr bios = flash->virtual_memory; - uint8_t id1, id2; + int result = probe_jedec(flash); - /* Product Identification Entry */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0x90, bios + 0x5555); - programmer_delay(10); + if (!result) + return result; - /* Read product ID */ - id1 = chip_readb(bios); - id2 = chip_readb(bios + 0x01); - - /* Product Identifixation Exit */ - chip_writeb(0xAA, bios + 0x5555); - chip_writeb(0x55, bios + 0x2AAA); - chip_writeb(0xF0, bios + 0x5555); - programmer_delay(10); - - printf_debug("%s: id1 0x%x, id2 0x%x\n", __func__, id1, id2); - - if (id1 != flash->manufacture_id || id2 != flash->model_id) - return 0; - map_flash_registers(flash); return 1;

1 0

[PATCH] Fall back to svn info if svnversion fails
by Carl-Daniel Hailfinger 05 Sep '09

05 Sep '09

Not all systems have svnversion installed. Fall back to svn info if svnversion fails. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-svnversion_fallback/Makefile =================================================================== --- flashrom-svnversion_fallback/Makefile (Revision 713) +++ flashrom-svnversion_fallback/Makefile (Arbeitskopie) @@ -58,7 +58,7 @@ # of the checked out flashrom files. # Note to packagers: Any tree exported with "make export" or "make tarball" # will not require subversion. The downloadable snapshots are already exported. -SVNVERSION := $(shell LC_ALL=C svnversion -cn . | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || echo unknown) +SVNVERSION := $(shell LC_ALL=C svnversion -cn . | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || LC_ALL=C svn info . | grep ^Revision | sed "s/.*[[:blank:]]\+$[0-9]*$[^0-9]*/\1/" | grep "[0-9]" || echo unknown) RELEASE := 0.9.1 VERSION := $(RELEASE)-r$(SVNVERSION) -- http://www.hailfinger.org/

3 4

[commit] r716 - trunk
by svn＠flashrom.org 05 Sep '09

05 Sep '09

Author: hailfinger Date: 2009-09-05 03:12:07 +0200 (Sat, 05 Sep 2009) New Revision: 716 Modified: trunk/Makefile Log: Not all systems have svnversion installed. Fall back to svn info if svnversion fails. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-09-05 01:10:23 UTC (rev 715) +++ trunk/Makefile 2009-09-05 01:12:07 UTC (rev 716) @@ -58,7 +58,7 @@ # of the checked out flashrom files. # Note to packagers: Any tree exported with "make export" or "make tarball" # will not require subversion. The downloadable snapshots are already exported. -SVNVERSION := $(shell LC_ALL=C svnversion -cn . | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || echo unknown) +SVNVERSION := $(shell LC_ALL=C svnversion -cn . | sed -e "s/.*://" -e "s/$[0-9]*$.*/\1/" | grep "[0-9]" || LC_ALL=C svn info . | grep ^Revision | sed "s/.*[[:blank:]]\+$[0-9]*$[^0-9]*/\1/" | grep "[0-9]" || echo unknown) RELEASE := 0.9.1 VERSION := $(RELEASE)-r$(SVNVERSION)

1 0

[PATCH] Fix strict aliasing in serprog
by Carl-Daniel Hailfinger 05 Sep '09

05 Sep '09

Fix strict aliasing in serprog. Initialize the sockaddr,sockaddr_in union directly instead of running memset later. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-strict_aliasing/serprog.c =================================================================== --- flashrom-strict_aliasing/serprog.c (revision 714) +++ flashrom-strict_aliasing/serprog.c (working copy) @@ -105,7 +105,7 @@ { int flag = 1; struct hostent *hostPtr = NULL; - struct sockaddr_in sp; + union { struct sockaddr_in si; struct sockaddr s; } sp = {}; int sock; printf_debug(MSGHEADER "IP %s port %d\n", ip, port); sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -117,11 +117,10 @@ if (NULL == hostPtr) sp_die("Error: cannot resolve"); } - memset(&sp, 0, sizeof(sp)); - sp.sin_family = AF_INET; - sp.sin_port = htons(port); - (void)memcpy(&sp.sin_addr, hostPtr->h_addr, hostPtr->h_length); - if (connect(sock, (struct sockaddr *)&sp, sizeof(sp)) < 0) { + sp.si.sin_family = AF_INET; + sp.si.sin_port = htons(port); + (void)memcpy(&sp.si.sin_addr, hostPtr->h_addr, hostPtr->h_length); + if (connect(sock, &sp.s, sizeof(sp.si)) < 0) { close(sock); sp_die("Error: serprog cannot connect"); } -- http://www.hailfinger.org/

1 1

[commit] r715 - trunk
by svn＠flashrom.org 05 Sep '09

05 Sep '09

Author: hailfinger Date: 2009-09-05 03:10:23 +0200 (Sat, 05 Sep 2009) New Revision: 715 Modified: trunk/serprog.c Log: Fix strict aliasing in serprog. Initialize the sockaddr,sockaddr_in union directly instead of running memset later. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/serprog.c =================================================================== --- trunk/serprog.c 2009-09-04 13:57:07 UTC (rev 714) +++ trunk/serprog.c 2009-09-05 01:10:23 UTC (rev 715) @@ -105,7 +105,7 @@ { int flag = 1; struct hostent *hostPtr = NULL; - struct sockaddr_in sp; + union { struct sockaddr_in si; struct sockaddr s; } sp = {}; int sock; printf_debug(MSGHEADER "IP %s port %d\n", ip, port); sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -117,11 +117,10 @@ if (NULL == hostPtr) sp_die("Error: cannot resolve"); } - memset(&sp, 0, sizeof(sp)); - sp.sin_family = AF_INET; - sp.sin_port = htons(port); - (void)memcpy(&sp.sin_addr, hostPtr->h_addr, hostPtr->h_length); - if (connect(sock, (struct sockaddr *)&sp, sizeof(sp)) < 0) { + sp.si.sin_family = AF_INET; + sp.si.sin_port = htons(port); + (void)memcpy(&sp.si.sin_addr, hostPtr->h_addr, hostPtr->h_length); + if (connect(sock, &sp.s, sizeof(sp.si)) < 0) { close(sock); sp_die("Error: serprog cannot connect"); }

1 0

pending patches
by Carl-Daniel Hailfinger 04 Sep '09

04 Sep '09

We have loads of pending patches and I'd like to reduce them to a manageable number. I plan to review everything not written by me unless it needs testing on real hardware. A list of pending patches is available here: http://patchwork.coreboot.org/project/flashrom/list/ The patch name listed in patchwork is basically the subject of the mail containing the patch. Regards, Carl-Daniel -- http://www.hailfinger.org/

3 2

[commit] r714 - trunk
by svn＠flashrom.org 04 Sep '09

04 Sep '09

Author: stepan Date: 2009-09-04 15:57:07 +0200 (Fri, 04 Sep 2009) New Revision: 714 Modified: trunk/physmap.c Log: fix for gcc 4.4 strict aliasing rules. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/physmap.c =================================================================== --- trunk/physmap.c 2009-09-02 23:27:45 UTC (rev 713) +++ trunk/physmap.c 2009-09-04 13:57:07 UTC (rev 714) @@ -133,7 +133,7 @@ msr_t rdmsr(int addr) { - uint8_t buf[8]; + uint32_t buf[2]; msr_t msr = { 0xffffffff, 0xffffffff }; if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) { @@ -143,8 +143,8 @@ } if (read(fd_msr, buf, 8) == 8) { - msr.lo = *(uint32_t *)buf; - msr.hi = *(uint32_t *)(buf + 4); + msr.lo = buf[0]; + msr.hi = buf[1]; return msr; }

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom