- flashrom - mail.coreboot.org

Flashrom current trunk is to circument password protections on laptops?
by jo.lee＠gmx.net 13 Jan '10

13 Jan '10

Already reported this in IRC, but was asked to send it to the mailing list: I managed to flash a password protected BIOS on an HP TC4400 without actually knowing the password, resulting in a complete erase of the whole Eeprom, including it's password and all system related information(serial number, model, etc.). The vendor tools both for DOS(rompaq) and Windows(hpqflash) won't let me do it without having to enter the password, thus I gave flashrom a try. Here's what I did(not a very elegant approach, though it worked) 1. Get Ubuntu onto USB the usual way(see System --> Sysem management --> Create 2. Create a FreeDOS floppy disk with peritools on it. Here's one containing it: http://stashbox.org/665101/DIYVDock-conf.RAR 3. Boot into Ubuntu 4. sudo setpci -s 0:1f.0 f0 5. sudo setpci -s 0:1f.0 f1 6. sudo setpci -s 0:1f.0 f2 7. sudo setpci -s 0:1f.0 f3 8. f3+f2+f1+f0 = Offset for RBCA, e.g. 0xFED90001 9. Feature flags are at RBCA+0x3418, e.g. 0xFED93418 10. Boot from floppy 11. pt MEM read 4 RBCAOffset, e.g.: pt MEM read 4 0xFED93418 12. Sample Output: 0x003400E9 13. Bit 4 from right is for SMBus --> Change to 0x003400E1: 14. pt MEM write 4 0xFED93418 0x003400E1 15. Chainload Ubuntu from FreeDOS: 16. edit A:\grub.cfg 17. add line: title Ubuntu USB 18. add line: root (hd0,0) 19. add line: kernel /casper/vmlinuz noprompt cdrom-detect/try-usb=true persistent file=/cdrom/preseed/ubuntu.seed boot=casper quiet 20. add line: initrd /casper/initrd.lz 21. start grub: grub --config-file=grubmenu.cfg 22. Boot Ubuntu by selecting it from the menu 23. sudo apt-get install subversion 24. sudo apt-get install pcilib-dev 25. Build flashrom from svn, instructions: http://www.flashrom.org/Downloads 26. flashrom -w rom.bin -V Explanations for all steps: 1: Designated for running flashrom 2: Used with a certain software(peritool) to change some contents in memory before chainbooting Ubuntu 3-14: Enable the SMBus controller. Usually, the Embedded Controller disables it, preventing certain SPI communication. In detail: 3-9: Determine offset for the Function Disable Register 10-14: Read out the current register value and change the Bit 3 to 0 (means SMBus enabled) 15-22: Chainload Ubuntu 23-25: Build current flashrom trunk 26: Flash the BIOS For backround information and an alternative, floppyless method regards 3-14, see here: http://forum.notebookreview.com/showpost.php?p=5479271&postcount=283 The most interesting part was that flashrom v0.9.1-r706 didn't do the job. It's the version which installs via apt-get install flashrom. Only the trunk version was able to do it. It failed at first try, however it used a different function to erase the Eeprom, and then was able to write it. It looks like the Embedded Controller it's doing it's job to block the usual erase function, but not the second one. That's a pretty ugly flaw. Maybe 3-14 weren't necessary at all, however I wanted to make sure there's no missing part for SPI communication. Maybe someone could verify this with another laptop. I've attached verbose output from both flashrom versions.

1 0

Re: [flashrom] [PATCH] Support for Spansion S25FL008A
by Carl-Daniel Hailfinger 13 Jan '10

13 Jan '10

On 13.01.2010 00:03, Michael Karcher wrote: > Tested with read/erase/write (including verify). I only wrote the image > that was read before - don't want to brick my laptop. > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> > Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

2 1

Re: [flashrom] [PATCH] Don't use "byte" as identifier.
by Carl-Daniel Hailfinger 13 Jan '10

13 Jan '10

On 12.01.2010 23:28, Michael Karcher wrote: > Some mingw declares a global identifier "byte", causing -Werror -Wshadow > to break compilation. This patch renames all identifiers called "byte". > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> > Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

2 1

[commit] r862 - trunk
by svn＠flashrom.org 13 Jan '10

13 Jan '10

Author: mkarcher Date: 2010-01-13 00:29:30 +0100 (Wed, 13 Jan 2010) New Revision: 862 Modified: trunk/flashchips.c trunk/flashchips.h Log: Support for Spansion S25FL008A Tested with read/erase/write (including verify). I only wrote the image that was read before - don't want to brick my laptop. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/flashchips.c =================================================================== --- trunk/flashchips.c 2010-01-12 23:29:26 UTC (rev 861) +++ trunk/flashchips.c 2010-01-12 23:29:30 UTC (rev 862) @@ -3285,6 +3285,32 @@ { .vendor = "Spansion", + .name = "S25FL008A", + .bustype = CHIP_BUSTYPE_SPI, + .manufacture_id = SPANSION_ID, + .model_id = SPANSION_S25FL008A, + .total_size = 1024, + .page_size = 256, + .tested = TEST_OK_PREW, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .erase = NULL, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 16} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .write = spi_chip_write_256, + .read = spi_chip_read, + }, + + { + .vendor = "Spansion", .name = "S25FL016A", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = SPANSION_ID, Modified: trunk/flashchips.h =================================================================== --- trunk/flashchips.h 2010-01-12 23:29:26 UTC (rev 861) +++ trunk/flashchips.h 2010-01-12 23:29:30 UTC (rev 862) @@ -365,6 +365,7 @@ * the second device ID byte is memory capacity. */ #define SPANSION_ID 0x01 /* Spansion, same ID as AMD */ +#define SPANSION_S25FL008A 0x0213 #define SPANSION_S25FL016A 0x0214 /*

1 0

[commit] r861 - trunk
by svn＠flashrom.org 13 Jan '10

13 Jan '10

Author: mkarcher Date: 2010-01-13 00:29:26 +0100 (Wed, 13 Jan 2010) New Revision: 861 Modified: trunk/chipdrivers.h trunk/chipset_enable.c trunk/spi.c Log: Don't use "byte" as identifier. Some mingw declares a global identifier "byte", causing -Werror -Wshadow to break compilation. This patch renames all identifiers called "byte". Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipdrivers.h =================================================================== --- trunk/chipdrivers.h 2010-01-12 15:36:24 UTC (rev 860) +++ trunk/chipdrivers.h 2010-01-12 23:29:26 UTC (rev 861) @@ -46,7 +46,7 @@ int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); uint8_t spi_read_status_register(void); int spi_disable_blockprotect(void); -int spi_byte_program(int addr, uint8_t byte); +int spi_byte_program(int addr, uint8_t databyte); int spi_nbyte_program(int addr, uint8_t *bytes, int len); int spi_nbyte_read(int addr, uint8_t *bytes, int len); int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize); Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2010-01-12 15:36:24 UTC (rev 860) +++ trunk/chipset_enable.c 2010-01-12 23:29:26 UTC (rev 861) @@ -1026,19 +1026,19 @@ static int enable_flash_mcp55(struct pci_dev *dev, const char *name) { - uint8_t old, new, byte; - uint16_t word; + uint8_t old, new, val; + uint16_t wordval; /* Set the 0-16 MB enable bits. */ - byte = pci_read_byte(dev, 0x88); - byte |= 0xff; /* 256K */ - pci_write_byte(dev, 0x88, byte); - byte = pci_read_byte(dev, 0x8c); - byte |= 0xff; /* 1M */ - pci_write_byte(dev, 0x8c, byte); - word = pci_read_word(dev, 0x90); - word |= 0x7fff; /* 16M */ - pci_write_word(dev, 0x90, word); + val = pci_read_byte(dev, 0x88); + val |= 0xff; /* 256K */ + pci_write_byte(dev, 0x88, val); + val = pci_read_byte(dev, 0x8c); + val |= 0xff; /* 1M */ + pci_write_byte(dev, 0x8c, val); + wordval = pci_read_word(dev, 0x90); + wordval |= 0x7fff; /* 16M */ + pci_write_word(dev, 0x90, wordval); old = pci_read_byte(dev, 0x6d); new = old | 0x01; Modified: trunk/spi.c =================================================================== --- trunk/spi.c 2010-01-12 15:36:24 UTC (rev 860) +++ trunk/spi.c 2010-01-12 23:29:26 UTC (rev 861) @@ -832,7 +832,7 @@ return result; } -int spi_byte_program(int addr, uint8_t byte) +int spi_byte_program(int addr, uint8_t databyte) { int result; struct spi_command cmds[] = { @@ -843,7 +843,7 @@ .readarr = NULL, }, { .writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE, - .writearr = (const unsigned char[]){ JEDEC_BYTE_PROGRAM, (addr >> 16) & 0xff, (addr >> 8) & 0xff, (addr & 0xff), byte }, + .writearr = (const unsigned char[]){ JEDEC_BYTE_PROGRAM, (addr >> 16) & 0xff, (addr >> 8) & 0xff, (addr & 0xff), databyte }, .readcnt = 0, .readarr = NULL, }, {

1 0

[PATCH] Support for Spansion S25FL008A
by Michael Karcher 13 Jan '10

13 Jan '10

Tested with read/erase/write (including verify). I only wrote the image that was read before - don't want to brick my laptop. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- flashchips.c | 26 ++++++++++++++++++++++++++ flashchips.h | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/flashchips.c b/flashchips.c index 1d53c82..8e90d2a 100644 --- a/flashchips.c +++ b/flashchips.c @@ -3285,6 +3285,32 @@ struct flashchip flashchips[] = { { .vendor = "Spansion", + .name = "S25FL008A", + .bustype = CHIP_BUSTYPE_SPI, + .manufacture_id = SPANSION_ID, + .model_id = SPANSION_S25FL008A, + .total_size = 1024, + .page_size = 256, + .tested = TEST_OK_PREW, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .erase = NULL, + .block_erasers = + { + { + .eraseblocks = { {64 * 1024, 16} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .write = spi_chip_write_256, + .read = spi_chip_read, + }, + + { + .vendor = "Spansion", .name = "S25FL016A", .bustype = CHIP_BUSTYPE_SPI, .manufacture_id = SPANSION_ID, diff --git a/flashchips.h b/flashchips.h index 19ff745..2a4d93b 100644 --- a/flashchips.h +++ b/flashchips.h @@ -365,6 +365,7 @@ * the second device ID byte is memory capacity. */ #define SPANSION_ID 0x01 /* Spansion, same ID as AMD */ +#define SPANSION_S25FL008A 0x0213 #define SPANSION_S25FL016A 0x0214 /* -- 1.6.5

1 0

[PATCH] Don't use "byte" as identifier.
by Michael Karcher 12 Jan '10

12 Jan '10

Some mingw declares a global identifier "byte", causing -Werror -Wshadow to break compilation. This patch renames all identifiers called "byte". Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- chipdrivers.h | 2 +- chipset_enable.c | 22 +++++++++++----------- spi.c | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/chipdrivers.h b/chipdrivers.h index e2c698b..e7261e0 100644 --- a/chipdrivers.h +++ b/chipdrivers.h @@ -46,7 +46,7 @@ int spi_chip_write_256(struct flashchip *flash, uint8_t *buf); int spi_chip_read(struct flashchip *flash, uint8_t *buf, int start, int len); uint8_t spi_read_status_register(void); int spi_disable_blockprotect(void); -int spi_byte_program(int addr, uint8_t byte); +int spi_byte_program(int addr, uint8_t databyte); int spi_nbyte_program(int addr, uint8_t *bytes, int len); int spi_nbyte_read(int addr, uint8_t *bytes, int len); int spi_read_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize); diff --git a/chipset_enable.c b/chipset_enable.c index f106f96..0f42c7f 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -1026,19 +1026,19 @@ static int enable_flash_sb400(struct pci_dev *dev, const char *name) static int enable_flash_mcp55(struct pci_dev *dev, const char *name) { - uint8_t old, new, byte; - uint16_t word; + uint8_t old, new, val; + uint16_t wordval; /* Set the 0-16 MB enable bits. */ - byte = pci_read_byte(dev, 0x88); - byte |= 0xff; /* 256K */ - pci_write_byte(dev, 0x88, byte); - byte = pci_read_byte(dev, 0x8c); - byte |= 0xff; /* 1M */ - pci_write_byte(dev, 0x8c, byte); - word = pci_read_word(dev, 0x90); - word |= 0x7fff; /* 16M */ - pci_write_word(dev, 0x90, word); + val = pci_read_byte(dev, 0x88); + val |= 0xff; /* 256K */ + pci_write_byte(dev, 0x88, val); + val = pci_read_byte(dev, 0x8c); + val |= 0xff; /* 1M */ + pci_write_byte(dev, 0x8c, val); + wordval = pci_read_word(dev, 0x90); + wordval |= 0x7fff; /* 16M */ + pci_write_word(dev, 0x90, wordval); old = pci_read_byte(dev, 0x6d); new = old | 0x01; diff --git a/spi.c b/spi.c index 43dc4bf..952952f 100644 --- a/spi.c +++ b/spi.c @@ -832,7 +832,7 @@ int spi_write_status_register(int status) return result; } -int spi_byte_program(int addr, uint8_t byte) +int spi_byte_program(int addr, uint8_t databyte) { int result; struct spi_command cmds[] = { @@ -843,7 +843,7 @@ int spi_byte_program(int addr, uint8_t byte) .readarr = NULL, }, { .writecnt = JEDEC_BYTE_PROGRAM_OUTSIZE, - .writearr = (const unsigned char[]){ JEDEC_BYTE_PROGRAM, (addr >> 16) & 0xff, (addr >> 8) & 0xff, (addr & 0xff), byte }, + .writearr = (const unsigned char[]){ JEDEC_BYTE_PROGRAM, (addr >> 16) & 0xff, (addr >> 8) & 0xff, (addr & 0xff), databyte }, .readcnt = 0, .readarr = NULL, }, { -- 1.6.5

1 0

[PATCH v2] Enable -Wshadow, clean code for that
by Michael Karcher 12 Jan '10

12 Jan '10

This is not just for fun. We hit a real bug on BSD with the outl macros. The macro variable tmp collided with the tmp from outer scope. second revision, now also taking care of inb/inw/inl. While that shadowing did not introduce bugs (yet), of course it breaks the build on BSD when -Wshadow is enabled. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- Makefile | 2 +- cbtable.c | 8 ++++---- cli_classic.c | 1 - flash.h | 1 - hwaccess.h | 12 ++++++------ 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 423e315..501f65a 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ INSTALL = install DIFF = diff PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man -CFLAGS ?= -Os -Wall -Werror +CFLAGS ?= -Os -Wall -Werror -Wshadow EXPORTDIR ?= . OS_ARCH = $(shell uname) diff --git a/cbtable.c b/cbtable.c index 2bc1bfa..2611a62 100644 --- a/cbtable.c +++ b/cbtable.c @@ -50,7 +50,7 @@ static unsigned long compute_checksum(void *addr, unsigned long length) volatile union { uint8_t byte[2]; uint16_t word; - } value; + } chksum; unsigned long sum; unsigned long i; @@ -72,10 +72,10 @@ static unsigned long compute_checksum(void *addr, unsigned long length) sum = (sum + (sum >> 16)) & 0xFFFF; } } - value.byte[0] = sum & 0xff; - value.byte[1] = (sum >> 8) & 0xff; + chksum.byte[0] = sum & 0xff; + chksum.byte[1] = (sum >> 8) & 0xff; - return (~value.word) & 0xFFFF; + return (~chksum.word) & 0xFFFF; } #define for_each_lbrec(head, rec) \ diff --git a/cli_classic.c b/cli_classic.c index d3e7a15..6cb0578 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -150,7 +150,6 @@ int cli_classic(int argc, char *argv[]) if (argc > 1) { /* Yes, print them. */ - int i; printf_debug("The arguments are:\n"); for (i = 1; i < argc; ++i) printf_debug("%s\n", argv[i]); diff --git a/flash.h b/flash.h index 069b903..9a25c70 100644 --- a/flash.h +++ b/flash.h @@ -297,7 +297,6 @@ void internal_delay(int usecs); extern uint32_t io_base_addr; extern struct pci_access *pacc; -extern struct pci_filter filter; extern struct pci_dev *pcidev_dev; struct pcidev_status { uint16_t vendor_id; diff --git a/hwaccess.h b/hwaccess.h index 2bc2927..0729226 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -46,12 +46,12 @@ #include <machine/cpufunc.h> #define off64_t off_t #define lseek64 lseek - #define OUTB(x, y) do { u_int tmp = (y); outb(tmp, (x)); } while (0) - #define OUTW(x, y) do { u_int tmp = (y); outw(tmp, (x)); } while (0) - #define OUTL(x, y) do { u_int tmp = (y); outl(tmp, (x)); } while (0) - #define INB(x) __extension__ ({ u_int tmp = (x); inb(tmp); }) - #define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); }) - #define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); }) + #define OUTB(x, y) do { u_int outb_tmp = (y); outb(outb_tmp, (x)); } while (0) + #define OUTW(x, y) do { u_int outw_tmp = (y); outw(outw_tmp, (x)); } while (0) + #define OUTL(x, y) do { u_int outl_tmp = (y); outl(outl_tmp, (x)); } while (0) + #define INB(x) __extension__ ({ u_int inb_tmp = (x); inb(inb_tmp); }) + #define INW(x) __extension__ ({ u_int inw_tmp = (x); inw(inw_tmp); }) + #define INL(x) __extension__ ({ u_int inl_tmp = (x); inl(inl_tmp); }) #else #if defined(__DARWIN__) #include <DirectIO/darwinio.h> -- 1.6.5

2 2

[commit] r860 - trunk
by svn＠flashrom.org 12 Jan '10

12 Jan '10

Author: mkarcher Date: 2010-01-12 16:36:24 +0100 (Tue, 12 Jan 2010) New Revision: 860 Modified: trunk/Makefile trunk/cbtable.c trunk/cli_classic.c trunk/flash.h trunk/hwaccess.h Log: Enable -Wshadow, clean code for that This is not just for fun. We hit a real bug on BSD with the outl macros. The macro variable tmp collided with the tmp from outer scope. second revision, now also taking care of inb/inw/inl. While that shadowing did not introduce bugs (yet), of course it breaks the build on BSD when -Wshadow is enabled. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Luc Verhaegen <libv(a)skynet.be> Modified: trunk/Makefile =================================================================== --- trunk/Makefile 2010-01-10 15:01:08 UTC (rev 859) +++ trunk/Makefile 2010-01-12 15:36:24 UTC (rev 860) @@ -25,7 +25,7 @@ DIFF = diff PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man -CFLAGS ?= -Os -Wall -Werror +CFLAGS ?= -Os -Wall -Werror -Wshadow EXPORTDIR ?= . OS_ARCH = $(shell uname) Modified: trunk/cbtable.c =================================================================== --- trunk/cbtable.c 2010-01-10 15:01:08 UTC (rev 859) +++ trunk/cbtable.c 2010-01-12 15:36:24 UTC (rev 860) @@ -50,7 +50,7 @@ volatile union { uint8_t byte[2]; uint16_t word; - } value; + } chksum; unsigned long sum; unsigned long i; @@ -72,10 +72,10 @@ sum = (sum + (sum >> 16)) & 0xFFFF; } } - value.byte[0] = sum & 0xff; - value.byte[1] = (sum >> 8) & 0xff; + chksum.byte[0] = sum & 0xff; + chksum.byte[1] = (sum >> 8) & 0xff; - return (~value.word) & 0xFFFF; + return (~chksum.word) & 0xFFFF; } #define for_each_lbrec(head, rec) \ Modified: trunk/cli_classic.c =================================================================== --- trunk/cli_classic.c 2010-01-10 15:01:08 UTC (rev 859) +++ trunk/cli_classic.c 2010-01-12 15:36:24 UTC (rev 860) @@ -150,7 +150,6 @@ if (argc > 1) { /* Yes, print them. */ - int i; printf_debug("The arguments are:\n"); for (i = 1; i < argc; ++i) printf_debug("%s\n", argv[i]); Modified: trunk/flash.h =================================================================== --- trunk/flash.h 2010-01-10 15:01:08 UTC (rev 859) +++ trunk/flash.h 2010-01-12 15:36:24 UTC (rev 860) @@ -297,7 +297,6 @@ extern uint32_t io_base_addr; extern struct pci_access *pacc; -extern struct pci_filter filter; extern struct pci_dev *pcidev_dev; struct pcidev_status { uint16_t vendor_id; Modified: trunk/hwaccess.h =================================================================== --- trunk/hwaccess.h 2010-01-10 15:01:08 UTC (rev 859) +++ trunk/hwaccess.h 2010-01-12 15:36:24 UTC (rev 860) @@ -46,12 +46,12 @@ #include <machine/cpufunc.h> #define off64_t off_t #define lseek64 lseek - #define OUTB(x, y) do { u_int tmp = (y); outb(tmp, (x)); } while (0) - #define OUTW(x, y) do { u_int tmp = (y); outw(tmp, (x)); } while (0) - #define OUTL(x, y) do { u_int tmp = (y); outl(tmp, (x)); } while (0) - #define INB(x) __extension__ ({ u_int tmp = (x); inb(tmp); }) - #define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); }) - #define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); }) + #define OUTB(x, y) do { u_int outb_tmp = (y); outb(outb_tmp, (x)); } while (0) + #define OUTW(x, y) do { u_int outw_tmp = (y); outw(outw_tmp, (x)); } while (0) + #define OUTL(x, y) do { u_int outl_tmp = (y); outl(outl_tmp, (x)); } while (0) + #define INB(x) __extension__ ({ u_int inb_tmp = (x); inb(inb_tmp); }) + #define INW(x) __extension__ ({ u_int inw_tmp = (x); inw(inw_tmp); }) + #define INL(x) __extension__ ({ u_int inl_tmp = (x); inl(inl_tmp); }) #else #if defined(__DARWIN__) #include <DirectIO/darwinio.h>

1 0

[PATCH] Enable -Wshadow, clean code for that
by Michael Karcher 12 Jan '10

12 Jan '10

Enable -Wshadow, clean code for that This is not just for fun. We hit a real bug on BSD with the outl macros. The macro variable tmp collided with the tmp from outer scope in intel_ich_gpio_set. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> --- Makefile | 2 +- cbtable.c | 8 ++++---- cli_classic.c | 1 - flash.h | 1 - hwaccess.h | 6 +++--- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 423e315..501f65a 100644 --- a/Makefile +++ b/Makefile @@ -25,7 +25,7 @@ INSTALL = install DIFF = diff PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man -CFLAGS ?= -Os -Wall -Werror +CFLAGS ?= -Os -Wall -Werror -Wshadow EXPORTDIR ?= . OS_ARCH = $(shell uname) diff --git a/cbtable.c b/cbtable.c index 2bc1bfa..2611a62 100644 --- a/cbtable.c +++ b/cbtable.c @@ -50,7 +50,7 @@ static unsigned long compute_checksum(void *addr, unsigned long length) volatile union { uint8_t byte[2]; uint16_t word; - } value; + } chksum; unsigned long sum; unsigned long i; @@ -72,10 +72,10 @@ static unsigned long compute_checksum(void *addr, unsigned long length) sum = (sum + (sum >> 16)) & 0xFFFF; } } - value.byte[0] = sum & 0xff; - value.byte[1] = (sum >> 8) & 0xff; + chksum.byte[0] = sum & 0xff; + chksum.byte[1] = (sum >> 8) & 0xff; - return (~value.word) & 0xFFFF; + return (~chksum.word) & 0xFFFF; } #define for_each_lbrec(head, rec) \ diff --git a/cli_classic.c b/cli_classic.c index d3e7a15..6cb0578 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -150,7 +150,6 @@ int cli_classic(int argc, char *argv[]) if (argc > 1) { /* Yes, print them. */ - int i; printf_debug("The arguments are:\n"); for (i = 1; i < argc; ++i) printf_debug("%s\n", argv[i]); diff --git a/flash.h b/flash.h index 069b903..9a25c70 100644 --- a/flash.h +++ b/flash.h @@ -297,7 +297,6 @@ void internal_delay(int usecs); extern uint32_t io_base_addr; extern struct pci_access *pacc; -extern struct pci_filter filter; extern struct pci_dev *pcidev_dev; struct pcidev_status { uint16_t vendor_id; diff --git a/hwaccess.h b/hwaccess.h index 2bc2927..274b990 100644 --- a/hwaccess.h +++ b/hwaccess.h @@ -46,9 +46,9 @@ #include <machine/cpufunc.h> #define off64_t off_t #define lseek64 lseek - #define OUTB(x, y) do { u_int tmp = (y); outb(tmp, (x)); } while (0) - #define OUTW(x, y) do { u_int tmp = (y); outw(tmp, (x)); } while (0) - #define OUTL(x, y) do { u_int tmp = (y); outl(tmp, (x)); } while (0) + #define OUTB(x, y) do { u_int outb_tmp = (y); outb(outb_tmp, (x)); } while (0) + #define OUTW(x, y) do { u_int outw_tmp = (y); outw(outw_tmp, (x)); } while (0) + #define OUTL(x, y) do { u_int outl_tmp = (y); outl(outl_tmp, (x)); } while (0) #define INB(x) __extension__ ({ u_int tmp = (x); inb(tmp); }) #define INW(x) __extension__ ({ u_int tmp = (x); inw(tmp); }) #define INL(x) __extension__ ({ u_int tmp = (x); inl(tmp); }) -- 1.6.5

2 1

Flashrom results
by antioxid antioxid 11 Jan '10

11 Jan '10

Mainboard : http://www.biostar-europe.com/v4/app/de/mb/content.php?S_ID=380 OS : Ubuntu 9.10 x64 Flashrom : v0.9.1-r706 Output : flashrom No coreboot table found. This chipset supports the following protocols: Non-SPI. WARNING: No chipset found. Flash detection will most likely fail. Error: Programmer initialization failed. flashrom -V flashrom v0.9.1-r706 No coreboot table found. This chipset supports the following protocols: Non-SPI. WARNING: No chipset found. Flash detection will most likely fail. Error: Programmer initialization failed. flashrom -r backup.bin flashrom v0.9.1-r706 No coreboot table found. This chipset supports the following protocols: Non-SPI. WARNING: No chipset found. Flash detection will most likely fail. Error: Programmer initialization failed.

4 3

Big problem after flash of SST SST25VF016B on HP Compaq 615
by Parallix 11 Jan '10

11 Jan '10

Mystery things do not stop. Now I succeeded when flashing the original BIOS with the patched version as one can see by flashrom's output: flashrom v0.9.1-r845 (patched) No coreboot table found. Found chipset "AMD SB700/SB710/SB750", enabling flash write... OK. This chipset supports the following protocols: LPC,FWH,SPI. Calibrating delay loop... OK. Found chip "SST SST25VF016B" (2048 KB, SPI) at physical address 0xffe00000. === This flash part has status UNTESTED for operations: ERASE Please email a report to flashrom(a)flashrom.org if any of the above operations work correctly for you with this flash part. Please include the flashrom output with the additional -V option for all operations you tested (-V, -rV, -wV, -EV), and mention which mainboard or programmer you tested. Thanks for your help! === Flash image seems to be a legacy BIOS. Disabling checks. Writing flash chip... Erasing flash before programming... done. COMPLETE. Verifying flash... VERIFIED. A verification by reading the BIOS (via flashrom -r <file>) and comparing it with the original bios (via diff) shows the NO difference. For now I think we can say good night. But I would be very pleased if we fix the problem tomorrow. The original job to flash a new bios isn't done up to now ... Best, Parallix

3 9

[Patch] Chipset: Fix sis5x0 register write verification.
by Luc Verhaegen 10 Jan '10

10 Jan '10

2 2

[commit] r859 - trunk
by svn＠flashrom.org 10 Jan '10

10 Jan '10

Author: libv Date: 2010-01-10 16:01:08 +0100 (Sun, 10 Jan 2010) New Revision: 859 Modified: trunk/chipset_enable.c Log: Chipset: Fix sis5x0 register write verification. Also remove separate sis 5596 routine: superio code will be handled separately, which then turns this routine into the sis 5511 chipset enable. Signed-off-by: Luc Verhaegen <libv(a)skynet.be> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipset_enable.c =================================================================== --- trunk/chipset_enable.c 2010-01-10 13:28:48 UTC (rev 858) +++ trunk/chipset_enable.c 2010-01-10 15:01:08 UTC (rev 859) @@ -144,16 +144,6 @@ return ret; } -static int enable_flash_sis5596(struct pci_dev *dev, const char *name) -{ - int ret; - - ret = enable_flash_sis5511(dev, name); - - /* FIXME: Needs same superio handling as enable_flash_sis630 */ - return ret; -} - static int enable_flash_sis530(struct pci_dev *dev, const char *name) { uint8_t new, newer; @@ -170,7 +160,7 @@ new &= (~0x20); new |= 0x4; pci_write_byte(sbdev, 0x45, new); - newer = pci_read_byte(dev, 0x45); + newer = pci_read_byte(sbdev, 0x45); if (newer != new) { 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); @@ -196,7 +186,7 @@ new &= (~0x80); new |= 0x40; pci_write_byte(sbdev, 0x45, new); - newer = pci_read_byte(dev, 0x45); + newer = pci_read_byte(sbdev, 0x45); if (newer != new) { 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); @@ -1206,7 +1196,7 @@ {0x1039, 0x0496, NT, "SiS", "85C496+497", enable_flash_sis85c496}, {0x1039, 0x0406, NT, "SiS", "501/5101/5501", enable_flash_sis501}, {0x1039, 0x5511, NT, "SiS", "5511", enable_flash_sis5511}, - {0x1039, 0x5596, NT, "SiS", "5596", enable_flash_sis5596}, + {0x1039, 0x5596, NT, "SiS", "5596", enable_flash_sis5511}, {0x1039, 0x5571, NT, "SiS", "5571", enable_flash_sis530}, {0x1039, 0x5591, NT, "SiS", "5591/5592", enable_flash_sis530}, {0x1039, 0x5597, NT, "SiS", "5597/5598/5581/5120", enable_flash_sis530},

1 0

[PATCH] Allow single-programmer compilation
by Carl-Daniel Hailfinger 10 Jan '10

10 Jan '10

If neither internal (old default) nor dummy (safe default) programmer are selected, we must pick a sensible default programmer. Since there is no reason to prefer a particular external programmer, we abort compilation if more than one of them is selected. If only one is selected, it is clear that the user wants that one to become the default. This fixes single-programmer compilation. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-allow_single_programmer/flashrom.c =================================================================== --- flashrom-allow_single_programmer/flashrom.c (Revision 837) +++ flashrom-allow_single_programmer/flashrom.c (Arbeitskopie) @@ -39,9 +39,38 @@ #elif DUMMY_SUPPORT == 1 enum programmer programmer = PROGRAMMER_DUMMY; #else -/* Activating the #error explodes on make dep. */ -//#error Neither internal nor dummy selected +/* If neither internal nor dummy are selected, we must pick a sensible default. + * Since there is no reason to prefer a particular external programmer, we fail + * if more than one of them is selected. If only one is selected, it is clear + * that the user wants that one to become the default. + */ +#if NIC3COM_SUPPORT+GFXNVIDIA_SUPPORT+DRKAISER_SUPPORT+SATASII_SUPPORT+FT2232_SPI_SUPPORT+SERPROG_SUPPORT+BUSPIRATE_SPI_SUPPORT > 1 +#error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all external programmers except one. #endif +enum programmer programmer = +#if NIC3COM_SUPPORT == 1 + PROGRAMMER_NIC3COM +#endif +#if GFXNVIDIA_SUPPORT == 1 + PROGRAMMER_GFXNVIDIA +#endif +#if DRKAISER_SUPPORT == 1 + PROGRAMMER_DRKAISER +#endif +#if SATASII_SUPPORT == 1 + PROGRAMMER_SATASII +#endif +#if FT2232_SPI_SUPPORT == 1 + PROGRAMMER_FT2232SPI +#endif +#if SERPROG_SUPPORT == 1 + PROGRAMMER_SERPROG +#endif +#if BUSPIRATE_SPI_SUPPORT == 1 + PROGRAMMER_BUSPIRATESPI +#endif +; +#endif char *programmer_param = NULL; -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

2 2

[commit] r858 - trunk
by svn＠flashrom.org 10 Jan '10

10 Jan '10

Author: hailfinger Date: 2010-01-10 14:28:48 +0100 (Sun, 10 Jan 2010) New Revision: 858 Modified: trunk/flashrom.c Log: If neither internal (old default) nor dummy (safe default) programmer are selected, we must pick a sensible default programmer. Since there is no reason to prefer a particular external programmer, we abort compilation if more than one of them is selected. If only one is selected, it is clear that the user wants that one to become the default. This fixes single-programmer compilation. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/flashrom.c =================================================================== --- trunk/flashrom.c 2010-01-10 01:59:50 UTC (rev 857) +++ trunk/flashrom.c 2010-01-10 13:28:48 UTC (rev 858) @@ -39,9 +39,38 @@ #elif DUMMY_SUPPORT == 1 enum programmer programmer = PROGRAMMER_DUMMY; #else -/* Activating the #error explodes on make dep. */ -//#error Neither internal nor dummy selected +/* If neither internal nor dummy are selected, we must pick a sensible default. + * Since there is no reason to prefer a particular external programmer, we fail + * if more than one of them is selected. If only one is selected, it is clear + * that the user wants that one to become the default. + */ +#if NIC3COM_SUPPORT+GFXNVIDIA_SUPPORT+DRKAISER_SUPPORT+SATASII_SUPPORT+FT2232_SPI_SUPPORT+SERPROG_SUPPORT+BUSPIRATE_SPI_SUPPORT > 1 +#error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all external programmers except one. #endif +enum programmer programmer = +#if NIC3COM_SUPPORT == 1 + PROGRAMMER_NIC3COM +#endif +#if GFXNVIDIA_SUPPORT == 1 + PROGRAMMER_GFXNVIDIA +#endif +#if DRKAISER_SUPPORT == 1 + PROGRAMMER_DRKAISER +#endif +#if SATASII_SUPPORT == 1 + PROGRAMMER_SATASII +#endif +#if FT2232_SPI_SUPPORT == 1 + PROGRAMMER_FT2232SPI +#endif +#if SERPROG_SUPPORT == 1 + PROGRAMMER_SERPROG +#endif +#if BUSPIRATE_SPI_SUPPORT == 1 + PROGRAMMER_BUSPIRATESPI +#endif +; +#endif char *programmer_param = NULL;

1 0

[PATCH] Chipset: Fix sis5x0 register write verification.
by Luc Verhaegen 10 Jan '10

10 Jan '10

Also remove separate sis 5596 routine: superio code will be handled separately, which then turns this routine into the sis 5511 chipset enable. Signed-off-by: Luc Verhaegen <libv(a)skynet.be> --- chipset_enable.c | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/chipset_enable.c b/chipset_enable.c index 6a0fc4f..f106f96 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -144,16 +144,6 @@ static int enable_flash_sis5511(struct pci_dev *dev, const char *name) return ret; } -static int enable_flash_sis5596(struct pci_dev *dev, const char *name) -{ - int ret; - - ret = enable_flash_sis5511(dev, name); - - /* FIXME: Needs same superio handling as enable_flash_sis630 */ - return ret; -} - static int enable_flash_sis530(struct pci_dev *dev, const char *name) { uint8_t new, newer; @@ -170,7 +160,7 @@ static int enable_flash_sis530(struct pci_dev *dev, const char *name) new &= (~0x20); new |= 0x4; pci_write_byte(sbdev, 0x45, new); - newer = pci_read_byte(dev, 0x45); + newer = pci_read_byte(sbdev, 0x45); if (newer != new) { 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); @@ -196,7 +186,7 @@ static int enable_flash_sis540(struct pci_dev *dev, const char *name) new &= (~0x80); new |= 0x40; pci_write_byte(sbdev, 0x45, new); - newer = pci_read_byte(dev, 0x45); + newer = pci_read_byte(sbdev, 0x45); if (newer != new) { 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); @@ -1206,7 +1196,7 @@ const struct penable chipset_enables[] = { {0x1039, 0x0496, NT, "SiS", "85C496+497", enable_flash_sis85c496}, {0x1039, 0x0406, NT, "SiS", "501/5101/5501", enable_flash_sis501}, {0x1039, 0x5511, NT, "SiS", "5511", enable_flash_sis5511}, - {0x1039, 0x5596, NT, "SiS", "5596", enable_flash_sis5596}, + {0x1039, 0x5596, NT, "SiS", "5596", enable_flash_sis5511}, {0x1039, 0x5571, NT, "SiS", "5571", enable_flash_sis530}, {0x1039, 0x5591, NT, "SiS", "5591/5592", enable_flash_sis530}, {0x1039, 0x5597, NT, "SiS", "5597/5598/5581/5120", enable_flash_sis530}, -- 1.6.0.2 --/04w6evG8XlLl3ft--

1 0

Elitegroup A780GM-M3
by G. Balut 10 Jan '10

10 Jan '10

I've never flashed a BIOS before and my board wasn't listed as working but I saw the chipset when I did a flashrom -L so backed up, verified the backup, erased it and then did the upgrade. That worked and verified. I did hit one 'issue' that's probably a non-issue because I seriously had no idea what I was doing. You asked for an email with "the flashrom output with the additional -V option for all operations you tested (-V, -rV, -wV, -EV". I could not add the verify option on the command line; it only accepted one command at a time. I did have to boot with the nopat option added to my kernel (mandriva 2010.0 2.6.31.5-desktop-1mnb) Anyway, I've attached the output from the bios write and the verify I did afterwards. I didn't save the erase command I did before I did the -w option - which included an erase - so I'm not quite getting exactly how you're supposed to do this stuff but I've since rebooted and seen that what had been my unrecognized CPU is showing up just fine (that's what I flashed it for), everything seems stable and no hangups like I had before. Does that make sense? :) The motherboard was the ECS A780GM-M3, CPU is AMD Sempron 140. And may I suggest - since I have no idea what I'm doing WRT flashing bios, could someone add examples to the man page or add to the one command line listed up on wikipedia of how to do it so us idiots would know what to do to flash a bios. :) I looked around but all I found was the 'how to do it with a dos boot disk and the exe utility' which I couldn't use so I gambled on what I was doing with this which is really kinda spooky. Anyway, a huge thank you from this bios idjit!

1 0

[PATCH] Convert sb600spi to msg_*
by Sean Nelson 10 Jan '10

10 Jan '10

Convert all messages in sb600spi.c to the new message infrastructure. Signed-off-by: Sean Nelson<audiohacked(a)gmail.com>

2 3

[commit] r857 - trunk
by svn＠flashrom.org 10 Jan '10

10 Jan '10

Author: hailfinger Date: 2010-01-10 02:59:50 +0100 (Sun, 10 Jan 2010) New Revision: 857 Modified: trunk/sb600spi.c Log: Convert all messages in sb600spi.c to the new message infrastructure. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/sb600spi.c =================================================================== --- trunk/sb600spi.c 2010-01-10 01:34:00 UTC (rev 856) +++ trunk/sb600spi.c 2010-01-10 01:59:50 UTC (rev 857) @@ -24,17 +24,6 @@ #include "flash.h" #include "spi.h" -/* Change this to #define if you want lowlevel debugging of commands - * sent to the SB600/SB700 SPI controller. - */ -#undef COMM_DEBUG - -#ifdef COMM_DEBUG -#define msg_comm_debug printf_debug -#else -#define msg_comm_debug(...) do {} while (0) -#endif - /* This struct is unused, but helps visualize the SB600 SPI BAR layout. *struct sb600_spi_controller { * unsigned int spi_cntrl0; / * 00h * / @@ -65,28 +54,28 @@ spi_disable_blockprotect(); /* Erase first */ - printf("Erasing flash before programming... "); + msg_pinfo("Erasing flash before programming... "); if (erase_flash(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_perr("ERASE FAILED!\n"); return -1; } - printf("done.\n"); + msg_pinfo("done.\n"); - printf("Programming flash"); + msg_pinfo("Programming flash"); for (i = 0; i < total_size; i++, buf++) { result = spi_nbyte_program(i, buf, 1); if (result) { - fprintf(stderr, "Write error!\n"); + msg_perr("Write error!\n"); return result; } /* wait program complete. */ if (i % 0x8000 == 0) - printf("."); + msg_pspew("."); while (spi_read_status_register() & JEDEC_RDSR_BIT_WIP) ; } - printf(" done.\n"); + msg_pinfo(" done.\n"); return result; } @@ -95,7 +84,7 @@ mmio_writeb(mmio_readb(sb600_spibar + 2) | 0x10, sb600_spibar + 2); while (mmio_readb(sb600_spibar + 0xD) & 0x7) - printf("reset\n"); + msg_pspew("reset\n"); } static void execute_command(void) @@ -116,17 +105,17 @@ writecnt--; - msg_comm_debug("%s, cmd=%x, writecnt=%x, readcnt=%x\n", - __func__, cmd, writecnt, readcnt); + msg_pspew("%s, cmd=%x, writecnt=%x, readcnt=%x\n", + __func__, cmd, writecnt, readcnt); if (readcnt > 8) { - printf("%s, SB600 SPI controller can not receive %d bytes, " + msg_pinfo("%s, SB600 SPI controller can not receive %d bytes, " "it is limited to 8 bytes\n", __func__, readcnt); return SPI_INVALID_LENGTH; } if (writecnt > 8) { - printf("%s, SB600 SPI controller can not send %d bytes, " + msg_pinfo("%s, SB600 SPI controller can not send %d bytes, " "it is limited to 8 bytes\n", __func__, writecnt); return SPI_INVALID_LENGTH; } @@ -146,10 +135,10 @@ /* Send the write byte to FIFO. */ for (count = 0; count < writecnt; count++, writearr++) { - msg_comm_debug(" [%x]", *writearr); + msg_pspew(" [%x]", *writearr); mmio_writeb(*writearr, sb600_spibar + 0xC); } - msg_comm_debug("\n"); + msg_pspew("\n"); /* * We should send the data by sequence, which means we need to reset @@ -175,16 +164,16 @@ /* Skip the bytes we sent. */ for (count = 0; count < writecnt; count++) { cmd = mmio_readb(sb600_spibar + 0xC); - msg_comm_debug("[ %2x]", cmd); + msg_pspew("[ %2x]", cmd); } - msg_comm_debug("The FIFO pointer after skipping is %d.\n", - mmio_readb(sb600_spibar + 0xd) & 0x07); + msg_pspew("The FIFO pointer after skipping is %d.\n", + mmio_readb(sb600_spibar + 0xd) & 0x07); for (count = 0; count < readcnt; count++, readarr++) { *readarr = mmio_readb(sb600_spibar + 0xC); - msg_comm_debug("[%02x]", *readarr); + msg_pspew("[%02x]", *readarr); } - msg_comm_debug("\n"); + msg_pspew("\n"); return 0; }

1 0

[PATCH] Change a few probe timings to FIXME
by Carl-Daniel Hailfinger 10 Jan '10

10 Jan '10

Change a few probe timings to TIMING_FIXME. They previously had TIMING_IGNORED, but now they use probe_jedec directly or indirectly and that function does not ignore probe timing. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-probe_timing_fixme/flashchips.c =================================================================== --- flashrom-probe_timing_fixme/flashchips.c (Revision 844) +++ flashrom-probe_timing_fixme/flashchips.c (Arbeitskopie) @@ -4241,15 +4241,15 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW040A, .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, }, { .vendor = "ST", @@ -4258,15 +4258,15 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW040B, .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, }, { .vendor = "ST", @@ -4275,15 +4275,15 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW080A, .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, }, { .vendor = "ST", @@ -4292,15 +4292,15 @@ .manufacture_id = ST_ID, .model_id = ST_M50FLW080B, .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, }, { .vendor = "ST", @@ -4692,15 +4692,15 @@ .bustype = CHIP_BUSTYPE_LPC, .manufacture_id = WINBOND_ID, .model_id = W_39V040C, .total_size = 512, .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_w39v040c, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (w39v040c.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_w39v040c, .write = write_w39v040c, .read = read_memmapped, }, { .vendor = "Winbond", -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

2 2

[commit] r856 - trunk
by svn＠flashrom.org 10 Jan '10

10 Jan '10

Author: hailfinger Date: 2010-01-10 02:34:00 +0100 (Sun, 10 Jan 2010) New Revision: 856 Modified: trunk/flashchips.c Log: Change a few probe timings to TIMING_FIXME. They previously had TIMING_IGNORED, but now they use probe_jedec directly or indirectly and that function does not ignore probe timing. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Sean Nelson <audiohacked(a)gmail.com> Modified: trunk/flashchips.c =================================================================== --- trunk/flashchips.c 2010-01-10 01:09:58 UTC (rev 855) +++ trunk/flashchips.c 2010-01-10 01:34:00 UTC (rev 856) @@ -4245,7 +4245,7 @@ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, @@ -4262,7 +4262,7 @@ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, @@ -4279,7 +4279,7 @@ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, @@ -4296,7 +4296,7 @@ .feature_bits = FEATURE_REGISTERMAP, .tested = TEST_UNTESTED, .probe = probe_jedec, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (stm50flw0x0x.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_stm50flw0x0x, .write = write_stm50flw0x0x, .read = read_memmapped, @@ -4696,7 +4696,7 @@ .page_size = 64 * 1024, .tested = TEST_OK_PREW, .probe = probe_w39v040c, - .probe_timing = TIMING_IGNORED, /* routine don't use probe_timing (w39v040c.c) */ + .probe_timing = TIMING_FIXME, .erase = erase_w39v040c, .write = write_w39v040c, .read = read_memmapped,

1 0

[PATCH] Convert it87spi to msg_*
by Sean Nelson 10 Jan '10

10 Jan '10

Convert all messages in it87spi.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com>

2 4

[PATCH] Convert ft2232_spi to msg_*
by Sean Nelson 10 Jan '10

10 Jan '10

Convert all messages in ft2232_spi.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com>

2 4

[commit] r855 - trunk
by svn＠flashrom.org 10 Jan '10

10 Jan '10

Author: snelson Date: 2010-01-10 02:09:58 +0100 (Sun, 10 Jan 2010) New Revision: 855 Modified: trunk/it87spi.c Log: Convert all messages in it87spi.c to the new message infrastructure. Change one msg_pdbg to msg_pinfo, change 7 msg_pinfo to msg_pdbg. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/it87spi.c =================================================================== --- trunk/it87spi.c 2010-01-10 01:08:37 UTC (rev 854) +++ trunk/it87spi.c 2010-01-10 01:09:58 UTC (rev 855) @@ -80,7 +80,7 @@ case 0x82: case 0x86: case 0x87: - printf_debug("Found ITE SuperI/O, id %04hx\n", + msg_pinfo("Found ITE SuperI/O, id %04hx\n", ret.model); return ret; } @@ -105,31 +105,31 @@ enter_conf_mode_ite(port); /* NOLDN, reg 0x24, mask out lowest bit (suspend) */ tmp = sio_read(port, 0x24) & 0xFE; - printf("Serial flash segment 0x%08x-0x%08x %sabled\n", + msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", 0xFFFE0000, 0xFFFFFFFF, (tmp & 1 << 1) ? "en" : "dis"); - printf("Serial flash segment 0x%08x-0x%08x %sabled\n", + msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", 0x000E0000, 0x000FFFFF, (tmp & 1 << 1) ? "en" : "dis"); - printf("Serial flash segment 0x%08x-0x%08x %sabled\n", + msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", 0xFFEE0000, 0xFFEFFFFF, (tmp & 1 << 2) ? "en" : "dis"); - printf("Serial flash segment 0x%08x-0x%08x %sabled\n", + msg_pdbg("Serial flash segment 0x%08x-0x%08x %sabled\n", 0xFFF80000, 0xFFFEFFFF, (tmp & 1 << 3) ? "en" : "dis"); - printf("LPC write to serial flash %sabled\n", + msg_pdbg("LPC write to serial flash %sabled\n", (tmp & 1 << 4) ? "en" : "dis"); /* The LPC->SPI force write enable below only makes sense for * non-programmer mode. */ /* If any serial flash segment is enabled, enable writing. */ if ((tmp & 0xe) && (!(tmp & 1 << 4))) { - printf("Enabling LPC write to serial flash\n"); + msg_pdbg("Enabling LPC write to serial flash\n"); tmp |= 1 << 4; sio_write(port, 0x24, tmp); } - printf("Serial flash pin %i\n", (tmp & 1 << 5) ? 87 : 29); + msg_pdbg("Serial flash pin %i\n", (tmp & 1 << 5) ? 87 : 29); /* LDN 0x7, reg 0x64/0x65 */ sio_write(port, 0x07, 0x7); flashport = sio_read(port, 0x64) << 8; flashport |= sio_read(port, 0x65); - printf("Serial flash port 0x%04x\n", flashport); + msg_pdbg("Serial flash port 0x%04x\n", flashport); if (programmer_param && !strlen(programmer_param)) { free(programmer_param); programmer_param = NULL; @@ -137,7 +137,7 @@ 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); + msg_pinfo("Forcing serial flash port 0x%04x\n", flashport); sio_write(port, 0x64, (flashport >> 8)); sio_write(port, 0x65, (flashport & 0xff)); } @@ -145,7 +145,7 @@ break; /* TODO: Handle more IT87xx if they support flash translation */ default: - printf("SuperI/O ID %04hx is not on the controller list.\n", id); + msg_pinfo("SuperI/O ID %04hx is not on the controller list.\n", id); } return flashport; } @@ -209,7 +209,7 @@ busy = INB(it8716f_flashport) & 0x80; } while (busy); if (readcnt > 3) { - printf("%s called with unsupported readcnt %i.\n", + msg_pinfo("%s called with unsupported readcnt %i.\n", __func__, readcnt); return SPI_INVALID_LENGTH; } @@ -239,7 +239,7 @@ writeenc = 0x3; break; default: - printf("%s called with unsupported writecnt %i.\n", + msg_pinfo("%s called with unsupported writecnt %i.\n", __func__, writecnt); return SPI_INVALID_LENGTH; } @@ -320,12 +320,12 @@ } else { spi_disable_blockprotect(); /* Erase first */ - printf("Erasing flash before programming... "); + msg_pinfo("Erasing flash before programming... "); if (erase_flash(flash)) { - fprintf(stderr, "ERASE FAILED!\n"); + msg_perr("ERASE FAILED!\n"); return -1; } - printf("done.\n"); + msg_pinfo("done.\n"); for (i = 0; i < total_size / 256; i++) { it8716f_spi_page_program(flash, i, buf); }

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom