flashrom

flashrom@flashrom.org

9092 discussions

[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

[PATCH] Add Suport for Dr.Kaiser PC-Waechter
by TURBO J 04 Sep '09

04 Sep '09

Hi, this patch adds support for a PCI "flash memory card" named "Dr. Kaiser PC-Waechter". The Vendor sold different designs under that name, the patch works with the one that has an ACTEL FPGA as PCI-to-Flash bridge. The Flash chip is a "Macronix MX29F001B" (128 KB, Parallel) soldered directly to the PCB. Flash operations (PROBE, READ, ERASE, WRITE) work as expected, btw. I had to modify pcidev.c a bit: This card has 0x0000000 at PCI_BASE_ADDRESS_0 because it uses PCI_BASE_ADDRESS_2 instead. -- TURBO J ps. Unrelated issue: My OpenSUSE 11.2 Beta Box needs "make CFLAGS=-fno-strict-aliasing" GCC is "gcc version 4.4.1 [gcc-4_4-branch revision 149935] (SUSE Linux)" Signed-off-by: TURBO J <turboj(a)gmx.de> Index: flash.h =================================================================== --- flash.h (Revision 710) +++ flash.h (Arbeitskopie) @@ -84,6 +84,7 @@ PROGRAMMER_INTERNAL, PROGRAMMER_DUMMY, PROGRAMMER_NIC3COM, + PROGRAMMER_DRKAISER, PROGRAMMER_SATASII, PROGRAMMER_IT87SPI, #if FT2232_SPI_SUPPORT == 1 @@ -387,6 +388,15 @@ uint8_t nic3com_chip_readb(const chipaddr addr); extern struct pcidev_status nics_3com[]; +/* drkaiser.c */ + +int drkaiser_init(void); +int drkaiser_shutdown(void); +void drkaiser_chip_writeb(uint8_t val, chipaddr addr); +uint8_t drkaiser_chip_readb(const chipaddr addr); + +extern struct pcidev_status drkaiser_pcidev[]; + /* satasii.c */ int satasii_init(void); int satasii_shutdown(void); Index: drkaiser.c =================================================================== --- drkaiser.c (Revision 0) +++ drkaiser.c (Revision 0) @@ -0,0 +1,76 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 TURBO J <turboj(a)web.de> + * + * 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 <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include "flash.h" +#define PCI_VENDOR_ID_DRKAISER 0x1803 +#define PCI_DEVICE_ID_DRKAISER_ACTEL 0x5057 + + +struct pcidev_status drkaiser_pcidev[] = { + {0x1803, 0x5057,PCI_OK,"Dr.Kaiser","PC-Waechter (Actel FPGA)"}, + {}, +}; + +#define PCI_MAGIC_DRKAISER_ADR 0x50 +#define PCI_MAGIC_DRKAISER_VALUE 0xA971 + +uint8_t * drkaiser_mem; + +int drkaiser_init(void) +{ + get_io_perms(); + pcidev_init(PCI_VENDOR_ID_DRKAISER, drkaiser_pcidev, programmer_param); + + // Write Magic Register to enable FLASH Write + pci_write_word(pcidev_dev,PCI_MAGIC_DRKAISER_ADR, PCI_MAGIC_DRKAISER_VALUE); + + // Map 128KB Flash Memory Window + drkaiser_mem=physmap("Dr.Kaiser PC-Waechter FLASH Memory", + pci_read_long(pcidev_dev,PCI_BASE_ADDRESS_2), 128*1024); + + buses_supported = CHIP_BUSTYPE_PARALLEL; + return 0; +} + +int drkaiser_shutdown(void) +{ + // Write protect the Flash again + pci_write_word(pcidev_dev,PCI_MAGIC_DRKAISER_ADR, 0); + free(programmer_param); + pci_cleanup(pacc); + release_io_perms(); + return 0; +}; + + +void drkaiser_chip_writeb(uint8_t val, chipaddr addr) +{ + mmio_writeb(val, drkaiser_mem+addr ); +} + +uint8_t drkaiser_chip_readb(const chipaddr addr) +{ + return mmio_readb(drkaiser_mem + addr ); +} + + + Index: pcidev.c =================================================================== --- pcidev.c (Revision 710) +++ pcidev.c (Arbeitskopie) @@ -39,6 +39,9 @@ /* Don't use dev->base_addr[0], won't work on older libpci. */ addr = pci_read_long(dev, PCI_BASE_ADDRESS_0) & ~0x03; + + /* Dr. Kaiser has BASE_ADDRESS_0 = 0x000 */ + if (!addr) addr= pci_read_long(dev, PCI_BASE_ADDRESS_2) & ~0x03; printf("Found \"%s %s\" (%04x:%04x, BDF %02x:%02x.%x).\n", devs[i].vendor_name, devs[i].device_name, dev->vendor_id, Index: Makefile =================================================================== --- Makefile (Revision 710) +++ Makefile (Arbeitskopie) @@ -50,7 +50,7 @@ flashrom.o w39v080fa.o sharplhf00l04.o w29ee011.o spi.o it87spi.o \ ichspi.o w39v040c.o sb600spi.o wbsio_spi.o m29f002.o internal.o \ dummyflasher.o pcidev.o nic3com.o satasii.o ft2232_spi.o \ - print.o + print.o drkaiser.o all: pciutils features dep $(PROGRAM) Index: flashrom.c =================================================================== --- flashrom.c (Revision 710) +++ flashrom.c (Arbeitskopie) @@ -87,7 +87,24 @@ .chip_writen = fallback_chip_writen, .delay = internal_delay, }, + { + .name = "drkaiser", + .init = drkaiser_init, + .shutdown = drkaiser_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, + .chip_readb = drkaiser_chip_readb, + .chip_readw = fallback_chip_readw, + .chip_readl = fallback_chip_readl, + .chip_readn = fallback_chip_readn, + .chip_writeb = drkaiser_chip_writeb, + .chip_writew = fallback_chip_writew, + .chip_writel = fallback_chip_writel, + .chip_writen = fallback_chip_writen, + .delay = internal_delay, + }, + { .name = "satasii", .init = satasii_init, @@ -747,6 +764,7 @@ printf("\nSupported PCI devices flashrom can use " "as programmer:\n\n"); print_supported_pcidevs(nics_3com); + print_supported_pcidevs(drkaiser_pcidev); print_supported_pcidevs(satas_sii); exit(0); }

5 6

[commit] r713 - trunk
by svn＠flashrom.org 02 Sep '09

02 Sep '09

Author: uwe Date: 2009-09-03 01:27:45 +0200 (Thu, 03 Sep 2009) New Revision: 713 Added: trunk/drkaiser.c Log: Add drkaiser.c which was accidentally omitted in the last commit. Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Added: trunk/drkaiser.c =================================================================== --- trunk/drkaiser.c (rev 0) +++ trunk/drkaiser.c 2009-09-02 23:27:45 UTC (rev 713) @@ -0,0 +1,79 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2009 TURBO J <turboj(a)web.de> + * + * 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 <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include "flash.h" + +#define PCI_VENDOR_ID_DRKAISER 0x1803 + +#define PCI_MAGIC_DRKAISER_ADDR 0x50 +#define PCI_MAGIC_DRKAISER_VALUE 0xa971 + +struct pcidev_status drkaiser_pcidev[] = { + {0x1803, 0x5057, PCI_OK, "Dr. Kaiser", "PC-Waechter (Actel FPGA)"}, + {}, +}; + +uint8_t *drkaiser_bar; + +int drkaiser_init(void) +{ + uint32_t addr; + + get_io_perms(); + pcidev_init(PCI_VENDOR_ID_DRKAISER, PCI_BASE_ADDRESS_2, + drkaiser_pcidev, programmer_param); + + /* Write magic register to enable flash write. */ + pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, + PCI_MAGIC_DRKAISER_VALUE); + + /* TODO: Mask lower bits? How many? 3? 7? */ + addr = pci_read_long(pcidev_dev, PCI_BASE_ADDRESS_2) & ~0x03; + + /* Map 128KB flash memory window. */ + drkaiser_bar = physmap("Dr. Kaiser PC-Waechter flash memory", + addr, 128 * 1024); + + buses_supported = CHIP_BUSTYPE_PARALLEL; + return 0; +} + +int drkaiser_shutdown(void) +{ + /* Write protect the flash again. */ + pci_write_word(pcidev_dev, PCI_MAGIC_DRKAISER_ADDR, 0); + free(programmer_param); + pci_cleanup(pacc); + release_io_perms(); + return 0; +}; + +void drkaiser_chip_writeb(uint8_t val, chipaddr addr) +{ + mmio_writeb(val, drkaiser_bar + addr); +} + +uint8_t drkaiser_chip_readb(const chipaddr addr) +{ + return mmio_readb(drkaiser_bar + addr); +}

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom