flashrom

flashrom@flashrom.org

5 participants
9161 discussions

[PATCH] Fix ICH FWH IDSEL setting
by Carl-Daniel Hailfinger 26 Jul '11

26 Jul '11

Fix ICH FWH IDSEL setting with the fwh_idsel= internal programmer parameter. The code took 32 bits of input and wrote them to an 48 bit register, duplicating some values. Document the fwh_idsel= parameter in the man page. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-ich_fwh_idsel_programmer_param_docfix/flashrom.8 =================================================================== --- flashrom-ich_fwh_idsel_programmer_param_docfix/flashrom.8 (Revision 1380) +++ flashrom-ich_fwh_idsel_programmer_param_docfix/flashrom.8 (Arbeitskopie) @@ -298,6 +298,20 @@ .B it87spi programmer. .sp +If you have an Intel chipset with an ICH6 or later southbridge and if you want +to set specific IDSEL values for a non-default flash chip or an embedded +controller (EC), you can use the +.sp +.B " flashrom \-p internal:fwh_idsel=value" +.sp +syntax where value is the 48-bit hexadecimal raw value to be written in the +IDSEL registers of the Intel southbridge. The upper 32 bits use one hex digit +each per 512 kB range between 0xffc00000 and 0xffffffff, and the lower 16 bits +use one hex digit each per 1024 kB range between 0xff400000 and 0xff7fffff. +The rightmost hex digit corresponds with the lowest address range. All address +ranges have a corresponding sister range 4 MB below with identical IDSEL +settings. +.sp Using flashrom on laptops is dangerous and may easily make your hardware unusable (see also the .B BUGS Index: flashrom-ich_fwh_idsel_programmer_param_docfix/chipset_enable.c =================================================================== --- flashrom-ich_fwh_idsel_programmer_param_docfix/chipset_enable.c (Revision 1380) +++ flashrom-ich_fwh_idsel_programmer_param_docfix/chipset_enable.c (Arbeitskopie) @@ -301,7 +301,7 @@ static int enable_flash_ich_dc(struct pci_dev *dev, const char *name) { - uint32_t fwh_conf; + uint64_t fwh_conf; int i; char *idsel = NULL; int tmp; @@ -311,15 +311,18 @@ idsel = extract_programmer_param("fwh_idsel"); if (idsel && strlen(idsel)) { - fwh_conf = (uint32_t)strtoul(idsel, NULL, 0); - - /* FIXME: Need to undo this on shutdown. */ - msg_pinfo("\nSetting IDSEL=0x%x for top 16 MB", fwh_conf); - rpci_write_long(dev, 0xd0, fwh_conf); - rpci_write_word(dev, 0xd4, fwh_conf); + fwh_conf = pci_read_long(dev, 0xd0); + fwh_conf <<= 16; + fwh_conf |= pci_read_word(dev, 0xd4); + msg_pinfo("\nSetting IDSEL from 0x%012llx ", fwh_conf); + /* Base 16, nothing else makes sense. */ + fwh_conf = (uint64_t)strtoull(idsel, NULL, 16); + msg_pinfo("to 0x%012llx for top 16 MB", fwh_conf); + rpci_write_long(dev, 0xd0, (fwh_conf >> 16) & 0xffffffff); + rpci_write_word(dev, 0xd4, fwh_conf & 0xffff); /* FIXME: Decode settings are not changed. */ } else if (idsel) { - msg_perr("Error: idsel= specified, but no number given.\n"); + msg_perr("Error: fwh_idsel= specified, but no number given.\n"); free(idsel); /* FIXME: Return failure here once internal_init() starts * to care about the return value of the chipset enable. -- http://www.hailfinger.org/

2 5

[commit] r1389 - trunk
by repository service 26 Jul '11

26 Jul '11

Author: hailfinger Date: Tue Jul 26 00:44:09 2011 New Revision: 1389 URL: http://flashrom.org/trac/flashrom/changeset/1389 Log: Fix ICH FWH IDSEL setting with the fwh_idsel= internal programmer parameter. The code took 32 bits of input and wrote them to an 48 bit register, duplicating some values. Document the fwh_idsel= parameter in the man page. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/chipset_enable.c trunk/flashrom.8 Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Tue Jul 26 00:07:05 2011 (r1388) +++ trunk/chipset_enable.c Tue Jul 26 00:44:09 2011 (r1389) @@ -30,6 +30,8 @@ #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <inttypes.h> +#include <errno.h> #include "flash.h" #include "programmer.h" @@ -311,15 +313,33 @@ idsel = extract_programmer_param("fwh_idsel"); if (idsel && strlen(idsel)) { - fwh_conf = (uint32_t)strtoul(idsel, NULL, 0); - - /* FIXME: Need to undo this on shutdown. */ - msg_pinfo("\nSetting IDSEL=0x%x for top 16 MB", fwh_conf); - rpci_write_long(dev, 0xd0, fwh_conf); - rpci_write_word(dev, 0xd4, fwh_conf); + uint64_t fwh_idsel_old; + uint64_t fwh_idsel; + errno = 0; + /* Base 16, nothing else makes sense. */ + fwh_idsel = (uint64_t)strtoull(idsel, NULL, 16); + if (errno) { + msg_perr("Error: fwh_idsel= specified, but value could " + "not be converted.\n"); + goto idsel_garbage_out; + } + if (fwh_idsel & 0xffff000000000000ULL) { + msg_perr("Error: fwh_idsel= specified, but value had " + "unusued bits set.\n"); + goto idsel_garbage_out; + } + fwh_idsel_old = pci_read_long(dev, 0xd0); + fwh_idsel_old <<= 16; + fwh_idsel_old |= pci_read_word(dev, 0xd4); + msg_pdbg("\nSetting IDSEL from 0x%012" PRIx64 " to " + "0x%012" PRIx64 " for top 16 MB.", fwh_idsel_old, + fwh_idsel); + rpci_write_long(dev, 0xd0, (fwh_idsel >> 16) & 0xffffffff); + rpci_write_word(dev, 0xd4, fwh_idsel & 0xffff); /* FIXME: Decode settings are not changed. */ } else if (idsel) { - msg_perr("Error: idsel= specified, but no number given.\n"); + msg_perr("Error: fwh_idsel= specified, but no value given.\n"); +idsel_garbage_out: free(idsel); /* FIXME: Return failure here once internal_init() starts * to care about the return value of the chipset enable. Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Tue Jul 26 00:07:05 2011 (r1388) +++ trunk/flashrom.8 Tue Jul 26 00:44:09 2011 (r1389) @@ -299,6 +299,23 @@ flashrom doesn't detect an active IT87 LPC<->SPI bridge, please send a bug report so we can diagnose the problem. .sp +If you have an Intel chipset with an ICH6 or later southbridge and if you want +to set specific IDSEL values for a non-default flash chip or an embedded +controller (EC), you can use the +.sp +.B " flashrom \-p internal:fwh_idsel=value" +.sp +syntax where value is the 48-bit hexadecimal raw value to be written in the +IDSEL registers of the Intel southbridge. The upper 32 bits use one hex digit +each per 512 kB range between 0xffc00000 and 0xffffffff, and the lower 16 bits +use one hex digit each per 1024 kB range between 0xff400000 and 0xff7fffff. +The rightmost hex digit corresponds with the lowest address range. All address +ranges have a corresponding sister range 4 MB below with identical IDSEL +settings. The default value for ICH7 is given in the example below. +.sp +Example: +.B "flashrom \-p internal:fwh_idsel=0x001122334567" +.sp Using flashrom on laptops is dangerous and may easily make your hardware unusable (see also the .B BUGS

1 0

[PATCH] satamv.c requires PCI port I/O
by Andrew Morgan 26 Jul '11

26 Jul '11

satamv.c requires PCI port I/O which isn't currently available on anything other than x86/x86_64. Generate the same compiler error as other programmers eg. rayer_spi.c, which is where I copied the code from. Signed-off-by: Andrew Morgan <ziltro(a)ziltro.com> -- Andrew.

3 2

[commit] r1388 - trunk
by repository service 26 Jul '11

26 Jul '11

Author: hailfinger Date: Tue Jul 26 00:07:05 2011 New Revision: 1388 URL: http://flashrom.org/trac/flashrom/changeset/1388 Log: satamv and atahpt require PCI port I/O which isn't currently supported on any architecture except x86/x86_64. Generate the same compiler error as other programmer drivers. Signed-off-by: Andrew Morgan <ziltro(a)ziltro.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/atahpt.c trunk/satamv.c Modified: trunk/atahpt.c ============================================================================== --- trunk/atahpt.c Mon Jul 25 23:12:57 2011 (r1387) +++ trunk/atahpt.c Tue Jul 26 00:07:05 2011 (r1388) @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#if defined(__i386__) || defined(__x86_64__) + #include <stdlib.h> #include <string.h> #include "flash.h" @@ -77,3 +79,7 @@ OUTL((uint32_t)addr, io_base_addr + BIOS_ROM_ADDR); return INB(io_base_addr + BIOS_ROM_DATA); } + +#else +#error PCI port I/O access is not supported on this architecture yet. +#endif Modified: trunk/satamv.c ============================================================================== --- trunk/satamv.c Mon Jul 25 23:12:57 2011 (r1387) +++ trunk/satamv.c Tue Jul 26 00:07:05 2011 (r1388) @@ -19,6 +19,7 @@ */ /* Datasheets are not public (yet?) */ +#if defined(__i386__) || defined(__x86_64__) #include <stdlib.h> #include "flash.h" @@ -182,3 +183,7 @@ { return satamv_indirect_chip_readb(addr); } + +#else +#error PCI port I/O access is not supported on this architecture yet. +#endif

1 0

[PATCH] flashrom: fix sparse warning: Using plain integer as NULL pointer
by Peter Hüwe 25 Jul '11

25 Jul '11

flashrom: fix sparse warning: Using plain integer as NULL pointer This patch fixes the "using plain integer as NULL pointer" warnings generated by running sparse on the flashrom source. Flashrom-Version: r1254 Signed-off-by: Peter Huewe <peterhuewe(a)gmx.de> --- cbtable.c | 2 +- chipset_enable.c | 2 +- cli_classic.c | 34 +++++++++++++++++----------------- physmap.c | 4 ++-- programmer.c | 2 +- serprog.c | 2 +- udelay.c | 8 ++++---- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cbtable.c b/cbtable.c index dbb2cff..f30a3ae 100644 --- a/cbtable.c +++ b/cbtable.c @@ -141,7 +141,7 @@ static struct lb_header *find_lb_table(void *base, unsigned long start, }; - return 0; + return NULL; } static void find_mainboard(struct lb_record *ptr, unsigned long addr) diff --git a/chipset_enable.c b/chipset_enable.c index 6d6008e..0896bce 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -1173,7 +1173,7 @@ const struct penable chipset_enables[] = { int chipset_flash_enable(void) { - struct pci_dev *dev = 0; + struct pci_dev *dev = NULL; int ret = -2; /* Nothing! */ int i; diff --git a/cli_classic.c b/cli_classic.c index 1211989..88b70db 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -116,23 +116,23 @@ int cli_classic(int argc, char *argv[]) static const char optstring[] = "r:Rw:v:nVEfc:m:l:i:p:Lzh"; static const struct option long_options[] = { - {"read", 1, 0, 'r'}, - {"write", 1, 0, 'w'}, - {"erase", 0, 0, 'E'}, - {"verify", 1, 0, 'v'}, - {"noverify", 0, 0, 'n'}, - {"chip", 1, 0, 'c'}, - {"mainboard", 1, 0, 'm'}, - {"verbose", 0, 0, 'V'}, - {"force", 0, 0, 'f'}, - {"layout", 1, 0, 'l'}, - {"image", 1, 0, 'i'}, - {"list-supported", 0, 0, 'L'}, - {"list-supported-wiki", 0, 0, 'z'}, - {"programmer", 1, 0, 'p'}, - {"help", 0, 0, 'h'}, - {"version", 0, 0, 'R'}, - {0, 0, 0, 0} + {"read", 1, NULL, 'r'}, + {"write", 1, NULL, 'w'}, + {"erase", 0, NULL, 'E'}, + {"verify", 1, NULL, 'v'}, + {"noverify", 0, NULL, 'n'}, + {"chip", 1, NULL, 'c'}, + {"mainboard", 1, NULL, 'm'}, + {"verbose", 0, NULL, 'V'}, + {"force", 0, NULL, 'f'}, + {"layout", 1, NULL, 'l'}, + {"image", 1, NULL, 'i'}, + {"list-supported", 0, NULL, 'L'}, + {"list-supported-wiki", 0, NULL, 'z'}, + {"programmer", 1, NULL, 'p'}, + {"help", 0, NULL, 'h'}, + {"version", 0, NULL, 'R'}, + {NULL, 0, NULL, 0} }; char *filename = NULL; diff --git a/physmap.c b/physmap.c index 4641e8e..70156a6 100644 --- a/physmap.c +++ b/physmap.c @@ -180,7 +180,7 @@ static void *sys_physmap_rw_uncached(unsigned long phys_addr, size_t len) } } - virt_addr = mmap(0, len, PROT_WRITE | PROT_READ, MAP_SHARED, + virt_addr = mmap(NULL, len, PROT_WRITE | PROT_READ, MAP_SHARED, fd_mem, (off_t)phys_addr); return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } @@ -200,7 +200,7 @@ static void *sys_physmap_ro_cached(unsigned long phys_addr, size_t len) } } - virt_addr = mmap(0, len, PROT_READ, MAP_SHARED, + virt_addr = mmap(NULL, len, PROT_READ, MAP_SHARED, fd_mem_cached, (off_t)phys_addr); return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } diff --git a/programmer.c b/programmer.c index 0160867..5c1f963 100644 --- a/programmer.c +++ b/programmer.c @@ -30,7 +30,7 @@ int noop_shutdown(void) void *fallback_map(const char *descr, unsigned long phys_addr, size_t len) { /* FIXME: Should return phys_addr. */ - return 0; + return NULL; } /* No-op/fallback unmap() for programmers which don't need special handling */ diff --git a/serprog.c b/serprog.c index 2cdfea6..f869b07 100644 --- a/serprog.c +++ b/serprog.c @@ -541,7 +541,7 @@ static void sp_execute_opbuf_noflush(void) { if ((sp_max_write_n) && (sp_write_n_bytes)) sp_pass_writen(); - sp_stream_buffer_op(S_CMD_O_EXEC, 0, 0); + sp_stream_buffer_op(S_CMD_O_EXEC, 0, NULL); msg_pspew(MSGHEADER "Executed operation buffer of %d bytes\n", sp_opbuf_usage); sp_opbuf_usage = 0; diff --git a/udelay.c b/udelay.c index 153f510..feae827 100644 --- a/udelay.c +++ b/udelay.c @@ -45,11 +45,11 @@ static unsigned long measure_os_delay_resolution(void) struct timeval start, end; unsigned long counter = 0; - gettimeofday(&start, 0); + gettimeofday(&start, NULL); timeusec = 0; while (!timeusec && (++counter < 1000000000)) { - gettimeofday(&end, 0); + gettimeofday(&end, NULL); timeusec = 1000000 * (end.tv_sec - start.tv_sec) + (end.tv_usec - start.tv_usec); /* Protect against time going forward too much. */ @@ -68,9 +68,9 @@ static unsigned long measure_delay(int usecs) unsigned long timeusec; struct timeval start, end; - gettimeofday(&start, 0); + gettimeofday(&start, NULL); myusec_delay(usecs); - gettimeofday(&end, 0); + gettimeofday(&end, NULL); timeusec = 1000000 * (end.tv_sec - start.tv_sec) + (end.tv_usec - start.tv_usec); /* Protect against time going forward too much. */ -- 1.7.2.2

3 2

Re: [flashrom] [PATCH] Fix NULL pointer reference in board_flash_enable.
by Maciej Pijanka 25 Jul '11

25 Jul '11

On Fri, 12 Mar 2010, Michael Karcher wrote: > Was introduced in r926. Found by Henrik Kretzschmar <henne(a)nachtwindheim.de>. > > Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Imo looks sane and should be commited. Acked-by: Maciej Pijanka <maciej.pijanka(a)gmail.com> > --- > board_enable.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/board_enable.c b/board_enable.c > index aa463bc..0e89137 100644 > --- a/board_enable.c > +++ b/board_enable.c > @@ -1445,7 +1445,7 @@ int board_flash_enable(const char *vendor, const char *part) > if (!board) > board = board_match_pci_card_ids(); > > - if (board->status == NT) { > + if (board && board->status == NT) { > if (!force_boardenable) > { > printf("WARNING: Your mainboard is %s %s, but the mainboard-specific\n" > -- -- Maciej Pijanka I don't fear computers, I fear lack of them -- Isaac Asimov

2 1

[PATCH] Random manpage improvements and updates
by Uwe Hermann 25 Jul '11

25 Jul '11

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

2 2

[commit] r1387 - trunk
by repository service 25 Jul '11

25 Jul '11

Author: uwe Date: Mon Jul 25 23:12:57 2011 New Revision: 1387 URL: http://flashrom.org/trac/flashrom/changeset/1387 Log: Random manpage improvements and updates. 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/flashrom.8 Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Mon Jul 25 22:38:52 2011 (r1386) +++ trunk/flashrom.8 Mon Jul 25 23:12:57 2011 (r1387) @@ -1,4 +1,4 @@ -.TH FLASHROM 8 "Jun 14, 2011" +.TH FLASHROM 8 "Jul 25, 2011" .SH NAME flashrom \- detect, read, write, verify and erase flash chips .SH SYNOPSIS @@ -12,13 +12,14 @@ .B flashrom is a utility for detecting, reading, writing, verifying and erasing flash chips. It's often used to flash BIOS/EFI/coreboot/firmware images in-system -using a supported mainboard, but it also supports flashing of network cards -(NICs), SATA controller cards, and other external devices which can program -flash chips. +using a supported mainboard. However, it also supports various external +PCI/USB/parallel-port/serial-port based devices which can program flash chips, +including some network cards (NICs), SATA/IDE controller cards, graphics cards, +the Bus Pirate device, various FTDI FT2232/FT4232H based USB devices, and more. .PP It supports a wide range of DIP32, PLCC32, DIP8, SO8/SOIC8, TSOP32, TSOP40, -and TSOP48 chips, which use various protocols such as LPC, FWH, parallel flash, -or SPI. +TSOP48, and BGA chips, which use various protocols such as LPC, FWH, +parallel flash, or SPI. .SH OPTIONS .B IMPORTANT: Please note that the command line interface for flashrom will change before @@ -30,7 +31,7 @@ or no operation. If no operation is specified, flashrom will only probe for flash chips. It is recommended that if you try flashrom the first time on a system, you run it -in probe only mode and check the output. Also you are advised to make a +in probe-only mode and check the output. Also you are advised to make a backup of your current ROM contents with .B \-r before you try to write a new image. @@ -38,6 +39,7 @@ .B "\-r, \-\-read <file>" Read flash ROM contents and save them into the given .BR <file> . +If the file already exists, it will be overwritten. .TP .B "\-w, \-\-write <file>" Write @@ -144,7 +146,8 @@ from flash layout. .TP .B "\-L, \-\-list\-supported" -List the flash chips, chipsets, mainboards, and PCI card "programmers" +List the flash chips, chipsets, mainboards, and external programmers +(including PCI, USB, parallel port, and serial port based devices) supported by flashrom. .sp There are many unlisted boards which will work out of the box, without @@ -160,8 +163,9 @@ Same as .BR \-\-list\-supported , but outputs the supported hardware in MediaWiki syntax, so that it can be -easily pasted into the wiki page at http://www.flashrom.org/. Please note -that MediaWiki output is not compiled in by default. +easily pasted into the wiki page at +.BR http://www.flashrom.org/ . +Please note that MediaWiki output is not compiled in by default. .TP .B "\-p, \-\-programmer <name>[:parameter[,parameter[,parameter]]]" Specify the programmer device. Currently supported are: @@ -489,7 +493,7 @@ four. Make sure to not forget the "0x" prefix for hexadecimal port addresses. .sp More information about the hardware is available at -http://rayer.ic.cz/elektro/spipgm.htm +.BR http://rayer.ic.cz/elektro/spipgm.htm . .TP .BR "ogp_spi " programmer The flash ROM chip to access must be specified with the @@ -517,7 +521,7 @@ section above. .sp More information about the hardware is available at -http://wiki.opengraphics.org +.BR http://wiki.opengraphics.org . .SH EXIT STATUS flashrom exits with 0 on success, 1 on most failures but with 2 if /dev/mem (/dev/xsvc on Solaris) can not be opened and with 3 if a call to mmap() fails. @@ -571,8 +575,10 @@ needs PCI configuration space read access and raw memory access. .sp On OpenBSD, you can obtain raw access permission by setting -securelevel=-1 in /etc/rc.securelevel and rebooting, or rebooting into single -user mode. +.B "securelevel=-1" +in +.B "/etc/rc.securelevel" +and rebooting, or rebooting into single user mode. .SH BUGS Please report any bugs at .sp @@ -590,6 +596,10 @@ backup. This is caused by the embedded controller (EC) present in many laptops, which interacts badly with any flash attempts. This is a hardware limitation and flashrom will attempt to detect it and abort immediately for safety reasons. +.sp +More information about flashrom on laptops is available from +.sp +.B " http://www.flashrom.org/Laptops" .SH LICENSE .B flashrom is covered by the GNU General Public License (GPL), version 2. Some files are

1 0

Re: [flashrom] [PATCH] fix output for multiple found flash chips
by Stefan Tauner 25 Jul '11

25 Jul '11

On Fri, 24 Jun 2011 19:03:52 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > - missing quotes > - missing commas > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > cli_classic.c | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/cli_classic.c b/cli_classic.c > index 59096a0..aba6edf 100644 > --- a/cli_classic.c > +++ b/cli_classic.c > @@ -373,9 +373,10 @@ int cli_classic(int argc, char *argv[]) > } > > if (chipcount > 1) { > - printf("Multiple flash chips were detected:"); > - for (i = 0; i < chipcount; i++) > - printf(" %s", flashes[i].name); > + printf("Multiple flash chips were detected: \"%s\"", > + flashes[0].name); > + for (i = 1; i < chipcount; i++) > + printf(", \"%s\"", flashes[i].name); > printf("\nPlease specify which chip to use with the -c <chipname> option.\n"); > programmer_shutdown(); > exit(1); since no one else has reviewed this yet and it is fairly trivial, i will add it with my next "tested stuff" commit -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 6

[commit] r1386 - trunk
by repository service 25 Jul '11

25 Jul '11

Author: stefanct Date: Mon Jul 25 22:38:52 2011 New Revision: 1386 URL: http://flashrom.org/trac/flashrom/changeset/1386 Log: add a bunch of new/tested stuff and various small changes 5 - mark EN25F80 as fully tested http://www.flashrom.org/pipermail/flashrom/2011-July/007329.html - mark W25Q16 as fully tested http://www.flashrom.org/pipermail/flashrom/2011-July/007151.html - mark W39V040A as fully tested http://www.flashrom.org/pipermail/flashrom/2011-July/007161.html - mark Pm25LV040 as fully tested reported by TL1 on IRC - mark W49F002U/N as fully tested http://paste.flashrom.org/view.php?id=733g - mark W39V080FA as fully tested http://www.flashrom.org/pipermail/flashrom/2011-July/007225.html - add ASUS P4S533-X to the list of supported boards http://www.flashrom.org/pipermail/flashrom/2011-July/007200.html - add ASUS M4A785TD-V EVO to the list of supported boards http://www.flashrom.org/pipermail/flashrom/2011-July/007329.html - add GA-945PL-S3P (rev. 6.6) to the list of supported boards reported by TL1 on IRC - add MS-7142 (K8MM-V) to the list of supported boards http://www.flashrom.org/pipermail/flashrom/2011-July/007161.html - add MS-7369 (K9N Neo V2) to the list of supported boards http://www.flashrom.org/pipermail/flashrom/2011-July/007181.html - add X7DBT-INF to the list of supported boards http://www.flashrom.org/pipermail/flashrom/2011-July/007225.html - mark SiS 645DX chipset enable as OK http://www.flashrom.org/pipermail/flashrom/2011-July/007200.html - mark SiS 651 chipset enable as OK http://paste.flashrom.org/view.php?id=733 - move intel_ich_gpio34_raise to the correct line(s) - change the output of unlock_w39_fwh_block from 0x%x to 0x%08x - fix output for untested chipset enables (missing space) - reorder the board enable in print.c entry for GA-8SIMLH added in r1385. - minor other fixes - fix output for multiple found flash chips by adding quotes and commas - similarly fix output of "Found/Assuming" chips Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> the last two points are Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> everything else is Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/board_enable.c trunk/chipset_enable.c trunk/cli_classic.c trunk/flashchips.c trunk/flashrom.c trunk/print.c trunk/w39.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Mon Jul 25 19:25:24 2011 (r1385) +++ trunk/board_enable.c Mon Jul 25 22:38:52 2011 (r1386) @@ -1475,15 +1475,6 @@ /* * Suited for: - * - ASUS A8Jm (laptop): Intel 945 + ICH7 - */ -static int intel_ich_gpio34_raise(void) -{ - return intel_ich_gpio_set(34, 1); -} - -/* - * Suited for: * - MSI MS-7046: LGA775 + 915P + ICH6 */ static int intel_ich_gpio19_raise(void) @@ -1521,6 +1512,15 @@ /* * Suited for: + * - ASUS A8Jm (laptop): Intel 945 + ICH7 + */ +static int intel_ich_gpio34_raise(void) +{ + return intel_ich_gpio_set(34, 1); +} + +/* + * Suited for: * - ASUS M6Ne (laptop): socket 479M (guessed) + Intel 855PM + ICH4-M */ static int intel_ich_gpio43_raise(void) @@ -2035,8 +2035,8 @@ {0x1106, 0x0686, 0x1106, 0x0686, 0x1106, 0x3058, 0x1458, 0xa000, NULL, NULL, NULL, P3, "GIGABYTE", "GA-7ZM", 512, OK, NULL}, {0x8086, 0x2570, 0x1458, 0x2570, 0x8086, 0x24d0, 0, 0, "^8IP775/-G$",NULL, NULL, P3, "GIGABYTE", "GA-8IP775", 0, OK, intel_ich_gpio32_raise}, {0x8086, 0x244b, 0x8086, 0x2442, 0x8086, 0x2445, 0x1458, 0xa002, NULL, NULL, NULL, P3, "GIGABYTE", "GA-8IRML", 0, OK, intel_ich_gpio25_raise}, - {0x1039, 0x0651, 0x1039, 0x0651, 0x1039, 0x7002, 0x1458, 0x5004, "^GA-8SIMLH$",NULL, NULL, P3, "GIGABYTE", "GA-8SIMLH", 0, OK, sis_gpio0_raise_and_w836xx_memw}, {0x8086, 0x24c3, 0x1458, 0x24c2, 0x8086, 0x24cd, 0x1458, 0x5004, NULL, NULL, NULL, P3, "GIGABYTE", "GA-8PE667 Ultra 2", 0, OK, intel_ich_gpio32_raise}, + {0x1039, 0x0651, 0x1039, 0x0651, 0x1039, 0x7002, 0x1458, 0x5004, "^GA-8SIMLH$",NULL, NULL, P3, "GIGABYTE", "GA-8SIMLH", 0, OK, sis_gpio0_raise_and_w836xx_memw}, {0x10DE, 0x02F1, 0x1458, 0x5000, 0x10DE, 0x0261, 0x1458, 0x5001, NULL, NULL, NULL, P3, "GIGABYTE", "GA-K8N51GMF", 0, OK, nvidia_mcp_gpio3b_raise}, {0x10DE, 0x026C, 0x1458, 0xA102, 0x10DE, 0x0260, 0x1458, 0x5001, NULL, NULL, NULL, P3, "GIGABYTE", "GA-K8N51GMF-9", 0, OK, nvidia_mcp_gpio3b_raise}, {0x10de, 0x00e4, 0x1458, 0x0c11, 0x10de, 0x00e0, 0x1458, 0x0c11, NULL, NULL, NULL, P3, "GIGABYTE", "GA-K8NS Pro-939", 0, NT, nvidia_mcp_gpio0a_raise}, Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Mon Jul 25 19:25:24 2011 (r1385) +++ trunk/chipset_enable.c Mon Jul 25 22:38:52 2011 (r1386) @@ -1031,10 +1031,10 @@ {0x1039, 0x0635, NT, "SiS", "635", enable_flash_sis540}, {0x1039, 0x0640, NT, "SiS", "640", enable_flash_sis540}, {0x1039, 0x0645, NT, "SiS", "645", enable_flash_sis540}, - {0x1039, 0x0646, NT, "SiS", "645DX", enable_flash_sis540}, + {0x1039, 0x0646, OK, "SiS", "645DX", enable_flash_sis540}, {0x1039, 0x0648, NT, "SiS", "648", enable_flash_sis540}, {0x1039, 0x0650, NT, "SiS", "650", enable_flash_sis540}, - {0x1039, 0x0651, NT, "SiS", "651", enable_flash_sis540}, + {0x1039, 0x0651, OK, "SiS", "651", enable_flash_sis540}, {0x1039, 0x0655, NT, "SiS", "655", enable_flash_sis540}, {0x1039, 0x0661, OK, "SiS", "661", enable_flash_sis540}, {0x1039, 0x0730, NT, "SiS", "730", enable_flash_sis540}, @@ -1229,7 +1229,7 @@ msg_pinfo("Found chipset \"%s %s\"", chipset_enables[i].vendor_name, chipset_enables[i].device_name); - msg_pdbg("with PCI ID %04x:%04x", + msg_pdbg(" with PCI ID %04x:%04x", chipset_enables[i].vendor_id, chipset_enables[i].device_id); msg_pinfo(". "); Modified: trunk/cli_classic.c ============================================================================== --- trunk/cli_classic.c Mon Jul 25 19:25:24 2011 (r1385) +++ trunk/cli_classic.c Mon Jul 25 22:38:52 2011 (r1386) @@ -380,9 +380,10 @@ } if (chipcount > 1) { - printf("Multiple flash chips were detected:"); - for (i = 0; i < chipcount; i++) - printf(" %s", flashes[i].name); + printf("Multiple flash chips were detected: \"%s\"", + flashes[0].name); + for (i = 1; i < chipcount; i++) + printf(", \"%s\"", flashes[i].name); printf("\nPlease specify which chip to use with the -c <chipname> option.\n"); ret = 1; goto out_shutdown; Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Mon Jul 25 19:25:24 2011 (r1385) +++ trunk/flashchips.c Mon Jul 25 22:38:52 2011 (r1386) @@ -3075,7 +3075,7 @@ .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_OK_PRE, + .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -5047,7 +5047,7 @@ .model_id = PMC_PM25LV040, .total_size = 512, .page_size = 256, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -7878,7 +7878,7 @@ .total_size = 2048, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = @@ -8384,9 +8384,9 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PR, + .tested = TEST_OK_PREW, .probe = probe_jedec, - .probe_timing = 10, + .probe_timing = 10, .block_erasers = { { @@ -8585,7 +8585,7 @@ .total_size = 256, .page_size = 128, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PRE, + .tested = TEST_OK_PREW, .probe = probe_jedec, .probe_timing = 10, .block_erasers = @@ -8705,7 +8705,7 @@ .total_size = 1024, .page_size = 64 * 1024, .feature_bits = FEATURE_REGISTERMAP | FEATURE_EITHER_RESET, - .tested = TEST_OK_PRE, + .tested = TEST_OK_PREW, .probe = probe_jedec, .probe_timing = 10, .block_erasers = Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Mon Jul 25 19:25:24 2011 (r1385) +++ trunk/flashrom.c Mon Jul 25 22:38:52 2011 (r1386) @@ -1201,7 +1201,7 @@ snprintf(location, sizeof(location), "on %s", programmer_table[programmer].name); tmp = flashbuses_to_text(flash->bustype); - msg_cinfo("%s chip \"%s %s\" (%d kB, %s) %s.\n", + msg_cinfo("%s %s flash chip \"%s\" (%d kB, %s) %s.\n", force ? "Assuming" : "Found", fill_flash->vendor, fill_flash->name, fill_flash->total_size, tmp, location); free(tmp); @@ -1711,7 +1711,7 @@ ret = 1; } /* It would be favorable if we could also check for correct terminaion - * of the follwing arrays, but we don't know their size in here... + * of the following arrays, but we don't know their sizes in here... * For 'flashchips' we check the first element to be non-null. In the * other cases there exist use cases where the first element can be * null. */ Modified: trunk/print.c ============================================================================== --- trunk/print.c Mon Jul 25 19:25:24 2011 (r1385) +++ trunk/print.c Mon Jul 25 22:38:52 2011 (r1386) @@ -448,6 +448,7 @@ B("ASUS", "M3A76-CM", 1, "http://www.asus.com/product.aspx?P_ID=aU8effdifLvraVze", NULL), B("ASUS", "M3A78-EM", 1, "http://www.asus.com/product.aspx?P_ID=KjpYqzmAd9vsTM2D", NULL), B("ASUS", "M4A78-EM", 1, "http://www.asus.com/product.aspx?P_ID=0KyowHKUFAQqH2DO", NULL), + B("ASUS", "M4A785TD-V EVO", 1, "http://www.asus.com/product.aspx?P_ID=fcsXWSxnhzZE9rnR", NULL), B("ASUS", "M4A785TD-M EVO", 1, "http://www.asus.com/product.aspx?P_ID=QHbvGVB1mXmmD8qQ", NULL), B("ASUS", "M4A79T Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=lhJiLTN5huPfCVkW", NULL), B("ASUS", "M4A87TD/USB3", 1, "http://www.asus.com/product.aspx?P_ID=nlWYrI9wlNIYHAaa", NULL), @@ -470,13 +471,14 @@ B("ASUS", "P4P800-E Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=INIJUvLlif7LHp3g", NULL), B("ASUS", "P4SC-E", 1, "ftp://ftp.asus.com.tw/pub/ASUS/mb/sock478/p4sc-e/", "Part of ASUS Terminator P4 533 barebone system"), B("ASUS", "P4SD-LA", 1, "http://h10025.www1.hp.com/ewfrf/wc/document?docname=c00022505", NULL), + B("ASUS", "P4S533-X", 1, "ftp://ftp.asus.com.tw/pub/ASUS/mb/sock478/p4s533-x/", NULL), B("ASUS", "P4S800-MX", 1, "http://www.asus.com/product.aspx?P_ID=Bb57zoJhmO1Qkcrh", NULL), B("ASUS", "P5A", 1, "ftp://ftp.asus.com.tw/pub/ASUS/mb/sock7/ali/p5a/", NULL), B("ASUS", "P5B", 1, "ftp://ftp.asus.com.tw/pub/ASUS/mb/socket775/P5B/", NULL), B("ASUS", "P5B-Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=bswT66IBSb2rEWNa", NULL), B("ASUS", "P5BV-M", 0, "ftp://ftp.asus.com.tw/pub/ASUS/mb/socket775/P5B-VM/", "Reported by Bernhard M. Wiedemann <bernhard(a)uml12d.zq1.de> to flashrom(a)coreboot.org, no public archive. Missing board enable and/or SST49LF008A unlocking. May work now."), B("ASUS", "P5GC-MX/1333", 1, "http://www.asus.com/product.aspx?P_ID=PYvbfOokwxUzJky3", NULL), - B("ASUS", "P5GDC Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=AbeoopyNpI2TZixg", NULL), + B("ASUS", "P5GDC Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=AbeoopyNpI2TZixg", NULL), B("ASUS", "P5KC", 1, "http://www.asus.com/product.aspx?P_ID=fFZ8oUIGmLpwNMjj", NULL), B("ASUS", "P5L-MX", 1, "http://www.asus.com/product.aspx?P_ID=X70d3NCzH2DE9vWH", NULL), B("ASUS", "P5GD1 Pro", 1, "http://www.asus.com/product.aspx?P_ID=50M49xQh71EZOeM1", NULL), @@ -534,8 +536,9 @@ B("GIGABYTE", "GA-7ZM", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1366", "Works fine if you remove jumper JP9 on the board and disable the flash protection BIOS option."), B("GIGABYTE", "GA-8IP775", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1830", NULL), B("GIGABYTE", "GA-8IRML", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1343", NULL), - B("GIGABYTE", "GA-8SIMLH", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1399", NULL), B("GIGABYTE", "GA-8PE667 Ultra 2", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1607", NULL), + B("GIGABYTE", "GA-8SIMLH", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1399", NULL), + B("GIGABYTE", "GA-945PL-S3P (rev. 6.6)", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2541", NULL), B("GIGABYTE", "GA-965GM-S2 (rev. 2.0)", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2617", NULL), B("GIGABYTE", "GA-965P-DS4", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2288", NULL), B("GIGABYTE", "GA-EP35-DS3L", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2778", NULL), @@ -602,6 +605,7 @@ B("MSI", "MS-7061 (KM3M-V/KM4M-V/KM4AM-V)", 1, "http://www.msi.com/service/search/?kw=7061&type=product", NULL), B("MSI", "MS-7065", 1, "http://browse.geekbench.ca/geekbench2/view/53114", NULL), B("MSI", "MS-7135 (K8N Neo3)", 1, "http://www.msi.com/product/mb/K8N-Neo3.html", NULL), + B("MSI", "MS-7142 (K8MM-V)", 1, "http://www.msi.com/product/mb/K8MM-V.html", NULL), B("MSI", "MS-7168 (Orion)", 1, "http://support.packardbell.co.uk/uk/item/index.php?i=spec_orion&pi=platform…", NULL), B("MSI", "MS-7207 (K8NGM2-L)", 1, "http://www.msi.com/product/mb/K8NGM2-FID--IL--L.html", NULL), B("MSI", "MS-7211 (PM8M3-V)", 1, "http://www.msi.com/product/mb/PM8M3-V.html", NULL), @@ -612,6 +616,7 @@ B("MSI", "MS-7312 (K9MM-V)", 1, "http://www.msi.com/product/mb/K9MM-V.html", NULL), B("MSI", "MS-7345 (P35 Neo2-FIR)", 1, "http://www.msi.com/product/mb/P35-Neo2-FR---FIR.html", NULL), B("MSI", "MS-7368 (K9AG Neo2-Digital)", 1, "http://www.msi.com/product/mb/K9AG-Neo2-Digital.html", NULL), + B("MSI", "MS-7369 (K9N Neo V2)", 1, "http://www.msi.com/product/mb/K9N-Neo-V2.html", NULL), B("MSI", "MS-7376 (K9A2 Platinum V1)", 1, "http://www.msi.com/product/mb/K9A2-Platinum.html", NULL), B("MSI", "MS-7529 (G31M3-L(S) V2)", 1, "http://www.msi.com/product/mb/G31M3-L-V2---G31M3-LS-V2.html", NULL), B("MSI", "MS-7529 (G31TM-P21)", 1, "http://www.msi.com/product/mb/G31TM-P21.html", NULL), @@ -648,6 +653,7 @@ B("Sun", "Fire x4600", 0, "http://www.sun.com/servers/x64/x4600/", "No public report found. May work now."), B("Supermicro", "H8QC8", 1, "http://www.supermicro.com/Aplus/motherboard/Opteron/nforce/H8QC8.cfm", NULL), B("Supermicro", "X5DP8-G2", 1, "http://www.supermicro.com/products/motherboard/Xeon/E7501/X5DP8-G2.cfm", NULL), + B("Supermicro", "X7DBT-INF", 1, "http://www.supermicro.com/products/motherboard/Xeon1333/5000P/X7DBT-INF.cfm", NULL), B("Supermicro", "X7SPA-HF", 1, "http://www.supermicro.com/products/motherboard/ATOM/ICH9/X7SPA.cfm?typ=H&IP…", NULL), B("Supermicro", "X8DT3", 1, "http://www.supermicro.com/products/motherboard/QPI/5500/X8DT3.cfm", NULL), B("Supermicro", "X8DTH-6F", 1, "http://www.supermicro.com/products/motherboard/QPI/5500/X8DTH-6F.cfm", NULL), Modified: trunk/w39.c ============================================================================== --- trunk/w39.c Mon Jul 25 19:25:24 2011 (r1385) +++ trunk/w39.c Mon Jul 25 22:38:52 2011 (r1386) @@ -70,10 +70,10 @@ if (locking & ((1 << 2) | (1 << 0))) { /* Lockdown active? */ if (locking & (1 << 1)) { - msg_cerr("Can't unlock block at 0x%x!\n", offset); + msg_cerr("Can't unlock block at 0x%08x!\n", offset); return -1; } else { - msg_cdbg("Unlocking block at 0x%x\n", offset); + msg_cdbg("Unlocking block at 0x%08x\n", offset); chip_writeb(0, wrprotect); } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom