flashrom January 2010

flashrom@flashrom.org

49 participants
216 discussions

[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

← Newer
1
...
10
11
12
13
14
15
16
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom January 2010