openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

Unify some probe functions that basically correspond to probe_jedec()

Browse Source 
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.

Corresponding to flashrom svn r717.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
This commit is contained in:
Carl-Daniel Hailfinger 2009-09-05 01:16:30 +00:00
parent d271e79174
commit 4e9cebb2fb
4 changed files with 21 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
82802ab.c
View File

@ -47,14 +47,11 @@ int probe_82802ab(struct flashchip *flash)
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 @@ int probe_82802ab(struct flashchip *flash)
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 @@ int probe_82802ab(struct flashchip *flash)
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,18 +84,8 @@ uint8_t wait_82802ab(chipaddr bios)
status = chip_readb(bios);
// put another command to get out of status register mode
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);
/* Reset to get a clean state */
chip_writeb(0xFF, bios);
return status;
}

45
stm50flw0x0x.c
View File

@ -42,49 +42,10 @@ void protect_stm50flw0x0x(chipaddr bios)
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);
/* 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;
if (!result)
return result;
map_flash_registers(flash);

22
w39v040c.c
View File

@ -23,7 +23,11 @@
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);
@ -32,8 +36,6 @@ int probe_w39v040c(struct flashchip *flash)
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 @@ int probe_w39v040c(struct flashchip *flash)
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)

25
w39v080fa.c
View File

@ -22,29 +22,10 @@
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);
/* 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;
if (!result)
return result;
map_flash_registers(flash);