- 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

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

10 Jan '10

Author: snelson Date: 2010-01-10 02:08:37 +0100 (Sun, 10 Jan 2010) New Revision: 854 Modified: trunk/ft2232_spi.c Log: Convert all messages in ft2232_spi.c to the new message infrastructure. Fix one pinfo message to be 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/ft2232_spi.c =================================================================== --- trunk/ft2232_spi.c 2010-01-10 01:06:23 UTC (rev 853) +++ trunk/ft2232_spi.c 2010-01-10 01:08:37 UTC (rev 854) @@ -29,17 +29,6 @@ #include "spi.h" #include <ftdi.h> -/* Change this to #define if you want lowlevel debugging of commands - * sent to the FT2232 SPI controller. - */ -#undef COMM_DEBUG - -#ifdef COMM_DEBUG -#define msg_comm_debug printf_debug -#else -#define msg_comm_debug(...) do {} while (0) -#endif - /* * The 'H' chips can run internally at either 12MHz or 60MHz. * The non-H chips can only run at 12MHz. @@ -62,7 +51,7 @@ int r; r = ftdi_write_data(ftdic, (unsigned char *) buf, size); if (r < 0) { - fprintf(stderr, "ftdi_write_data: %d, %s\n", r, + msg_perr("ftdi_write_data: %d, %s\n", r, ftdi_get_error_string(ftdic)); return 1; } @@ -74,7 +63,7 @@ int r; r = ftdi_read_data(ftdic, (unsigned char *) buf, size); if (r < 0) { - fprintf(stderr, "ftdi_read_data: %d, %s\n", r, + msg_perr("ftdi_read_data: %d, %s\n", r, ftdi_get_error_string(ftdic)); return 1; } @@ -91,7 +80,7 @@ enum ftdi_interface ft2232_interface = INTERFACE_B; if (ftdi_init(ftdic) < 0) { - fprintf(stderr, "ftdi_init failed\n"); + msg_perr("ftdi_init failed\n"); return EXIT_FAILURE; // TODO } @@ -115,48 +104,48 @@ ft2232_interface = INTERFACE_B; break; default: - fprintf(stderr, "Invalid interface specified, " + msg_perr("Invalid interface specified, " "using default.\n"); } } free(programmer_param); } - printf_debug("Using device type %s ", + msg_pdbg("Using device type %s ", (ft2232_type == FTDI_FT2232H) ? "2232H" : "4232H"); - printf_debug("interface %s\n", + msg_pdbg("interface %s\n", (ft2232_interface == INTERFACE_A) ? "A" : "B"); f = ftdi_usb_open(ftdic, 0x0403, ft2232_type); if (f < 0 && f != -5) { - fprintf(stderr, "Unable to open FTDI device: %d (%s)\n", f, + msg_perr("Unable to open FTDI device: %d (%s)\n", f, ftdi_get_error_string(ftdic)); exit(-1); // TODO } if (ftdi_set_interface(ftdic, ft2232_interface) < 0) { - fprintf(stderr, "Unable to select interface: %s\n", + msg_perr("Unable to select interface: %s\n", ftdic->error_str); } if (ftdi_usb_reset(ftdic) < 0) { - fprintf(stderr, "Unable to reset FTDI device\n"); + msg_perr("Unable to reset FTDI device\n"); } if (ftdi_set_latency_timer(ftdic, 2) < 0) { - fprintf(stderr, "Unable to set latency timer\n"); + msg_perr("Unable to set latency timer\n"); } if (ftdi_write_data_set_chunksize(ftdic, 512)) { - fprintf(stderr, "Unable to set chunk size\n"); + msg_perr("Unable to set chunk size\n"); } if (ftdi_set_bitmode(ftdic, 0x00, BITMODE_BITBANG_SPI) < 0) { - fprintf(stderr, "Unable to set bitmode to SPI\n"); + msg_perr("Unable to set bitmode to SPI\n"); } #if CLOCK_5X - printf_debug("Disable divide-by-5 front stage\n"); + msg_pdbg("Disable divide-by-5 front stage\n"); buf[0] = 0x8a; /* Disable divide-by-5. */ if (send_buf(ftdic, buf, 1)) return -1; @@ -167,7 +156,7 @@ #define MPSSE_CLK 12.0 #endif - printf_debug("Set clock divisor\n"); + msg_pdbg("Set clock divisor\n"); buf[0] = 0x86; /* command "set divisor" */ /* valueL/valueH are (desired_divisor - 1) */ buf[1] = (DIVIDE_BY - 1) & 0xff; @@ -175,16 +164,16 @@ if (send_buf(ftdic, buf, 3)) return -1; - printf("SPI clock is %fMHz\n", + msg_pdbg("SPI clock is %fMHz\n", (double)(MPSSE_CLK / (((DIVIDE_BY - 1) + 1) * 2))); /* Disconnect TDI/DO to TDO/DI for loopback. */ - printf_debug("No loopback of TDI/DO TDO/DI\n"); + msg_pdbg("No loopback of TDI/DO TDO/DI\n"); buf[0] = 0x85; if (send_buf(ftdic, buf, 1)) return -1; - printf_debug("Set data bits\n"); + msg_pdbg("Set data bits\n"); /* Set data bits low-byte command: * value: 0x08 CS=high, DI=low, DO=low, SK=low * dir: 0x0b CS=output, DI=input, DO=output, SK=output @@ -196,7 +185,7 @@ if (send_buf(ftdic, buf, 3)) return -1; - // printf_debug("\nft2232 chosen\n"); + // msg_pdbg("\nft2232 chosen\n"); buses_supported = CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_FT2232; @@ -223,7 +212,7 @@ if (bufsize > oldbufsize) { buf = realloc(buf, bufsize); if (!buf) { - fprintf(stderr, "Out of memory!\n"); + msg_perr("Out of memory!\n"); exit(1); } oldbufsize = bufsize; @@ -235,7 +224,7 @@ * and deassert CS# all in one shot. If reading, we do three separate * operations. */ - msg_comm_debug("Assert CS#\n"); + msg_pspew("Assert CS#\n"); buf[i++] = SET_BITS_LOW; buf[i++] = 0 & ~CS_BIT; /* assertive */ buf[i++] = 0x0b; @@ -260,7 +249,7 @@ failed = ret; /* We can't abort here, we still have to deassert CS#. */ if (ret) - fprintf(stderr, "send_buf failed before read: %i\n", + msg_perr("send_buf failed before read: %i\n", ret); i = 0; if (ret == 0) { @@ -273,18 +262,18 @@ failed |= ret; /* We can't abort here either. */ if (ret) - fprintf(stderr, "get_buf failed: %i\n", ret); + msg_perr("get_buf failed: %i\n", ret); } } - msg_comm_debug("De-assert CS#\n"); + msg_pspew("De-assert CS#\n"); buf[i++] = SET_BITS_LOW; buf[i++] = CS_BIT; buf[i++] = 0x0b; ret = send_buf(ftdic, buf, i); failed |= ret; if (ret) - fprintf(stderr, "send_buf failed at end: %i\n", ret); + msg_perr("send_buf failed at end: %i\n", ret); return failed ? -1 : 0; } @@ -302,13 +291,13 @@ 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"); - printf_debug("total_size is %d\n", total_size); + msg_pinfo("done.\n"); + msg_pdbg("total_size is %d\n", total_size); for (i = 0; i < total_size; i += 256) { int l, r; if (i + 256 <= total_size) @@ -317,7 +306,7 @@ l = total_size - i; if ((r = spi_nbyte_program(i, &buf[i], l))) { - fprintf(stderr, "%s: write fail %d\n", __func__, r); + msg_perr("%s: write fail %d\n", __func__, r); return 1; }

1 0

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

10 Jan '10

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

2 4

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

10 Jan '10

Author: snelson Date: 2010-01-10 02:06:23 +0100 (Sun, 10 Jan 2010) New Revision: 853 Modified: trunk/serprog.c Log: Convert all messages in serprog.c to the new message infrastructure. Rename some msg_pdbg to msg_pspew. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/serprog.c =================================================================== --- trunk/serprog.c 2010-01-09 23:58:37 UTC (rev 852) +++ trunk/serprog.c 2010-01-10 01:06:23 UTC (rev 853) @@ -99,7 +99,7 @@ struct hostent *hostPtr = NULL; union { struct sockaddr_in si; struct sockaddr s; } sp = {}; int sock; - printf_debug(MSGHEADER "IP %s port %d\n", ip, port); + msg_pdbg(MSGHEADER "IP %s port %d\n", ip, port); sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP); if (sock < 0) sp_die("Error: serprog cannot open socket"); @@ -170,7 +170,7 @@ unsigned char c = S_CMD_SYNCNOP; if (write(sp_fd, &c, 1) != 1) sp_die("sync write"); - printf_debug("."); + msg_pdbg("."); fflush(stdout); for (n = 0; n < 10; n++) { c = sp_sync_read_timeout(5); /* wait upto 50ms */ @@ -191,12 +191,11 @@ /* Ok, synchronized; back to blocking reads and return. */ flags &= ~O_NONBLOCK; fcntl(sp_fd, F_SETFL, flags); - printf_debug("\n"); + msg_pdbg("\n"); return; } } - fprintf(stderr, - "Error: cannot synchronize protocol\n" + msg_perr("Error: cannot synchronize protocol\n" "- check communications and reset device?\n"); exit(1); } @@ -212,7 +211,7 @@ static int sp_automatic_cmdcheck(uint8_t cmd) { if ((sp_check_avail_automatic) && (sp_check_commandavail(cmd) == 0)) { - printf_debug ("Warning: Automatic command availability check" + msg_pdbg("Warning: Automatic command availability check" " failed for cmd %d - wont execute cmd\n",cmd); return 1; } @@ -239,8 +238,7 @@ sp_die("Error: cannot read from device"); if (c == S_NAK) return 1; if (c != S_ACK) { - fprintf(stderr, - "Error: invalid response 0x%02X from device\n",c); + msg_perr("Error: invalid response 0x%02X from device\n",c); exit(1); } if (retlen) { @@ -263,18 +261,14 @@ do { unsigned char c; if (read(sp_fd, &c, 1) != 1) { - sp_die - ("Error: cannot read from device (flushing stream)"); + sp_die("Error: cannot read from device (flushing stream)"); } if (c == S_NAK) { - fprintf(stderr, - "Error: NAK to a stream buffer operation\n"); + msg_perr("Error: NAK to a stream buffer operation\n"); exit(1); } if (c != S_ACK) { - fprintf(stderr, - "Error: Invalid reply 0x%02X from device\n", - c); + msg_perr("Error: Invalid reply 0x%02X from device\n", c); exit(1); } } while (--sp_streamed_transmit_ops); @@ -310,12 +304,11 @@ unsigned char c; char *num; char *dev; - printf_debug("%s\n", __func__); + msg_pspew("%s\n", __func__); /* the parameter is either of format "/dev/device:baud" or "ip:port" */ if ((!programmer_param) || (!strlen(programmer_param))) { nodevice: - fprintf(stderr, - "Error: No device/host given for the serial programmer driver.\n" + msg_perr("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); } @@ -323,8 +316,7 @@ len = num - programmer_param; if (!len) goto nodevice; if (!num) { - fprintf(stderr, - "Error: No port or baudrate specified to serial programmer driver.\n" + msg_perr("Error: No port or baudrate specified to serial programmer driver.\n" "Use flashrom -p serprog=/dev/device:baud or flashrom -p serprog=ip:port\n"); exit(1); } @@ -344,28 +336,28 @@ free(dev); dev = NULL; free(num); num = NULL; - printf_debug(MSGHEADER "connected - attempting to synchronize\n"); + msg_pdbg(MSGHEADER "connected - attempting to synchronize\n"); sp_check_avail_automatic = 0; sp_synchronize(); - printf_debug(MSGHEADER "Synchronized\n"); + msg_pdbg(MSGHEADER "Synchronized\n"); if (sp_docommand(S_CMD_Q_IFACE, 0, NULL, 2, &iface)) { - fprintf(stderr, "Error: NAK to Query Interface version\n"); + msg_perr("Error: NAK to Query Interface version\n"); exit(1); } if (iface != 1) { - fprintf(stderr, "Error: Unknown interface version %d\n", iface); + msg_perr("Error: Unknown interface version %d\n", iface); exit(1); } - printf_debug(MSGHEADER "Interface version ok.\n"); + msg_pdbg(MSGHEADER "Interface version ok.\n"); if (sp_docommand(S_CMD_Q_CMDMAP, 0, NULL, 32, sp_cmdmap)) { - fprintf(stderr, "Error: query command map not supported\n"); + msg_perr("Error: query command map not supported\n"); exit(1); } @@ -373,81 +365,77 @@ /* Check for the minimum operational set of commands */ if (sp_check_commandavail(S_CMD_R_BYTE) == 0) { - fprintf(stderr, "Error: Single byte read not supported\n"); + msg_perr("Error: Single byte read not supported\n"); exit(1); } /* This could be translated to single byte reads (if missing), * * but now we dont support that. */ if (sp_check_commandavail(S_CMD_R_NBYTES) == 0) { - fprintf(stderr, "Error: Read n bytes not supported\n"); + msg_perr("Error: Read n bytes not supported\n"); exit(1); } /* In the future one could switch to read-only mode if these * * are not available. */ if (sp_check_commandavail(S_CMD_O_INIT) == 0) { - fprintf(stderr, - "Error: Initialize operation buffer not supported\n"); + msg_perr("Error: Initialize operation buffer not supported\n"); exit(1); } if (sp_check_commandavail(S_CMD_O_WRITEB) == 0) { - fprintf(stderr, - "Error: Write to opbuf: write byte not supported\n"); + msg_perr("Error: Write to opbuf: write byte not supported\n"); exit(1); } if (sp_check_commandavail(S_CMD_O_DELAY) == 0) { - fprintf(stderr, "Error: Write to opbuf: delay not supported\n"); + msg_perr("Error: Write to opbuf: delay not supported\n"); exit(1); } if (sp_check_commandavail(S_CMD_O_EXEC) == 0) { - fprintf(stderr, + msg_perr( "Error: Execute operation buffer not supported\n"); exit(1); } if (sp_docommand(S_CMD_Q_PGMNAME, 0, NULL, 16, pgmname)) { - fprintf(stderr, "Warning: NAK to query programmer name\n"); + msg_perr("Warning: NAK to query programmer name\n"); strcpy((char *)pgmname, "(unknown)"); } pgmname[16] = 0; - printf(MSGHEADER "Programmer name \"%s\"\n", pgmname); + msg_pinfo(MSGHEADER "Programmer name \"%s\"\n", pgmname); if (sp_docommand(S_CMD_Q_SERBUF, 0, NULL, 2, &sp_device_serbuf_size)) { - fprintf(stderr, "Warning: NAK to query serial buffer size\n"); + msg_perr("Warning: NAK to query serial buffer size\n"); } - printf_debug(MSGHEADER "serial buffer size %d\n", + msg_pdbg(MSGHEADER "serial buffer size %d\n", sp_device_serbuf_size); if (sp_docommand(S_CMD_Q_OPBUF, 0, NULL, 2, &sp_device_opbuf_size)) { - fprintf(stderr, - "Warning: NAK to query operation buffer size\n"); + msg_perr("Warning: NAK to query operation buffer size\n"); } - printf_debug(MSGHEADER "operation buffer size %d\n", + msg_pdbg(MSGHEADER "operation buffer size %d\n", sp_device_opbuf_size); if (sp_docommand(S_CMD_Q_BUSTYPE, 0, NULL, 1, &c)) { - fprintf(stderr, "Warning: NAK to query supported buses\n"); + msg_perr("Warning: NAK to query supported buses\n"); c = CHIP_BUSTYPE_NONSPI; /* A reasonable default for now. */ } buses_supported = c; if (sp_docommand(S_CMD_O_INIT, 0, NULL, 0, NULL)) { - fprintf(stderr, "Error: NAK to initialize operation buffer\n"); + msg_perr("Error: NAK to initialize operation buffer\n"); exit(1); } if (sp_docommand(S_CMD_Q_WRNMAXLEN, 0, NULL, 3, rbuf)) { - printf_debug(MSGHEADER "Write-n not supported"); + msg_pdbg(MSGHEADER "Write-n not supported"); sp_max_write_n = 0; } else { sp_max_write_n = ((unsigned int)(rbuf[0]) << 0); sp_max_write_n |= ((unsigned int)(rbuf[1]) << 8); sp_max_write_n |= ((unsigned int)(rbuf[2]) << 16); - printf_debug(MSGHEADER "Maximum write-n length %d\n", + msg_pdbg(MSGHEADER "Maximum write-n length %d\n", sp_max_write_n); sp_write_n_buf = malloc(sp_max_write_n); if (!sp_write_n_buf) { - fprintf(stderr, - "Error: cannot allocate memory for Write-n buffer\n"); + msg_perr("Error: cannot allocate memory for Write-n buffer\n"); exit(1); } sp_write_n_bytes = 0; @@ -458,10 +446,10 @@ sp_max_read_n = ((unsigned int)(rbuf[0]) << 0); sp_max_read_n |= ((unsigned int)(rbuf[1]) << 8); sp_max_read_n |= ((unsigned int)(rbuf[2]) << 16); - printf_debug(MSGHEADER "Maximum read-n length %d\n", + msg_pdbg(MSGHEADER "Maximum read-n length %d\n", sp_max_read_n ? sp_max_read_n : (1<<24)); } else { - printf_debug(MSGHEADER "Maximum read-n length not reported\n"); + msg_pdbg(MSGHEADER "Maximum read-n length not reported\n"); sp_max_read_n = 0; } @@ -477,7 +465,7 @@ static void sp_pass_writen(void) { unsigned char header[7]; - printf_debug(MSGHEADER "Passing write-n bytes=%d addr=0x%x\n", + msg_pspew(MSGHEADER "Passing write-n bytes=%d addr=0x%x\n", sp_write_n_bytes, sp_write_n_addr); if (sp_streamed_transmit_bytes >= (7 + sp_write_n_bytes + sp_device_serbuf_size)) @@ -517,7 +505,7 @@ if ((sp_max_write_n) && (sp_write_n_bytes)) sp_pass_writen(); sp_stream_buffer_op(S_CMD_O_EXEC, 0, 0); - printf_debug(MSGHEADER "Executed operation buffer of %d bytes\n", + msg_pspew(MSGHEADER "Executed operation buffer of %d bytes\n", sp_opbuf_usage); sp_opbuf_usage = 0; sp_prev_was_write = 0; @@ -532,7 +520,7 @@ int serprog_shutdown(void) { - printf_debug("%s\n", __func__); + msg_pspew("%s\n", __func__); if ((sp_opbuf_usage) || (sp_max_write_n && sp_write_n_bytes)) sp_execute_opbuf(); close(sp_fd); @@ -547,14 +535,13 @@ sp_execute_opbuf(); /* If this happens in the mid of an page load the page load * * will propably fail. */ - printf_debug(MSGHEADER - "Warning: executed operation buffer due to size reasons\n"); + msg_pdbg(MSGHEADER "Warning: executed operation buffer due to size reasons\n"); } } void serprog_chip_writeb(uint8_t val, chipaddr addr) { - printf_debug("%s\n", __func__); + msg_pspew("%s\n", __func__); if (sp_max_write_n) { if ((sp_prev_was_write) && (addr == (sp_write_n_addr + sp_write_n_bytes))) { @@ -598,7 +585,7 @@ sp_flush_stream(); if (read(sp_fd, &c, 1) != 1) sp_die("readb byteread"); - printf_debug("%s addr=0x%lx returning 0x%02X\n", __func__, addr, c); + msg_pspew("%s addr=0x%lx returning 0x%02X\n", __func__, addr, c); return c; } @@ -607,7 +594,7 @@ { int rd_bytes = 0; unsigned char sbuf[6]; - printf_debug("%s: addr=0x%lx len=%lu\n", __func__, addr, (unsigned long)len); + msg_pspew("%s: addr=0x%lx len=%lu\n", __func__, addr, (unsigned long)len); /* Stream the read-n -- as above. */ if ((sp_opbuf_usage) || (sp_max_write_n && sp_write_n_bytes)) sp_execute_opbuf_noflush(); @@ -644,7 +631,7 @@ void serprog_delay(int delay) { unsigned char buf[4]; - printf_debug("%s\n", __func__); + msg_pspew("%s\n", __func__); if ((sp_max_write_n) && (sp_write_n_bytes)) sp_pass_writen(); sp_check_opbuf_usage(5);

1 0

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

10 Jan '10

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

2 2

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

10 Jan '10

Author: snelson Date: 2010-01-10 00:58:37 +0100 (Sun, 10 Jan 2010) New Revision: 852 Modified: trunk/bitbang_spi.c Log: Convert all messages in bitbang_spi.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/bitbang_spi.c =================================================================== --- trunk/bitbang_spi.c 2010-01-09 23:56:41 UTC (rev 851) +++ trunk/bitbang_spi.c 2010-01-09 23:58:37 UTC (rev 852) @@ -99,14 +99,14 @@ if (bufsize > oldbufsize) { bufout = realloc(bufout, bufsize); if (!bufout) { - fprintf(stderr, "Out of memory!\n"); + msg_perr("Out of memory!\n"); if (bufin) free(bufin); exit(1); } bufin = realloc(bufout, bufsize); if (!bufin) { - fprintf(stderr, "Out of memory!\n"); + msg_perr("Out of memory!\n"); if (bufout) free(bufout); exit(1); @@ -143,7 +143,7 @@ int total_size = 1024 * flash->total_size; int i; - printf_debug("total_size is %d\n", total_size); + msg_pdbg("total_size is %d\n", total_size); for (i = 0; i < total_size; i += 256) { int l, r; if (i + 256 <= total_size) @@ -152,7 +152,7 @@ l = total_size - i; if ((r = spi_nbyte_program(i, &buf[i], l))) { - fprintf(stderr, "%s: write fail %d\n", __func__, r); + msg_perr("%s: write fail %d\n", __func__, r); return 1; }

1 0

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

10 Jan '10

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

2 2

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

10 Jan '10

Author: snelson Date: 2010-01-10 00:56:41 +0100 (Sun, 10 Jan 2010) New Revision: 851 Modified: trunk/buspirate_spi.c Log: Convert all messages in buspirate_spi.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/buspirate_spi.c =================================================================== --- trunk/buspirate_spi.c 2010-01-09 23:54:05 UTC (rev 850) +++ trunk/buspirate_spi.c 2010-01-09 23:56:41 UTC (rev 851) @@ -25,17 +25,6 @@ #include "flash.h" #include "spi.h" -/* Change this to #define if you want lowlevel debugging of commands - * sent to the Bus Pirate. - */ -#undef COMM_DEBUG - -#ifdef COMM_DEBUG -#define msg_comm_debug printf_debug -#else -#define msg_comm_debug(...) do {} while (0) -#endif - /* Change this to #define if you want to test without a serial implementation */ #undef FAKE_COMMUNICATION @@ -58,14 +47,14 @@ { int i, ret = 0; - msg_comm_debug("%s: write %i, read %i ", __func__, writecnt, readcnt); + msg_pspew("%s: write %i, read %i ", __func__, writecnt, readcnt); if (!writecnt && !readcnt) { - fprintf(stderr, "Zero length command!\n"); + msg_perr("Zero length command!\n"); return 1; } - msg_comm_debug("Sending"); + msg_pspew("Sending"); for (i = 0; i < writecnt; i++) - msg_comm_debug(" 0x%02x", buf[i]); + msg_pspew(" 0x%02x", buf[i]); #ifdef FAKE_COMMUNICATION /* Placate the caller for now. */ if (readcnt) { @@ -83,10 +72,10 @@ if (ret) return ret; #endif - msg_comm_debug(", receiving"); + msg_pspew(", receiving"); for (i = 0; i < readcnt; i++) - msg_comm_debug(" 0x%02x", buf[i]); - msg_comm_debug("\n"); + msg_pspew(" 0x%02x", buf[i]); + msg_pspew("\n"); return 0; } @@ -119,13 +108,13 @@ dev = extract_param(&programmer_param, "dev=", ",:"); speed = extract_param(&programmer_param, "spispeed=", ",:"); if (strlen(programmer_param)) - fprintf(stderr, "Unhandled programmer parameters: %s\n", + msg_perr("Unhandled programmer parameters: %s\n", programmer_param); free(programmer_param); programmer_param = NULL; } if (!dev) { - fprintf(stderr, "No serial device given. Use flashrom -p " + msg_perr("No serial device given. Use flashrom -p " "buspiratespi:dev=/dev/ttyUSB0\n"); return 1; } @@ -137,10 +126,10 @@ break; } if (!spispeeds[i].name) - fprintf(stderr, "Invalid SPI speed, using default.\n"); + msg_perr("Invalid SPI speed, using default.\n"); } /* This works because speeds numbering starts at 0 and is contiguous. */ - printf_debug("SPI speed is %sHz\n", spispeeds[spispeed].name); + msg_pdbg("SPI speed is %sHz\n", spispeeds[spispeed].name); ret = buspirate_serialport_setup(dev); if (ret) @@ -163,12 +152,12 @@ if (ret) return ret; if (memcmp(buf, "BBIO", 4)) { - fprintf(stderr, "Entering raw bitbang mode failed!\n"); + msg_perr("Entering raw bitbang mode failed!\n"); return 1; } - printf_debug("Raw bitbang mode version %c\n", buf[4]); + msg_pdbg("Raw bitbang mode version %c\n", buf[4]); if (buf[4] != '1') { - fprintf(stderr, "Can't handle raw bitbang mode version %c!\n", + msg_perr("Can't handle raw bitbang mode version %c!\n", buf[4]); return 1; } @@ -176,12 +165,12 @@ buf[0] = 0x01; ret = buspirate_sendrecv(buf, 1, 4); if (memcmp(buf, "SPI", 3)) { - fprintf(stderr, "Entering raw SPI mode failed!\n"); + msg_perr("Entering raw SPI mode failed!\n"); return 1; } - printf_debug("Raw SPI mode version %c\n", buf[3]); + msg_pdbg("Raw SPI mode version %c\n", buf[3]); if (buf[3] != '1') { - fprintf(stderr, "Can't handle raw SPI mode version %c!\n", + msg_perr("Can't handle raw SPI mode version %c!\n", buf[3]); return 1; } @@ -192,7 +181,7 @@ if (ret) return 1; if (buf[0] != 0x01) { - fprintf(stderr, "Protocol error while setting power/CS/AUX!\n"); + msg_perr("Protocol error while setting power/CS/AUX!\n"); return 1; } @@ -202,7 +191,7 @@ if (ret) return 1; if (buf[0] != 0x01) { - fprintf(stderr, "Protocol error while setting SPI speed!\n"); + msg_perr("Protocol error while setting SPI speed!\n"); return 1; } @@ -212,7 +201,7 @@ if (ret) return 1; if (buf[0] != 0x01) { - fprintf(stderr, "Protocol error while setting SPI config!\n"); + msg_perr("Protocol error while setting SPI config!\n"); return 1; } @@ -222,7 +211,7 @@ if (ret) return 1; if (buf[0] != 0x01) { - fprintf(stderr, "Protocol error while raising CS#!\n"); + msg_perr("Protocol error while raising CS#!\n"); return 1; } @@ -243,12 +232,12 @@ if (ret) return ret; if (memcmp(buf, "BBIO", 4)) { - fprintf(stderr, "Entering raw bitbang mode failed!\n"); + msg_perr("Entering raw bitbang mode failed!\n"); return 1; } - printf_debug("Raw bitbang mode version %c\n", buf[4]); + msg_pdbg("Raw bitbang mode version %c\n", buf[4]); if (buf[4] != '1') { - fprintf(stderr, "Can't handle raw bitbang mode version %c!\n", + msg_perr("Can't handle raw bitbang mode version %c!\n", buf[4]); return 1; } @@ -262,7 +251,7 @@ ret = serialport_shutdown(); if (ret) return ret; - printf_debug("Bus Pirate shutdown completed.\n"); + msg_pdbg("Bus Pirate shutdown completed.\n"); return 0; } @@ -279,7 +268,7 @@ /* +2 is pretty arbitrary. */ buf = realloc(buf, writecnt + readcnt + 2); if (!buf) { - fprintf(stderr, "Out of memory!\n"); + msg_perr("Out of memory!\n"); exit(1); // -1 } @@ -289,7 +278,7 @@ if (ret) return SPI_GENERIC_ERROR; if (buf[0] != 0x01) { - fprintf(stderr, "Protocol error while lowering CS#!\n"); + msg_perr("Protocol error while lowering CS#!\n"); return SPI_GENERIC_ERROR; } @@ -302,7 +291,7 @@ if (ret) return SPI_GENERIC_ERROR; if (buf[0] != 0x01) { - fprintf(stderr, "Protocol error while reading/writing SPI!\n"); + msg_perr("Protocol error while reading/writing SPI!\n"); return SPI_GENERIC_ERROR; } memcpy(readarr, buf + i, readcnt); @@ -314,7 +303,7 @@ if (ret) return SPI_GENERIC_ERROR; if (buf[0] != 0x01) { - fprintf(stderr, "Protocol error while raising CS#!\n"); + msg_perr("Protocol error while raising CS#!\n"); return SPI_GENERIC_ERROR; }

1 0

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

10 Jan '10

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

2 2

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

10 Jan '10

Author: snelson Date: 2010-01-10 00:54:05 +0100 (Sun, 10 Jan 2010) New Revision: 850 Modified: trunk/gfxnvidia.c Log: Convert all messages in gfxnvidia.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/gfxnvidia.c =================================================================== --- trunk/gfxnvidia.c 2010-01-09 23:50:27 UTC (rev 849) +++ trunk/gfxnvidia.c 2010-01-09 23:54:05 UTC (rev 850) @@ -64,7 +64,7 @@ io_base_addr = pcidev_init(PCI_VENDOR_ID_NVIDIA, PCI_BASE_ADDRESS_0, gfx_nvidia, programmer_param); io_base_addr += 0x300000; - printf("Detected NVIDIA I/O base address: 0x%x.\n", io_base_addr); + msg_pinfo("Detected NVIDIA I/O base address: 0x%x.\n", io_base_addr); /* Allow access to flash interface (will disable screen). */ reg32 = pci_read_long(pcidev_dev, 0x50);

1 0

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

10 Jan '10

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

2 2

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

10 Jan '10

Author: snelson Date: 2010-01-10 00:50:27 +0100 (Sun, 10 Jan 2010) New Revision: 849 Modified: trunk/satasii.c Log: Convert all messages in satasii.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/satasii.c =================================================================== --- trunk/satasii.c 2010-01-09 23:46:39 UTC (rev 848) +++ trunk/satasii.c 2010-01-09 23:50:27 UTC (rev 849) @@ -63,7 +63,7 @@ /* Check if ROM cycle are OK. */ if ((id != 0x0680) && (!(mmio_readl(sii_bar) & (1 << 26)))) - printf("Warning: Flash seems unconnected.\n"); + msg_pinfo("Warning: Flash seems unconnected.\n"); buses_supported = CHIP_BUSTYPE_PARALLEL;

1 0

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

10 Jan '10

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

2 2

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

10 Jan '10

Author: snelson Date: 2010-01-10 00:46:39 +0100 (Sun, 10 Jan 2010) New Revision: 848 Modified: trunk/serial.c Log: Convert all messages in serial.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/serial.c =================================================================== --- trunk/serial.c 2010-01-09 23:34:45 UTC (rev 847) +++ trunk/serial.c 2010-01-09 23:46:39 UTC (rev 848) @@ -139,7 +139,7 @@ for (i = 0;; i++) { if (sp_baudtable[i].baud == 0) { close(fd); - fprintf(stderr, + msg_perr( "Error: cannot configure for baudrate %d\n", baud); exit(1); @@ -193,7 +193,7 @@ if (tmp == -1) return 1; if (!tmp) - printf_debug("Empty write\n"); + msg_pdbg("Empty write\n"); writecnt -= tmp; buf += tmp; } @@ -214,7 +214,7 @@ if (tmp == -1) return 1; if (!tmp) - printf_debug("Empty read\n"); + msg_pdbg("Empty read\n"); readcnt -= tmp; buf += tmp; }

1 0

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

10 Jan '10

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

2 2

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

10 Jan '10

Author: snelson Date: 2010-01-10 00:34:45 +0100 (Sun, 10 Jan 2010) New Revision: 847 Modified: trunk/wbsio_spi.c Log: Convert all messages in wbsio_spi.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/wbsio_spi.c =================================================================== --- trunk/wbsio_spi.c 2010-01-09 23:31:13 UTC (rev 846) +++ trunk/wbsio_spi.c 2010-01-09 23:34:45 UTC (rev 847) @@ -22,17 +22,6 @@ #include "flash.h" #include "spi.h" -/* Change this to #define if you want lowlevel debugging of commands - * sent to the Winbond W836xx SPI controller. - */ -#undef COMM_DEBUG - -#ifdef COMM_DEBUG -#define msg_comm_debug printf_debug -#else -#define msg_comm_debug(...) do {} while (0) -#endif - #define WBSIO_PORT1 0x2e #define WBSIO_PORT2 0x4e @@ -46,18 +35,18 @@ w836xx_ext_enter(port); id = sio_read(port, 0x20); if (id != 0xa0) { - fprintf(stderr, "\nW83627 not found at 0x%x, id=0x%02x want=0xa0.\n", port, id); + msg_perr("\nW83627 not found at 0x%x, id=0x%02x want=0xa0.\n", port, id); goto done; } if (0 == (sio_read(port, 0x24) & 2)) { - fprintf(stderr, "\nW83627 found at 0x%x, but SPI pins are not enabled. (CR[0x24] bit 1=0)\n", port); + msg_perr("\nW83627 found at 0x%x, but SPI pins are not enabled. (CR[0x24] bit 1=0)\n", port); goto done; } sio_write(port, 0x07, 0x06); if (0 == (sio_read(port, 0x30) & 1)) { - fprintf(stderr, "\nW83627 found at 0x%x, but SPI is not enabled. (LDN6[0x30] bit 0=0)\n", port); + msg_perr("\nW83627 found at 0x%x, but SPI is not enabled. (LDN6[0x30] bit 0=0)\n", port); goto done; } @@ -74,7 +63,7 @@ if (0 == (wbsio_spibase = wbsio_get_spibase(WBSIO_PORT2))) return 1; - msg_comm_debug("\nwbsio_spibase = 0x%x\n", wbsio_spibase); + msg_pspew("\nwbsio_spibase = 0x%x\n", wbsio_spibase); buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_WBSIO; @@ -108,42 +97,42 @@ int i; uint8_t mode = 0; - msg_comm_debug("%s:", __func__); + msg_pspew("%s:", __func__); if (1 == writecnt && 0 == readcnt) { mode = 0x10; } else if (2 == writecnt && 0 == readcnt) { OUTB(writearr[1], wbsio_spibase + 4); - msg_comm_debug(" data=0x%02x", writearr[1]); + msg_pspew(" data=0x%02x", writearr[1]); mode = 0x20; } else if (1 == writecnt && 2 == readcnt) { mode = 0x30; } else if (4 == writecnt && 0 == readcnt) { - msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_pspew(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug("%02x", writearr[i]); + msg_pspew("%02x", writearr[i]); } mode = 0x40 | (writearr[1] & 0x0f); } else if (5 == writecnt && 0 == readcnt) { - msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_pspew(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < 4; i++) { OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug("%02x", writearr[i]); + msg_pspew("%02x", writearr[i]); } OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug(" data=0x%02x", writearr[i]); + msg_pspew(" data=0x%02x", writearr[i]); mode = 0x50 | (writearr[1] & 0x0f); } else if (8 == writecnt && 0 == readcnt) { - msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_pspew(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < 4; i++) { OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug("%02x", writearr[i]); + msg_pspew("%02x", writearr[i]); } - msg_comm_debug(" data=0x"); + msg_pspew(" data=0x"); for (; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug("%02x", writearr[i]); + msg_pspew("%02x", writearr[i]); } mode = 0x60 | (writearr[1] & 0x0f); } else if (5 == writecnt && 4 == readcnt) { @@ -154,17 +143,17 @@ */ ; } else if (4 == writecnt && readcnt >= 1 && readcnt <= 4) { - msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_pspew(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug("%02x", writearr[i]); + msg_pspew("%02x", writearr[i]); } mode = ((7 + readcnt) << 4) | (writearr[1] & 0x0f); } - msg_comm_debug(" cmd=%02x mode=%02x\n", writearr[0], mode); + msg_pspew(" cmd=%02x mode=%02x\n", writearr[0], mode); if (!mode) { - fprintf(stderr, "%s: unsupported command type wr=%d rd=%d\n", + msg_perr("%s: unsupported command type wr=%d rd=%d\n", __func__, writecnt, readcnt); /* Command type refers to the number of bytes read/written. */ return SPI_INVALID_LENGTH; @@ -177,12 +166,12 @@ if (!readcnt) return 0; - msg_comm_debug("%s: returning data =", __func__); + msg_pspew("%s: returning data =", __func__); for (i = 0; i < readcnt; i++) { readarr[i] = INB(wbsio_spibase + 4 + i); - msg_comm_debug(" 0x%02x", readarr[i]); + msg_pspew(" 0x%02x", readarr[i]); } - msg_comm_debug("\n"); + msg_pspew("\n"); return 0; } @@ -191,7 +180,7 @@ int size = 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__); + msg_perr("%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); return 1; } @@ -203,7 +192,7 @@ int size = 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__); + msg_perr("%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); return 1; }

1 0

Fix mess-up in commit 845
by Michael Karcher 10 Jan '10

10 Jan '10

commit 845 is wrong, as I deleted a wrong line when I wanted to remove debugging print code. This (hopefully obviously correct) patch fixes the issue. As a previous version (before adding the debugging statement) was already executed on the board, the missing OUTW was executed on the testers machine on an earlier flashrom run. Regards, Michael Karcher Index: board_enable.c =================================================================== --- board_enable.c (Revision 845) +++ board_enable.c (Arbeitskopie) @@ -967,7 +967,7 @@ base = pci_read_word(dev, 0x74); temp = INW(base + 0x68); temp &= ~(1 << 0); /* Make pin output? */ - printf_debug("changed to %04x\n",temp); + OUTW(temp, base + 0x68); temp = INW(base + 0x64); temp |= (1 << 0); /* Raise output? */

2 2

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

10 Jan '10

Author: mkarcher Date: 2010-01-10 00:31:13 +0100 (Sun, 10 Jan 2010) New Revision: 846 Modified: trunk/board_enable.c Log: commit 845 is wrong, as I deleted a wrong line when I wanted to remove debugging print code. This (hopefully obviously correct) patch fixes the issue. As a previous version (before adding the debugging statement) was already executed on the board, the missing OUTW was executed on the testers machine on an earlier flashrom run. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Luc Verhaegen <libv(a)skynet.be> Modified: trunk/board_enable.c =================================================================== --- trunk/board_enable.c 2010-01-09 17:36:06 UTC (rev 845) +++ trunk/board_enable.c 2010-01-09 23:31:13 UTC (rev 846) @@ -967,7 +967,7 @@ base = pci_read_word(dev, 0x74); temp = INW(base + 0x68); temp &= ~(1 << 0); /* Make pin output? */ - printf_debug("changed to %04x\n",temp); + OUTW(temp, base + 0x68); temp = INW(base + 0x64); temp |= (1 << 0); /* Raise output? */

1 0

Re: [flashrom] Big problem after flash of SST SST25VF016B on HP Compaq 615
by Carl-Daniel Hailfinger 09 Jan '10

09 Jan '10

Hi Parallix, I have re-added the flashrom list so others can follow our conversation. I just wanted to avoid any BIOS images on the list for legal reasons. On 09.01.2010 22:17, Parallix wrote: > Am Samstag, 9. Januar 2010 21:55:56 schrieben Sie: > >> On 09.01.2010 20:33, Parallix wrote: >> >>> COMPLETE. >>> Verifying flash... VERIFY FAILED at 0x00010058! Expected=0x15, Read=0x05, failed byte count from 0x00000000-0x001fffff: 0x12d075 >>> >>> A verification by reading the BIOS (via flashrom -r <file>) and comparing it with >>> the original bios (via diff) shows the same difference. >>> >>> >> This is very odd. Can you try flashing the backup BIOS with unmodified >> latest flashrom, then read back the result? >> > > I used the unpatched flashrom v0.9.1-r845. > Thanks. >> Please mail me personally at <c-d.hailfinger.devel.2006(a)gmx.net> the >> following files (preferably bz2 compressed): >> - original backup >> > > Is attatched > > >> - readback image after flashing with unmodified latest flashrom >> > > Is attachted, too. It contains a lot of identical bytes and thus results > in a much smaller bz2 file. > Thanks. >From your log file: > Chip status register is 8c > Chip status register: Block Protect Write Disable (BPL) is set This means it is probably not possible to undo the locking. > Chip status register: Auto Address Increment Programming (AAI) is not set > Chip status register: Bit 5 / Block Protect 3 (BP3) is not set > Chip status register: Bit 4 / Block Protect 2 (BP2) is not set > Chip status register: Bit 3 / Block Protect 1 (BP1) is set > Chip status register: Bit 2 / Block Protect 0 (BP0) is set > Chip status register: Write Enable Latch (WEL) is not set > Chip status register: Write In Progress (WIP/BUSY) is not set > Resulting block protection : 1C0000H-1FFFFFH The good news is that the erase result is as expected from the block protection data. The not-so-good news is that we need a board enable routine for your laptop if we want to flash the protected blocks. The bad news is that we probably need SuperIO or EC information (which we don't have) to write the board enable routine. Now let us focus on recovery. Can you read back the flash chip again and compare it against the last readback? They should be identical. If not, we have a really big problem where some unknown software is modifying the flash chip. Then try to write with a flashrom patched with the following patch. It will also turn up at http://patchwork.coreboot.org/project/flashrom/list/ shortly in case you have problems extracting the patch from this mail. Do not erase, check only if 0x0-0x1BFFFF is erased, then write 0x0-0x1BFFFF. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-parallix/spi.c =================================================================== --- flashrom-parallix/spi.c (Revision 845) +++ flashrom-parallix/spi.c (Arbeitskopie) @@ -997,10 +997,11 @@ */ int spi_chip_write_1(struct flashchip *flash, uint8_t *buf) { - int total_size = 1024 * flash->total_size; + int total_size = 0x1C0000; int i, result = 0; spi_disable_blockprotect(); +#if 0 /* Erase first */ printf("Erasing flash before programming... "); if (erase_flash(flash)) { @@ -1008,6 +1009,11 @@ return -1; } printf("done.\n"); +#endif + if (check_erased_range(flash, 0, total_size)) { + fprintf(stderr, "WTF erased area failed erasecheck!\n"); + return 1; + } for (i = 0; i < total_size; i++) { result = spi_byte_program(i, buf[i]); if (result) -- Developer quote of the year: "We are juggling too many chainsaws and flaming arrows and tigers."

1 0

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

09 Jan '10

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

2 1

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

09 Jan '10

Somewhat strage: After flashing the old bios with the suggested patch I got the following error output: flashrom v0.9.1-r845 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... VERIFY FAILED at 0x00010058! Expected=0x15, Read=0x05, failed byte count from 0x00000000-0x001fffff: 0x12d075 Your flash chip is in an unknown state. Get help on IRC at irc.freenode.net (channel #flashrom) or mail flashrom(a)flashrom.org! ------------------------------------------------------------------------------- DO NOT REBOOT OR POWEROFF! A verification by reading the BIOS (via flashrom -r <file>) and comparing it with the original bios (via diff) shows the same difference. Best, Parallix

2 1

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

09 Jan '10

Dear Carl-Daniel (Hailfinger), dear Michael (Karcher) here comes the information of the HP Compaq 615 you asked for. Best, Parallix

1 0

Re: [flashrom] Big problem after flash of SST SST25VF016B on HP Compaq 615
by Michael Karcher 09 Jan '10

09 Jan '10

Am Samstag, den 09.01.2010, 20:00 +0100 schrieb Parallix: > should I now flash the old (and buggy) bios or the new (hopefully bugless) > one? The old one, to recover your system to a safe state. Fixing the real issue is left for later. You might want to compare whether the last 256KB of the old and new BIOS are the same. In that case, an update without removing the boot block lock is possible, although not yet implemented in flashrom (partial write). > Should I use the trunk/developers version of flashrom or the released > one? You should use the developers version with the suggested modification applied. Please also send the info Carl-Daniel Hailfinger requested. Regards, Michael Karcher

1 0

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

09 Jan '10

I've a big problem. Of course, I made a backup of my old bios with flashrom -r oldbios.bin. Then I tried to flash my HP Compaq 615 with flashrom v0.9.1-r792 and got the following "warning": 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. Flash image seems to be a legacy BIOS. Disabling checks. Writing flash chip... Erasing flash before programming... Erasing flash chip... ERASE FAILED at 0x001c0000! Expected=0xff, Read=0xfc, failed byte count from 0x00000000-0x001fffff: 0x37386 ERASE FAILED! FAILED! ERASE FAILED! FAILED! Your flash chip is in an unknown state. Get help on IRC at irc.freenode.net (channel #flashrom) or mail flashrom(a)flashrom.org! ------------------------------------------------------------------------------- DO NOT REBOOT OR POWEROFF! After reading the flash contents with flashrom -r newbios.bin I compared the old bios with the new one. They differ. What can I now do? Best, Parallix

3 2

Re: [flashrom] [commit] r845 - trunk
by Luc Verhaegen 09 Jan '10

09 Jan '10

On Sat, Jan 09, 2010 at 06:36:07PM +0100, svn(a)flashrom.org wrote: > Author: mkarcher > Date: 2010-01-09 18:36:06 +0100 (Sat, 09 Jan 2010) > New Revision: 845 > > Modified: > trunk/board_enable.c > Log: > Enable flashing on MSI 651M-L. > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> > Acked-by: Sergey Lichack <shadowpilot34(a)gmail.com> I seem unable to find the prerequisites for supporting this board on the ml, lspci and superio. The superio one is very important, as i need to know which superio this is for the upcoming superio changes. I expect it to be a w83697(T)HF, as so far only those required this memw enable (like the it8705 is the only one require something rather similar). But cool, we have our first sis gpio poker. > +/** > + * Enable some GPIO pin on SiS southbridge. > + * Suited for MSI 651M-L: SiS651 / SiS962 > + */ > +static int board_msi_651ml(const char *name) > +{ > + struct pci_dev *dev; > + uint16_t base; > + uint16_t temp; > + > + dev = pci_dev_find(0x1039, 0x0962); > + if (!dev) { > + fprintf(stderr, "Expected south bridge not found\n"); > + return 1; > + } > + > + /* Registers 68 and 64 seem like bitmaps */ > + base = pci_read_word(dev, 0x74); > + temp = INW(base + 0x68); > + temp &= ~(1 << 0); /* Make pin output? */ > + printf_debug("changed to %04x\n",temp); Where do you end up writing this bit? > + > + temp = INW(base + 0x64); > + temp |= (1 << 0); /* Raise output? */ > + OUTW(temp, base + 0x64); > + > + w836xx_memw_enable(0x2E); > + > + return 0; > +} > + One or two more of these routines, and we might make a first stab at a general sis gpio routine. Luc Verhaegen.

2 1

Addendum: Big problem after flash of SST SST25VF016B on HP Compaq 615 (also with flashrom v0.9.1-r844)
by Parallix 09 Jan '10

09 Jan '10

I've the same problem I posted on Sat Jan 9 18:28:53 CET 2010 with flashrom v0.9.1-r844 I kindly ask for your help. Best, Parallix

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom