flashrom July 2011

flashrom@flashrom.org

50 participants
275 discussions

[PATCH] Kill unused "log" argument of count_usable_erasers()
by Sylvain 'ythier' Hitier 04 Jul '11

04 Jul '11

Kill unused "log" argument of count_usable_erasers(). Signed-off-by: Sylvain "ythier" Hitier <sylvain.hitier(a)gmail.com> Index: flashrom.c =================================================================== --- flashrom.c (revision 1362) +++ flashrom.c (working copy) @@ -713,9 +713,8 @@ return extract_param(&programmer_param, param_name, ","); } -/* Returns the number of well-defined erasers for a chip. - * The log parameter controls output. */ -static unsigned int count_usable_erasers(const struct flashchip *flash, int log) +/* Returns the number of well-defined erasers for a chip. */ +static unsigned int count_usable_erasers(const struct flashchip *flash) { unsigned int usable_erasefunctions = 0; int k; @@ -1511,7 +1510,7 @@ int k, ret = 0; uint8_t *curcontents; unsigned long size = flash->total_size * 1024; - unsigned int usable_erasefunctions = count_usable_erasers(flash, 0); + unsigned int usable_erasefunctions = count_usable_erasers(flash); msg_cinfo("Erasing and writing flash chip... "); curcontents = (uint8_t *) malloc(size); @@ -1831,7 +1830,7 @@ return 1; msg_cerr("Continuing anyway.\n"); } - if(count_usable_erasers(flash, 0) == 0) { + if(count_usable_erasers(flash) == 0) { msg_cerr("flashrom has no erase function for this " "flash chip.\n"); return 1; Regards, Sylvain "ythier" Hitier -- Business is about being busy, not being rich... Living in a Debian package => http://en.wikipedia.org/wiki/Apt,_Vaucluse

2 1

[commit] r1364 - trunk
by repository service 04 Jul '11

04 Jul '11

Author: stefanct Date: Mon Jul 4 09:27:17 2011 New Revision: 1364 URL: http://flashrom.org/trac/flashrom/changeset/1364 Log: Kill unused "log" argument of count_usable_erasers(). Signed-off-by: Sylvain "ythier" Hitier <sylvain.hitier(a)gmail.com> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/flashrom.c Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Jul 3 21:44:12 2011 (r1363) +++ trunk/flashrom.c Mon Jul 4 09:27:17 2011 (r1364) @@ -713,9 +713,8 @@ return extract_param(&programmer_param, param_name, ","); } -/* Returns the number of well-defined erasers for a chip. - * The log parameter controls output. */ -static unsigned int count_usable_erasers(const struct flashchip *flash, int log) +/* Returns the number of well-defined erasers for a chip. */ +static unsigned int count_usable_erasers(const struct flashchip *flash) { unsigned int usable_erasefunctions = 0; int k; @@ -1511,7 +1510,7 @@ int k, ret = 0; uint8_t *curcontents; unsigned long size = flash->total_size * 1024; - unsigned int usable_erasefunctions = count_usable_erasers(flash, 0); + unsigned int usable_erasefunctions = count_usable_erasers(flash); msg_cinfo("Erasing and writing flash chip... "); curcontents = (uint8_t *) malloc(size); @@ -1831,7 +1830,7 @@ return 1; msg_cerr("Continuing anyway.\n"); } - if(count_usable_erasers(flash, 0) == 0) { + if(count_usable_erasers(flash) == 0) { msg_cerr("flashrom has no erase function for this " "flash chip.\n"); return 1;

1 0

[PATCH] Fix and improve Windows/MinGW/MSYS build
by Uwe Hermann 03 Jul '11

03 Jul '11

See patch. Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

2 4

[commit] r1363 - trunk
by repository service 03 Jul '11

03 Jul '11

Author: uwe Date: Sun Jul 3 21:44:12 2011 New Revision: 1363 URL: http://flashrom.org/trac/flashrom/changeset/1363 Log: Fix and improve Windows/MinGW/MSYS build. - Makefile: Use $(OS_ARCH) to add some MinGW-specific workarounds and settings, so that a simple "make" is sufficient on MinGW (instead of manual Makefile hacking). - Explicitly set CC=gcc in the Makefile, otherwise you get an error like "cc: command not found" on MinGW. - MinGW doesn't have ffs(), use gcc's __builtin_ffs() instead. - Add /usr/local/include and /usr/local/lib to CPPFLAGS/LDFLAGS, that's where libusb-win32 and libftdi stuff is usually placed on MinGW/MSYS. - Disable serprog (no sockets) and all PCI-based programmers (no libpci) for now. That leaves dummy, ft2232_spi, and buspirate_spi enabled on MinGW per default. - serial.c: Use correct type for 'tmp', both on Windows/MinGW (DWORD) and POSIX (ssize_t). Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/Makefile trunk/serial.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Fri Jul 1 02:39:23 2011 (r1362) +++ trunk/Makefile Sun Jul 3 21:44:12 2011 (r1363) @@ -84,6 +84,88 @@ endif endif +ifeq ($(OS_ARCH), MINGW32_NT-5.1) +# Explicitly set CC = gcc on MinGW, otherwise: "cc: command not found". +CC = gcc +# MinGW doesn't have the ffs() function, but we can use gcc's __builtin_ffs(). +CFLAGS += -Dffs=__builtin_ffs +# libusb-win32/libftdi stuff is usually installed in /usr/local. +CPPFLAGS += -I/usr/local/include +LDFLAGS += -L/usr/local/lib +# Serprog is not supported under Windows/MinGW (missing sockets support). +ifeq ($(CONFIG_SERPROG), yes) +UNSUPPORTED_FEATURES += CONFIG_SERPROG=yes +else +override CONFIG_SERPROG = no +endif +# For now we disable all PCI-based programmers on Windows/MinGW (no libpci). +ifeq ($(CONFIG_INTERNAL), yes) +UNSUPPORTED_FEATURES += CONFIG_INTERNAL=yes +else +override CONFIG_INTERNAL = no +endif +ifeq ($(CONFIG_RAYER_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_RAYER_SPI=yes +else +override CONFIG_RAYER_SPI = no +endif +ifeq ($(CONFIG_NIC3COM), yes) +UNSUPPORTED_FEATURES += CONFIG_NIC3COM=yes +else +override CONFIG_NIC3COM = no +endif +ifeq ($(CONFIG_GFXNVIDIA), yes) +UNSUPPORTED_FEATURES += CONFIG_GFXNVIDIA=yes +else +override CONFIG_GFXNVIDIA = no +endif +ifeq ($(CONFIG_SATASII), yes) +UNSUPPORTED_FEATURES += CONFIG_SATASII=yes +else +override CONFIG_SATASII = no +endif +ifeq ($(CONFIG_ATAHPT), yes) +UNSUPPORTED_FEATURES += CONFIG_ATAHPT=yes +else +override CONFIG_ATAHPT = no +endif +ifeq ($(CONFIG_DRKAISER), yes) +UNSUPPORTED_FEATURES += CONFIG_DRKAISER=yes +else +override CONFIG_DRKAISER = no +endif +ifeq ($(CONFIG_NICREALTEK), yes) +UNSUPPORTED_FEATURES += CONFIG_NICREALTEK=yes +else +override CONFIG_NICREALTEK = no +endif +ifeq ($(CONFIG_NICNATSEMI), yes) +UNSUPPORTED_FEATURES += CONFIG_NICNATSEMI=yes +else +override CONFIG_NICNATSEMI = no +endif +ifeq ($(CONFIG_NICINTEL), yes) +UNSUPPORTED_FEATURES += CONFIG_NICINTEL=yes +else +override CONFIG_NICINTEL = no +endif +ifeq ($(CONFIG_NICINTEL_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_NICINTEL_SPI=yes +else +override CONFIG_NICINTEL_SPI = no +endif +ifeq ($(CONFIG_OGP_SPI), yes) +UNSUPPORTED_FEATURES += CONFIG_OGP_SPI=yes +else +override CONFIG_OGP_SPI = no +endif +ifeq ($(CONFIG_SATAMV), yes) +UNSUPPORTED_FEATURES += CONFIG_SATAMV=yes +else +override CONFIG_SATAMV = no +endif +endif + ifeq ($(OS_ARCH), libpayload) CC:=CC=i386-elf-gcc lpgcc AR:=i386-elf-ar Modified: trunk/serial.c ============================================================================== --- trunk/serial.c Fri Jul 1 02:39:23 2011 (r1362) +++ trunk/serial.c Sun Jul 3 21:44:12 2011 (r1363) @@ -192,7 +192,11 @@ int serialport_write(unsigned char *buf, unsigned int writecnt) { - long tmp = 0; +#ifdef _WIN32 + DWORD tmp = 0; +#else + ssize_t tmp = 0; +#endif while (writecnt > 0) { #ifdef _WIN32 @@ -215,7 +219,11 @@ int serialport_read(unsigned char *buf, unsigned int readcnt) { - long tmp = 0; +#ifdef _WIN32 + DWORD tmp = 0; +#else + ssize_t tmp = 0; +#endif while (readcnt > 0) { #ifdef _WIN32

1 0

Re: [flashrom] PCCHIPS M863G V5.1A + Winbond W49V002AP - Write OK
by Stefan Tauner 03 Jul '11

03 Jul '11

On Sat, 2 Jul 2011 12:27:45 -0300 Marcos Felipe Rasia de Mello <marcosfrm(a)gmail.com> wrote: > Tested with a PCCHIPS M863G V5.1A board w/ a Winbond W49V002AP flash. > I programmed "050518S.rom" BIOS. Worked OK. hello and thanks for your report! i have added the board to our supported hw list and marked the W49V002A as fully tested and will commit that later. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Asus M3A
by Fabio Semino 03 Jul '11

03 Jul '11

Erase and write ok with 12.06 bios, i'm attaching the output of the operation and lspci Fabio

2 1

PCCHIPS M863G V5.1A + Winbond W49V002AP - Write OK
by Marcos Felipe Rasia de Mello 02 Jul '11

02 Jul '11

Tested with a PCCHIPS M863G V5.1A board w/ a Winbond W49V002AP flash. I programmed "050518S.rom" BIOS. Worked OK. Marcos ---------------------------------------------------------- # flashrom -Vw 050518S.rom flashrom v0.9.3-r1362 on Linux 2.6.39.2-zero (i686), built with libpci 3.1.4, GCC 4.4.4 20100726 (Red Hat 4.4.4-13), little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OS timer resolution is 1 usecs, 750M loops per second, 10 myus = 10 us, 100 myus = 101 us, 1000 myus = 1001 us, 10000 myus = 10005 us, 4 myus = 5 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "ECS" DMI string system-product-name: "M863" DMI string system-version: "1.0" DMI string baseboard-manufacturer: "ECS" DMI string baseboard-product-name: "M863" DMI string baseboard-version: "1.0" DMI string chassis-type: "Desktop" Found ITE Super I/O, ID 0x8705 on port 0x2e Found ITE Super I/O, ID 0x8705 on port 0x4e Found chipset "SiS 741", enabling flash write... chipset PCI ID is 1039:0741, Found southbridge 1039:0964 at 00:02:0 OK. This chipset supports the following protocols: Non-SP. No IT8705F flash segment enabled. No IT8705F flash segment enabled. Probing for AMD Am29F010A/B, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F016D, 2048 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F080B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV001BB, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV001BT, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV002BB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV002BT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV004BB, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV004BT, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV008BB, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV008BT, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV081B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A49LF040A, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Atmel AT29C512, 64 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Atmel AT29C010A, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Atmel AT29C020, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Atmel AT29C040A, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Atmel AT49BV512, 64 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Atmel AT49F020, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Atmel AT49F002(N), 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Atmel AT49F002(N)T, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Bright BM29F040, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for EMST F49B002UA, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Eon EN29F010, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29F002(A)(N)B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29F002(A)(N)T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F004BC, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F004TC, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F400BC, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Fujitsu MBM29F400TC, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Hyundai HY29F002T, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Hyundai HY29F002B, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Hyundai HY29F040A, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F001BN/BX-B, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Intel 28F001BN/BX-T, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Intel 28F002BC/BL/BV/BX-T, 256 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F008S3/S5/SC, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F004B5/BE/BV/BX-B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F004B5/BE/BV/BX-T, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F400BV/BX/CE/CV-B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F400BV/BX/CE/CV-T, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AB, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AC, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F001B, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F001T, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29LV040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51000B, 64 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for MoselVitelic V29C51000T, 64 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for MoselVitelic V29C51400B, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for MoselVitelic V29C51400T, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for MoselVitelic V29LC51000, 64 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for MoselVitelic V29LC51001, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for MoselVitelic V29LC51002, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for PMC Pm29F002T, 256 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm29F002B, 256 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV010, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL002, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for PMC Pm49FL004, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Sharp LHF00L04, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST28SF040A, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29EE010, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST29LE010, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST29EE020A, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST29LE020, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST39SF512, 64 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST39SF010A, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST39SF020A, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST39SF040, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST39VF512, 64 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST39VF010, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST39VF020, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST39VF040, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST39VF080, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF002A/B, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST49LF003A/B, 384 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST49LF004A/B, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST49LF004C, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008A, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008C, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF016C, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF020, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST49LF020A, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST49LF040, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST49LF040B, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SST SST49LF080A, 1024 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF160C, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F002T/NT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F400BB, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for ST M29F400BT, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for ST M29W010B, 128 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29W040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29W512B, 64 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040A, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080A, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080B, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW002, 256 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW016, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW040, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW080, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50LPW116, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51001B, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SyncMOS/MoselVitelic {F,S,V}29C51001T, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SyncMOS/MoselVitelic {F,S,V}29C51002B, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SyncMOS/MoselVitelic {F,S,V}29C51002T, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SyncMOS/MoselVitelic {F,S,V}29C51004B, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SyncMOS/MoselVitelic {F,S,V}29C51004T, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SyncMOS/MoselVitelic {S,V}29C31004B, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for SyncMOS/MoselVitelic {S,V}29C31004T, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for TI TMS29F002RB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for TI TMS29F002RT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012, 128 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W29C020(C)/W29C022, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W29C040/P, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012, 128 kB: Probing disabled for Winbond W29EE011 because the probing sequence puts the AMIC A49LF040A in a funky state. Use 'flashrom -c W29EE011' if you have a board with this chip. Probing for Winbond W39L040, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W39V040A, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W39V040B, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W39V040C, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W39V040FA, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W39V040FB, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W39V040FC, 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W39V080A, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49F002U/N, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W49F020, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W49V002A, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Found chip "Winbond W49V002A" (256 kB, LPC) at physical address 0xfffc0000. Probing for Winbond W49V002FA, 256 kB: probe_jedec_common: id1 0xda, id2 0xb0 Probing for Winbond W39V080FA, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080FA (dual mode), 512 kB: probe_jedec_common: id1 0xda, id2 0xb0 === This flash part has status UNTESTED for operations: WRITE The test status of this chip may have been updated in the latest development version of flashrom. If you are running the latest development version, 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, -Vr, -Vw, -VE), and mention which mainboard or programmer you tested. Please mention your board in the subject line. Thanks for your help! Flash image seems to be a legacy BIOS. Disabling coreboot-related checks. Reading old flash chip contents... done. Erasing and writing flash chip... Looking at blockwise erase function 0... trying... 0x000000-0x00ffff:W, 0x010000-0x01ffff:W, 0x020000-0x02ffff:W, 0x030000-0x037fff:W, 0x038000-0x039fff:S, 0x03a000-0x03bfff:S, 0x03c000-0x03ffff:W Done. Verifying flash... VERIFIED. Restoring PCI config space for 00:02:0 reg 0x45 Restoring PCI config space for 00:02:0 reg 0x40

1 0

Re: [flashrom] [PATCH] Autodetect target processor architecture
by Carl-Daniel Hailfinger 01 Jul '11

01 Jul '11

Am 01.07.2011 04:45 schrieb David Hendricks: > On Tue, Jun 28, 2011 at 7:26 PM, Carl-Daniel Hailfinger < > c-d.hailfinger.devel.2006(a)gmx.net> wrote: > > >> Autodetect target processor architecture. >> Enable architecture dependent compilation of individual sub-drivers for >> the internal programmer. >> >> With this patch, you no longer have to edit the Makefile to compile the >> internal driver on MIPS/ARM/... >> >> TODO: arch.h is not suitable for inclusion in a .c/.h file because of >> its last line. Any ideas how to change that (move arch.h as "here >> document" into the Makefile, use other trickery like more #ifdefs)? >> >> Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> >> >> Index: flashrom-target_arch/Makefile >> =================================================================== >> --- flashrom-target_arch/Makefile (Revision 1357) >> +++ flashrom-target_arch/Makefile (Arbeitskopie) >> @@ -37,7 +37,10 @@ >> CFLAGS += -Werror >> endif >> >> -# FIXME We have to differentiate between host and target arch. >> +# Determine the destination processor architecture >> +ARCH = $(strip $(shell LC_ALL=C gcc -E arch.h|grep -v '^\#')) >> >> > Use $(CC) instead of "gcc" so stuff like "armv7a-cros-linux-gnueabi-gcc" > Ouch, yes! This was a cut-n-paste error. Thanks for spotting it. > gets handled properly. I still think assigning ARCH conditionally is wise > since package managers should set it when cross-compiling, though > using $(CC) should yield the same result. > > Aside from that, I was able to cross-compile successfully for ARM (using the > same CONFIG_* settings as before) after adding this minor patch on top of > yours: > > diff -Nru a/Makefile b/Makefile > --- a/Makefile 2011-06-30 19:35:53.410049173 -0700 > +++ b/Makefile 2011-06-30 19:35:39.140049283 -0700 > @@ -38,7 +38,7 @@ > endif > > # Determine the destination processor architecture > -ARCH = $(strip $(shell LC_ALL=C gcc -E arch.h|grep -v '^\#')) > +ARCH = $(strip $(shell LC_ALL=C $(CC) -E arch.h|grep -v '^\#')) > Right. > # FIXME We have to differentiate between host and target OS architecture. > OS_ARCH ?= $(shell uname) > @@ -228,6 +228,10 @@ > ifeq ($(ARCH),"x86") > PROGRAMMER_OBJS += it87spi.o it85spi.o ichspi.o sb600spi.o wbsio_spi.o > mcp6x_spi.o > else > +ifeq ($(ARCH),"arm") > +PROGRAMMER_OBJS += tegra2_spi.o > +else > +endif > endif > NEED_PCI := yes > endif > diff -Nru a/arch.h b/arch.h > --- a/arch.h 2011-06-30 19:35:50.190944388 -0700 > +++ b/arch.h 2011-06-30 19:35:35.280103884 -0700 > @@ -27,5 +27,7 @@ > #define __FLASHROM_ARCH__ "mips" > #elif defined(__powerpc__) || defined(__powerpc64__) || defined(__ppc__) || > defined(__ppc64__) > #define __FLASHROM_ARCH__ "ppc" > +#elif defined(__arm__) > +#define __FLASHROM_ARCH__ "arm" > #endif > __FLASHROM_ARCH__ > Should I extend my patch to cover ARM as well, or should we perform all AR related changes in your big ARM suppport patch? Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

Re: [flashrom] [PATCH 3/3] add support for SFDP (JESD216)
by Carl-Daniel Hailfinger 01 Jul '11

01 Jul '11

Am 24.06.2011 16:53 schrieb Stefan Tauner: > Similar to ICH Hardware Sequencing this uses a generic struct flashchip > element in flashrom.c with dummy values and a special probe function that fills the > obtained values into that generic struct. > Documentation used: > http://www.jedec.org/standards-documents/docs/jesd216 (2011-04) > W25Q32BV data sheet Revision F (2011-04-01) > EN25QH16 data sheet Revision F (2011-06-01) > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > Nice feature. > --- > chipdrivers.h | 1 + > flashchips.c | 24 +++++ > flashchips.h | 1 + > flashrom.c | 28 ++++++- > spi.h | 5 + > spi25.c | 273 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 6 files changed, 331 insertions(+), 1 deletions(-) > > diff --git a/chipdrivers.h b/chipdrivers.h > index 92ddbea..0a3df50 100644 > --- a/chipdrivers.h > +++ b/chipdrivers.h > @@ -26,6 +26,7 @@ > #define __CHIPDRIVERS_H__ 1 > > /* spi.c, should probably be in spi_chip.c */ > +int probe_spi_sfdp(struct flashchip *flash); > int probe_spi_rdid(struct flashchip *flash); > int probe_spi_rdid4(struct flashchip *flash); > int probe_spi_rems(struct flashchip *flash); > diff --git a/flashchips.c b/flashchips.c > index 865ba2f..6fbbd2c 100644 > --- a/flashchips.c > +++ b/flashchips.c > @@ -8507,6 +8507,30 @@ const struct flashchip flashchips[] = { > .write = write_jedec_1, > .read = read_memmapped, > }, > + > + { > + .vendor = "Unknown", > + .name = "SFDP device", > + .bustype = CHIP_BUSTYPE_SPI, > + .manufacture_id = GENERIC_MANUF_ID, > + .model_id = SFDP_DEVICE_ID, > + /* We present our own "report this" text hence we do not > + * want the default "This flash part has status UNTESTED..." > + * text to be printed. */ > + .tested = TEST_OK_PREW, > + .probe = probe_spi_sfdp, > + .page_size = 256, > + .write = spi_chip_write_256, > Does SFDP really specify 256-byte write capability? > + .read = spi_chip_read, > + /* FIXME: some vendor extensions define this */ > + .voltage = {}, > + /* Everything below will be set by the probing function. */ > + .total_size = 0, > + .feature_bits = 0, > + .block_erasers = {}, > + .unlock = NULL, > + .printlock = NULL, > + }, > > { > .vendor = "AMIC", > diff --git a/flashchips.h b/flashchips.h > index 3b2b94f..82333c8 100644 > --- a/flashchips.h > +++ b/flashchips.h > @@ -36,6 +36,7 @@ > > #define GENERIC_MANUF_ID 0xffff /* Check if there is a vendor ID */ > #define GENERIC_DEVICE_ID 0xffff /* Only match the vendor ID */ > +#define SFDP_DEVICE_ID 0xfffe > Just a comment, not something that needs to be changed: We probably need CFI_DEVICE_ID as well once we support CFI (which is SFDP for non-SPI flash). > > #define ALLIANCE_ID 0x52 /* Alliance Semiconductor */ > #define ALLIANCE_AS29F002B 0x34 > diff --git a/flashrom.c b/flashrom.c > index aed10aa..56af373 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -1206,7 +1206,33 @@ int probe_flash(int startchip, struct flashchip *fill_flash, int force) > * probe_flash() is the first one and thus no chip has been > * found before. > */ > - if (startchip == 0 || fill_flash->model_id != GENERIC_DEVICE_ID) > + if (startchip == 0 && fill_flash->model_id == SFDP_DEVICE_ID) { > + msg_cinfo("===\n" > + "SFDP has autodetected a flash chip which is " > + "not natively supported by flashrom yet.\n"); > + if (!check_block_erasers(flash, 0)) > + msg_cinfo("The standard operations read and " > + "verify should work, but to support " > + "erase, write and all other " > + "possible features"); > + else > + msg_cinfo("All standard operations (read, " > + "verify, erase and write) should " > + "work, but to support all possible " > + "features"); > + > + msg_cinfo(" we need to add them manually.\nYou " > + "can help us by mailing us the output of " > + "the following command to flashrom@flashrom." > + "org: \n'flashrom -VV [plus the " > + "-p/--programmer parameter (if needed)]" > + "'\nThanks for your help!\n" > + "===\n"); > + } > Should we refactor those SFDP messages into a separate function and do that for the untested chip messages as well? It would probably improve code readability here. > + > + if (startchip == 0 || > + ((fill_flash->model_id != GENERIC_DEVICE_ID) && > + (fill_flash->model_id != SFDP_DEVICE_ID))) > break; > > notfound: > diff --git a/spi.h b/spi.h > index b908603..5f07eae 100644 > --- a/spi.h > +++ b/spi.h > @@ -40,6 +40,11 @@ > #define JEDEC_REMS_OUTSIZE 0x04 > #define JEDEC_REMS_INSIZE 0x02 > > +/* Read Serial Flash Discoverable Parameters (SFDP) */ > +#define JEDEC_SFDP 0x5a > +#define JEDEC_SFDP_OUTSIZE 0x05 /* 8b op, 24b addr, 8b dummy */ > Ouch. A few SPI masters will have pretty explosions with that outsize. This reminds me... I should resend my patch which can deal with dummy bytes between write and read in a SPI command. > +/* JEDEC_SFDP_INSIZE : any length */ > + > /* Read Electronic Signature */ > #define JEDEC_RES 0xab > #define JEDEC_RES_OUTSIZE 0x04 > diff --git a/spi25.c b/spi25.c > index d3680fb..af81f19 100644 > --- a/spi25.c > +++ b/spi25.c > @@ -23,6 +23,7 @@ > */ > > #include <string.h> > +#include <stdlib.h> > #include "flash.h" > #include "flashchips.h" > #include "chipdrivers.h" > @@ -113,6 +114,278 @@ int spi_write_disable(void) > return spi_send_command(sizeof(cmd), 0, cmd, NULL); > } > > The code below is huge, and I'd argue it is for a chip family and should live in sfdp25.c (or something with a similar name). > +static int spi_sfdp(uint32_t address, uint8_t *buf, int len) > +{ > + const unsigned char cmd[JEDEC_SFDP_OUTSIZE] = { > + JEDEC_SFDP, > + (address >> 16) & 0xff, > + (address >> 8) & 0xff, > + (address >> 0) & 0xff, > + 0 > + }; > + return spi_send_command(sizeof(cmd), len, cmd, buf); > +} > + > +struct sfdp_tbl_hdr { > + uint8_t id; > + uint8_t v_minor; > + uint8_t v_major; > + uint8_t len; > + uint32_t ptp; /* 24b pointer */ > +}; > + > +struct sfdp_tbl_0 { > + uint8_t id; > + uint8_t v_minor; > + uint8_t v_major; > + uint8_t len; > + uint32_t ptp; /* 24b pointer */ > +}; > + > +static int sfdp_fill_flash(struct flashchip *f, uint8_t *buf, uint16_t len) > +{ > + uint32_t tmp32; > + uint8_t tmp8; > + uint32_t total_size; /* in bytes */ > + uint32_t bsize; > + int i, j; > + > + msg_cspew("Parsing JEDEC SFDP parameter table...\n"); > + if (len == 9 * 4) { > + msg_cerr("%s: len out of spec\n", __func__); > + return 1; > + } > + > + /* 1. double word */ > + i = 0; > + tmp32 = buf[(4 * i) + 0]; > + tmp32 |= ((unsigned int)buf[(4 * i) + 1]) << 8; > + tmp32 |= ((unsigned int)buf[(4 * i) + 2]) << 16; > + tmp32 |= ((unsigned int)buf[(4 * i) + 3]) << 24; > + > + tmp8 = (tmp32 >> 17) & 0x3; > + switch (tmp8) { > + case 0x0: > + msg_cspew(" 3-Byte only addressing.\n"); > + break; > + case 0x1: > + msg_cspew(" 3-Byte (and optionally 4-Byte) addressing.\n"); > + break; > + case 0x2: > + msg_cdbg(" 4-Byte only addressing not supported.\n"); > + return 1; > + default: > + msg_cdbg(" Required addressing mode (0x%x) not supported.\n", > + tmp8); > + return 1; > + } > + > + msg_cspew(" Writes to the status register have "); > + if (tmp32 & (1 << 3)) { > + f->unlock = spi_disable_blockprotect; > + msg_cspew("to be enabled with "); > + if (tmp32 & (1 << 4)) { > + f->feature_bits = FEATURE_WRSR_WREN; > + msg_cspew("WREN (0x06).\n"); > + } else { > + f->feature_bits = FEATURE_WRSR_EWSR; > + msg_cspew("EWSR (0x50).\n"); > + } > + } else > + msg_cspew("not to be especially enabled.\n"); > + > + /* 2. double word */ > + i = 1; > + tmp32 = buf[(4 * i) + 0]; > + tmp32 |= ((unsigned int)buf[(4 * i) + 1]) << 8; > + tmp32 |= ((unsigned int)buf[(4 * i) + 2]) << 16; > + tmp32 |= ((unsigned int)buf[(4 * i) + 3]) << 24; > + > + if (tmp32 & (1<<31)) { > + msg_cdbg(" Flash chip size >= 4 Gb/ 500 MB not supported.\n"); > + return 1; > + } > + total_size = (tmp32 & 0x7FFFFFFF) / 8; > + f->total_size = total_size / 1024; > + msg_cspew(" Flash chip size is %d kB.\n", f->total_size); > + > + i = 8; > + for(j = 0; j < 4; j++) { > + /* 8 double words from the start + 2 words for every eraser */ > + bsize = 2^(buf[(4 * i) + (2 * j)]); > + if (bsize == 0) > + continue; > + > + tmp32 = buf[(4 * i) + (2 * j) + 1]; > + switch(tmp32){ > + case 0x00: > + case 0xff: > + /* Not specified, assuming "not supported". */ > + continue; > + case 0x20: > + f->block_erasers[j].block_erase = spi_block_erase_20; > + break; > + case 0x52: > + f->block_erasers[j].block_erase = spi_block_erase_52; > + break; > + case 0x60: > + f->block_erasers[j].block_erase = spi_block_erase_60; > + break; > + case 0xc7: > + f->block_erasers[j].block_erase = spi_block_erase_c7; > + break; > + case 0xd7: > + f->block_erasers[j].block_erase = spi_block_erase_d7; > + break; > + case 0xd8: > + f->block_erasers[j].block_erase = spi_block_erase_d8; > + break; > + default: > + msg_cinfo("%s: unknown opcode (0x%02x) in SFDP table. " > + "Please report this at " > + "flashrom(a)flashrom.org\n", > + __func__, tmp32); > + continue; > + } > + f->block_erasers[j].eraseblocks[0].size = bsize; > + f->block_erasers[j].eraseblocks[0].count = total_size/bsize; > + msg_cspew(" Block eraser %d: %d x %d B with opcode 0x%02x\n", > + j, total_size/bsize, bsize, tmp32); > + } > + return 0; > +} > + > +static int sfdp_fetch_pt(uint32_t addr, uint8_t *buf, uint16_t len) > +{ > + uint16_t i; > + if (spi_sfdp(addr, buf, len)) { > + msg_cerr("Receiving SFDP parameter table failed.\n"); > + return 1; > + } > + msg_cspew(" Parameter table contents:\n"); > + for(i = 0; i < len; i++) { > + if ((i % 8) == 0) { > + msg_cspew(" 0x%03x: ", i); > + } > + msg_cspew(" 0x%02x", buf[i]); > + if ((i % 8) == 7) { > + msg_cspew("\n"); > + continue; > + } > + if ((i % 8) == 3) { > + msg_cspew(" "); > + continue; > + } > + } > + msg_cspew("\n"); > + return 0; > +} > + > +int probe_spi_sfdp(struct flashchip *flash) > +{ > + int ret = 0; > + uint8_t buf[8]; > + uint16_t tmp16; > + uint32_t tmp32; > + uint8_t nph; > + uint8_t i; > + struct sfdp_tbl_hdr *hdrs; > + uint8_t *hbuf; > + uint8_t *tbuf; > + > + if (spi_sfdp(0x0, buf, 4)) { > + msg_cerr("Receiving SFDP signature failed.\n"); > + return 0; > + } > + tmp32 = buf[0]; > + tmp32 |= ((unsigned int)buf[1]) << 8; > + tmp32 |= ((unsigned int)buf[2]) << 16; > + tmp32 |= ((unsigned int)buf[3]) << 24; > + > + msg_cspew("SFDP signature = 0x%08x (should be 0x50444653)\n", tmp32); > + if (tmp32 != 0x50444653) { > + msg_cdbg("No SFDP signature found.\n"); > + return 0; > + } > + if (spi_sfdp(0x4, buf, 3)) { > + msg_cerr("Receiving SFDP revision and number of parameter " > + "headers (NPH) failed. "); > + return 0; > + } > + msg_cspew("SFDP revision = %d.%d\n", buf[1], buf[0]); > + nph = buf[3]; > + msg_cspew("SFDP number of parameter headers (NPH) = %d (+ 1 mandatory)" > + "\n", nph); > + > + /* Fetch all parameter headers, even if we don't use them all (yet). */ > + hbuf = malloc(sizeof(struct sfdp_tbl_hdr) * (nph + 1)); > + hdrs = malloc((nph + 1) * 8); > + if (hbuf == NULL || hdrs == NULL ) { > + msg_gerr("Out of memory!\n"); > + exit(1); /* FIXME: shutdown gracefully */ > + } > + if (spi_sfdp(0x8, hbuf, (nph + 1) * 8)) { > + msg_cerr("Receiving SFDP parameter table headers failed.\n"); > + goto cleanup_hdrs; > + } > + > + i = 0; > + do{ > + hdrs[i].id = hbuf[(8 * i) + 0]; > + hdrs[i].v_minor = hbuf[(8 * i) + 1]; > + hdrs[i].v_major = hbuf[(8 * i) + 2]; > + hdrs[i].len = hbuf[(8 * i) + 3]; > + hdrs[i].ptp = hbuf[(8 * i) + 4]; > + hdrs[i].ptp |= ((unsigned int)hbuf[(8 * i) + 5]) << 8; > + hdrs[i].ptp |= ((unsigned int)hbuf[(8 * i) + 6]) << 16; > + msg_cspew("SFDP parameter table header %d:\n", i); > + msg_cspew(" ID 0x%02x, version %d.%d\n", hdrs[i].id, > + hdrs[i].v_major, hdrs[i].v_minor); > + tmp16 = hdrs[i].len * 4; > + tmp32 = hdrs[i].ptp; > + msg_cspew(" Length %d B, Parameter Table Pointer 0x%06x\n", > + tmp16, tmp32); > + > + tbuf = malloc(tmp16); > + if (tbuf == NULL) { > + msg_gerr("Out of memory!\n"); > + exit(1); /* FIXME: shutdown gracefully */ > + } > + if (sfdp_fetch_pt(tmp32, tbuf, tmp16)){ > + msg_cerr("Fetching SFDP parameter table %d failed.\n", > + i); > + free(tbuf); > + break; > + } > + if (i == 0) { /* Mandatory JEDEC SFDP parameter table */ > + if (hdrs[i].id != 0) > + msg_cdbg("ID of the mandatory JEDEC SFDP " > + "parameter table is not 0 as demanded " > + "by JESD216 (warning only).\n"); > + > + if (hdrs[i].len != (9 * 4)) { > + msg_cdbg("Length of the mandatory JEDEC SFDP " > + "parameter table is not 24 B as " > + "demanded by JESD216.\n"); > + if (hdrs[i].len == (4 * 4)) > + msg_cdbg("It seems like it is the " > + "preliminary Intel version of " > + "SFDP, which we don't support." > + "\n"); > + } else if (sfdp_fill_flash(flash, tbuf, tmp16) == 0) > + ret = 1; > + } > + > + free(tbuf); > + i++; > + } while(i <= nph); > + > +cleanup_hdrs: > + free(hdrs); > + free(hbuf); > + return ret; > +} > + > static int probe_spi_rdid_generic(struct flashchip *flash, int bytes) > { > unsigned char readarr[4]; > Could you resend this with the comments addressed and with the squash patch merged in? I didn't review the SFDP code yet, but the right presentation makes reviewing easier. Regards, Carl-Daniel -- http://www.hailfinger.org/

2 5

[PATCH] fix unchecked malloc calls
by Stefan Tauner 01 Jul '11

01 Jul '11

compile tested only. btw... why dont we wrap malloc to automatically include these checks? there is probably a patch somewhere that adds totally awesome shutdown code in OOM cases, but afaics we just print a warning and exit right now... it is just stupid to do the checks in the real code then. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- flashrom.c | 12 ++++++++++++ hwaccess.c | 4 ++++ pcidev.c | 4 ++++ serial.c | 2 ++ 4 files changed, 22 insertions(+), 0 deletions(-) diff --git a/flashrom.c b/flashrom.c index 12a51ad..a41d0c9 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1515,6 +1515,10 @@ int erase_and_write_flash(struct flashchip *flash, uint8_t *oldcontents, uint8_t msg_cinfo("Erasing and writing flash chip... "); curcontents = (uint8_t *) malloc(size); + if (!curcontents) { + msg_gerr("Out of memory!\n"); + exit(1); + } /* Copy oldcontents to curcontents to avoid clobbering oldcontents. */ memcpy(curcontents, oldcontents, size); @@ -1882,9 +1886,17 @@ int doit(struct flashchip *flash, int force, const char *filename, int read_it, } oldcontents = (uint8_t *) malloc(size); + if (!oldcontents) { + msg_gerr("Out of memory!\n"); + exit(1); + } /* Assume worst case: All bits are 0. */ memset(oldcontents, 0x00, size); newcontents = (uint8_t *) malloc(size); + if (!newcontents) { + msg_gerr("Out of memory!\n"); + exit(1); + } /* Assume best case: All bits should be 1. */ memset(newcontents, 0xff, size); /* Side effect of the assumptions above: Default write action is erase diff --git a/hwaccess.c b/hwaccess.c index efe8bb0..8c89925 100644 --- a/hwaccess.c +++ b/hwaccess.c @@ -226,6 +226,10 @@ int undo_mmio_write(void *p) { \ struct undo_mmio_write_data *undo_mmio_write_data; \ undo_mmio_write_data = malloc(sizeof(struct undo_mmio_write_data)); \ + if (!undo_mmio_write_data) { \ + msg_gerr("Out of memory!\n"); \ + exit(1); \ + } \ undo_mmio_write_data->addr = a; \ undo_mmio_write_data->type = mmio_write_type_##c; \ undo_mmio_write_data->c##data = mmio_read##c(a); \ diff --git a/pcidev.c b/pcidev.c index 1f9a5cc..d4ad8bc 100644 --- a/pcidev.c +++ b/pcidev.c @@ -295,6 +295,10 @@ int undo_pci_write(void *p) { \ struct undo_pci_write_data *undo_pci_write_data; \ undo_pci_write_data = malloc(sizeof(struct undo_pci_write_data)); \ + if (!undo_pci_write_data) { \ + msg_gerr("Out of memory!\n"); \ + exit(1); \ + } \ undo_pci_write_data->dev = *a; \ undo_pci_write_data->reg = b; \ undo_pci_write_data->type = pci_write_type_##c; \ diff --git a/serial.c b/serial.c index 37ea422..31d76e3 100644 --- a/serial.c +++ b/serial.c @@ -110,6 +110,8 @@ fdtype sp_openserport(char *dev, unsigned int baud) (tolower((unsigned char)dev[1]) == 'o') && (tolower((unsigned char)dev[2]) == 'm')) { dev2 = malloc(strlen(dev) + 5); + if (!dev2) + sp_die("Error: Out of memory"); strcpy(dev2, "\\\\.\\"); strcpy(dev2 + 4, dev); } -- 1.7.1

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom July 2011