- flashrom - mail.coreboot.org

[PATCH] Tidy up docs before release
by Carl-Daniel Hailfinger 18 Aug '09

18 Aug '09

Tidy up docs before release. Don't mention coreboot.org without context. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-doc_cosmetics/flashrom.8 =================================================================== --- flashrom-doc_cosmetics/flashrom.8 (Revision 687) +++ flashrom-doc_cosmetics/flashrom.8 (Arbeitskopie) @@ -15,10 +15,6 @@ It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, or SPI. -.PP -(see -.B http://coreboot.org -for details on coreboot) .SH OPTIONS Please note that the command line interface for flashrom will change before flashrom 1.0. Do not use flashrom in scripts or other automated tools without Index: flashrom-doc_cosmetics/README =================================================================== --- flashrom-doc_cosmetics/README (Revision 687) +++ flashrom-doc_cosmetics/README (Arbeitskopie) @@ -2,19 +2,16 @@ flashrom README ------------------------------------------------------------------------------- -flashrom is a utility for reading, writing, verifying and erasing flash ROM -chips. It's often used to flash BIOS/EFI/coreboot/firmware images in-system -using a supported mainboard, but it also supports flashing of network +flashrom is a utility for detecting, reading, writing, verifying and erasing +flash chips. It is often used to flash BIOS/EFI/coreboot/firmware images +in-system using a supported mainboard, but it also supports flashing of network cards (NICs), SATA controller cards, and other external devices which can program flash chips. -It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and -TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, -or SPI. +It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and TSOP40 +chips, which use various protocols such as LPC, FWH, parallel flash, or SPI. -(see http://coreboot.org for details on coreboot) - Packaging --------- -- http://www.hailfinger.org/

2 2

[commit] r688 - trunk
by svn＠flashrom.org 18 Aug '09

18 Aug '09

Author: hailfinger Date: 2009-08-19 01:50:14 +0200 (Wed, 19 Aug 2009) New Revision: 688 Modified: trunk/README trunk/flashrom.8 Log: Tidy up docs before release. Don't mention coreboot.org without context. 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/README =================================================================== --- trunk/README 2009-08-18 17:05:54 UTC (rev 687) +++ trunk/README 2009-08-18 23:50:14 UTC (rev 688) @@ -2,19 +2,16 @@ flashrom README ------------------------------------------------------------------------------- -flashrom is a utility for reading, writing, verifying and erasing flash ROM -chips. It's often used to flash BIOS/EFI/coreboot/firmware images in-system -using a supported mainboard, but it also supports flashing of network +flashrom is a utility for detecting, reading, writing, verifying and erasing +flash chips. It is often used to flash BIOS/EFI/coreboot/firmware images +in-system using a supported mainboard, but it also supports flashing of network cards (NICs), SATA controller cards, and other external devices which can program flash chips. -It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and -TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, -or SPI. +It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and TSOP40 +chips, which use various protocols such as LPC, FWH, parallel flash, or SPI. -(see http://coreboot.org for details on coreboot) - Packaging --------- Modified: trunk/flashrom.8 =================================================================== --- trunk/flashrom.8 2009-08-18 17:05:54 UTC (rev 687) +++ trunk/flashrom.8 2009-08-18 23:50:14 UTC (rev 688) @@ -15,10 +15,6 @@ It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, and TSOP40 chips, which use various protocols such as LPC, FWH, parallel flash, or SPI. -.PP -(see -.B http://coreboot.org -for details on coreboot) .SH OPTIONS Please note that the command line interface for flashrom will change before flashrom 1.0. Do not use flashrom in scripts or other automated tools without

1 0

[commit] r687 - tags
by svn＠flashrom.org 18 Aug '09

18 Aug '09

Author: hailfinger Date: 2009-08-18 19:05:54 +0200 (Tue, 18 Aug 2009) New Revision: 687 Added: tags/flashrom-0.9.1-rc1/ Log: flashrom 0.9.1-rc1 tag Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net>

1 0

new flashchip support for flashrom program information
by nanotonne＠free.fr 18 Aug '09

18 Aug '09

Hi, I send you a information for flashrom additionnal support (please) Flashrom program detect good my mainboard and chipset but don't detect chip flash rom I have tested to force reading with "similar" model" and it work mainboard : ASUS A7V133 chip flash memory : MOSEL V29C51002T (text writed on chip and reported by awflash utility) aparently this chip similar model as "SyncMOS S29C51002T" from your website because i can read fully with flashrom utility but i can't flash it. documentation mainboard is here : http://dlsvr02.asus.com/pub/ASUS/mb/socka/kt133a/a7v133/a7v133-105.pdf documentation chip rom is here : http://www.datasheetcatalog.org/datasheet/mosel/V29C51002T.pdf or here : http://pdf1.alldatasheet.co.kr/datasheet-pdf/view/2313/MOSEL/V29C51002T-90P… thank to add support of this chip , and too add option for flashrom program to force writing with a "similar chip" (know as compatible after research) when chip is manually defined. note : project coreboot is good, but support for usb disk for boot it and keyboard/mouse usb not supported is a big lack to "switch" to this alternative open firmware :-( ... Michael

2 1

flashrom v0.9.0-r670 works with an ASUS KFN4-D16
by Thomas Ward 18 Aug '09

18 Aug '09

I can report that flashrom v0.9.0-r670 works with an ASUS KFN4-D16 to reflash the mainboard bios chip I flashed an ASUS ROM (3.02) and halted the computer and rebooted, computer booted up as normal. next stop is to flash coreboot on this board, I hope to report back in about one month good luck with your project, Tom Ward

1 0

Success: Gigabyte GA-MA78GPM-DS2H
by Erik Haugen Bakke 17 Aug '09

17 Aug '09

Hi, all. Just wanted to confirm that the current SVN version of flashrom works on a Gigabyte GA-MA78GPM-DS2H board. The last time I tried this was about 2 months ago and the flashing failed back then, so this support would have added some time since then. The board was delivered with BIOS revision F3, and I have successfully flashed it with F4 and F5. This is my first success report, so please let me know if you need additional information on the board. Best regards -- Erik H. Bakke __________________________________________________________________________________ Find local businesses and services in your area with Yahoo!7 Local. Get started: http://local.yahoo.com.au

1 0

[PATCH] Fix compilation on Nexenta (Ubuntu/Solaris)
by Carl-Daniel Hailfinger 17 Aug '09

17 Aug '09

Fix compilation on Nexenta which is Ubuntu with a Solaris kernel. This is 0.9.1 material. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-nexenta/Makefile =================================================================== --- flashrom-nexenta/Makefile (Revision 684) +++ flashrom-nexenta/Makefile (Arbeitskopie) @@ -70,7 +70,10 @@ ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' OBJS += serprog.o +ifeq ($(OS_ARCH), SunOS) +LIBS += -lsocket endif +endif FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") Index: flashrom-nexenta/README =================================================================== --- flashrom-nexenta/README (Revision 684) +++ flashrom-nexenta/README (Arbeitskopie) @@ -43,7 +43,7 @@ * pciutils * pciutils-devel / pciutils-dev / libpci-dev - * zlib-devel / zlib1g-dev + * zlib-devel / zlib1g-dev (only needed if libpci is static) On FreeBSD, you need the following ports: @@ -58,15 +58,18 @@ gmake +To compile on Nexenta, use: + + make + To compile on Solaris, use: - gmake LDFLAGS="-L$pathtolibpci -lpci -lz" CC="gcc -I$pathtopciheaders" \ - CFLAGS=-O2 + gmake LDFLAGS="-L$pathtolibpci" CC="gcc -I$pathtopciheaders" CFLAGS=-O2 To compile on DragonFly BSD, use: ln -s /usr/pkg/include/pciutils pci - gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib -lpci -lz" + gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib" To compile and run on Darwin/Mac OS X: -- http://www.hailfinger.org/

2 2

[commit] r686 - trunk
by svn＠flashrom.org 17 Aug '09

17 Aug '09

Author: hailfinger Date: 2009-08-17 18:30:53 +0200 (Mon, 17 Aug 2009) New Revision: 686 Modified: trunk/Makefile trunk/README Log: Fix compilation on Nexenta which is Ubuntu with a Solaris kernel. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-08-13 23:23:37 UTC (rev 685) +++ trunk/Makefile 2009-08-17 16:30:53 UTC (rev 686) @@ -70,7 +70,10 @@ ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' OBJS += serprog.o +ifeq ($(OS_ARCH), SunOS) +LIBS += -lsocket endif +endif FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") Modified: trunk/README =================================================================== --- trunk/README 2009-08-13 23:23:37 UTC (rev 685) +++ trunk/README 2009-08-17 16:30:53 UTC (rev 686) @@ -43,7 +43,7 @@ * pciutils * pciutils-devel / pciutils-dev / libpci-dev - * zlib-devel / zlib1g-dev + * zlib-devel / zlib1g-dev (only needed if libpci is static) On FreeBSD, you need the following ports: @@ -58,15 +58,18 @@ gmake +To compile on Nexenta, use: + + make + To compile on Solaris, use: - gmake LDFLAGS="-L$pathtolibpci -lpci -lz" CC="gcc -I$pathtopciheaders" \ - CFLAGS=-O2 + gmake LDFLAGS="-L$pathtolibpci" CC="gcc -I$pathtopciheaders" CFLAGS=-O2 To compile on DragonFly BSD, use: ln -s /usr/pkg/include/pciutils pci - gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib -lpci -lz" + gmake CFLAGS=-I. LDFLAGS="-L/usr/pkg/lib" To compile and run on Darwin/Mac OS X:

1 0

[PATCH] ICH6+ FWH IDSEL override
by Carl-Daniel Hailfinger 17 Aug '09

17 Aug '09

Allow the user to override FWH IDSEL on ICH6 and later. Usage: flashrom -p internal=fwh_idsel=0 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-ich6_fwh_idsel/chipset_enable.c =================================================================== --- flashrom-ich6_fwh_idsel/chipset_enable.c (Revision 683) +++ flashrom-ich6_fwh_idsel/chipset_enable.c (Arbeitskopie) @@ -203,6 +203,7 @@ { uint32_t fwh_conf; int i; + char *idsel = NULL; /* Ignore all legacy ranges below 1 MB. */ /* FWH_SEL1 */ @@ -232,6 +233,19 @@ (0xff0 + i) * 0x100000, (fwh_conf >> i) & 0x1 ? "en" : "dis"); + if (programmer_param) + idsel = strstr(programmer_param, "fwh_idsel="); + + if (idsel) { + idsel += strlen("fwh_idsel="); + fwh_conf = (uint32_t)strtoul(idsel, NULL, 0); + + /* FIXME: Need to undo this on shutdown. */ + printf("\nSetting IDSEL=0x%x for top 16 MB", fwh_conf); + pci_write_long(dev, 0xd0, fwh_conf); + pci_write_word(dev, 0xd4, fwh_conf); + } + return enable_flash_ich(dev, name, 0xdc); } -- http://www.hailfinger.org/

3 6

[commit] r685 - trunk
by svn＠flashrom.org 13 Aug '09

13 Aug '09

Author: hailfinger Date: 2009-08-14 01:23:37 +0200 (Fri, 14 Aug 2009) New Revision: 685 Modified: trunk/chipset_enable.c Log: Allow the user to override FWH IDSEL on ICH6 and later. Usage: flashrom -p internal=fwh_idsel=0 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Log: flashrom v0.9.0-r670 coreboot table found at 0xcf7f3c00. Vendor ID: KONTRON, part ID: 986LCD-M Found chipset "Intel ICH7/ICH7R", enabling flash write... Setting IDSEL=0 for top 8 MBOK. This chipset supports the following protocols: LPC,FWH. Disabling flash write protection for board "Kontron 986LCD-M"... OK. Calibrating delay loop... OK. Found chip "SST SST49LF016C" (2048 KB, FWH) at physical address 0xffe00000. No operations were specified. Acked-by: Chris Kinney <cmkinne(a)sandia.gov> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-08-13 11:38:44 UTC (rev 684) +++ trunk/chipset_enable.c 2009-08-13 23:23:37 UTC (rev 685) @@ -203,6 +203,7 @@ { uint32_t fwh_conf; int i; + char *idsel = NULL; /* Ignore all legacy ranges below 1 MB. */ /* FWH_SEL1 */ @@ -232,6 +233,19 @@ (0xff0 + i) * 0x100000, (fwh_conf >> i) & 0x1 ? "en" : "dis"); + if (programmer_param) + idsel = strstr(programmer_param, "fwh_idsel="); + + if (idsel) { + idsel += strlen("fwh_idsel="); + fwh_conf = (uint32_t)strtoul(idsel, NULL, 0); + + /* FIXME: Need to undo this on shutdown. */ + printf("\nSetting IDSEL=0x%x for top 16 MB", fwh_conf); + pci_write_long(dev, 0xd0, fwh_conf); + pci_write_word(dev, 0xd4, fwh_conf); + } + return enable_flash_ich(dev, name, 0xdc); }

1 0

Re: [flashrom] flashrom compatibility
by Carl-Daniel Hailfinger 13 Aug '09

13 Aug '09

Hi James. On 13.08.2009 16:39, James Li wrote: > Is flashrom utility executable inside QNX4 environment ? > I do not know, but can you test if it compiles in QNX4? If it does not compile, we can work with you to add QNX4 support. flashrom needs: - physical RAM access (/dev/mem on Linux) - I/O port access (inb/outb) - MSR access for GeodeLX boards Regards, Carl-Daniel -- http://www.hailfinger.org/

1 0

flashrom compatibility
by James Li 13 Aug '09

13 Aug '09

Hi, Is flashrom utility executable inside QNX4 environment ? Thanks

1 0

[PATCH] Only list available programers in usage()
by Carl-Daniel Hailfinger 13 Aug '09

13 Aug '09

Generate the usage message by walking the list of available programmers. This makes sure compiled out programmers are not listed. Tested, usage output is identical to the hardcoded variant. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_usagemessage/flashrom.c =================================================================== --- flashrom-programmer_usagemessage/flashrom.c (Revision 680) +++ flashrom-programmer_usagemessage/flashrom.c (Arbeitskopie) @@ -486,6 +486,11 @@ void usage(const char *name) { + const char *pname; + int pnamelen; + int remaining = 0; + enum programmer p; + printf("usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n" " [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name); @@ -508,9 +513,33 @@ " -i | --image <name>: only flash image name from flash layout\n" " -L | --list-supported: print supported devices\n" " -z | --list-supported-wiki: print supported devices in wiki syntax\n" - " -p | --programmer <name>: specify the programmer device\n" - " (internal, dummy, nic3com, satasii,\n" - " it87spi, ft2232spi, serprog)\n" + " -p | --programmer <name>: specify the programmer device"); + + for (p = 0; p < PROGRAMMER_INVALID; p++) { + pname = programmer_table[p].name; + pnamelen = strlen(pname); + if (remaining - pnamelen - 2 < 0) { + printf("\n "); + remaining = 43; + } else { + printf(" "); + remaining--; + } + if (p == 0) { + printf("("); + remaining--; + } + printf("%s", pname); + remaining -= pnamelen; + if (p < PROGRAMMER_INVALID - 1) { + printf(","); + remaining--; + } else { + printf(")\n"); + } + } + + printf( " -h | --help: print this help text\n" " -R | --version: print the version (release)\n" "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n" -- http://www.hailfinger.org/

2 3

[commit] r684 - trunk
by svn＠flashrom.org 13 Aug '09

13 Aug '09

Author: hailfinger Date: 2009-08-13 13:38:44 +0200 (Thu, 13 Aug 2009) New Revision: 684 Modified: trunk/flashrom.c Log: Generate the usage message by walking the list of available programmers. This makes sure compiled out programmers are not listed. Tested, usage output is identical to the hardcoded variant. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-08-12 18:25:24 UTC (rev 683) +++ trunk/flashrom.c 2009-08-13 11:38:44 UTC (rev 684) @@ -488,6 +488,11 @@ void usage(const char *name) { + const char *pname; + int pnamelen; + int remaining = 0; + enum programmer p; + printf("usage: %s [-VfLzhR] [-E|-r file|-w file|-v file] [-c chipname]\n" " [-m [vendor:]part] [-l file] [-i image] [-p programmer]\n\n", name); @@ -510,9 +515,33 @@ " -i | --image <name>: only flash image name from flash layout\n" " -L | --list-supported: print supported devices\n" " -z | --list-supported-wiki: print supported devices in wiki syntax\n" - " -p | --programmer <name>: specify the programmer device\n" - " (internal, dummy, nic3com, satasii,\n" - " it87spi, ft2232spi, serprog)\n" + " -p | --programmer <name>: specify the programmer device"); + + for (p = 0; p < PROGRAMMER_INVALID; p++) { + pname = programmer_table[p].name; + pnamelen = strlen(pname); + if (remaining - pnamelen - 2 < 0) { + printf("\n "); + remaining = 43; + } else { + printf(" "); + remaining--; + } + if (p == 0) { + printf("("); + remaining--; + } + printf("%s", pname); + remaining -= pnamelen; + if (p < PROGRAMMER_INVALID - 1) { + printf(","); + remaining--; + } else { + printf(")\n"); + } + } + + printf( " -h | --help: print this help text\n" " -R | --version: print the version (release)\n" "\nYou can specify one of -E, -r, -w, -v or no operation. If no operation is\n"

1 0

[commit] r683 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: stepan Date: 2009-08-12 20:25:24 +0200 (Wed, 12 Aug 2009) New Revision: 683 Modified: trunk/board_enable.c Log: oops. MSR accesses in board specific code. I missed those. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/board_enable.c =================================================================== --- trunk/board_enable.c 2009-08-12 16:58:11 UTC (rev 682) +++ trunk/board_enable.c 2009-08-12 18:25:24 UTC (rev 683) @@ -495,51 +495,29 @@ #define DBE6x_BOOT_LOC_FLASH (2) #define DBE6x_BOOT_LOC_FWHUB (3) - unsigned long msr[2]; - int msr_fd; + msr_t msr; unsigned long boot_loc; - msr_fd = open("/dev/cpu/0/msr", O_RDWR); - if (msr_fd == -1) { - perror("open /dev/cpu/0/msr"); + /* Geode only has a single core */ + if (setup_cpu_msr(0)) return -1; - } - if (lseek(msr_fd, DBE6x_MSR_DIVIL_BALL_OPTS, SEEK_SET) == -1) { - perror("lseek"); - close(msr_fd); - return -1; - } + msr = rdmsr(DBE6x_MSR_DIVIL_BALL_OPTS); - if (read(msr_fd, (void *)msr, 8) != 8) { - perror("read"); - close(msr_fd); - return -1; - } - - if ((msr[0] & (DBE6x_BOOT_OP_LATCHED)) == + if ((msr.lo & (DBE6x_BOOT_OP_LATCHED)) == (DBE6x_BOOT_LOC_FWHUB << DBE6x_BOOT_OP_LATCHED_SHIFT)) boot_loc = DBE6x_BOOT_LOC_FWHUB; else boot_loc = DBE6x_BOOT_LOC_FLASH; - msr[0] &= ~(DBE6x_PRI_BOOT_LOC | DBE6x_SEC_BOOT_LOC); - msr[0] |= ((boot_loc << DBE6x_PRI_BOOT_LOC_SHIFT) | + msr.lo &= ~(DBE6x_PRI_BOOT_LOC | DBE6x_SEC_BOOT_LOC); + msr.lo |= ((boot_loc << DBE6x_PRI_BOOT_LOC_SHIFT) | (boot_loc << DBE6x_SEC_BOOT_LOC_SHIFT)); - if (lseek(msr_fd, DBE6x_MSR_DIVIL_BALL_OPTS, SEEK_SET) == -1) { - perror("lseek"); - close(msr_fd); - return -1; - } + wrmsr(DBE6x_MSR_DIVIL_BALL_OPTS, msr); - if (write(msr_fd, (void *)msr, 8) != 8) { - perror("write"); - close(msr_fd); - return -1; - } + cleanup_cpu_msr(); - close(msr_fd); return 0; }

1 0

[commit] r682 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: libv Date: 2009-08-12 18:58:11 +0200 (Wed, 12 Aug 2009) New Revision: 682 Modified: trunk/board_enable.c Log: Board enable for Asus P4P800-E Deluxe. Raises what seems to be gpio21. Uses host controller and Promise Raid Controller for a unique match. Signed-off-by: Luc Verhaegen <libv(a)skynet.be> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Tested-by: Bojan Radakovic <crnibojan(a)gmail.com> Modified: trunk/board_enable.c =================================================================== --- trunk/board_enable.c 2009-08-12 16:17:41 UTC (rev 681) +++ trunk/board_enable.c 2009-08-12 16:58:11 UTC (rev 682) @@ -888,6 +888,32 @@ } /** + * Suited for Asus P4P800-E: Intel Intel 865PE + ICH5R. + */ +static int board_asus_p4p800(const char *name) +{ + struct pci_dev *dev; + uint16_t base; + uint8_t tmp; + + dev = pci_dev_find(0x8086, 0x24D0); /* Intel ICH5R ISA Bridge */ + if (!dev) { + fprintf(stderr, "\nERROR: Intel ICH5R ISA Bridge not found.\n"); + return -1; + } + + /* get PM IO base */ + base = pci_read_long(dev, 0x58) & 0x0000FFC0; + + /* Raise GPIO 21 */ + tmp = INB(base + 0x0E); + tmp |= 0x20; + OUTB(tmp, base + 0x0E); + + return 0; +} + +/** * We use 2 sets of IDs here, you're free to choose which is which. This * is to provide a very high degree of certainty when matching a board on * the basis of subsystem/card IDs. As not every vendor handles @@ -920,6 +946,7 @@ {0x1106, 0x3189, 0x1043, 0x807F, 0x1106, 0x3177, 0x1043, 0x808C, NULL, NULL, "ASUS", "A7V8X", board_asus_a7v8x}, {0x1106, 0x3177, 0x1043, 0x80A1, 0x1106, 0x3205, 0x1043, 0x8118, NULL, NULL, "ASUS", "A7V8X-MX SE", board_asus_a7v8x_mx}, {0x8086, 0x1a30, 0x1043, 0x8070, 0x8086, 0x244b, 0x1043, 0x8028, NULL, NULL, "ASUS", "P4B266", ich2_gpio22_raise}, + {0x8086, 0x2570, 0x1043, 0x80F2, 0x105A, 0x3373, 0x1043, 0x80F5, NULL, NULL, "ASUS", "P4P800-E Deluxe", board_asus_p4p800}, {0x10B9, 0x1541, 0, 0, 0x10B9, 0x1533, 0, 0, "asus", "p5a", "ASUS", "P5A", board_asus_p5a}, {0x1106, 0x3149, 0x1565, 0x3206, 0x1106, 0x3344, 0x1565, 0x1202, NULL, NULL, "Biostar", "P4M80-M4", it8705_rom_write_enable}, {0x1106, 0x3038, 0x1019, 0x0996, 0x1106, 0x3177, 0x1019, 0x0996, NULL, NULL, "Elitegroup", "K7VTA3", it8705f_write_enable_2e},

1 0

flashrom 0.9.1 soon
by Carl-Daniel Hailfinger 12 Aug '09

12 Aug '09

Hi, I'd like to tag flashrom 0.9.1 soon. Preliminary release announcement is here: http://www.coreboot.org/Flashrom/0.9.1 The release announcement will be transferred to flashrom.org at the time of release. Patches I'd like to have in 0.9.1: Acked with modifications, commit needed: - fix MSR code in flashrom Ack needed: - Use correct programmer fallback functions - Improve error messages, protect the user TODO: - Don't list programmers which weren't compiled in. This means #if inside the usage message and in a lot of other places. Makefile tweaking needed as well. - Don't error out if chipset initialization returned with a warning. - Document serprog usage in the man page. - Loads of testing. I hope to get the pending patches listed above committed tomorrow, then tag 0.9.1-rc1 to give packagers a base to work with and test. No new features will be merged between 0.9.1-rc1 and 0.9.1. (I do have one neat new SPI bitbang feature pending, but that one has to wait as well.) I'd rather get 0.9.1 out before the Opensuse package update deadline. That means we also make the Ubuntu Karmic deadline. Thoughts? Comments? Regards, Carl-Daniel -- http://www.hailfinger.org/

2 3

[PATCH] Allow to compile out serprog completely
by Carl-Daniel Hailfinger 12 Aug '09

12 Aug '09

Allow to compile out serprog completely. If CONFIG_SERPROG is not set, no stubs and no data of serprog will remain. Side benefit: This kills a few dozen lines of code. r678, r679 and r680 made this possible. Once "Only list available programers in usage()" is committed, even the usage message will be adjusted automatically. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-serprog_compileout/flash.h =================================================================== --- flashrom-serprog_compileout/flash.h (Revision 680) +++ flashrom-serprog_compileout/flash.h (Arbeitskopie) @@ -87,7 +87,9 @@ PROGRAMMER_SATASII, PROGRAMMER_IT87SPI, PROGRAMMER_FT2232SPI, +#if SERPROG_SUPPORT == 1 PROGRAMMER_SERPROG, +#endif PROGRAMMER_INVALID /* This must always be the last entry. */ }; Index: flashrom-serprog_compileout/serprog.c =================================================================== --- flashrom-serprog_compileout/serprog.c (Revision 680) +++ flashrom-serprog_compileout/serprog.c (Arbeitskopie) @@ -23,9 +23,6 @@ #include <stdlib.h> #include <unistd.h> #include "flash.h" - -#if SERPROG_SUPPORT == 1 - #include <string.h> #include <ctype.h> #include <fcntl.h> @@ -774,42 +771,3 @@ sp_opbuf_usage += 5; sp_prev_was_write = 0; } - -#else - -int serprog_init(void) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -int serprog_shutdown(void) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_chip_writeb(uint8_t val, chipaddr addr) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -uint8_t serprog_chip_readb(const chipaddr addr) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_chip_readn(uint8_t *buf, const chipaddr addr, size_t len) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_delay(int delay) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} -#endif Index: flashrom-serprog_compileout/Makefile =================================================================== --- flashrom-serprog_compileout/Makefile (Revision 680) +++ flashrom-serprog_compileout/Makefile (Arbeitskopie) @@ -49,7 +49,7 @@ sst49lfxxxc.o sst_fwhub.o layout.o cbtable.o flashchips.o physmap.o \ 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 serprog.o \ + dummyflasher.o pcidev.o nic3com.o satasii.o ft2232_spi.o \ print.o all: pciutils features dep $(PROGRAM) @@ -64,15 +64,21 @@ SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' -$(PROGRAM): $(OBJS) - $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) +# Always enable serprog for now. Needs to be disabled on Windows. +CONFIG_SERPROG = yes -FEATURE_CFLAGS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") -# Always enable serprog for now. Needs to be disabled on Windows. +ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' +OBJS += serprog.o +endif -FEATURE_LIBS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") +FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") + +$(PROGRAM): $(OBJS) + $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) + # TAROPTIONS reduces information leakage from the packager's system. # If other tar programs support command line arguments for setting uid/gid of # stored files, they can be handled here as well. Index: flashrom-serprog_compileout/flashrom.c =================================================================== --- flashrom-serprog_compileout/flashrom.c (Revision 680) +++ flashrom-serprog_compileout/flashrom.c (Arbeitskopie) @@ -139,6 +139,7 @@ .delay = internal_delay, }, +#if SERPROG_SUPPORT == 1 { .name = "serprog", .init = serprog_init, @@ -155,6 +156,7 @@ .chip_writen = fallback_chip_writen, .delay = serprog_delay, }, +#endif {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; -- http://www.hailfinger.org/

2 2

[commit] r681 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: hailfinger Date: 2009-08-12 18:17:41 +0200 (Wed, 12 Aug 2009) New Revision: 681 Modified: trunk/Makefile trunk/flash.h trunk/flashrom.c trunk/serprog.c Log: Allow to compile out serprog completely. If CONFIG_SERPROG is not set, no stubs and no data of serprog will remain. Side benefit: This kills a few dozen lines of code. r678, r679 and r680 made this possible. Once "Only list available programers in usage()" is committed, even the usage message will be adjusted automatically. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-08-12 14:34:35 UTC (rev 680) +++ trunk/Makefile 2009-08-12 16:17:41 UTC (rev 681) @@ -49,7 +49,7 @@ sst49lfxxxc.o sst_fwhub.o layout.o cbtable.o flashchips.o physmap.o \ 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 serprog.o \ + dummyflasher.o pcidev.o nic3com.o satasii.o ft2232_spi.o \ print.o all: pciutils features dep $(PROGRAM) @@ -64,15 +64,21 @@ SVNDEF := -D'FLASHROM_VERSION="$(VERSION)"' -$(PROGRAM): $(OBJS) - $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) +# Always enable serprog for now. Needs to be disabled on Windows. +CONFIG_SERPROG = yes -FEATURE_CFLAGS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") -# Always enable serprog for now. Needs to be disabled on Windows. +ifeq ($(CONFIG_SERPROG), yes) FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' +OBJS += serprog.o +endif -FEATURE_LIBS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") +FEATURE_CFLAGS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") +FEATURE_LIBS += $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") + +$(PROGRAM): $(OBJS) + $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) + # TAROPTIONS reduces information leakage from the packager's system. # If other tar programs support command line arguments for setting uid/gid of # stored files, they can be handled here as well. Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-12 14:34:35 UTC (rev 680) +++ trunk/flash.h 2009-08-12 16:17:41 UTC (rev 681) @@ -87,7 +87,9 @@ PROGRAMMER_SATASII, PROGRAMMER_IT87SPI, PROGRAMMER_FT2232SPI, +#if SERPROG_SUPPORT == 1 PROGRAMMER_SERPROG, +#endif PROGRAMMER_INVALID /* This must always be the last entry. */ }; Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-08-12 14:34:35 UTC (rev 680) +++ trunk/flashrom.c 2009-08-12 16:17:41 UTC (rev 681) @@ -139,6 +139,7 @@ .delay = internal_delay, }, +#if SERPROG_SUPPORT == 1 { .name = "serprog", .init = serprog_init, @@ -155,6 +156,7 @@ .chip_writen = fallback_chip_writen, .delay = serprog_delay, }, +#endif {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; Modified: trunk/serprog.c =================================================================== --- trunk/serprog.c 2009-08-12 14:34:35 UTC (rev 680) +++ trunk/serprog.c 2009-08-12 16:17:41 UTC (rev 681) @@ -23,9 +23,6 @@ #include <stdlib.h> #include <unistd.h> #include "flash.h" - -#if SERPROG_SUPPORT == 1 - #include <string.h> #include <ctype.h> #include <fcntl.h> @@ -774,42 +771,3 @@ sp_opbuf_usage += 5; sp_prev_was_write = 0; } - -#else - -int serprog_init(void) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -int serprog_shutdown(void) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_chip_writeb(uint8_t val, chipaddr addr) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -uint8_t serprog_chip_readb(const chipaddr addr) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_chip_readn(uint8_t *buf, const chipaddr addr, size_t len) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} - -void serprog_delay(int delay) -{ - fprintf(stderr, "Serial programmer support was not compiled in\n"); - exit(1); -} -#endif

1 0

[PATCH] Use programmer name field
by Carl-Daniel Hailfinger 12 Aug '09

12 Aug '09

Use programmer.name to match the --programmer parameter instead of hardcoding the name of every single programmer in main(). -p dummyfoo won't be mistaken for -p dummy anymore. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_name/flash.h =================================================================== --- flashrom-programmer_name/flash.h (Revision 679) +++ flashrom-programmer_name/flash.h (Arbeitskopie) @@ -88,6 +88,7 @@ PROGRAMMER_IT87SPI, PROGRAMMER_FT2232SPI, PROGRAMMER_SERPROG, + PROGRAMMER_INVALID /* This must always be the last entry. */ }; extern enum programmer programmer; Index: flashrom-programmer_name/flashrom.c =================================================================== --- flashrom-programmer_name/flashrom.c (Revision 679) +++ flashrom-programmer_name/flashrom.c (Arbeitskopie) @@ -38,6 +38,7 @@ const struct programmer_entry programmer_table[] = { { + .name = "internal", .init = internal_init, .shutdown = internal_shutdown, .map_flash_region = physmap, @@ -54,6 +55,7 @@ }, { + .name = "dummy", .init = dummy_init, .shutdown = dummy_shutdown, .map_flash_region = dummy_map, @@ -70,6 +72,7 @@ }, { + .name = "nic3com", .init = nic3com_init, .shutdown = nic3com_shutdown, .map_flash_region = fallback_map, @@ -86,6 +89,7 @@ }, { + .name = "satasii", .init = satasii_init, .shutdown = satasii_shutdown, .map_flash_region = fallback_map, @@ -102,6 +106,7 @@ }, { + .name = "it87spi", .init = it87spi_init, .shutdown = fallback_shutdown, .map_flash_region = fallback_map, @@ -118,6 +123,7 @@ }, { + .name = "ft2232spi", .init = ft2232_spi_init, .shutdown = fallback_shutdown, .map_flash_region = fallback_map, @@ -134,6 +140,7 @@ }, { + .name = "serprog", .init = serprog_init, .shutdown = serprog_shutdown, .map_flash_region = fallback_map, @@ -149,7 +156,7 @@ .delay = serprog_delay, }, - {}, + {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; int programmer_init(void) @@ -523,6 +530,8 @@ FILE *image; /* Probe for up to three flash chips. */ struct flashchip *flash, *flashes[3]; + const char *name; + int namelen; int opt; int option_index = 0; int force = 0; @@ -565,6 +574,12 @@ printf_debug("%s\n", argv[i]); } + /* Safety check. */ + if (ARRAY_SIZE(programmer_table) - 1 != PROGRAMMER_INVALID) { + fprintf(stderr, "Programmer table miscompilation!\n"); + exit(1); + } + setbuf(stdout, NULL); while ((opt = getopt_long(argc, argv, "rRwvnVEfc:m:l:i:p:Lzh", long_options, &option_index)) != EOF) { @@ -641,35 +656,28 @@ list_supported_wiki = 1; break; case 'p': - if (strncmp(optarg, "internal", 8) == 0) { - programmer = PROGRAMMER_INTERNAL; - if (optarg[8] == '=') - programmer_param = strdup(optarg + 9); - } else if (strncmp(optarg, "dummy", 5) == 0) { - programmer = PROGRAMMER_DUMMY; - if (optarg[5] == '=') - programmer_param = strdup(optarg + 6); - } else if (strncmp(optarg, "nic3com", 7) == 0) { - programmer = PROGRAMMER_NIC3COM; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "satasii", 7) == 0) { - programmer = PROGRAMMER_SATASII; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "it87spi", 7) == 0) { - programmer = PROGRAMMER_IT87SPI; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "ft2232spi", 9) == 0) { - programmer = PROGRAMMER_FT2232SPI; - if (optarg[9] == '=') - programmer_param = strdup(optarg + 10); - } else if (strncmp(optarg, "serprog", 7) == 0) { - programmer = PROGRAMMER_SERPROG; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else { + for (programmer = 0; programmer < PROGRAMMER_INVALID; programmer++) { + name = programmer_table[programmer].name; + namelen = strlen(name); + if (strncmp(optarg, name, namelen) == 0) { + switch (optarg[namelen]) { + case '=': + programmer_param = strdup(optarg + namelen + 1); + break; + case '\0': + break; + default: + /* The continue refers to the + * for loop. It is here to be + * able to differentiate between + * foo and foobar. + */ + continue; + } + break; + } + } + if (programmer == PROGRAMMER_INVALID) { printf("Error: Unknown programmer.\n"); exit(1); } -- http://www.hailfinger.org/

2 2

[commit] r680 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: hailfinger Date: 2009-08-12 16:34:35 +0200 (Wed, 12 Aug 2009) New Revision: 680 Modified: trunk/flash.h trunk/flashrom.c Log: Use programmer.name to match the --programmer parameter instead of hardcoding the name of every single programmer in main(). -p dummyfoo won't be mistaken for -p dummy anymore. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-12 13:32:56 UTC (rev 679) +++ trunk/flash.h 2009-08-12 14:34:35 UTC (rev 680) @@ -88,6 +88,7 @@ PROGRAMMER_IT87SPI, PROGRAMMER_FT2232SPI, PROGRAMMER_SERPROG, + PROGRAMMER_INVALID /* This must always be the last entry. */ }; extern enum programmer programmer; Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-08-12 13:32:56 UTC (rev 679) +++ trunk/flashrom.c 2009-08-12 14:34:35 UTC (rev 680) @@ -38,6 +38,7 @@ const struct programmer_entry programmer_table[] = { { + .name = "internal", .init = internal_init, .shutdown = internal_shutdown, .map_flash_region = physmap, @@ -54,6 +55,7 @@ }, { + .name = "dummy", .init = dummy_init, .shutdown = dummy_shutdown, .map_flash_region = dummy_map, @@ -70,6 +72,7 @@ }, { + .name = "nic3com", .init = nic3com_init, .shutdown = nic3com_shutdown, .map_flash_region = fallback_map, @@ -86,6 +89,7 @@ }, { + .name = "satasii", .init = satasii_init, .shutdown = satasii_shutdown, .map_flash_region = fallback_map, @@ -102,6 +106,7 @@ }, { + .name = "it87spi", .init = it87spi_init, .shutdown = fallback_shutdown, .map_flash_region = fallback_map, @@ -118,6 +123,7 @@ }, { + .name = "ft2232spi", .init = ft2232_spi_init, .shutdown = fallback_shutdown, .map_flash_region = fallback_map, @@ -134,6 +140,7 @@ }, { + .name = "serprog", .init = serprog_init, .shutdown = serprog_shutdown, .map_flash_region = fallback_map, @@ -149,7 +156,7 @@ .delay = serprog_delay, }, - {}, + {}, /* This entry corresponds to PROGRAMMER_INVALID. */ }; int programmer_init(void) @@ -523,6 +530,8 @@ FILE *image; /* Probe for up to three flash chips. */ struct flashchip *flash, *flashes[3]; + const char *name; + int namelen; int opt; int option_index = 0; int force = 0; @@ -565,6 +574,12 @@ printf_debug("%s\n", argv[i]); } + /* Safety check. */ + if (ARRAY_SIZE(programmer_table) - 1 != PROGRAMMER_INVALID) { + fprintf(stderr, "Programmer table miscompilation!\n"); + exit(1); + } + setbuf(stdout, NULL); while ((opt = getopt_long(argc, argv, "rRwvnVEfc:m:l:i:p:Lzh", long_options, &option_index)) != EOF) { @@ -641,35 +656,28 @@ list_supported_wiki = 1; break; case 'p': - if (strncmp(optarg, "internal", 8) == 0) { - programmer = PROGRAMMER_INTERNAL; - if (optarg[8] == '=') - programmer_param = strdup(optarg + 9); - } else if (strncmp(optarg, "dummy", 5) == 0) { - programmer = PROGRAMMER_DUMMY; - if (optarg[5] == '=') - programmer_param = strdup(optarg + 6); - } else if (strncmp(optarg, "nic3com", 7) == 0) { - programmer = PROGRAMMER_NIC3COM; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "satasii", 7) == 0) { - programmer = PROGRAMMER_SATASII; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "it87spi", 7) == 0) { - programmer = PROGRAMMER_IT87SPI; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else if (strncmp(optarg, "ft2232spi", 9) == 0) { - programmer = PROGRAMMER_FT2232SPI; - if (optarg[9] == '=') - programmer_param = strdup(optarg + 10); - } else if (strncmp(optarg, "serprog", 7) == 0) { - programmer = PROGRAMMER_SERPROG; - if (optarg[7] == '=') - programmer_param = strdup(optarg + 8); - } else { + for (programmer = 0; programmer < PROGRAMMER_INVALID; programmer++) { + name = programmer_table[programmer].name; + namelen = strlen(name); + if (strncmp(optarg, name, namelen) == 0) { + switch (optarg[namelen]) { + case '=': + programmer_param = strdup(optarg + namelen + 1); + break; + case '\0': + break; + default: + /* The continue refers to the + * for loop. It is here to be + * able to differentiate between + * foo and foobar. + */ + continue; + } + break; + } + } + if (programmer == PROGRAMMER_INVALID) { printf("Error: Unknown programmer.\n"); exit(1); }

1 0

[PATCH] Common parameter variable for all programmers
by Carl-Daniel Hailfinger 12 Aug '09

12 Aug '09

Use a common parameter variable for all programmers. This allows us to reduce #ifdef clauses a lot if we compile out some programmers completely. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-programmer_common_param/flash.h =================================================================== --- flashrom-programmer_common_param/flash.h (Revision 678) +++ flashrom-programmer_common_param/flash.h (Arbeitskopie) @@ -277,7 +277,7 @@ const char *device_name; }; uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs); -uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs); +uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcidev_bdf); /* print.c */ char *flashbuses_to_text(enum chipbustype bustype); @@ -350,7 +350,6 @@ #endif /* dummyflasher.c */ -extern char *dummytype; int dummy_init(void); int dummy_shutdown(void); void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); @@ -383,13 +382,13 @@ /* ft2232_spi.c */ #define FTDI_FT2232H 0x6010 #define FTDI_FT4232H 0x6011 -extern char *ft2232spi_param; int ft2232_spi_init(void); int ft2232_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf); /* flashrom.c */ +extern char *programmer_param; extern int verbose; extern const char *flashrom_version; #define printf_debug(x...) { if (verbose) printf(x); } @@ -399,7 +398,6 @@ int max(int a, int b); int check_erased_range(struct flashchip *flash, int start, int len); int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); -extern char *pcidev_bdf; char *strcat_realloc(char *dest, const char *src); #define OK 0 @@ -507,7 +505,6 @@ int ich_spi_send_multicommand(struct spi_command *spicommands); /* it87spi.c */ -extern char *it87opts; extern uint16_t it8716f_flashport; void enter_conf_mode_ite(uint16_t port); void exit_conf_mode_ite(uint16_t port); @@ -628,7 +625,6 @@ int write_stm50flw0x0x(struct flashchip *flash, uint8_t *buf); /* serprog.c */ -extern char *serprog_param; int serprog_init(void); int serprog_shutdown(void); void serprog_chip_writeb(uint8_t val, chipaddr addr); Index: flashrom-programmer_common_param/it87spi.c =================================================================== --- flashrom-programmer_common_param/it87spi.c (Revision 678) +++ flashrom-programmer_common_param/it87spi.c (Arbeitskopie) @@ -31,7 +31,6 @@ #define ITE_SUPERIO_PORT1 0x2e #define ITE_SUPERIO_PORT2 0x4e -char *it87opts = NULL; uint16_t it8716f_flashport = 0; /* use fast 33MHz SPI (<>0) or slow 16MHz (0) */ int fast_spi = 1; @@ -95,11 +94,11 @@ flashport = sio_read(port, 0x64) << 8; flashport |= sio_read(port, 0x65); printf("Serial flash port 0x%04x\n", flashport); - if (it87opts && !strlen(it87opts)) { - free(it87opts); - it87opts = NULL; + if (programmer_param && !strlen(programmer_param)) { + free(programmer_param); + programmer_param = NULL; } - if (it87opts && (portpos = strstr(it87opts, "port="))) { + if (programmer_param && (portpos = strstr(programmer_param, "port="))) { portpos += 5; flashport = strtol(portpos, (char **)NULL, 0); printf("Forcing serial flash port 0x%04x\n", flashport); Index: flashrom-programmer_common_param/pcidev.c =================================================================== --- flashrom-programmer_common_param/pcidev.c (Revision 678) +++ flashrom-programmer_common_param/pcidev.c (Arbeitskopie) @@ -26,7 +26,6 @@ uint32_t io_base_addr; struct pci_access *pacc; struct pci_filter filter; -char *pcidev_bdf = NULL; struct pci_dev *pcidev_dev = NULL; uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs) @@ -58,7 +57,7 @@ return 0; } -uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs) +uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcidev_bdf) { struct pci_dev *dev; char *msg = NULL; Index: flashrom-programmer_common_param/serprog.c =================================================================== --- flashrom-programmer_common_param/serprog.c (Revision 678) +++ flashrom-programmer_common_param/serprog.c (Arbeitskopie) @@ -19,8 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <string.h> +#include <stdio.h> #include <stdlib.h> +#include <unistd.h> +#include "flash.h" + +#if SERPROG_SUPPORT == 1 + +#include <string.h> #include <ctype.h> #include <fcntl.h> #include <sys/types.h> @@ -31,16 +37,9 @@ #include <netdb.h> #include <sys/stat.h> #include <errno.h> -#include <stdio.h> -#include <unistd.h> #include <inttypes.h> #include <termios.h> -#include "flash.h" -char *serprog_param = NULL; - -#if SERPROG_SUPPORT == 1 - #define MSGHEADER "serprog:" #define S_ACK 0x06 @@ -431,15 +430,15 @@ char *dev; printf_debug("%s\n", __func__); /* the parameter is either of format "/dev/device:baud" or "ip:port" */ - if ((!serprog_param) || (!strlen(serprog_param))) { + if ((!programmer_param) || (!strlen(programmer_param))) { nodevice: fprintf(stderr, "Error: No device/host given for the serial programmer driver.\n" "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); exit(1); } - num = strstr(serprog_param, ":"); - len = num - serprog_param; + num = strstr(programmer_param, ":"); + len = num - programmer_param; if (!len) goto nodevice; if (!num) { fprintf(stderr, @@ -447,15 +446,15 @@ "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); exit(1); } - len = num - serprog_param; + len = num - programmer_param; dev = malloc(len + 1); if (!dev) sp_die("Error: memory allocation failure"); - memcpy(dev, serprog_param, len); + memcpy(dev, programmer_param, len); dev[len] = 0; num = strdup(num + 1); if (!num) sp_die("Error: memory allocation failure"); - free(serprog_param); - serprog_param = NULL; + free(programmer_param); + programmer_param = NULL; if (dev[0] == '/') sp_fd = sp_openserport(dev, atoi(num)); else sp_fd = sp_opensocket(dev, atoi(num)); Index: flashrom-programmer_common_param/nic3com.c =================================================================== --- flashrom-programmer_common_param/nic3com.c (Revision 678) +++ flashrom-programmer_common_param/nic3com.c (Arbeitskopie) @@ -58,7 +58,7 @@ { get_io_perms(); - io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, nics_3com); + io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, nics_3com, programmer_param); id = pcidev_dev->device_id; /* 3COM 3C90xB cards need a special fixup. */ @@ -94,7 +94,7 @@ OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); } - free(pcidev_bdf); + free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-programmer_common_param/ft2232_spi.c =================================================================== --- flashrom-programmer_common_param/ft2232_spi.c (Revision 678) +++ flashrom-programmer_common_param/ft2232_spi.c (Arbeitskopie) @@ -26,8 +26,6 @@ #include "flash.h" #include "spi.h" -char *ft2232spi_param = NULL; - #if FT2232_SPI_SUPPORT == 1 #include <ftdi.h> @@ -83,16 +81,16 @@ return EXIT_FAILURE; } - if (ft2232spi_param && !strlen(ft2232spi_param)) { - free(ft2232spi_param); - ft2232spi_param = NULL; + if (programmer_param && !strlen(programmer_param)) { + free(programmer_param); + programmer_param = NULL; } - if (ft2232spi_param) { - if (strstr(ft2232spi_param, "2232")) + if (programmer_param) { + if (strstr(programmer_param, "2232")) ft2232_type = FTDI_FT2232H; - if (strstr(ft2232spi_param, "4232")) + if (strstr(programmer_param, "4232")) ft2232_type = FTDI_FT4232H; - portpos = strstr(ft2232spi_param, "port="); + portpos = strstr(programmer_param, "port="); if (portpos) { portpos += 5; switch (toupper(*portpos)) { @@ -107,7 +105,7 @@ "using default.\n"); } } - free(ft2232spi_param); + free(programmer_param); } printf_debug("Using device type %s ", (ft2232_type == FTDI_FT2232H) ? "2232H" : "4232H"); Index: flashrom-programmer_common_param/satasii.c =================================================================== --- flashrom-programmer_common_param/satasii.c (Revision 678) +++ flashrom-programmer_common_param/satasii.c (Arbeitskopie) @@ -47,7 +47,7 @@ get_io_perms(); - pcidev_init(PCI_VENDOR_ID_SII, satas_sii); + pcidev_init(PCI_VENDOR_ID_SII, satas_sii, programmer_param); id = pcidev_dev->device_id; if ((id == 0x3132) || (id == 0x3124)) { @@ -71,7 +71,7 @@ int satasii_shutdown(void) { - free(pcidev_bdf); + free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Index: flashrom-programmer_common_param/dummyflasher.c =================================================================== --- flashrom-programmer_common_param/dummyflasher.c (Revision 678) +++ flashrom-programmer_common_param/dummyflasher.c (Arbeitskopie) @@ -24,45 +24,43 @@ #include <sys/types.h> #include "flash.h" -char *dummytype = NULL; - int dummy_init(void) { int i; printf_debug("%s\n", __func__); /* "all" is equivalent to specifying no type. */ - if (dummytype && (!strcmp(dummytype, "all"))) { - free(dummytype); - dummytype = NULL; + if (programmer_param && (!strcmp(programmer_param, "all"))) { + free(programmer_param); + programmer_param = NULL; } - if (!dummytype) - dummytype = strdup("parallel,lpc,fwh,spi"); + if (!programmer_param) + programmer_param = strdup("parallel,lpc,fwh,spi"); /* Convert the parameters to lowercase. */ - for (i = 0; dummytype[i] != '\0'; i++) - dummytype[i] = (char)tolower(dummytype[i]); + for (i = 0; programmer_param[i] != '\0'; i++) + programmer_param[i] = (char)tolower(programmer_param[i]); buses_supported = CHIP_BUSTYPE_NONE; - if (strstr(dummytype, "parallel")) { + if (strstr(programmer_param, "parallel")) { buses_supported |= CHIP_BUSTYPE_PARALLEL; printf_debug("Enabling support for %s flash.\n", "parallel"); } - if (strstr(dummytype, "lpc")) { + if (strstr(programmer_param, "lpc")) { buses_supported |= CHIP_BUSTYPE_LPC; printf_debug("Enabling support for %s flash.\n", "LPC"); } - if (strstr(dummytype, "fwh")) { + if (strstr(programmer_param, "fwh")) { buses_supported |= CHIP_BUSTYPE_FWH; printf_debug("Enabling support for %s flash.\n", "FWH"); } - if (strstr(dummytype, "spi")) { + if (strstr(programmer_param, "spi")) { buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_DUMMY; printf_debug("Enabling support for %s flash.\n", "SPI"); } if (buses_supported == CHIP_BUSTYPE_NONE) printf_debug("Support for all flash bus types disabled.\n"); - free(dummytype); + free(programmer_param); return 0; } Index: flashrom-programmer_common_param/flashrom.c =================================================================== --- flashrom-programmer_common_param/flashrom.c (Revision 678) +++ flashrom-programmer_common_param/flashrom.c (Arbeitskopie) @@ -34,6 +34,7 @@ char *chip_to_probe = NULL; int verbose = 0; enum programmer programmer = PROGRAMMER_INTERNAL; +char *programmer_param = NULL; const struct programmer_entry programmer_table[] = { { @@ -642,30 +643,32 @@ case 'p': if (strncmp(optarg, "internal", 8) == 0) { programmer = PROGRAMMER_INTERNAL; + if (optarg[8] == '=') + programmer_param = strdup(optarg + 9); } else if (strncmp(optarg, "dummy", 5) == 0) { programmer = PROGRAMMER_DUMMY; if (optarg[5] == '=') - dummytype = strdup(optarg + 6); + programmer_param = strdup(optarg + 6); } else if (strncmp(optarg, "nic3com", 7) == 0) { programmer = PROGRAMMER_NIC3COM; if (optarg[7] == '=') - pcidev_bdf = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "satasii", 7) == 0) { programmer = PROGRAMMER_SATASII; if (optarg[7] == '=') - pcidev_bdf = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "it87spi", 7) == 0) { programmer = PROGRAMMER_IT87SPI; if (optarg[7] == '=') - it87opts = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "ft2232spi", 9) == 0) { programmer = PROGRAMMER_FT2232SPI; if (optarg[9] == '=') - ft2232spi_param = strdup(optarg + 10); + programmer_param = strdup(optarg + 10); } else if (strncmp(optarg, "serprog", 7) == 0) { programmer = PROGRAMMER_SERPROG; if (optarg[7] == '=') - serprog_param = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else { printf("Error: Unknown programmer.\n"); exit(1); -- http://www.hailfinger.org/

2 2

[commit] r679 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: hailfinger Date: 2009-08-12 15:32:56 +0200 (Wed, 12 Aug 2009) New Revision: 679 Modified: trunk/dummyflasher.c trunk/flash.h trunk/flashrom.c trunk/ft2232_spi.c trunk/it87spi.c trunk/nic3com.c trunk/pcidev.c trunk/satasii.c trunk/serprog.c Log: Use a common parameter variable for all programmers. This allows us to reduce #ifdef clauses a lot if we compile out some programmers completely. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/dummyflasher.c =================================================================== --- trunk/dummyflasher.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/dummyflasher.c 2009-08-12 13:32:56 UTC (rev 679) @@ -24,45 +24,43 @@ #include <sys/types.h> #include "flash.h" -char *dummytype = NULL; - int dummy_init(void) { int i; printf_debug("%s\n", __func__); /* "all" is equivalent to specifying no type. */ - if (dummytype && (!strcmp(dummytype, "all"))) { - free(dummytype); - dummytype = NULL; + if (programmer_param && (!strcmp(programmer_param, "all"))) { + free(programmer_param); + programmer_param = NULL; } - if (!dummytype) - dummytype = strdup("parallel,lpc,fwh,spi"); + if (!programmer_param) + programmer_param = strdup("parallel,lpc,fwh,spi"); /* Convert the parameters to lowercase. */ - for (i = 0; dummytype[i] != '\0'; i++) - dummytype[i] = (char)tolower(dummytype[i]); + for (i = 0; programmer_param[i] != '\0'; i++) + programmer_param[i] = (char)tolower(programmer_param[i]); buses_supported = CHIP_BUSTYPE_NONE; - if (strstr(dummytype, "parallel")) { + if (strstr(programmer_param, "parallel")) { buses_supported |= CHIP_BUSTYPE_PARALLEL; printf_debug("Enabling support for %s flash.\n", "parallel"); } - if (strstr(dummytype, "lpc")) { + if (strstr(programmer_param, "lpc")) { buses_supported |= CHIP_BUSTYPE_LPC; printf_debug("Enabling support for %s flash.\n", "LPC"); } - if (strstr(dummytype, "fwh")) { + if (strstr(programmer_param, "fwh")) { buses_supported |= CHIP_BUSTYPE_FWH; printf_debug("Enabling support for %s flash.\n", "FWH"); } - if (strstr(dummytype, "spi")) { + if (strstr(programmer_param, "spi")) { buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_DUMMY; printf_debug("Enabling support for %s flash.\n", "SPI"); } if (buses_supported == CHIP_BUSTYPE_NONE) printf_debug("Support for all flash bus types disabled.\n"); - free(dummytype); + free(programmer_param); return 0; } Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/flash.h 2009-08-12 13:32:56 UTC (rev 679) @@ -277,7 +277,7 @@ const char *device_name; }; uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs); -uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs); +uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcidev_bdf); /* print.c */ char *flashbuses_to_text(enum chipbustype bustype); @@ -350,7 +350,6 @@ #endif /* dummyflasher.c */ -extern char *dummytype; int dummy_init(void); int dummy_shutdown(void); void *dummy_map(const char *descr, unsigned long phys_addr, size_t len); @@ -383,13 +382,13 @@ /* ft2232_spi.c */ #define FTDI_FT2232H 0x6010 #define FTDI_FT4232H 0x6011 -extern char *ft2232spi_param; int ft2232_spi_init(void); int ft2232_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf); /* flashrom.c */ +extern char *programmer_param; extern int verbose; extern const char *flashrom_version; #define printf_debug(x...) { if (verbose) printf(x); } @@ -399,7 +398,6 @@ int max(int a, int b); int check_erased_range(struct flashchip *flash, int start, int len); int verify_range(struct flashchip *flash, uint8_t *cmpbuf, int start, int len, char *message); -extern char *pcidev_bdf; char *strcat_realloc(char *dest, const char *src); #define OK 0 @@ -507,7 +505,6 @@ int ich_spi_send_multicommand(struct spi_command *spicommands); /* it87spi.c */ -extern char *it87opts; extern uint16_t it8716f_flashport; void enter_conf_mode_ite(uint16_t port); void exit_conf_mode_ite(uint16_t port); @@ -628,7 +625,6 @@ int write_stm50flw0x0x(struct flashchip *flash, uint8_t *buf); /* serprog.c */ -extern char *serprog_param; int serprog_init(void); int serprog_shutdown(void); void serprog_chip_writeb(uint8_t val, chipaddr addr); Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/flashrom.c 2009-08-12 13:32:56 UTC (rev 679) @@ -34,6 +34,7 @@ char *chip_to_probe = NULL; int verbose = 0; enum programmer programmer = PROGRAMMER_INTERNAL; +char *programmer_param = NULL; const struct programmer_entry programmer_table[] = { { @@ -642,30 +643,32 @@ case 'p': if (strncmp(optarg, "internal", 8) == 0) { programmer = PROGRAMMER_INTERNAL; + if (optarg[8] == '=') + programmer_param = strdup(optarg + 9); } else if (strncmp(optarg, "dummy", 5) == 0) { programmer = PROGRAMMER_DUMMY; if (optarg[5] == '=') - dummytype = strdup(optarg + 6); + programmer_param = strdup(optarg + 6); } else if (strncmp(optarg, "nic3com", 7) == 0) { programmer = PROGRAMMER_NIC3COM; if (optarg[7] == '=') - pcidev_bdf = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "satasii", 7) == 0) { programmer = PROGRAMMER_SATASII; if (optarg[7] == '=') - pcidev_bdf = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "it87spi", 7) == 0) { programmer = PROGRAMMER_IT87SPI; if (optarg[7] == '=') - it87opts = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else if (strncmp(optarg, "ft2232spi", 9) == 0) { programmer = PROGRAMMER_FT2232SPI; if (optarg[9] == '=') - ft2232spi_param = strdup(optarg + 10); + programmer_param = strdup(optarg + 10); } else if (strncmp(optarg, "serprog", 7) == 0) { programmer = PROGRAMMER_SERPROG; if (optarg[7] == '=') - serprog_param = strdup(optarg + 8); + programmer_param = strdup(optarg + 8); } else { printf("Error: Unknown programmer.\n"); exit(1); Modified: trunk/ft2232_spi.c =================================================================== --- trunk/ft2232_spi.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/ft2232_spi.c 2009-08-12 13:32:56 UTC (rev 679) @@ -26,8 +26,6 @@ #include "flash.h" #include "spi.h" -char *ft2232spi_param = NULL; - #if FT2232_SPI_SUPPORT == 1 #include <ftdi.h> @@ -83,16 +81,16 @@ return EXIT_FAILURE; } - if (ft2232spi_param && !strlen(ft2232spi_param)) { - free(ft2232spi_param); - ft2232spi_param = NULL; + if (programmer_param && !strlen(programmer_param)) { + free(programmer_param); + programmer_param = NULL; } - if (ft2232spi_param) { - if (strstr(ft2232spi_param, "2232")) + if (programmer_param) { + if (strstr(programmer_param, "2232")) ft2232_type = FTDI_FT2232H; - if (strstr(ft2232spi_param, "4232")) + if (strstr(programmer_param, "4232")) ft2232_type = FTDI_FT4232H; - portpos = strstr(ft2232spi_param, "port="); + portpos = strstr(programmer_param, "port="); if (portpos) { portpos += 5; switch (toupper(*portpos)) { @@ -107,7 +105,7 @@ "using default.\n"); } } - free(ft2232spi_param); + free(programmer_param); } printf_debug("Using device type %s ", (ft2232_type == FTDI_FT2232H) ? "2232H" : "4232H"); Modified: trunk/it87spi.c =================================================================== --- trunk/it87spi.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/it87spi.c 2009-08-12 13:32:56 UTC (rev 679) @@ -31,7 +31,6 @@ #define ITE_SUPERIO_PORT1 0x2e #define ITE_SUPERIO_PORT2 0x4e -char *it87opts = NULL; uint16_t it8716f_flashport = 0; /* use fast 33MHz SPI (<>0) or slow 16MHz (0) */ int fast_spi = 1; @@ -95,11 +94,11 @@ flashport = sio_read(port, 0x64) << 8; flashport |= sio_read(port, 0x65); printf("Serial flash port 0x%04x\n", flashport); - if (it87opts && !strlen(it87opts)) { - free(it87opts); - it87opts = NULL; + if (programmer_param && !strlen(programmer_param)) { + free(programmer_param); + programmer_param = NULL; } - if (it87opts && (portpos = strstr(it87opts, "port="))) { + if (programmer_param && (portpos = strstr(programmer_param, "port="))) { portpos += 5; flashport = strtol(portpos, (char **)NULL, 0); printf("Forcing serial flash port 0x%04x\n", flashport); Modified: trunk/nic3com.c =================================================================== --- trunk/nic3com.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/nic3com.c 2009-08-12 13:32:56 UTC (rev 679) @@ -58,7 +58,7 @@ { get_io_perms(); - io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, nics_3com); + io_base_addr = pcidev_init(PCI_VENDOR_ID_3COM, nics_3com, programmer_param); id = pcidev_dev->device_id; /* 3COM 3C90xB cards need a special fixup. */ @@ -94,7 +94,7 @@ OUTL(internal_conf, io_base_addr + INTERNAL_CONFIG); } - free(pcidev_bdf); + free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/pcidev.c =================================================================== --- trunk/pcidev.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/pcidev.c 2009-08-12 13:32:56 UTC (rev 679) @@ -26,7 +26,6 @@ uint32_t io_base_addr; struct pci_access *pacc; struct pci_filter filter; -char *pcidev_bdf = NULL; struct pci_dev *pcidev_dev = NULL; uint32_t pcidev_validate(struct pci_dev *dev, struct pcidev_status *devs) @@ -58,7 +57,7 @@ return 0; } -uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs) +uint32_t pcidev_init(uint16_t vendor_id, struct pcidev_status *devs, char *pcidev_bdf) { struct pci_dev *dev; char *msg = NULL; Modified: trunk/satasii.c =================================================================== --- trunk/satasii.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/satasii.c 2009-08-12 13:32:56 UTC (rev 679) @@ -47,7 +47,7 @@ get_io_perms(); - pcidev_init(PCI_VENDOR_ID_SII, satas_sii); + pcidev_init(PCI_VENDOR_ID_SII, satas_sii, programmer_param); id = pcidev_dev->device_id; if ((id == 0x3132) || (id == 0x3124)) { @@ -71,7 +71,7 @@ int satasii_shutdown(void) { - free(pcidev_bdf); + free(programmer_param); pci_cleanup(pacc); release_io_perms(); return 0; Modified: trunk/serprog.c =================================================================== --- trunk/serprog.c 2009-08-12 11:39:29 UTC (rev 678) +++ trunk/serprog.c 2009-08-12 13:32:56 UTC (rev 679) @@ -19,8 +19,14 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <string.h> +#include <stdio.h> #include <stdlib.h> +#include <unistd.h> +#include "flash.h" + +#if SERPROG_SUPPORT == 1 + +#include <string.h> #include <ctype.h> #include <fcntl.h> #include <sys/types.h> @@ -31,16 +37,9 @@ #include <netdb.h> #include <sys/stat.h> #include <errno.h> -#include <stdio.h> -#include <unistd.h> #include <inttypes.h> #include <termios.h> -#include "flash.h" -char *serprog_param = NULL; - -#if SERPROG_SUPPORT == 1 - #define MSGHEADER "serprog:" #define S_ACK 0x06 @@ -431,15 +430,15 @@ char *dev; printf_debug("%s\n", __func__); /* the parameter is either of format "/dev/device:baud" or "ip:port" */ - if ((!serprog_param) || (!strlen(serprog_param))) { + if ((!programmer_param) || (!strlen(programmer_param))) { nodevice: fprintf(stderr, "Error: No device/host given for the serial programmer driver.\n" "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); exit(1); } - num = strstr(serprog_param, ":"); - len = num - serprog_param; + num = strstr(programmer_param, ":"); + len = num - programmer_param; if (!len) goto nodevice; if (!num) { fprintf(stderr, @@ -447,15 +446,15 @@ "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); exit(1); } - len = num - serprog_param; + len = num - programmer_param; dev = malloc(len + 1); if (!dev) sp_die("Error: memory allocation failure"); - memcpy(dev, serprog_param, len); + memcpy(dev, programmer_param, len); dev[len] = 0; num = strdup(num + 1); if (!num) sp_die("Error: memory allocation failure"); - free(serprog_param); - serprog_param = NULL; + free(programmer_param); + programmer_param = NULL; if (dev[0] == '/') sp_fd = sp_openserport(dev, atoi(num)); else sp_fd = sp_opensocket(dev, atoi(num));

1 0

[PATCH] Use correct programmer fallback functions
by Carl-Daniel Hailfinger 12 Aug '09

12 Aug '09

FT2232 and IT87 programmers used functions of the dummy programmer instead of fallback functions. The dummy programmer is a "real" programmer with possible side effects and its functions should not be abused by other programmers. Make FT2232 and IT87 use official fallback functions instead. Create fallback_shutdown(). Create fallback_chip_writeb(). Convert the programmer #defines to an enum. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-fallback/flash.h =================================================================== --- flashrom-fallback/flash.h (Revision 674) +++ flashrom-fallback/flash.h (Arbeitskopie) @@ -80,15 +80,18 @@ typedef unsigned long chipaddr; -extern int programmer; -#define PROGRAMMER_INTERNAL 0x00 -#define PROGRAMMER_DUMMY 0x01 -#define PROGRAMMER_NIC3COM 0x02 -#define PROGRAMMER_SATASII 0x03 -#define PROGRAMMER_IT87SPI 0x04 -#define PROGRAMMER_FT2232SPI 0x05 -#define PROGRAMMER_SERPROG 0x06 +enum programmer { + PROGRAMMER_INTERNAL, + PROGRAMMER_DUMMY, + PROGRAMMER_NIC3COM, + PROGRAMMER_SATASII, + PROGRAMMER_IT87SPI, + PROGRAMMER_FT2232SPI, + PROGRAMMER_SERPROG, +}; +extern enum programmer programmer; + struct programmer_entry { const char *vendor; const char *name; @@ -325,8 +328,10 @@ uint16_t mmio_readw(void *addr); uint32_t mmio_readl(void *addr); void internal_delay(int usecs); +int fallback_shutdown(void); void *fallback_map(const char *descr, unsigned long phys_addr, size_t len); void fallback_unmap(void *virt_addr, size_t len); +void fallback_chip_writeb(uint8_t val, chipaddr addr); void fallback_chip_writew(uint16_t val, chipaddr addr); void fallback_chip_writel(uint32_t val, chipaddr addr); void fallback_chip_writen(uint8_t *buf, chipaddr addr, size_t len); @@ -375,7 +380,6 @@ int ft2232_spi_init(void); int ft2232_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); -int ft2232_spi_write1(struct flashchip *flash, uint8_t *buf); int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf); /* flashrom.c */ Index: flashrom-fallback/flashrom.c =================================================================== --- flashrom-fallback/flashrom.c (Revision 674) +++ flashrom-fallback/flashrom.c (Arbeitskopie) @@ -33,7 +33,7 @@ const char *flashrom_version = FLASHROM_VERSION; char *chip_to_probe = NULL; int verbose = 0; -int programmer = PROGRAMMER_INTERNAL; +enum programmer programmer = PROGRAMMER_INTERNAL; const struct programmer_entry programmer_table[] = { { @@ -102,14 +102,14 @@ { .init = it87spi_init, - .shutdown = dummy_shutdown, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, + .shutdown = fallback_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, .chip_readb = dummy_chip_readb, .chip_readw = fallback_chip_readw, .chip_readl = fallback_chip_readl, .chip_readn = fallback_chip_readn, - .chip_writeb = dummy_chip_writeb, + .chip_writeb = fallback_chip_writeb, .chip_writew = fallback_chip_writew, .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, @@ -118,19 +118,20 @@ { .init = ft2232_spi_init, - .shutdown = dummy_shutdown, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, + .shutdown = fallback_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, .chip_readb = dummy_chip_readb, .chip_readw = fallback_chip_readw, .chip_readl = fallback_chip_readl, .chip_readn = fallback_chip_readn, - .chip_writeb = dummy_chip_writeb, + .chip_writeb = fallback_chip_writeb, .chip_writew = fallback_chip_writew, .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, .delay = internal_delay, }, + { .init = serprog_init, .shutdown = serprog_shutdown, Index: flashrom-fallback/internal.c =================================================================== --- flashrom-fallback/internal.c (Revision 674) +++ flashrom-fallback/internal.c (Arbeitskopie) @@ -218,6 +218,12 @@ } } +/* Fallback shutdown() for programmers which don't need special handling */ +int fallback_shutdown(void) +{ + return 0; +} + /* Fallback map() for programmers which don't need special handling */ void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) { @@ -229,6 +235,11 @@ { } +/* No-op fallback for drivers not supporting addr/data pair accesses */ +void fallback_chip_writeb(uint8_t val, chipaddr addr) +{ +} + /* Little-endian fallback for drivers not supporting 16 bit accesses */ void fallback_chip_writew(uint16_t val, chipaddr addr) { -- http://www.hailfinger.org/

2 2

[PATCH] fix MSR code in flashrom
by Stefan Reinauer 12 Aug '09

12 Aug '09

See patch... With this flashrom won't try to open /dev/cpu/x/msr on non-linux OSes... Stefan -- coresystems GmbH • Brahmsstr. 16 • D-79104 Freiburg i. Br. Tel.: +49 761 7668825 • Fax: +49 761 7664613 Email: info(a)coresystems.de • http://www.coresystems.de/ Registergericht: Amtsgericht Freiburg • HRB 7656 Geschäftsführer: Stefan Reinauer • Ust-IdNr.: DE245674866

2 4

[commit] r678 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: hailfinger Date: 2009-08-12 13:39:29 +0200 (Wed, 12 Aug 2009) New Revision: 678 Modified: trunk/flash.h trunk/flashrom.c trunk/internal.c Log: FT2232 and IT87 programmers used functions of the dummy programmer instead of fallback functions. The dummy programmer is a "real" programmer with possible side effects and its functions should not be abused by other programmers. Make FT2232 and IT87 use official fallback functions instead. Create fallback_shutdown(). Create fallback_chip_writeb(). Convert the programmer #defines to an enum. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-12 09:27:45 UTC (rev 677) +++ trunk/flash.h 2009-08-12 11:39:29 UTC (rev 678) @@ -80,15 +80,18 @@ typedef unsigned long chipaddr; -extern int programmer; -#define PROGRAMMER_INTERNAL 0x00 -#define PROGRAMMER_DUMMY 0x01 -#define PROGRAMMER_NIC3COM 0x02 -#define PROGRAMMER_SATASII 0x03 -#define PROGRAMMER_IT87SPI 0x04 -#define PROGRAMMER_FT2232SPI 0x05 -#define PROGRAMMER_SERPROG 0x06 +enum programmer { + PROGRAMMER_INTERNAL, + PROGRAMMER_DUMMY, + PROGRAMMER_NIC3COM, + PROGRAMMER_SATASII, + PROGRAMMER_IT87SPI, + PROGRAMMER_FT2232SPI, + PROGRAMMER_SERPROG, +}; +extern enum programmer programmer; + struct programmer_entry { const char *vendor; const char *name; @@ -332,8 +335,10 @@ uint16_t mmio_readw(void *addr); uint32_t mmio_readl(void *addr); void internal_delay(int usecs); +int fallback_shutdown(void); void *fallback_map(const char *descr, unsigned long phys_addr, size_t len); void fallback_unmap(void *virt_addr, size_t len); +void fallback_chip_writeb(uint8_t val, chipaddr addr); void fallback_chip_writew(uint16_t val, chipaddr addr); void fallback_chip_writel(uint32_t val, chipaddr addr); void fallback_chip_writen(uint8_t *buf, chipaddr addr, size_t len); @@ -382,7 +387,6 @@ int ft2232_spi_init(void); int ft2232_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int ft2232_spi_read(struct flashchip *flash, uint8_t *buf, int start, int len); -int ft2232_spi_write1(struct flashchip *flash, uint8_t *buf); int ft2232_spi_write_256(struct flashchip *flash, uint8_t *buf); /* flashrom.c */ Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2009-08-12 09:27:45 UTC (rev 677) +++ trunk/flashrom.c 2009-08-12 11:39:29 UTC (rev 678) @@ -33,7 +33,7 @@ const char *flashrom_version = FLASHROM_VERSION; char *chip_to_probe = NULL; int verbose = 0; -int programmer = PROGRAMMER_INTERNAL; +enum programmer programmer = PROGRAMMER_INTERNAL; const struct programmer_entry programmer_table[] = { { @@ -102,14 +102,14 @@ { .init = it87spi_init, - .shutdown = dummy_shutdown, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, + .shutdown = fallback_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, .chip_readb = dummy_chip_readb, .chip_readw = fallback_chip_readw, .chip_readl = fallback_chip_readl, .chip_readn = fallback_chip_readn, - .chip_writeb = dummy_chip_writeb, + .chip_writeb = fallback_chip_writeb, .chip_writew = fallback_chip_writew, .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, @@ -118,19 +118,20 @@ { .init = ft2232_spi_init, - .shutdown = dummy_shutdown, - .map_flash_region = dummy_map, - .unmap_flash_region = dummy_unmap, + .shutdown = fallback_shutdown, + .map_flash_region = fallback_map, + .unmap_flash_region = fallback_unmap, .chip_readb = dummy_chip_readb, .chip_readw = fallback_chip_readw, .chip_readl = fallback_chip_readl, .chip_readn = fallback_chip_readn, - .chip_writeb = dummy_chip_writeb, + .chip_writeb = fallback_chip_writeb, .chip_writew = fallback_chip_writew, .chip_writel = fallback_chip_writel, .chip_writen = fallback_chip_writen, .delay = internal_delay, }, + { .init = serprog_init, .shutdown = serprog_shutdown, Modified: trunk/internal.c =================================================================== --- trunk/internal.c 2009-08-12 09:27:45 UTC (rev 677) +++ trunk/internal.c 2009-08-12 11:39:29 UTC (rev 678) @@ -218,6 +218,12 @@ } } +/* Fallback shutdown() for programmers which don't need special handling */ +int fallback_shutdown(void) +{ + return 0; +} + /* Fallback map() for programmers which don't need special handling */ void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) { @@ -229,6 +235,11 @@ { } +/* No-op fallback for drivers not supporting addr/data pair accesses */ +void fallback_chip_writeb(uint8_t val, chipaddr addr) +{ +} + /* Little-endian fallback for drivers not supporting 16 bit accesses */ void fallback_chip_writew(uint16_t val, chipaddr addr) {

1 0

[commit] r677 - trunk
by svn＠flashrom.org 12 Aug '09

12 Aug '09

Author: stepan Date: 2009-08-12 11:27:45 +0200 (Wed, 12 Aug 2009) New Revision: 677 Modified: trunk/chipset_enable.c trunk/flash.h trunk/physmap.c Log: Fix up MSR handling in flashrom to support more OSes than Linux. Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-08-11 12:15:39 UTC (rev 676) +++ trunk/chipset_enable.c 2009-08-12 09:27:45 UTC (rev 677) @@ -2,7 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2000 Silicon Integrated System Corporation - * Copyright (C) 2005-2009 coresystems GmbH <stepan(a)coresystems.de> + * Copyright (C) 2005-2009 coresystems GmbH * Copyright (C) 2006 Uwe Hermann <uwe(a)hermann-uwe.de> * * This program is free software; you can redistribute it and/or modify @@ -527,92 +527,36 @@ /** * Geode systems write protect the BIOS via RCONFs (cache settings similar - * to MTRRs). To unlock, change MSR 0x1808 top byte to 0x22. Reading and - * writing to MSRs, however requires instructions rdmsr/wrmsr, which are - * ring0 privileged instructions so only the kernel can do the read/write. - * This function, therefore, requires that the msr kernel module be loaded - * to access these instructions from user space using device /dev/cpu/0/msr. + * to MTRRs). To unlock, change MSR 0x1808 top byte to 0x22. * - * This hard-coded location could have potential problems on SMP machines - * since it assumes cpu0, but it is safe on the Geode which is not SMP. - * * Geode systems also write protect the NOR flash chip itself via MSR_NORF_CTL. * To enable write to NOR Boot flash for the benefit of systems that have such * a setup, raise MSR 0x51400018 WE_CS3 (write enable Boot Flash Chip Select). - * - * This is probably not portable beyond Linux. */ static int enable_flash_cs5536(struct pci_dev *dev, const char *name) { #define MSR_RCONF_DEFAULT 0x1808 #define MSR_NORF_CTL 0x51400018 - int fd_msr; - unsigned char buf[8]; + msr_t msr; - fd_msr = open("/dev/cpu/0/msr", O_RDWR); - if (fd_msr == -1) { - perror("open(/dev/cpu/0/msr)"); - printf("Cannot operate on MSR. Did you run 'modprobe msr'?\n"); + /* Geode only has a single core */ + if (setup_cpu_msr(0)) return -1; - } - if (lseek64(fd_msr, (off64_t) MSR_RCONF_DEFAULT, SEEK_SET) == -1) { - perror("lseek64"); - close(fd_msr); - return -1; + msr = rdmsr(MSR_RCONF_DEFAULT); + if ((msr.hi >> 24) != 0x22) { + msr.hi &= 0xfbffffff; + wrmsr(MSR_RCONF_DEFAULT, msr); } - if (read(fd_msr, buf, 8) != 8) { - perror("read msr"); - close(fd_msr); - return -1; - } - - if (buf[7] != 0x22) { - buf[7] &= 0xfb; - if (lseek64(fd_msr, (off64_t) MSR_RCONF_DEFAULT, - SEEK_SET) == -1) { - perror("lseek64"); - close(fd_msr); - return -1; - } - - if (write(fd_msr, buf, 8) < 0) { - perror("msr write"); - close(fd_msr); - return -1; - } - } - - if (lseek64(fd_msr, (off64_t) MSR_NORF_CTL, SEEK_SET) == -1) { - perror("lseek64"); - close(fd_msr); - return -1; - } - - if (read(fd_msr, buf, 8) != 8) { - perror("read msr"); - close(fd_msr); - return -1; - } - + msr = rdmsr(MSR_NORF_CTL); /* Raise WE_CS3 bit. */ - buf[0] |= 0x08; + msr.lo |= 0x08; + wrmsr(MSR_NORF_CTL, msr); - if (lseek64(fd_msr, (off64_t) MSR_NORF_CTL, SEEK_SET) == -1) { - perror("lseek64"); - close(fd_msr); - return -1; - } - if (write(fd_msr, buf, 8) < 0) { - perror("msr write"); - close(fd_msr); - return -1; - } + cleanup_cpu_msr(); - close(fd_msr); - #undef MSR_RCONF_DEFAULT #undef MSR_NORF_CTL return 0; Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-11 12:15:39 UTC (rev 676) +++ trunk/flash.h 2009-08-12 09:27:45 UTC (rev 677) @@ -3,7 +3,7 @@ * * Copyright (C) 2000 Silicon Integrated System Corporation * Copyright (C) 2000 Ronald G. Minnich <rminnich(a)gmail.com> - * Copyright (C) 2005-2007 coresystems GmbH <stepan(a)coresystems.de> + * Copyright (C) 2005-2009 coresystems GmbH * Copyright (C) 2006-2009 Carl-Daniel Hailfinger * * This program is free software; you can redistribute it and/or modify @@ -301,6 +301,13 @@ /* physmap.c */ void *physmap(const char *descr, unsigned long phys_addr, size_t len); void physunmap(void *virt_addr, size_t len); +int setup_cpu_msr(int cpu); +void cleanup_cpu_msr(void); +#ifndef __DARWIN__ +typedef struct { uint32_t hi, lo; } msr_t; +msr_t rdmsr(int addr); +int wrmsr(int addr, msr_t msr); +#endif /* internal.c */ struct pci_dev *pci_dev_find_filter(struct pci_filter filter); Modified: trunk/physmap.c =================================================================== --- trunk/physmap.c 2009-08-11 12:15:39 UTC (rev 676) +++ trunk/physmap.c 2009-08-12 09:27:45 UTC (rev 677) @@ -2,6 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2009 Peter Stuge <peter(a)stuge.se> + * Copyright (C) 2009 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 @@ -21,6 +22,7 @@ #include <sys/stat.h> #include <fcntl.h> #include <stdlib.h> +#include <string.h> #include <errno.h> #include "flash.h" @@ -117,3 +119,136 @@ return virt_addr; } + +#ifdef __linux__ +/* + * Reading and writing to MSRs, however requires instructions rdmsr/wrmsr, + * which are ring0 privileged instructions so only the kernel can do the + * read/write. This function, therefore, requires that the msr kernel module + * be loaded to access these instructions from user space using device + * /dev/cpu/0/msr. + */ + +static int fd_msr = -1; + +msr_t rdmsr(int addr) +{ + uint8_t buf[8]; + msr_t msr = { 0xffffffff, 0xffffffff }; + + if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) { + perror("Could not lseek() to MSR"); + close(fd_msr); + exit(1); + } + + if (read(fd_msr, buf, 8) == 8) { + msr.lo = *(uint32_t *)buf; + msr.hi = *(uint32_t *)(buf + 4); + + return msr; + } + + if (errno != EIO) { + // A severe error. + perror("Could not read() MSR"); + close(fd_msr); + exit(1); + } + + return msr; +} + +int wrmsr(int addr, msr_t msr) +{ + if (lseek(fd_msr, (off_t) addr, SEEK_SET) == -1) { + perror("Could not lseek() to MSR"); + close(fd_msr); + exit(1); + } + + if (write(fd_msr, &msr, 8) != 8 && errno != EIO) { + perror("Could not write() MSR"); + close(fd_msr); + exit(1); + } + + /* some MSRs must not be written */ + if (errno == EIO) + return -1; + + return 0; +} + +int setup_cpu_msr(int cpu) +{ + char msrfilename[64]; + memset(msrfilename, 0, 64); + sprintf(msrfilename, "/dev/cpu/%d/msr", cpu); + + if (fd_msr != -1) { + printf("MSR was already initialized\n"); + return -1; + } + + fd_msr = open(msrfilename, O_RDWR); + + if (fd_msr < 0) { + perror("Error while opening /dev/cpu/0/msr"); + printf("Did you run 'modprobe msr'?\n"); + return -1; + } + + return 0; +} + +void cleanup_cpu_msr(void) +{ + if (fd_msr == -1) { + printf("No MSR initialized.\n"); + return; + } + + close(fd_msr); + + /* Clear MSR file descriptor */ + fd_msr = -1; +} +#else +#ifdef __DARWIN__ +int setup_cpu_msr(int cpu) +{ + // Always succeed for now + return 0; +} + +void cleanup_cpu_msr(void) +{ + // Nothing, yet. +} +#else +msr_t rdmsr(int addr) +{ + msr_t ret = { 0xffffffff, 0xffffffff }; + + return ret; +} + +int wrmsr(int addr, msr_t msr) +{ + return -1; +} + +int setup_cpu_msr(int cpu) +{ + printf("No MSR support for your OS yet.\n"); + return -1; +} + +void cleanup_cpu_msr(void) +{ + // Nothing, yet. +} +#endif +#endif +

1 0

flashrom -V output on Asus P4P800-E Deluxe
by crnibojan 12 Aug '09

12 Aug '09

Hello! Here it is output from flashrom -V on Asus P4P800-E Deluxe flashrom v0.9.0-r676 No coreboot table found. Found chipset "Intel ICH5/ICH5R", enabling flash write... BIOS Lock Enable: disabled, BIOS Write Enable: enabled, BIOS_CNTL is 0x1 OK. This chipset supports the following protocols: Non-SPI. Calibrating delay loop... 787M loops per second, 100 myus = 162 us. OK. Probing for AMD Am29F010A/B, 128 KB: probe_29f040b: id1 0x2b, id2 0xeb Probing for AMD Am29F002(N)BB, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for AMD Am29F002(N)BT, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for AMD Am29F016D, 2048 KB: probe_29f040b: id1 0xff, id2 0xff Probing for AMD Am29F040B, 512 KB: probe_29f040b: id1 0xff, id2 0xff Probing for AMD Am29F080B, 1024 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV040B, 512 KB: probe_29f040b: id1 0xff, id2 0xff Probing for AMD Am29LV081B, 1024 KB: probe_29f040b: id1 0xff, id2 0xff Probing for ASD AE49F2008, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Atmel AT25DF021, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF041A, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF081, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF161, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF321, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF321A, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF641, 8192 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25F512B, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25FS010, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25FS040, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT26DF041, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT26DF081A, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT26DF161, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT26DF161A, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT26F004, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT29C512, 64 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for Atmel AT29C010A, 128 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for Atmel AT29C020, 256 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for Atmel AT29C040A, 512 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for Atmel AT45CS1282, 16896 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB011D, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB021D, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB041D, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB081D, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB161D, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB321C, 4224 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB321D, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB642D, 8192 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT49BV512, 64 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Atmel AT49F002(N), 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Atmel AT49F002(N)T, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for AMIC A25L40P, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for AMIC A29002B, 256 KB: probe_29f002: id1 0x9d, id2 0x6e Probing for AMIC A29002T, 256 KB: probe_29f002: id1 0x9d, id2 0x6e Probing for AMIC A29040B, 512 KB: probe_29f040b: id1 0xff, id2 0xff Probing for AMIC A49LF040A, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for EMST F49B002UA, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Eon EN25B05, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B10, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B20, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B40, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B80, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B32, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B64, 8192 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25D16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F05, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F10, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F20, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F40, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F80, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F32, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for EON EN29F002(A)(N)B, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for EON EN29F002(A)(N)T, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Fujitsu MBM29F004BC, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Fujitsu MBM29F004TC, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Fujitsu MBM29F400BC, 512 KB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Fujitsu MBM29F400TC, 512 KB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Intel 28F001BX-B, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Intel 28F001BX-T, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Intel 82802AB, 512 KB: probe_82802ab: id1 0xff, id2 0xff Probing for Intel 82802AC, 1024 KB: probe_82802ab: id1 0xff, id2 0xff Probing for Macronix MX25L512, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L1005, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L2005, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L4005, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L8005, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L1605, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L1635D, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L3205, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L3235D, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L6405, 8192 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L12805, 16384 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX29F002B, 256 KB: probe_29f002: id1 0x9d, id2 0x6e Probing for Macronix MX29F002T, 256 KB: probe_29f002: id1 0x9d, id2 0x6e Probing for Macronix MX29LV040, 512 KB: probe_29f002: id1 0x9d, id2 0x6e Probing for Numonyx M25PE10, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Numonyx M25PE20, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Numonyx M25PE40, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Numonyx M25PE80, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Numonyx M25PE16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV010, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV016B, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV020, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV040, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV080B, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV512, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm29F0002T, 256 KB: probe_29f040b: id1 0x6d, id2 0x48 Probing for PMC Pm29F0002B, 256 KB: probe_29f040b: id1 0x6d, id2 0x48 Probing for PMC Pm39LV010, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for PMC Pm49FL002, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for PMC Pm49FL004, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Found chip "PMC Pm49FL004" (512 KB, LPC,FWH) at physical address 0xfff80000. Probing for Sharp LHF00L04, 1024 KB: probe_lhf00l04: id1 0xff, id2 0xff Probing for Spansion S25FL016A, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF016B, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF032B, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF040B, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF040.REMS, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF040B.REMS, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF080B, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST28SF040A, 512 KB: probe_28sf040: id1 0xff, id2 0xff Probing for SST SST29EE010, 128 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST29LE010, 128 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST29EE020A, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST29LE020, 256 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST39SF010A, 128 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST39SF020A, 256 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST39SF040, 512 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST39VF512, 64 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST39VF010, 128 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST39VF020, 256 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST39VF040, 512 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST39VF080, 1024 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF002A/B, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST49LF003A/B, 384 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST49LF004A/B, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST49LF004C, 512 KB: probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST SST49LF008A, 1024 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008C, 1024 KB: probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST SST49LF016C, 2048 KB: probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST SST49LF020, 256 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST49LF020A, 256 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST49LF040, 512 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST49LF040B, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for SST SST49LF080A, 1024 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF160C, 2048 KB: probe_49lfxxxc: id1 0xff, id2 0xff Probing for ST M25P05-A, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P05.RES, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P10-A, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P10.RES, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P20, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P40, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P40-old, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P80, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P32, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P64, 8192 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P128, 16384 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M29F002B, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for ST M29F002T/NT, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for ST M29F040B, 512 KB: probe_29f040b: id1 0xff, id2 0xff Probing for ST M29F400BT, 512 KB: probe_m29f400bt: id1 0xff, id2 0xff Probing for ST M29W010B, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for ST M29W040B, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for ST M50FLW040A, 512 KB: probe_stm50flw0x0x: id1 0x9d, id2 0x6e Probing for ST M50FLW040B, 512 KB: probe_stm50flw0x0x: id1 0x9d, id2 0x6e Probing for ST M50FLW080A, 1024 KB: probe_stm50flw0x0x: id1 0xff, id2 0xff Probing for ST M50FLW080B, 1024 KB: probe_stm50flw0x0x: id1 0xff, id2 0xff Probing for ST M50FW002, 256 KB: probe_49lfxxxc: id1 0x6d, id2 0x48 Probing for ST M50FW016, 2048 KB: probe_82802ab: id1 0xff, id2 0xff Probing for ST M50FW040, 512 KB: probe_82802ab: id1 0xff, id2 0xff Probing for ST M50FW080, 1024 KB: probe_82802ab: id1 0xff, id2 0xff Probing for ST M50LPW116, 2048 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS S29C31004T, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for SyncMOS S29C51001T, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for SyncMOS S29C51002T, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for SyncMOS S29C51004T, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for TI TMS29F002RB, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for TI TMS29F002RT, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Winbond W25x10, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Winbond W25x20, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Winbond W25x40, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Winbond W25x80, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Winbond W25x16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Winbond W29C011, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Winbond W29C020C, 256 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for Winbond W29C040P, 512 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for Winbond W29EE011, 128 KB: Probing disabled for Winbond W29EE011 because the probing sequence puts the AMIC A49LF040A in a funky state. Use 'flashrom -c W29EE011' if you have a board with this chip. Probing for Winbond W39V040A, 512 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for Winbond W39V040B, 512 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for Winbond W39V040C, 512 KB: probe_w39v040c: id1 0x9d, id2 0x6e Probing for Winbond W39V040FA, 512 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for Winbond W39V080A, 1024 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49F002U, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Winbond W49V002A, 256 KB: probe_jedec: id1 0x9d, id2 0x6e Probing for Winbond W49V002FA, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x9d, id2 0x6e Probing for Winbond W39V080FA, 1024 KB: probe_winbond_fwhub: id1 0xff, id2 0xff Probing for Winbond W39V080FA (dual mode), 512 KB: probe_winbond_fwhub: id1 0x9d, id2 0x6e Probing for Atmel unknown Atmel SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for EON unknown EON SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix unknown Macronix SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC unknown PMC SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST unknown SST SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST unknown ST SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. No operations were specified. Best regards, Bojan Radakovic

1 3

MSI MS-7350 with Nvidia mcp51 but no flash chip
by Philipp Matthias Hahn 11 Aug '09

11 Aug '09

Hi, attached below if the output of "flashrom --verbose" from my MSI MS-7350 with th Nvidia mcp51 chip but not flash chip detected. Any advise on how to procees is appreciated. Thanks in advance for your nice work. flashrom v0.9.0-r674 No coreboot table found. Found chipset "NVIDIA MCP51", enabling flash write... OK. This chipset supports the following protocols: Non-SPI. Calibrating delay loop... 760M loops per second, 100 myus = 200 us. OK. Probing for AMD Am29F010A/B, 128 KB: probe_29f040b: id1 0x00, id2 0x00 Probing for AMD Am29F002(N)BB, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BT, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F016D, 2048 KB: probe_29f040b: id1 0xff, id2 0xff Probing for AMD Am29F040B, 512 KB: probe_29f040b: id1 0xff, id2 0xff Probing for AMD Am29F080B, 1024 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV040B, 512 KB: probe_29f040b: id1 0xff, id2 0xff Probing for AMD Am29LV081B, 1024 KB: probe_29f040b: id1 0xff, id2 0xff Probing for ASD AE49F2008, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT25DF021, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF041A, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF081, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF161, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF321, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF321A, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25DF641, 8192 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25F512B, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25FS010, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT25FS040, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT26DF041, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT26DF081A, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT26DF161, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT26DF161A, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT26F004, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT29C512, 64 KB: probe_jedec: id1 0x05, id2 0xe0, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C010A, 128 KB: probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C020, 256 KB: probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C040A, 512 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT45CS1282, 16896 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB011D, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB021D, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB041D, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB081D, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB161D, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB321C, 4224 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB321D, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT45DB642D, 8192 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Atmel AT49BV512, 64 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x05, id2 0xe0, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49F002(N), 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49F002(N)T, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for AMIC A25L40P, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for AMIC A29002B, 256 KB: probe_29f002: id1 0x02, id2 0x1e Probing for AMIC A29002T, 256 KB: probe_29f002: id1 0x02, id2 0x1e Probing for AMIC A29040B, 512 KB: probe_29f040b: id1 0xff, id2 0xff Probing for AMIC A49LF040A, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for EMST F49B002UA, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for Eon EN25B05, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B10, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B20, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B40, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B80, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B32, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25B64, 8192 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25D16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F05, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F10, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F20, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F40, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F80, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Eon EN25F32, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for EON EN29F002(A)(N)B, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for EON EN29F002(A)(N)T, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F004BC, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F004TC, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F400BC, 512 KB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Fujitsu MBM29F400TC, 512 KB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Intel 28F001BX-B, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F001BX-T, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AB, 512 KB: probe_82802ab: id1 0xff, id2 0xff Probing for Intel 82802AC, 1024 KB: probe_82802ab: id1 0xff, id2 0xff Probing for Macronix MX25L512, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L1005, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L2005, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L4005, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L8005, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L1605, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L1635D, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L3205, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L3235D, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L6405, 8192 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX25L12805, 16384 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix MX29F002B, 256 KB: probe_29f002: id1 0x02, id2 0x1e Probing for Macronix MX29F002T, 256 KB: probe_29f002: id1 0x02, id2 0x1e Probing for Macronix MX29LV040, 512 KB: probe_29f002: id1 0xff, id2 0xff Probing for Numonyx M25PE10, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Numonyx M25PE20, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Numonyx M25PE40, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Numonyx M25PE80, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Numonyx M25PE16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV010, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV016B, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV020, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV040, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV080B, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm25LV512, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC Pm29F0002T, 256 KB: probe_29f040b: id1 0x02, id2 0x1e Probing for PMC Pm29F0002B, 256 KB: probe_29f040b: id1 0x02, id2 0x1e Probing for PMC Pm39LV010, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL002, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL004, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Sharp LHF00L04, 1024 KB: probe_lhf00l04: id1 0xff, id2 0xff Probing for Spansion S25FL016A, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF016B, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF032B, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF040B, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF040.REMS, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF040B.REMS, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST25VF080B, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST SST28SF040A, 512 KB: probe_28sf040: id1 0xff, id2 0xff Probing for SST SST29EE010, 128 KB: probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29LE010, 128 KB: probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29EE020A, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for SST SST29LE020, 256 KB: probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF010A, 128 KB: probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF020A, 256 KB: probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for SST SST39SF040, 512 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF512, 64 KB: probe_jedec: id1 0x05, id2 0xe0, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF010, 128 KB: probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF020, 256 KB: probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF040, 512 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF080, 1024 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF002A/B, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF003A/B, 384 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x91, id2 0xe3, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004A/B, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004C, 512 KB: probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST SST49LF008A, 1024 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008C, 1024 KB: probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST SST49LF016C, 2048 KB: probe_49lfxxxc: id1 0xff, id2 0xff Probing for SST SST49LF020, 256 KB: probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF020A, 256 KB: probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF040, 512 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF040B, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF080A, 1024 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF160C, 2048 KB: probe_49lfxxxc: id1 0xff, id2 0xff Probing for ST M25P05-A, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P05.RES, 64 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P10-A, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P10.RES, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P20, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P40, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P40-old, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P80, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P32, 4096 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P64, 8192 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M25P128, 16384 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST M29F002B, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for ST M29F002T/NT, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for ST M29F040B, 512 KB: probe_29f040b: id1 0xff, id2 0xff Probing for ST M29F400BT, 512 KB: probe_m29f400bt: id1 0xff, id2 0xff Probing for ST M29W010B, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29W040B, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040A, 512 KB: probe_stm50flw0x0x: id1 0xff, id2 0xff Probing for ST M50FLW040B, 512 KB: probe_stm50flw0x0x: id1 0xff, id2 0xff Probing for ST M50FLW080A, 1024 KB: probe_stm50flw0x0x: id1 0xff, id2 0xff Probing for ST M50FLW080B, 1024 KB: probe_stm50flw0x0x: id1 0xff, id2 0xff Probing for ST M50FW002, 256 KB: probe_49lfxxxc: id1 0x02, id2 0x1e Probing for ST M50FW016, 2048 KB: probe_82802ab: id1 0xff, id2 0xff Probing for ST M50FW040, 512 KB: probe_82802ab: id1 0xff, id2 0xff Probing for ST M50FW080, 1024 KB: probe_82802ab: id1 0xff, id2 0xff Probing for ST M50LPW116, 2048 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS S29C31004T, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS S29C51001T, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS S29C51002T, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS S29C51004T, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for TI TMS29F002RB, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for TI TMS29F002RT, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for Winbond W25x10, 128 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Winbond W25x20, 256 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Winbond W25x40, 512 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Winbond W25x80, 1024 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Winbond W25x16, 2048 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Winbond W29C011, 128 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x00, id2 0x00, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C020C, 256 KB: probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C040P, 512 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29EE011, 128 KB: Probing disabled for Winbond W29EE011 because the probing sequence puts the AMIC A49LF040A in a funky state. Use 'flashrom -c W29EE011' if you have a board with this chip. Probing for Winbond W39V040A, 512 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040B, 512 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040C, 512 KB: probe_w39v040c: id1 0xff, id2 0xff, id1 parity violation Probing for Winbond W39V040FA, 512 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080A, 1024 KB: probe_jedec: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49F002U, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49V002A, 256 KB: probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49V002FA, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0x02, id2 0x1e, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080FA, 1024 KB: probe_winbond_fwhub: id1 0xff, id2 0xff Probing for Winbond W39V080FA (dual mode), 512 KB: probe_winbond_fwhub: id1 0xff, id2 0xff Probing for Atmel unknown Atmel SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for EON unknown EON SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for Macronix unknown Macronix SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for PMC unknown PMC SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for SST unknown SST SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. Probing for ST unknown ST SPI chip, 0 KB: skipped. Host bus type Non-SPI and chip bus type SPI are incompatible. No EEPROM/flash device found. If you know which flash chip you have, and if this version of flashrom supports a similar flash chip, you can try to force read your chip. Run: flashrom -f -r -c similar_supported_flash_chip filename Note: flashrom can never write when the flash chip isn't found automatically. BYtE Philipp -- / / (_)__ __ ____ __ Philipp Hahn / /__/ / _ \/ // /\ \/ / /____/_/_//_/\_,_/ /_/\_\ pmhahn(a)titan.lahn.de

1 0

[commit] r676 - trunk
by svn＠flashrom.org 11 Aug '09

11 Aug '09

Author: stepan Date: 2009-08-11 14:15:39 +0200 (Tue, 11 Aug 2009) New Revision: 676 Modified: trunk/chipset_enable.c Log: Make debug messages printf_debug(). Signed-off-by: Stefan Reinauer <stepan(a)coresystems.de> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-08-10 23:30:45 UTC (rev 675) +++ trunk/chipset_enable.c 2009-08-11 12:15:39 UTC (rev 676) @@ -2,7 +2,7 @@ * This file is part of the flashrom project. * * Copyright (C) 2000 Silicon Integrated System Corporation - * Copyright (C) 2005-2007 coresystems GmbH <stepan(a)coresystems.de> + * Copyright (C) 2005-2009 coresystems GmbH <stepan(a)coresystems.de> * Copyright (C) 2006 Uwe Hermann <uwe(a)hermann-uwe.de> * * This program is free software; you can redistribute it and/or modify @@ -98,7 +98,7 @@ } OUTB(0x24, 0x2e); - printf("2f is %#x\n", INB(0x2f)); + printf_debug("2f is %#x\n", INB(0x2f)); b = INB(0x2f) | 0xfc; OUTB(0x24, 0x2e); OUTB(b, 0x2f); @@ -146,7 +146,7 @@ pci_write_word(dev, xbcs, new); if (pci_read_word(dev, xbcs) != new) { - printf("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", xbcs, new, name); + printf_debug("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", xbcs, new, name); return -1; } @@ -182,7 +182,7 @@ pci_write_byte(dev, bios_cntl, new); if (pci_read_byte(dev, bios_cntl) != new) { - printf("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", bios_cntl, new, name); + printf_debug("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", bios_cntl, new, name); return -1; } @@ -487,7 +487,7 @@ pci_write_byte(dev, 0x40, val); if (pci_read_byte(dev, 0x40) != val) { - printf("\nWARNING: Failed to enable ROM Write on \"%s\"\n", + printf("\nWARNING: Failed to enable flash write on \"%s\"\n", name); return -1; } @@ -627,7 +627,7 @@ new = pci_read_byte(dev, 0x52); if (new != 0xee) { - printf("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x52, new, name); + printf_debug("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x52, new, name); return -1; } @@ -647,8 +647,8 @@ newer = pci_read_byte(dev, 0x45); if (newer != new) { - printf("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x45, new, name); - printf("Stuck at 0x%x\n", newer); + printf_debug("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x45, new, name); + printf_debug("Stuck at 0x%x\n", newer); return -1; } @@ -659,8 +659,8 @@ pci_write_byte(dev, 0x40, new); newer = pci_read_byte(dev, 0x40); if (newer != new) { - printf("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x40, new, name); - printf("Stuck at 0x%x\n", newer); + printf_debug("tried to set register 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x40, new, name); + printf_debug("Stuck at 0x%x\n", newer); return -1; } return 0; @@ -677,7 +677,7 @@ if (new != old) { pci_write_byte(dev, 0x43, new); if (pci_read_byte(dev, 0x43) != new) { - printf("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x43, new, name); + printf_debug("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x43, new, name); } } @@ -689,7 +689,7 @@ pci_write_byte(dev, 0x40, new); if (pci_read_byte(dev, 0x40) != new) { - printf("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x40, new, name); + printf_debug("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x40, new, name); return -1; } @@ -860,7 +860,7 @@ if (new != old) { pci_write_byte(dev, 0x88, new); if (pci_read_byte(dev, 0x88) != new) { - printf("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x88, new, name); + printf_debug("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x88, new, name); } } @@ -871,7 +871,7 @@ pci_write_byte(dev, 0x6d, new); if (pci_read_byte(dev, 0x6d) != new) { - printf("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x6d, new, name); + printf_debug("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x6d, new, name); return -1; } @@ -937,7 +937,7 @@ pci_write_byte(dev, 0x6d, new); if (pci_read_byte(dev, 0x6d) != new) { - printf("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x6d, new, name); + printf_debug("tried to set 0x%x to 0x%x on %s failed (WARNING ONLY)\n", 0x6d, new, name); return -1; }

1 0

Re: [flashrom] ICH6-ICH10 flash decode debug, IDSEL=0 hardcode
by Carl-Daniel Hailfinger 10 Aug '09

10 Aug '09

On 07.08.2009 00:38, Chris Kinney wrote: > here is the real output, didnt recompile, mistake on my part! looks > better now. Great, it found the chip. Flashing should work fine, no forcing needed at all. > [root@k2 flashrom]# ./flashrom -V > flashrom v0.9.0-r670 > Found candidate at: 00000500-00000510 > Found coreboot table at 0x00000500. > Found candidate at: 00000c00-00001350 > Found coreboot table at 0x00000c00. > coreboot table found at 0xcf7f3c00. > coreboot header(24) checksum: 67a9 table(1872) checksum: ff43 entries: 21 > Vendor ID: KONTRON, part ID: 986LCD-M > Found chipset "Intel ICH7/ICH7R", enabling flash write... > 0xfff80000/0xffb80000 FWH IDSEL: 0x0, > 0xfff00000/0xffb00000 FWH IDSEL: 0x0, > 0xffe80000/0xffa80000 FWH IDSEL: 0x1, > 0xffe00000/0xffa00000 FWH IDSEL: 0x1, > 0xffd80000/0xff980000 FWH IDSEL: 0x2, > 0xffd00000/0xff900000 FWH IDSEL: 0x2, > 0xffc80000/0xff880000 FWH IDSEL: 0x3, > 0xffc00000/0xff800000 FWH IDSEL: 0x3, > 0xff700000/0xff300000 FWH IDSEL: 0x4, > 0xff600000/0xff200000 FWH IDSEL: 0x5, > 0xff500000/0xff100000 FWH IDSEL: 0x6, > 0xff400000/0xff000000 FWH IDSEL: 0x7, 0xfff80000/0xffb80000 FWH decode > enabled, 0xfff00000/0xffb00000 FWH decode enabled, > 0xffe80000/0xffa80000 FWH decode enabled, 0xffe00000/0xffa00000 FWH > decode enabled, 0xffd80000/0xff980000 FWH decode enabled, > 0xffd00000/0xff900000 FWH decode enabled, 0xffc80000/0xff880000 FWH > decode enabled, 0xffc00000/0xff800000 FWH decode enabled, > 0xff700000/0xff300000 FWH decode enabled, 0xff600000/0xff200000 FWH > decode enabled, 0xff500000/0xff100000 FWH decode enabled, > 0xff400000/0xff000000 FWH decode enabled, > Setting IDSEL=0 for top 8 MB > BIOS Lock Enable: disabled, BIOS Write Enable: enabled, BIOS_CNTL is 0x1 > > Root Complex Register Block address = 0xfed1c000 > GCS = 0x7a0c60: BIOS Interface Lock-Down: disabled, BOOT BIOS Straps: > 0x3 (LPC) > Top Swap : not enabled > OK. > This chipset supports the following protocols: LPC,FWH. > Disabling flash write protection for board "Kontron 986LCD-M"... > GPIOBAR=0x0480 GP_LVL: 0x0001003d > OK. > Calibrating delay loop... 282M loops per second, 100 myus = 202 us. OK. > Probing for AMD Am29F010A/B, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMD Am29F002(N)BB, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMD Am29F002(N)BT, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMD Am29F016D, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMD Am29F040B, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMD Am29F080B, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMD Am29LV040B, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMD Am29LV081B, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for ASD AE49F2008, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Atmel AT25DF021, 256 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT25DF041A, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT25DF081, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT25DF161, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT25DF321, 4096 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT25DF321A, 4096 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT25DF641, 8192 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT25F512B, 64 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT25FS010, 128 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT25FS040, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT26DF041, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT26DF081A, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT26DF161, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT26DF161A, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT26F004, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT29C512, 64 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Atmel AT29C010A, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Atmel AT29C020, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Atmel AT29C040A, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Atmel AT45CS1282, 16896 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT45DB011D, 128 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT45DB021D, 256 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT45DB041D, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT45DB081D, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT45DB161D, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT45DB321C, 4224 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT45DB321D, 4096 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT45DB642D, 8192 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Atmel AT49BV512, 64 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Atmel AT49F002(N), 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Atmel AT49F002(N)T, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMIC A25L40P, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for AMIC A29002B, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMIC A29002T, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMIC A29040B, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for AMIC A49LF040A, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for EMST F49B002UA, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Eon EN25B05, 64 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25B10, 128 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25B20, 256 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25B40, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25B80, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25B16, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25B32, 4096 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25B64, 8192 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25D16, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25F05, 64 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25F10, 128 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25F20, 256 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25F40, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25F80, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25F16, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Eon EN25F32, 4096 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for EON EN29F002(A)(N)B, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for EON EN29F002(A)(N)T, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Fujitsu MBM29F004BC, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Fujitsu MBM29F004TC, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Fujitsu MBM29F400BC, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Fujitsu MBM29F400TC, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Intel 28F001BX-B, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Intel 28F001BX-T, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Intel 82802AB, 512 KB: probe_82802ab: id1 0xbf, id2 0x5c Probing for Intel 82802AC, 1024 KB: probe_82802ab: id1 0xbf, id2 0x5c > Probing for Macronix MX25L512, 64 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX25L1005, 128 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX25L2005, 256 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX25L4005, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX25L8005, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX25L1605, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX25L1635D, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX25L3205, 4096 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX25L3235D, 4096 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX25L6405, 8192 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX25L12805, 16384 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix MX29F002B, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Macronix MX29F002T, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Macronix MX29LV040, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Numonyx M25PE10, 128 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Numonyx M25PE20, 256 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Numonyx M25PE40, 256 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Numonyx M25PE80, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Numonyx M25PE16, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for PMC Pm25LV010, 128 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for PMC Pm25LV016B, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for PMC Pm25LV020, 256 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for PMC Pm25LV040, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for PMC Pm25LV080B, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for PMC Pm25LV512, 64 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for PMC Pm29F0002T, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for PMC Pm29F0002B, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for PMC Pm39LV010, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for PMC Pm49FL002, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for PMC Pm49FL004, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for Sharp LHF00L04, 1024 KB: probe_lhf00l04: id1 0xbf, id2 0x5c > Probing for Spansion S25FL016A, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for SST SST25VF016B, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for SST SST25VF032B, 4096 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for SST SST25VF040B, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for SST SST25VF040.REMS, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for SST SST25VF040B.REMS, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for SST SST25VF080B, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for SST SST28SF040A, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST29EE010, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST29LE010, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST29EE020A, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST29LE020, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST39SF010A, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST39SF020A, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST39SF040, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST39VF512, 64 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST39VF010, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST39VF020, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST39VF040, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST39VF080, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SST SST49LF002A/B, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for SST SST49LF003A/B, 384 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for SST SST49LF004A/B, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for SST SST49LF004C, 512 KB: probe_49lfxxxc: id1 0xbf, id2 0x5c > Probing for SST SST49LF008A, 1024 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for SST SST49LF008C, 1024 KB: probe_49lfxxxc: id1 0xbf, id2 0x5c > Probing for SST SST49LF016C, 2048 KB: probe_49lfxxxc: id1 0xbf, id2 0x5c > Found chip "SST SST49LF016C" (2048 KB, FWH) at physical address 0xffe00000. > Probing for SST SST49LF020, 256 KB: probe_jedec: id1 0xbf, id2 0x5c > Probing for SST SST49LF020A, 256 KB: probe_jedec: id1 0xbf, id2 0x5c > Probing for SST SST49LF040, 512 KB: probe_jedec: id1 0xbf, id2 0x5c > Probing for SST SST49LF040B, 512 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for SST SST49LF080A, 1024 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for SST SST49LF160C, 2048 KB: probe_49lfxxxc: id1 0xbf, id2 0x5c > Probing for ST M25P05-A, 64 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P05.RES, 64 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P10-A, 128 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P10.RES, 128 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P20, 256 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P40, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P40-old, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P80, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P16, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P32, 4096 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P64, 8192 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M25P128, 16384 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST M29F002B, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for ST M29F002T/NT, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for ST M29F040B, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for ST M29F400BT, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for ST M29W010B, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for ST M29W040B, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for ST M50FLW040A, 512 KB: probe_stm50flw0x0x: id1 0xbf, id2 0x5c > Probing for ST M50FLW040B, 512 KB: probe_stm50flw0x0x: id1 0xbf, id2 0x5c > Probing for ST M50FLW080A, 1024 KB: probe_stm50flw0x0x: id1 0xbf, id2 0x5c > Probing for ST M50FLW080B, 1024 KB: probe_stm50flw0x0x: id1 0xbf, id2 0x5c > Probing for ST M50FW002, 256 KB: probe_49lfxxxc: id1 0xbf, id2 0x5c > Probing for ST M50FW016, 2048 KB: probe_82802ab: id1 0xbf, id2 0x5c > Probing for ST M50FW040, 512 KB: probe_82802ab: id1 0xbf, id2 0x5c > Probing for ST M50FW080, 1024 KB: probe_82802ab: id1 0xbf, id2 0x5c > Probing for ST M50LPW116, 2048 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for SyncMOS S29C31004T, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SyncMOS S29C51001T, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SyncMOS S29C51002T, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for SyncMOS S29C51004T, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for TI TMS29F002RB, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for TI TMS29F002RT, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Winbond W25x10, 128 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Winbond W25x20, 256 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Winbond W25x40, 512 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Winbond W25x80, 1024 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Winbond W25x16, 2048 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Winbond W29C011, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Winbond W29C020C, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Winbond W29C040P, 512 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Winbond W29EE011, 128 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Winbond W39V040A, 512 KB: probe_jedec: id1 0xbf, id2 0x5c > Probing for Winbond W39V040B, 512 KB: probe_jedec: id1 0xbf, id2 0x5c > Probing for Winbond W39V040C, 512 KB: probe_w39v040c: id1 0xbf, id2 0x5c > Probing for Winbond W39V040FA, 512 KB: probe_jedec: id1 0xbf, id2 0x5c > Probing for Winbond W39V080A, 1024 KB: probe_jedec: id1 0xbf, id2 0x5c > Probing for Winbond W49F002U, 256 KB: skipped. Host bus type LPC,FWH and chip bus type Parallel are incompatible. > Probing for Winbond W49V002A, 256 KB: probe_jedec: id1 0xbf, id2 0x5c > Probing for Winbond W49V002FA, 256 KB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec: id1 0xbf, id2 0x5c > Probing for Winbond W39V080FA, 1024 KB: probe_winbond_fwhub: id1 0xbf, id2 0x5c > Probing for Winbond W39V080FA (dual mode), 512 KB: probe_winbond_fwhub: id1 0xbf, id2 0x5c > Probing for Atmel unknown Atmel SPI chip, 0 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for EON unknown EON SPI chip, 0 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for Macronix unknown Macronix SPI chip, 0 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for PMC unknown PMC SPI chip, 0 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for SST unknown SST SPI chip, 0 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > Probing for ST unknown ST SPI chip, 0 KB: skipped. Host bus type LPC,FWH and chip bus type SPI are incompatible. > > No operations were specified. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 3

[commit] r675 - trunk
by svn＠flashrom.org 10 Aug '09

10 Aug '09

Author: hailfinger Date: 2009-08-11 01:30:45 +0200 (Tue, 11 Aug 2009) New Revision: 675 Modified: trunk/chipset_enable.c Log: Add ICH6,ICH7,ICH8,ICH9,ICH10 FWH IDSEL settings and flash decode settings to the debug output. This can help debug cases where the BIOS does not set up a correct flash decode for the given flash size. The Intel docs state that the decode applies to FWH and SPI flash. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Chris Kinney <cmkinne(a)sandia.gov> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-08-10 10:14:23 UTC (rev 674) +++ trunk/chipset_enable.c 2009-08-10 23:30:45 UTC (rev 675) @@ -191,11 +191,47 @@ static int enable_flash_ich_4e(struct pci_dev *dev, const char *name) { + /* + * Note: ICH5 has registers similar to FWH_SEL1, FWH_SEL2 and + * FWH_DEC_EN1, but they are called FB_SEL1, FB_SEL2, FB_DEC_EN1 and + * FB_DEC_EN2. + */ return enable_flash_ich(dev, name, 0x4e); } static int enable_flash_ich_dc(struct pci_dev *dev, const char *name) { + uint32_t fwh_conf; + int i; + + /* Ignore all legacy ranges below 1 MB. */ + /* FWH_SEL1 */ + fwh_conf = pci_read_long(dev, 0xd0); + for (i = 7; i >= 0; i--) + printf_debug("\n0x%08x/0x%08x FWH IDSEL: 0x%x", + (0x1ff8 + i) * 0x80000, + (0x1ff0 + i) * 0x80000, + (fwh_conf >> (i * 4)) & 0xf); + /* FWH_SEL2 */ + fwh_conf = pci_read_word(dev, 0xd4); + for (i = 3; i >= 0; i--) + printf_debug("\n0x%08x/0x%08x FWH IDSEL: 0x%x", + (0xff4 + i) * 0x100000, + (0xff0 + i) * 0x100000, + (fwh_conf >> (i * 4)) & 0xf); + /* FWH_DEC_EN1 */ + fwh_conf = pci_read_word(dev, 0xd8); + for (i = 7; i >= 0; i--) + printf_debug("\n0x%08x/0x%08x FWH decode %sabled", + (0x1ff8 + i) * 0x80000, + (0x1ff0 + i) * 0x80000, + (fwh_conf >> (i + 0x8)) & 0x1 ? "en" : "dis"); + for (i = 3; i >= 0; i--) + printf_debug("\n0x%08x/0x%08x FWH decode %sabled", + (0xff4 + i) * 0x100000, + (0xff0 + i) * 0x100000, + (fwh_conf >> i) & 0x1 ? "en" : "dis"); + return enable_flash_ich(dev, name, 0xdc); }

1 0

[PATCH] Add IDs for 44 new flash chips
by Carl-Daniel Hailfinger 10 Aug '09

10 Aug '09

Add IDs for 25 AMD chips, 8 Sharp chips, 11 Hynix chips and their variants. AM29DL400BB AM29DL400BT AM29DL800BB AM29DL800BT AM29F004BB AM29F004BT AM29F200BB AM29F200BT AM29F400BB AM29F400BT AM29F800BB AM29F800BT AM29LV002BB AM29LV002BT AM29LV004BB AM29LV004BT AM29LV008BB AM29LV008BT AM29LV080B AM29LV200BB AM29LV200BT AM29LV400BB AM29LV400BT AM29LV800BB AM29LV800BT HY29F002 HY29F040A HY29F080 HY29F400B HY29F400T HY29F800B HY29F800T HY29LV400B HY29LV400T HY29LV800B HY29LV800T LH28F008BJxxPB LH28F008BJxxPT LH28F008SA LH28F008SC LH28F800BVxxBTL LH28F800BVxxBV LH28F800BVxxTV LHF00L02 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-newids/flashchips.h =================================================================== --- flashrom-newids/flashchips.h (Revision 667) +++ flashrom-newids/flashchips.h (Arbeitskopie) @@ -39,20 +39,44 @@ #define ALLIANCE_ID 0x52 /* Alliance Semiconductor */ #define AMD_ID 0x01 /* AMD */ +#define AM_29DL400BT 0x0C +#define AM_29DL400BB 0x0F +#define AM_29DL800BT 0x4A +#define AM_29DL800BB 0xCB +#define AM_29F002BB 0x34 /* Same as Am29F002NBB */ +#define AM_29F002BT 0xB0 /* Same as Am29F002NBT */ +#define AM_29F004BB 0x7B +#define AM_29F004BT 0x77 +#define AM_29F016D 0xAD #define AM_29F010B 0x20 /* Same as Am29F010A */ -#define AM_29F002BT 0xB0 -#define AM_29F002BB 0x34 #define AM_29F040B 0xA4 #define AM_29F080B 0xD5 +#define AM_29F200BB 0x57 +#define AM_29F200BT 0x51 +#define AM_29F400BB 0xAB +#define AM_29F400BT 0x23 +#define AM_29F800BB 0x58 +#define AM_29F800BT 0xD6 +#define AM_29LV002BB 0xC2 +#define AM_29LV002BT 0x40 +#define AM_29LV004BB 0xB6 +#define AM_29LV004BT 0xB5 +#define AM_29LV008BB 0x37 +#define AM_29LV008BT 0x3E #define AM_29LV040B 0x4F -#define AM_29LV081B 0x38 -#define AM_29F016D 0xAD +#define AM_29LV080B 0x38 /* Same as Am29LV081B */ +#define AM_29LV200BB 0xBF +#define AM_29LV200BT 0x3B +#define AM_29LV800BB 0x5B /* Same as Am29LV800DB */ +#define AM_29LV400BT 0xB9 +#define AM_29LV400BB 0xBA +#define AM_29LV800BT 0xDA /* Same as Am29LV800DT */ #define AMIC_ID 0x7F37 /* AMIC */ #define AMIC_ID_NOPREFIX 0x37 /* AMIC */ #define AMIC_A25L40P 0x2013 #define AMIC_A29002B 0x0d -#define AMIC_A29002T 0x8c +#define AMIC_A29002T 0x8C /* Same as A290021T */ #define AMIC_A29040B 0x86 #define AMIC_A29400T 0xB0 /* Same as 294001T */ #define AMIC_A29400U 0x31 /* Same as A294001U */ @@ -194,16 +218,29 @@ #define MBM29LV800TA 0xDA /* Same as MBM29LV800TE */ #define HYUNDAI_ID 0xAD /* Hyundai */ +#define HY_29F400T 0x23 /* Same as HY_29F400AT */ +#define HY_29F800B 0x58 /* Same as HY_29F800AB */ +#define HY_29LV800B 0x5B +#define HY_29F040A 0xA4 +#define HY_29F400B 0xAB /* Same as HY_29F400AB */ +#define HY_29F002 0xB0 +#define HY_29LV400T 0xB9 +#define HY_29LV400B 0xBA +#define HY_29F080 0xD5 +#define HY_29F800T 0xD6 /* Same as HY_29F800AT */ +#define HY_29LV800T 0xDA #define IMT_ID 0x7F1F /* Integrated Memory Technologies */ #define IM_29F004B 0xAE #define IM_29F004T 0xAF #define INTEL_ID 0x89 /* Intel */ -#define I_82802AB 0xAD -#define I_82802AC 0xAC +#define I_82802AB 0xAD +#define I_82802AC 0xAC #define P28F001BXT 0x94 /* 28F001BX-T */ #define P28F001BXB 0x95 /* 28F001BX-B */ +#define SHARP_LH28F008SA 0xA2 /* Sharp chip, Intel Vendor ID */ +#define SHARP_LH28F008SC 0xA6 /* Sharp chip, Intel Vendor ID */ #define ISSI_ID 0xD5 /* ISSI Integrated Silicon Solutions */ @@ -287,14 +324,20 @@ #define PMC_49FL004 0x6E #define SHARP_ID 0xB0 /* Sharp */ -#define SHARP_LHF00L04 0xCF +#define SHARP_LH28F008BJxxPT 0xEC +#define SHARP_LH28F008BJxxPB 0xED +#define SHARP_LH28F800BVxxBTL 0x4B +#define SHARP_LH28F800BVxxBV 0x4D +#define SHARP_LH28F800BVxxTV 0x4C +#define SHARP_LHF00L02 0xC9 /* Same as LHF00L06/LHF00L07 */ +#define SHARP_LHF00L04 0xCF /* Same as LHF00L03/LHF00L05 */ /* * Spansion was previously a joint venture of AMD and Fujitsu. * S25 chips are SPI. The first device ID byte is memory type and * the second device ID byte is memory capacity. */ -#define SPANSION_ID 0x01 /* Spansion */ +#define SPANSION_ID 0x01 /* Spansion, same ID as AMD */ #define SPANSION_S25FL016A 0x0214 /* @@ -336,13 +379,13 @@ #define SST_29SF040 0x13 #define SST_29VF040 0x14 #define SST_39SF010 0xB5 -#define SST_39SF020 0xB6 +#define SST_39SF020 0xB6 /* Same as 39SF020A */ #define SST_39SF040 0xB7 #define SST_39VF512 0xD4 #define SST_39VF010 0xD5 -#define SST_39VF020 0xD6 -#define SST_39VF040 0xD7 -#define SST_39VF080 0xD8 /* Same as SST_39LF080/39VF080/39VF088 */ +#define SST_39VF020 0xD6 /* Same as 39LF020 */ +#define SST_39VF040 0xD7 /* Same as 39LF040 */ +#define SST_39VF080 0xD8 /* Same as 39LF080/39VF080/39VF088 */ #define SST_49LF040B 0x50 #define SST_49LF040 0x51 #define SST_49LF020 0x61 @@ -351,7 +394,7 @@ #define SST_49LF080A 0x5B #define SST_49LF002A 0x57 #define SST_49LF003A 0x1B -#define SST_49LF004A 0x60 +#define SST_49LF004A 0x60 /* Same as 49LF004B */ #define SST_49LF008A 0x5A #define SST_49LF004C 0x54 #define SST_49LF008C 0x59 @@ -389,14 +432,14 @@ #define ST_M50FW080 0x2D #define ST_M50FW016 0x2E #define ST_M50LPW116 0x30 -#define ST_M29F002B 0x34 -#define ST_M29F002T 0xB0 /* M29F002T / M29F002NT */ -#define ST_M29F040B 0xE2 +#define ST_M29F002B 0x34 /* Same as M29F002BB */ +#define ST_M29F002T 0xB0 /* Same as M29F002BT/M29F002NT/M29F002BNT */ +#define ST_M29F040B 0xE2 /* Same as M29F040 */ #define ST_M29F080 0xF1 #define ST_M29F200BT 0xD3 #define ST_M29F200BB 0xD4 -#define ST_M29F400BT 0xD5 -#define ST_M29F400BB 0xD6 +#define ST_M29F400BT 0xD5 /* Same as M29F400T */ +#define ST_M29F400BB 0xD6 /* Same as M29F400B */ #define ST_M29F800DB 0x58 #define ST_M29F800DT 0xEC #define ST_M29W010B 0x23 @@ -427,8 +470,8 @@ #define W_25X32 0x3016 #define W_25X64 0x3017 #define W_29C011 0xC1 -#define W_29C020C 0x45 -#define W_29C040P 0x46 +#define W_29C020C 0x45 /* Same as W29C020 */ +#define W_29C040P 0x46 /* Same as W29C040 */ #define W_29EE011 0xC1 #define W_39L020 0xB5 #define W_39L040 0xB6 -- http://www.hailfinger.org/

2 3

[commit] r674 - trunk
by svn＠flashrom.org 10 Aug '09

10 Aug '09

Author: hailfinger Date: 2009-08-10 12:14:23 +0200 (Mon, 10 Aug 2009) New Revision: 674 Modified: trunk/flashchips.c trunk/flashchips.h Log: Add IDs for 25 AMD chips, 11 Hynix chips, 8 Sharp chips, and their variants. AM29DL400BB, AM29DL400BT, AM29DL800BB, AM29DL800BT, AM29F004BB AM29F004BT, AM29F200BB, AM29F200BT, AM29F400BB, AM29F400BT AM29F800BB, AM29F800BT, AM29LV002BB, AM29LV002BT, AM29LV004BB AM29LV004BT, AM29LV008BB, AM29LV008BT, AM29LV080B, AM29LV200BB AM29LV200BT, AM29LV400BB, AM29LV400BT, AM29LV800BB, AM29LV800BT HY29F002, HY29F040A, HY29F080, HY29F400B, HY29F400T, HY29F800B HY29F800T, HY29LV400B, HY29LV400T, HY29LV800B, HY29LV800T LH28F008BJxxPB, LH28F008BJxxPT, LH28F008SA, LH28F008SC, LH28F800BVxxBTL LH28F800BVxxBV, LH28F800BVxxTV, LHF00L02 Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/flashchips.c =================================================================== --- trunk/flashchips.c 2009-08-10 02:29:21 UTC (rev 673) +++ trunk/flashchips.c 2009-08-10 10:14:23 UTC (rev 674) @@ -165,7 +165,7 @@ .name = "Am29LV081B", .bustype = CHIP_BUSTYPE_PARALLEL, .manufacture_id = AMD_ID, - .model_id = AM_29LV081B, + .model_id = AM_29LV080B, .total_size = 1024, .page_size = 64 * 1024, .tested = TEST_UNTESTED, Modified: trunk/flashchips.h =================================================================== --- trunk/flashchips.h 2009-08-10 02:29:21 UTC (rev 673) +++ trunk/flashchips.h 2009-08-10 10:14:23 UTC (rev 674) @@ -39,20 +39,44 @@ #define ALLIANCE_ID 0x52 /* Alliance Semiconductor */ #define AMD_ID 0x01 /* AMD */ +#define AM_29DL400BT 0x0C +#define AM_29DL400BB 0x0F +#define AM_29DL800BT 0x4A +#define AM_29DL800BB 0xCB +#define AM_29F002BB 0x34 /* Same as Am29F002NBB */ +#define AM_29F002BT 0xB0 /* Same as Am29F002NBT */ +#define AM_29F004BB 0x7B +#define AM_29F004BT 0x77 +#define AM_29F016D 0xAD #define AM_29F010B 0x20 /* Same as Am29F010A */ -#define AM_29F002BT 0xB0 -#define AM_29F002BB 0x34 #define AM_29F040B 0xA4 #define AM_29F080B 0xD5 +#define AM_29F200BB 0x57 +#define AM_29F200BT 0x51 +#define AM_29F400BB 0xAB +#define AM_29F400BT 0x23 +#define AM_29F800BB 0x58 +#define AM_29F800BT 0xD6 +#define AM_29LV002BB 0xC2 +#define AM_29LV002BT 0x40 +#define AM_29LV004BB 0xB6 +#define AM_29LV004BT 0xB5 +#define AM_29LV008BB 0x37 +#define AM_29LV008BT 0x3E #define AM_29LV040B 0x4F -#define AM_29LV081B 0x38 -#define AM_29F016D 0xAD +#define AM_29LV080B 0x38 /* Same as Am29LV081B */ +#define AM_29LV200BB 0xBF +#define AM_29LV200BT 0x3B +#define AM_29LV800BB 0x5B /* Same as Am29LV800DB */ +#define AM_29LV400BT 0xB9 +#define AM_29LV400BB 0xBA +#define AM_29LV800BT 0xDA /* Same as Am29LV800DT */ #define AMIC_ID 0x7F37 /* AMIC */ #define AMIC_ID_NOPREFIX 0x37 /* AMIC */ #define AMIC_A25L40P 0x2013 #define AMIC_A29002B 0x0d -#define AMIC_A29002T 0x8c +#define AMIC_A29002T 0x8C /* Same as A290021T */ #define AMIC_A29040B 0x86 #define AMIC_A29400T 0xB0 /* Same as 294001T */ #define AMIC_A29400U 0x31 /* Same as A294001U */ @@ -194,16 +218,29 @@ #define MBM29LV800TA 0xDA /* Same as MBM29LV800TE */ #define HYUNDAI_ID 0xAD /* Hyundai */ +#define HY_29F400T 0x23 /* Same as HY_29F400AT */ +#define HY_29F800B 0x58 /* Same as HY_29F800AB */ +#define HY_29LV800B 0x5B +#define HY_29F040A 0xA4 +#define HY_29F400B 0xAB /* Same as HY_29F400AB */ +#define HY_29F002 0xB0 +#define HY_29LV400T 0xB9 +#define HY_29LV400B 0xBA +#define HY_29F080 0xD5 +#define HY_29F800T 0xD6 /* Same as HY_29F800AT */ +#define HY_29LV800T 0xDA #define IMT_ID 0x7F1F /* Integrated Memory Technologies */ #define IM_29F004B 0xAE #define IM_29F004T 0xAF #define INTEL_ID 0x89 /* Intel */ -#define I_82802AB 0xAD -#define I_82802AC 0xAC +#define I_82802AB 0xAD +#define I_82802AC 0xAC #define P28F001BXT 0x94 /* 28F001BX-T */ #define P28F001BXB 0x95 /* 28F001BX-B */ +#define SHARP_LH28F008SA 0xA2 /* Sharp chip, Intel Vendor ID */ +#define SHARP_LH28F008SC 0xA6 /* Sharp chip, Intel Vendor ID */ #define ISSI_ID 0xD5 /* ISSI Integrated Silicon Solutions */ @@ -287,14 +324,20 @@ #define PMC_49FL004 0x6E #define SHARP_ID 0xB0 /* Sharp */ -#define SHARP_LHF00L04 0xCF +#define SHARP_LH28F008BJxxPT 0xEC +#define SHARP_LH28F008BJxxPB 0xED +#define SHARP_LH28F800BVxxBTL 0x4B +#define SHARP_LH28F800BVxxBV 0x4D +#define SHARP_LH28F800BVxxTV 0x4C +#define SHARP_LHF00L02 0xC9 /* Same as LHF00L06/LHF00L07 */ +#define SHARP_LHF00L04 0xCF /* Same as LHF00L03/LHF00L05 */ /* * Spansion was previously a joint venture of AMD and Fujitsu. * S25 chips are SPI. The first device ID byte is memory type and * the second device ID byte is memory capacity. */ -#define SPANSION_ID 0x01 /* Spansion */ +#define SPANSION_ID 0x01 /* Spansion, same ID as AMD */ #define SPANSION_S25FL016A 0x0214 /* @@ -336,13 +379,13 @@ #define SST_29SF040 0x13 #define SST_29VF040 0x14 #define SST_39SF010 0xB5 -#define SST_39SF020 0xB6 +#define SST_39SF020 0xB6 /* Same as 39SF020A */ #define SST_39SF040 0xB7 #define SST_39VF512 0xD4 #define SST_39VF010 0xD5 -#define SST_39VF020 0xD6 -#define SST_39VF040 0xD7 -#define SST_39VF080 0xD8 /* Same as SST_39LF080/39VF080/39VF088 */ +#define SST_39VF020 0xD6 /* Same as 39LF020 */ +#define SST_39VF040 0xD7 /* Same as 39LF040 */ +#define SST_39VF080 0xD8 /* Same as 39LF080/39VF080/39VF088 */ #define SST_49LF040B 0x50 #define SST_49LF040 0x51 #define SST_49LF020 0x61 @@ -351,7 +394,7 @@ #define SST_49LF080A 0x5B #define SST_49LF002A 0x57 #define SST_49LF003A 0x1B -#define SST_49LF004A 0x60 +#define SST_49LF004A 0x60 /* Same as 49LF004B */ #define SST_49LF008A 0x5A #define SST_49LF004C 0x54 #define SST_49LF008C 0x59 @@ -389,14 +432,14 @@ #define ST_M50FW080 0x2D #define ST_M50FW016 0x2E #define ST_M50LPW116 0x30 -#define ST_M29F002B 0x34 -#define ST_M29F002T 0xB0 /* M29F002T / M29F002NT */ -#define ST_M29F040B 0xE2 +#define ST_M29F002B 0x34 /* Same as M29F002BB */ +#define ST_M29F002T 0xB0 /* Same as M29F002BT/M29F002NT/M29F002BNT */ +#define ST_M29F040B 0xE2 /* Same as M29F040 */ #define ST_M29F080 0xF1 #define ST_M29F200BT 0xD3 #define ST_M29F200BB 0xD4 -#define ST_M29F400BT 0xD5 -#define ST_M29F400BB 0xD6 +#define ST_M29F400BT 0xD5 /* Same as M29F400T */ +#define ST_M29F400BB 0xD6 /* Same as M29F400B */ #define ST_M29F800DB 0x58 #define ST_M29F800DT 0xEC #define ST_M29W010B 0x23 @@ -427,8 +470,8 @@ #define W_25X32 0x3016 #define W_25X64 0x3017 #define W_29C011 0xC1 -#define W_29C020C 0x45 -#define W_29C040P 0x46 +#define W_29C020C 0x45 /* Same as W29C020 */ +#define W_29C040P 0x46 /* Same as W29C040 */ #define W_29EE011 0xC1 #define W_39L020 0xB5 #define W_39L040 0xB6

1 0

[PATCH] SPI autoerase before write
by Carl-Daniel Hailfinger 09 Aug '09

09 Aug '09

Some SPI chip drivers and the generic 1-byte SPI chip write functions didn't include the automatic erase present in other chip drivers. Since the majority is definitely auto-erase, change the remaining explicit-erase cases to be auto-erase as well. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-spi_autoerase_before_write/flash.h =================================================================== --- flashrom-spi_autoerase_before_write/flash.h (revision 672) +++ flashrom-spi_autoerase_before_write/flash.h (working copy) @@ -505,7 +505,6 @@ int it8716f_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); -int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf); int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf); /* sb600spi.c */ Index: flashrom-spi_autoerase_before_write/it87spi.c =================================================================== --- flashrom-spi_autoerase_before_write/it87spi.c (revision 672) +++ flashrom-spi_autoerase_before_write/it87spi.c (working copy) @@ -248,32 +248,6 @@ } /* - * Program chip using firmware cycle byte programming. (SLOW!) - * This is for chips which can only handle one byte writes - * and for chips where memory mapped programming is impossible due to - * size constraints in IT87* (over 512 kB) - */ -int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf) -{ - int total_size = 1024 * flash->total_size; - int i; - int result; - - fast_spi = 0; - - spi_disable_blockprotect(); - for (i = 0; i < total_size; i++) { - result = spi_byte_program(i, buf[i]); - while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) - programmer_delay(10); - } - /* resume normal ops... */ - OUTB(0x20, it8716f_flashport); - - return 0; -} - -/* * IT8716F only allows maximum of 512 kb SPI mapped to LPC memory cycles * Need to read this big flash using firmware cycles 3 byte at a time. */ @@ -301,8 +275,16 @@ * mapped access. */ if ((programmer == PROGRAMMER_IT87SPI) || (total_size > 512 * 1024)) { - it8716f_spi_chip_write_1(flash, buf); + spi_chip_write_1(flash, buf); } else { + spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); for (i = 0; i < total_size / 256; i++) { it8716f_spi_page_program(flash, i, buf); } Index: flashrom-spi_autoerase_before_write/spi.c =================================================================== --- flashrom-spi_autoerase_before_write/spi.c (revision 672) +++ flashrom-spi_autoerase_before_write/spi.c (working copy) @@ -963,6 +963,13 @@ int i; spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); for (i = 0; i < total_size; i++) { spi_byte_program(i, buf[i]); while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) Index: flashrom-spi_autoerase_before_write/ft2232_spi.c =================================================================== --- flashrom-spi_autoerase_before_write/ft2232_spi.c (revision 672) +++ flashrom-spi_autoerase_before_write/ft2232_spi.c (working copy) @@ -271,6 +271,14 @@ int total_size = 1024 * flash->total_size; int i; + spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); printf_debug("total_size is %d\n", total_size); for (i = 0; i < total_size; i += 256) { int l, r; @@ -281,14 +289,12 @@ if ((r = spi_nbyte_program(i, &buf[i], l))) { fprintf(stderr, "%s: write fail %d\n", __FUNCTION__, r); - // spi_write_disable(); chip does this for us return 1; } while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) /* loop */; } - // spi_write_disable(); chip does this for us return 0; } Index: flashrom-spi_autoerase_before_write/wbsio_spi.c =================================================================== --- flashrom-spi_autoerase_before_write/wbsio_spi.c (revision 672) +++ flashrom-spi_autoerase_before_write/wbsio_spi.c (working copy) @@ -183,29 +183,17 @@ return 1; } - read_memmapped(flash, buf, start, len); - return 0; + return read_memmapped(flash, buf, start, len); } int wbsio_spi_write_1(struct flashchip *flash, uint8_t *buf) { - int pos, size = flash->total_size * 1024; - int result; + int size = flash->total_size * 1024; - if (flash->total_size > 1024) { + if (size > 1024 * 1024) { fprintf(stderr, "%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); return 1; } - if (flash->erase(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - for (pos = 0; pos < size; pos++) { - result = spi_byte_program(pos, buf[pos]); - while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) - programmer_delay(10); - } - spi_write_disable(); - return 0; + return spi_chip_write_1(flash, buf); } Index: flashrom-spi_autoerase_before_write/sb600spi.c =================================================================== --- flashrom-spi_autoerase_before_write/sb600spi.c (revision 672) +++ flashrom-spi_autoerase_before_write/sb600spi.c (working copy) @@ -45,12 +45,14 @@ return spi_read_chunked(flash, buf, start, len, 8); } +/* FIXME: SB600 can write 5 bytes per transaction. */ int sb600_spi_write_1(struct flashchip *flash, uint8_t *buf) { int rc = 0, i; int total_size = flash->total_size * 1024; int result; + spi_disable_blockprotect(); /* Erase first */ printf("Erasing flash before programming... "); if (flash->erase(flash)) { @@ -61,7 +63,6 @@ printf("Programming flash"); for (i = 0; i < total_size; i++, buf++) { - spi_disable_blockprotect(); result = spi_byte_program(i, *buf); /* wait program complete. */ if (i % 0x8000 == 0) -- http://www.hailfinger.org/

2 2

[commit] r673 - trunk
by svn＠flashrom.org 09 Aug '09

09 Aug '09

Author: hailfinger Date: 2009-08-10 04:29:21 +0200 (Mon, 10 Aug 2009) New Revision: 673 Modified: trunk/flash.h trunk/ft2232_spi.c trunk/it87spi.c trunk/sb600spi.c trunk/spi.c trunk/wbsio_spi.c Log: Some SPI chip drivers and the generic 1-byte SPI chip write functions didn't include the automatic erase present in other chip drivers. Since the majority is definitely auto-erase, change the remaining explicit-erase cases to be auto-erase as well. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Carlos Arnau Perez <cemede(a)gmail.com> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/flash.h 2009-08-10 02:29:21 UTC (rev 673) @@ -505,7 +505,6 @@ int it8716f_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr); int it8716f_spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); -int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf); int it8716f_spi_chip_write_256(struct flashchip *flash, uint8_t *buf); /* sb600spi.c */ Modified: trunk/ft2232_spi.c =================================================================== --- trunk/ft2232_spi.c 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/ft2232_spi.c 2009-08-10 02:29:21 UTC (rev 673) @@ -271,6 +271,14 @@ int total_size = 1024 * flash->total_size; int i; + spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); printf_debug("total_size is %d\n", total_size); for (i = 0; i < total_size; i += 256) { int l, r; @@ -281,14 +289,12 @@ if ((r = spi_nbyte_program(i, &buf[i], l))) { fprintf(stderr, "%s: write fail %d\n", __FUNCTION__, r); - // spi_write_disable(); chip does this for us return 1; } while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) /* loop */; } - // spi_write_disable(); chip does this for us return 0; } Modified: trunk/it87spi.c =================================================================== --- trunk/it87spi.c 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/it87spi.c 2009-08-10 02:29:21 UTC (rev 673) @@ -248,32 +248,6 @@ } /* - * Program chip using firmware cycle byte programming. (SLOW!) - * This is for chips which can only handle one byte writes - * and for chips where memory mapped programming is impossible due to - * size constraints in IT87* (over 512 kB) - */ -int it8716f_spi_chip_write_1(struct flashchip *flash, uint8_t *buf) -{ - int total_size = 1024 * flash->total_size; - int i; - int result; - - fast_spi = 0; - - spi_disable_blockprotect(); - for (i = 0; i < total_size; i++) { - result = spi_byte_program(i, buf[i]); - while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) - programmer_delay(10); - } - /* resume normal ops... */ - OUTB(0x20, it8716f_flashport); - - return 0; -} - -/* * IT8716F only allows maximum of 512 kb SPI mapped to LPC memory cycles * Need to read this big flash using firmware cycles 3 byte at a time. */ @@ -301,8 +275,16 @@ * mapped access. */ if ((programmer == PROGRAMMER_IT87SPI) || (total_size > 512 * 1024)) { - it8716f_spi_chip_write_1(flash, buf); + spi_chip_write_1(flash, buf); } else { + spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); for (i = 0; i < total_size / 256; i++) { it8716f_spi_page_program(flash, i, buf); } Modified: trunk/sb600spi.c =================================================================== --- trunk/sb600spi.c 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/sb600spi.c 2009-08-10 02:29:21 UTC (rev 673) @@ -45,12 +45,14 @@ return spi_read_chunked(flash, buf, start, len, 8); } +/* FIXME: SB600 can write 5 bytes per transaction. */ int sb600_spi_write_1(struct flashchip *flash, uint8_t *buf) { int rc = 0, i; int total_size = flash->total_size * 1024; int result; + spi_disable_blockprotect(); /* Erase first */ printf("Erasing flash before programming... "); if (flash->erase(flash)) { @@ -61,7 +63,6 @@ printf("Programming flash"); for (i = 0; i < total_size; i++, buf++) { - spi_disable_blockprotect(); result = spi_byte_program(i, *buf); /* wait program complete. */ if (i % 0x8000 == 0) Modified: trunk/spi.c =================================================================== --- trunk/spi.c 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/spi.c 2009-08-10 02:29:21 UTC (rev 673) @@ -963,6 +963,13 @@ int i; spi_disable_blockprotect(); + /* Erase first */ + printf("Erasing flash before programming... "); + if (flash->erase(flash)) { + fprintf(stderr, "ERASE FAILED!\n"); + return -1; + } + printf("done.\n"); for (i = 0; i < total_size; i++) { spi_byte_program(i, buf[i]); while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) Modified: trunk/wbsio_spi.c =================================================================== --- trunk/wbsio_spi.c 2009-08-09 21:50:24 UTC (rev 672) +++ trunk/wbsio_spi.c 2009-08-10 02:29:21 UTC (rev 673) @@ -183,29 +183,17 @@ return 1; } - read_memmapped(flash, buf, start, len); - return 0; + return read_memmapped(flash, buf, start, len); } int wbsio_spi_write_1(struct flashchip *flash, uint8_t *buf) { - int pos, size = flash->total_size * 1024; - int result; + int size = flash->total_size * 1024; - if (flash->total_size > 1024) { + if (size > 1024 * 1024) { fprintf(stderr, "%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); return 1; } - if (flash->erase(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); - return -1; - } - for (pos = 0; pos < size; pos++) { - result = spi_byte_program(pos, buf[pos]); - while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) - programmer_delay(10); - } - spi_write_disable(); - return 0; + return spi_chip_write_1(flash, buf); }

1 0

[PATCH] Fix another SB600 SPI corner case
by Carl-Daniel Hailfinger 09 Aug '09

09 Aug '09

SB600 SPI has an off-by-one error during read, and that hardware issue is not documented anywhere yet. r661 tried to work around this, but the fix had unpleasant side effects. The new workaround only triggers if readcnt is nonzero, eliminating all possible interactions with write-only commands. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-spi_sb600_offbyone_fixfix/sb600spi.c =================================================================== --- flashrom-spi_sb600_offbyone_fixfix/sb600spi.c (revision 672) +++ flashrom-spi_sb600_offbyone_fixfix/sb600spi.c (working copy) @@ -118,9 +118,13 @@ * an opcode and no additional data/address, the SPI controller will * read one byte too few from the chip. Basically, the last byte of * the chip response is discarded and will not end up in the FIFO. - * It is unclear if the CS# line is set high too early as well. + * It is unclear if the CS# line is set high too early as well, but + * it seems CS# line timing matches the bytecounts we specify, so there + * is a mismatch between FIFO content count and CS# timing. + * Only trigger this if readcnt is nonzero on the assumption that + * reading more doesn't hurt if we already read soemthing. */ - readoffby1 = (writecnt) ? 0 : 1; + readoffby1 = (!writecnt && readcnt) ? 1 : 0; mmio_writeb((readcnt + readoffby1) << 4 | (writecnt), sb600_spibar + 1); mmio_writeb(cmd, sb600_spibar + 0); -- http://www.hailfinger.org/

1 1

[PATCH] ioperm+include cleanup
by Carl-Daniel Hailfinger 09 Aug '09

09 Aug '09

Releasing IO permissions was done by hand everywhere. Use a proper abstraction. Kill unneeded #include statements. Move #include statements for serprog inside #ifdef. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-cleanup/flash.h =================================================================== --- flashrom-cleanup/flash.h (Revision 671) +++ flashrom-cleanup/flash.h (Arbeitskopie) @@ -308,6 +308,7 @@ struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device); void get_io_perms(void); +void release_io_perms(void); int internal_init(void); int internal_shutdown(void); void internal_chip_writeb(uint8_t val, chipaddr addr); Index: flashrom-cleanup/serprog.c =================================================================== --- flashrom-cleanup/serprog.c (Revision 671) +++ flashrom-cleanup/serprog.c (Arbeitskopie) @@ -21,6 +21,13 @@ #include <string.h> #include <stdlib.h> +#include <stdio.h> +#include "flash.h" + +char *serprog_param = NULL; + +#if SERPROG_SUPPORT == 1 + #include <ctype.h> #include <fcntl.h> #include <sys/types.h> @@ -31,16 +38,10 @@ #include <netdb.h> #include <sys/stat.h> #include <errno.h> -#include <stdio.h> #include <unistd.h> #include <inttypes.h> #include <termios.h> -#include "flash.h" -char *serprog_param = NULL; - -#if SERPROG_SUPPORT == 1 - #define MSGHEADER "serprog:" #define S_ACK 0x06 Index: flashrom-cleanup/nic3com.c =================================================================== --- flashrom-cleanup/nic3com.c (Revision 671) +++ flashrom-cleanup/nic3com.c (Arbeitskopie) @@ -20,10 +20,7 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" #define BIOS_ROM_ADDR 0x04 @@ -99,9 +96,7 @@ free(pcidev_bdf); pci_cleanup(pacc); -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; } Index: flashrom-cleanup/satasii.c =================================================================== --- flashrom-cleanup/satasii.c (Revision 671) +++ flashrom-cleanup/satasii.c (Arbeitskopie) @@ -22,10 +22,6 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" #define PCI_VENDOR_ID_SII 0x1095 @@ -77,9 +73,7 @@ { free(pcidev_bdf); pci_cleanup(pacc); -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; } Index: flashrom-cleanup/internal.c =================================================================== --- flashrom-cleanup/internal.c (Revision 671) +++ flashrom-cleanup/internal.c (Arbeitskopie) @@ -95,6 +95,13 @@ } } +void release_io_perms(void) +{ +#if defined(__FreeBSD__) || defined(__DragonFly__) + close(io_fd); +#endif +} + int internal_init(void) { int ret = 0; @@ -128,9 +135,7 @@ int internal_shutdown(void) { -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; } -- http://www.hailfinger.org/

2 4

[commit] r672 - trunk
by svn＠flashrom.org 09 Aug '09

09 Aug '09

Author: hailfinger Date: 2009-08-09 23:50:24 +0200 (Sun, 09 Aug 2009) New Revision: 672 Modified: trunk/flash.h trunk/internal.c trunk/nic3com.c trunk/satasii.c Log: Releasing IO permissions was done by hand everywhere. Use a proper abstraction. Kill unneeded #include statements. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2009-08-09 12:44:08 UTC (rev 671) +++ trunk/flash.h 2009-08-09 21:50:24 UTC (rev 672) @@ -308,6 +308,7 @@ struct pci_dev *pci_card_find(uint16_t vendor, uint16_t device, uint16_t card_vendor, uint16_t card_device); void get_io_perms(void); +void release_io_perms(void); int internal_init(void); int internal_shutdown(void); void internal_chip_writeb(uint8_t val, chipaddr addr); Modified: trunk/internal.c =================================================================== --- trunk/internal.c 2009-08-09 12:44:08 UTC (rev 671) +++ trunk/internal.c 2009-08-09 21:50:24 UTC (rev 672) @@ -95,6 +95,13 @@ } } +void release_io_perms(void) +{ +#if defined(__FreeBSD__) || defined(__DragonFly__) + close(io_fd); +#endif +} + int internal_init(void) { int ret = 0; @@ -128,9 +135,7 @@ int internal_shutdown(void) { -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; } Modified: trunk/nic3com.c =================================================================== --- trunk/nic3com.c 2009-08-09 12:44:08 UTC (rev 671) +++ trunk/nic3com.c 2009-08-09 21:50:24 UTC (rev 672) @@ -20,10 +20,7 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" #define BIOS_ROM_ADDR 0x04 @@ -99,9 +96,7 @@ free(pcidev_bdf); pci_cleanup(pacc); -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; } Modified: trunk/satasii.c =================================================================== --- trunk/satasii.c 2009-08-09 12:44:08 UTC (rev 671) +++ trunk/satasii.c 2009-08-09 21:50:24 UTC (rev 672) @@ -22,10 +22,6 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" #define PCI_VENDOR_ID_SII 0x1095 @@ -77,9 +73,7 @@ { free(pcidev_bdf); pci_cleanup(pacc); -#if defined(__FreeBSD__) || defined(__DragonFly__) - close(io_fd); -#endif + release_io_perms(); return 0; }

1 0

some questions about flashrom in windows edition
by zhou 09 Aug '09

09 Aug '09

hello, my honor! I am very interested in the program of flashrom,especially of the edition in windows,now I had worked on it for a few months,but there is some questions I couldn't understand, I wonder if you could offer me some help.The questions are showed as below: * 1,what's the use of the source code "Board_enable.c"? It looks so strange to me that I hardly understand? How I get something helpful? * 2,In order to modify the program under GNU,how can I test it? And how to debug it in details in windows? Is there any software ? * 3,As it is a complex program, where can I find out all the datasheets suitable? Are they free? I am looking forward your answers and please reply as soon as possible . My best wishes! james

2 1

[PATCH] Clean up before Windows support merge
by Carl-Daniel Hailfinger 09 Aug '09

09 Aug '09

Stefan pointed out a few issues with the current code which have to be worked around in the Windows support patch. Fix them. Remove unnecessary #include files. Serprog compilation is now controlled by a Makefile variable. Replace munmap with physunmap where appropriate. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-winprepare/pcidev.c =================================================================== --- flashrom-winprepare/pcidev.c (Revision 670) +++ flashrom-winprepare/pcidev.c (Arbeitskopie) @@ -20,10 +20,7 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" uint32_t io_base_addr; Index: flashrom-winprepare/serprog.c =================================================================== --- flashrom-winprepare/serprog.c (Revision 670) +++ flashrom-winprepare/serprog.c (Arbeitskopie) @@ -39,8 +39,6 @@ char *serprog_param = NULL; -#define SERPROG_SUPPORT 1 - #if SERPROG_SUPPORT == 1 #define MSGHEADER "serprog:" Index: flashrom-winprepare/sst49lfxxxc.c =================================================================== --- flashrom-winprepare/sst49lfxxxc.c (Revision 670) +++ flashrom-winprepare/sst49lfxxxc.c (Arbeitskopie) @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <errno.h> -#include <fcntl.h> -#include <sys/mman.h> #include <stdlib.h> #include "flash.h" Index: flashrom-winprepare/Makefile =================================================================== --- flashrom-winprepare/Makefile (Revision 670) +++ flashrom-winprepare/Makefile (Arbeitskopie) @@ -68,6 +68,8 @@ $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) FEATURE_CFLAGS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") +# Always enable serprog for now. Needs to be disabled on Windows. +FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' FEATURE_LIBS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") Index: flashrom-winprepare/dummyflasher.c =================================================================== --- flashrom-winprepare/dummyflasher.c (Revision 670) +++ flashrom-winprepare/dummyflasher.c (Arbeitskopie) @@ -21,10 +21,7 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" char *dummytype = NULL; Index: flashrom-winprepare/chipset_enable.c =================================================================== --- flashrom-winprepare/chipset_enable.c (Revision 670) +++ flashrom-winprepare/chipset_enable.c (Arbeitskopie) @@ -29,7 +29,6 @@ #include <string.h> #include <sys/types.h> #include <sys/stat.h> -#include <sys/mman.h> #include <fcntl.h> #include "flash.h" @@ -968,7 +967,7 @@ } /* 4. Clean up */ - munmap(mmcr, getpagesize()); + physunmap(mmcr, getpagesize()); return 0; } Index: flashrom-winprepare/sb600spi.c =================================================================== --- flashrom-winprepare/sb600spi.c (Revision 670) +++ flashrom-winprepare/sb600spi.c (Arbeitskopie) @@ -21,7 +21,6 @@ */ #include <string.h> -#include <sys/mman.h> #include "flash.h" #include "spi.h" Index: flashrom-winprepare/ichspi.c =================================================================== --- flashrom-winprepare/ichspi.c (Revision 670) +++ flashrom-winprepare/ichspi.c (Arbeitskopie) @@ -33,7 +33,6 @@ */ #include <string.h> -#include <sys/mman.h> #include "flash.h" #include "spi.h" Index: flashrom-winprepare/cbtable.c =================================================================== --- flashrom-winprepare/cbtable.c (Revision 670) +++ flashrom-winprepare/cbtable.c (Arbeitskopie) @@ -22,11 +22,8 @@ */ #include <stdlib.h> -#include <fcntl.h> #include <sys/types.h> #include <string.h> -#include <errno.h> -#include <sys/mman.h> #include "flash.h" #include "coreboot_tables.h" -- http://www.hailfinger.org/

2 2

[commit] r671 - trunk
by svn＠flashrom.org 09 Aug '09

09 Aug '09

Author: hailfinger Date: 2009-08-09 14:44:08 +0200 (Sun, 09 Aug 2009) New Revision: 671 Modified: trunk/Makefile trunk/cbtable.c trunk/chipset_enable.c trunk/dummyflasher.c trunk/ichspi.c trunk/pcidev.c trunk/sb600spi.c trunk/serprog.c trunk/sst49lfxxxc.c Log: Remove unnecessary #include files. Serprog compilation is now controlled by a Makefile variable. Replace munmap with physunmap where appropriate. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/Makefile 2009-08-09 12:44:08 UTC (rev 671) @@ -68,6 +68,8 @@ $(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS) FEATURE_CFLAGS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'") +# Always enable serprog for now. Needs to be disabled on Windows. +FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1' FEATURE_LIBS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi") Modified: trunk/cbtable.c =================================================================== --- trunk/cbtable.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/cbtable.c 2009-08-09 12:44:08 UTC (rev 671) @@ -22,11 +22,8 @@ */ #include <stdlib.h> -#include <fcntl.h> #include <sys/types.h> #include <string.h> -#include <errno.h> -#include <sys/mman.h> #include "flash.h" #include "coreboot_tables.h" Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/chipset_enable.c 2009-08-09 12:44:08 UTC (rev 671) @@ -29,7 +29,6 @@ #include <string.h> #include <sys/types.h> #include <sys/stat.h> -#include <sys/mman.h> #include <fcntl.h> #include "flash.h" @@ -968,7 +967,7 @@ } /* 4. Clean up */ - munmap(mmcr, getpagesize()); + physunmap(mmcr, getpagesize()); return 0; } Modified: trunk/dummyflasher.c =================================================================== --- trunk/dummyflasher.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/dummyflasher.c 2009-08-09 12:44:08 UTC (rev 671) @@ -21,10 +21,7 @@ #include <string.h> #include <stdlib.h> #include <ctype.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" char *dummytype = NULL; Modified: trunk/ichspi.c =================================================================== --- trunk/ichspi.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/ichspi.c 2009-08-09 12:44:08 UTC (rev 671) @@ -33,7 +33,6 @@ */ #include <string.h> -#include <sys/mman.h> #include "flash.h" #include "spi.h" Modified: trunk/pcidev.c =================================================================== --- trunk/pcidev.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/pcidev.c 2009-08-09 12:44:08 UTC (rev 671) @@ -20,10 +20,7 @@ #include <stdlib.h> #include <string.h> -#include <fcntl.h> #include <sys/types.h> -#include <sys/stat.h> -#include <errno.h> #include "flash.h" uint32_t io_base_addr; Modified: trunk/sb600spi.c =================================================================== --- trunk/sb600spi.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/sb600spi.c 2009-08-09 12:44:08 UTC (rev 671) @@ -21,7 +21,6 @@ */ #include <string.h> -#include <sys/mman.h> #include "flash.h" #include "spi.h" Modified: trunk/serprog.c =================================================================== --- trunk/serprog.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/serprog.c 2009-08-09 12:44:08 UTC (rev 671) @@ -39,8 +39,6 @@ char *serprog_param = NULL; -#define SERPROG_SUPPORT 1 - #if SERPROG_SUPPORT == 1 #define MSGHEADER "serprog:" Modified: trunk/sst49lfxxxc.c =================================================================== --- trunk/sst49lfxxxc.c 2009-08-03 09:35:20 UTC (rev 670) +++ trunk/sst49lfxxxc.c 2009-08-09 12:44:08 UTC (rev 671) @@ -19,9 +19,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <errno.h> -#include <fcntl.h> -#include <sys/mman.h> #include <stdlib.h> #include "flash.h"

1 0

GSoCs Winflashrom versus r126.
by Luc Verhaegen 09 Aug '09

09 Aug '09

3 4

AMIC A290021T-70
by Helmut Adrigan 08 Aug '09

08 Aug '09

hi i found this AMIC A290021T-70 chip in my ABIT BX133-Raid V 1.01 (Intel 440BX Chipset) Mainboard. greetz

1 0

A290021T-70
by Helmut Adrigan 08 Aug '09

08 Aug '09

hi, many thx

1 0

ICH6-ICH10 flash decode debug, IDSEL=0 hardcode
by Carl-Daniel Hailfinger 06 Aug '09

06 Aug '09

Add ICH6,ICH7,ICH8,ICH9,ICH10 FWH IDSEL settings and flash decode settings to the debug output. This can help debug cases where the BIOS does not set up a correct flash decode for the given flash size. The Intel docs state that the decode applies to FWH and SPI flash. Hardcode IDSEL=0 for the top 8 MB for now. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-ich6_fwh_idsel_debug/chipset_enable.c =================================================================== --- flashrom-ich6_fwh_idsel_debug/chipset_enable.c (Revision 670) +++ flashrom-ich6_fwh_idsel_debug/chipset_enable.c (Arbeitskopie) @@ -192,11 +192,45 @@ static int enable_flash_ich_4e(struct pci_dev *dev, const char *name) { + /* + * Note: ICH5 has registers similar to FWH_SEL1, FWH_SEL2 and + * FWH_DEC_EN1, but they are called FB_SEL1, FB_SEL2, FB_DEC_EN1 and + * FB_DEC_EN2. + */ return enable_flash_ich(dev, name, 0x4e); } static int enable_flash_ich_dc(struct pci_dev *dev, const char *name) { + uint32_t fwh_conf; + int i; + + /* Ignore all legacy ranges below 1 MB. */ + /* FWH_SEL1 */ + fwh_conf = pci_read_long(dev, 0xd0); + for (i = 7; i >= 0; i--) + printf_debug("\n0xff%02x0000/0xff%02x0000 FWH IDSEL: 0x%x, ", + i * 0x8 + 0xc0, i * 0x8 + 0x80, + (fwh_conf >> (i * 4)) & 0xf); + /* FWH_SEL2 */ + fwh_conf = pci_read_word(dev, 0xd4); + for (i = 3; i >= 0; i--) + printf_debug("\n0xff%02x0000/0xff%02x0000 FWH IDSEL: 0x%x, ", + i * 0x10 + 0x40, i * 0x10, + (fwh_conf >> (i * 4)) & 0xf); + /* FWH_DEC_EN1 */ + fwh_conf = pci_read_word(dev, 0xd8); + for (i = 7; i >= 0; i--) + printf_debug("0xff%02x0000/0xff%02x0000 FWH decode %sabled, ", + i * 0x8 + 0xc0, i * 0x8 + 0x80, + (fwh_conf >> (i + 0x8)) & 0x1 ? "en" : "dis"); + for (i = 3; i >= 0; i--) + printf_debug("0xff%02x0000/0xff%02x0000 FWH decode %sabled, ", + i * 0x10 + 0x40, i * 0x10, + (fwh_conf >> i) & 0x1 ? "en" : "dis"); + /* Gross unmergeable hack to pick IDSEL=0 for top 8 MB */ + printf("\nSetting IDSEL=0 for top 8 MB"); + pci_write_word(dev, 0xd0, 0x00000000); return enable_flash_ich(dev, name, 0xdc); } -- http://www.hailfinger.org/

3 3

SPIPGM bug for SST25*
by Carl-Daniel Hailfinger 05 Aug '09

05 Aug '09

Hi RayeR, I found that SST25 flash only allows one-byte write and no page write. But it uses the normal page write opcode. To fix this, SPI_FLASH_PAGE_SIZE must be 1 instead of 256 for SST25 family. Regards, Carl-Daniel

1 0

[PATCH] Fix SPI multicommand endless loop
by Carl-Daniel Hailfinger 03 Aug '09

03 Aug '09

Fix SPI multicommand endless loop in default_spi_send_multicommand. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-spi_multicommand_loopfix/spi.c =================================================================== --- flashrom-spi_multicommand_loopfix/spi.c (Revision 669) +++ flashrom-spi_multicommand_loopfix/spi.c (Arbeitskopie) @@ -147,6 +147,7 @@ while ((spicommands->writecnt || spicommands->readcnt) && !result) { result = spi_send_command(spicommands->writecnt, spicommands->readcnt, spicommands->writearr, spicommands->readarr); + spicommands++; } return result; } -- http://www.hailfinger.org/

2 2

[commit] r670 - trunk
by svn＠flashrom.org 03 Aug '09

03 Aug '09

Author: hailfinger Date: 2009-08-03 11:35:20 +0200 (Mon, 03 Aug 2009) New Revision: 670 Modified: trunk/spi.c Log: Fix SPI multicommand endless loop in default_spi_send_multicommand. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Reinauer <stepan(a)coresystems.de> Modified: trunk/spi.c =================================================================== --- trunk/spi.c 2009-07-30 13:32:26 UTC (rev 669) +++ trunk/spi.c 2009-08-03 09:35:20 UTC (rev 670) @@ -147,6 +147,7 @@ while ((spicommands->writecnt || spicommands->readcnt) && !result) { result = spi_send_command(spicommands->writecnt, spicommands->readcnt, spicommands->writearr, spicommands->readarr); + spicommands++; } return result; }

1 0

[PATCH] ICH6-ICH10 flash decode debugging
by Carl-Daniel Hailfinger 30 Jul '09

30 Jul '09

Add ICH6,ICH7,ICH8,ICH9,ICH10 FWH IDSEL settings and flash decode settings to the debug output. This can help debug cases where the BIOS does not set up a correct flash decode for the given flash size. The Intel docs state that the decode applies to FWH and SPI flash. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-ich6_fwh_idsel_debug/chipset_enable.c =================================================================== --- flashrom-ich6_fwh_idsel_debug/chipset_enable.c (Revision 667) +++ flashrom-ich6_fwh_idsel_debug/chipset_enable.c (Arbeitskopie) @@ -192,11 +192,43 @@ static int enable_flash_ich_4e(struct pci_dev *dev, const char *name) { + /* + * Note: ICH5 has registers similar to FWH_SEL1, FWH_SEL2 and + * FWH_DEC_EN1, but they are called FB_SEL1, FB_SEL2, FB_DEC_EN1 and + * FB_DEC_EN2. + */ return enable_flash_ich(dev, name, 0x4e); } static int enable_flash_ich_dc(struct pci_dev *dev, const char *name) { + uint32_t fwh_conf; + int i; + + /* Ignore all legacy ranges below 1 MB. */ + /* FWH_SEL1 */ + fwh_conf = pci_read_long(dev, 0xd0); + for (i = 7; i >= 0; i--) + printf_debug("0xff%02x/0xff%02x FWH IDSEL: 0x%x, ", + i * 0x8 + 0xc0, i * 0x8 + 0x80, + (fwh_conf >> (i * 4)) & 0xf); + /* FWH_SEL2 */ + fwh_conf = pci_read_word(dev, 0xd4); + for (i = 3; i >= 0; i--) + printf_debug("0xff%02x/0xff%02x FWH IDSEL: 0x%x, ", + i * 0x10 + 0x40, i * 0x10, + (fwh_conf >> (i * 4)) & 0xf); + /* FWH_DEC_EN1 */ + fwh_conf = pci_read_word(dev, 0xd8); + for (i = 7; i >= 0; i--) + printf_debug("0xff%02x/0xff%02x FWH decode %sabled, ", + i * 0x8 + 0xc0, i * 0x8 + 0x80, + (fwh_conf >> (i + 0x8)) & 0x1 ? "en" : "dis"); + for (i = 3; i >= 0; i--) + printf_debug("0xff%02x/0xff%02x FWH decode %sabled, ", + i * 0x10 + 0x40, i * 0x10, + (fwh_conf >> i) & 0x1 ? "en" : "dis"); + printf_debug("\n"); return enable_flash_ich(dev, name, 0xdc); } -- http://www.hailfinger.org/

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom