flashrom June 2012

flashrom@flashrom.org

35 participants
108 discussions

Flashing M/B Bios (Asus P5LD2-VM) goes wrong

by Emil Sirbu

Hello, I have an ASUS P5LD2-VM, and I try to update bios, first with flashrom v0.9.2-r1028 ( http://paste.flashrom.org/view.php?id=489 ) then with 0.9.3 ( http://paste.flashrom.org/view.php?id=490 also, the ROM is at http://paste.flashrom.org/uploads/491.bin ) but: Writing flash chip... Erasing flash chip... Looking at blockwise erase function 0... trying... 0x000000-0x000fff, 0x001000-0x001fff, 0x002000-0x002fff, 0x003000-0xff, 0x004000-0x004fff, 0x005000-0x005fff, ERASE FAILED at 0x00005760! Expected=0xff, Read=0x50, failed byte count from 0x00005000-0x00005fff: 0x87a ERASE FAILED! Can you help whit this? I'm carco on freenode/#flashrom channel Thank you, Emil Sirbu

7 years, 11 months

[PATCH] remove exit calls from sp_sync_read_timeout and sp_synchronize

by Niklas Söderlund

Add return values to sp_synchronize so we can signal a failure to the only upstream caller, which is prepared to propagate a failure. The addition of a return code to signal a failure from the read syscall in sp_sync_read_timeout is a bit of a stretch and might look strange. But the only caller is in the loop in sp_synchronize and any sequential call to read will result in the same error and end result. But please take a extra look on this to make sure we don't miss any corner case. The alternative would be to differentiate between a read failure over fast detection of a EAGAIN. The end result would in my opinion only make the code harder to read. The cost is that upon read failure the user might be spammed up to 10 times with the same error message before flashrom dies. Signed-off-by: Niklas Söderlund <niso(a)kth.se> --- serprog.c | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/serprog.c b/serprog.c index 02996ea..f03d332 100644 --- a/serprog.c +++ b/serprog.c @@ -145,8 +145,10 @@ static int sp_sync_read_timeout(int loops) rv = read(sp_fd, &c, 1); if (rv == 1) return c; - if ((rv == -1) && (errno != EAGAIN)) - sp_die("read"); + if ((rv == -1) && (errno != EAGAIN)) { + msg_perr("read: %s\n", strerror(errno)); + return -1; + } usleep(10 * 1000); /* 10ms units */ } return -1; @@ -158,7 +160,7 @@ static int sp_sync_read_timeout(int loops) * blocking read - TODO: add an alarm() timer for the rest of the app on * * serial operations, though not such a big issue as the first thing to * * do is synchronize (eg. check that device is alive). */ -static void sp_synchronize(void) +static int sp_synchronize(void) { int i; int flags = fcntl(sp_fd, F_GETFL); @@ -169,8 +171,10 @@ static void sp_synchronize(void) * the device serial parser to get to a sane state, unless if it * * is waiting for a real long write-n. */ memset(buf, S_CMD_NOP, 8); - if (write(sp_fd, buf, 8) != 8) - sp_die("flush write"); + if (write(sp_fd, buf, 8) != 8) { + msg_perr("flush write: %s\n", strerror(errno)); + return 1; + } /* A second should be enough to get all the answers to the buffer */ usleep(1000 * 1000); sp_flush_incoming(); @@ -181,9 +185,11 @@ static void sp_synchronize(void) * attempt, ~1s if immediate success. */ for (i = 0; i < 8; i++) { int n; - unsigned char c = S_CMD_SYNCNOP; - if (write(sp_fd, &c, 1) != 1) - sp_die("sync write"); + int c = S_CMD_SYNCNOP; + if (write(sp_fd, &c, 1) != 1) { + msg_perr("sync write: %s\n", strerror(errno)); + return 1; + } msg_pdbg("."); fflush(stdout); for (n = 0; n < 10; n++) { @@ -194,8 +200,10 @@ static void sp_synchronize(void) if (c != S_ACK) continue; c = S_CMD_SYNCNOP; - if (write(sp_fd, &c, 1) != 1) - sp_die("sync write"); + if (write(sp_fd, &c, 1) != 1) { + msg_perr("sync write: %s\n", strerror(errno)); + return 1; + } c = sp_sync_read_timeout(50); if (c != S_NAK) break; /* fail */ @@ -206,12 +214,12 @@ static void sp_synchronize(void) flags &= ~O_NONBLOCK; fcntl(sp_fd, F_SETFL, flags); msg_pdbg("\n"); - return; + return 0; } } msg_perr("Error: cannot synchronize protocol " "- check communications and reset device?\n"); - exit(1); + return 1; } static int sp_check_commandavail(uint8_t command) @@ -432,7 +440,8 @@ int serprog_init(void) sp_check_avail_automatic = 0; - sp_synchronize(); + if (sp_synchronize()) + return 1; msg_pdbg(MSGHEADER "Synchronized\n"); -- 1.7.10.3

7 years, 11 months

Gembird-PCI-VIA VT6421A-W39V040C

by Alexey

Hi! I'm going to flash Gembird PCI 3SATA+1IDE controller's BIOS, there is W39V040C. I found an excellent professionaly modified ROM for this device. I will try to do it on board of ASUS P4P800E-DELUX. Just let me know, is it possible in the moment or I have to wait for a new version of flashrom.exe? This device have unfriendly relations to Radeon X1600 AGP, on board of ASRock P4i45E MB, so I found only new modified ROM of PCI controller can help. Waiting for Your answer, Alexey.

7 years, 11 months

[PATCH] Hack libpci not to exit(1) during init if PCI does not work

by Carl-Daniel Hailfinger

This patch is for testing only, and not for immediate merge. libpci unhelpfully calls exit(1) instead of reporting an error if init fails. Fortunately, that part of libpci has not changed since the year 2000, so we can use a really evil hack to avoid that. We supply an alternative error printing function (which does not exit(1)) and this function detects which error is happening and hacks internal libpci structures in a way that avoids a later segfault due to NULL pointer dereference. We MUST absolutely make sure that pci_init() in libpci will not change or this hack will explode spectacularly. Once we decide that this hack is the way to go, notifying the libpci maintainer is essential. Apply this patch, then compile flashrom with make CONFIG_DUMMY=no CONFIG_INTERNAL=o CONFIG_SERPROG=no CONFIG_RAYER_SPI=no CONFIG_NIC3COM=no CONFIG_GFXNVIDIA=no CONFIG_SATASII=no CONFIG_FT2232_SPI=no CONFIG_DRKAISER=no CONFIG_NICREALTEK=no CONFIG_NICINTEL_SPI=no CONFIG_BUSPIRATE_SPI=no CONFIG_OGP_SPI=no CONFIG_SATAMV=no CONFIG_NICINTEL=yes To check if the hack works, run "flashrom -V" and respond to this mail with the output. You should get a message near the end which says that programmer initialization failed. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-libpci_hack_avoid_exit1_during_init/pcidev.c =================================================================== --- flashrom-libpci_hack_avoid_exit1_during_init/pcidev.c (Revision 1362) +++ flashrom-libpci_hack_avoid_exit1_during_init/pcidev.c (Arbeitskopie) @@ -21,6 +21,8 @@ #include <stdlib.h> #include <string.h> +#include <stdio.h> +#include <stdarg.h> #include "flash.h" #include "programmer.h" @@ -188,6 +190,58 @@ return 0; } +/* Ugliest hack ever in flashrom! Should work for all libpci versions released + * in the year 2000 or later. Checked to make sense until at least version + * 3.1.8-test1. + */ +static void fake_libpci_method_init(struct pci_access *foo) +{ + msg_pinfo("Working around another pcilib crash\n"); + return; +} + +static struct { + char *name; /* name in all libpci versions */ + char *dummy1; /* Only present in some libpci versions */ + void *dummy2; + void (*init1)(struct pci_access *); /* init in older versions */ + void (*init2)(struct pci_access *); /* init in newer versions */ + void *dummy3; + void *dummy4; + void *dummy5; + void *dummy6; + void *dummy7; + void *dummy8; + void *dummy9; + void *dummy10; +} fake_libpci_methods = { + .name = "None", + .init1 = &fake_libpci_method_init, + .init2 = &fake_libpci_method_init, +}; + +static int pci_init_failed = 0; + +static void my_libpci_generic_error(char *msg, ...) +{ + va_list ap; + + msg_pinfo("pcilib: "); + va_start(ap, msg); + vprintf(msg, ap); + va_end(ap); + msg_pinfo("\n"); + if (!strcmp(msg, "Cannot find any working access method.")) { + /* Workaround for crash, very ugly. */ + msg_pinfo("Working around pcilib crash\n"); + pacc->methods = (void *)&fake_libpci_methods; + pci_init_failed = 1; + } else { + /* Any error in libpci would result in exit(1) by default. */ + exit(1); + } +} + uintptr_t pcidev_init(int bar, const struct pcidev_status *devs) { struct pci_dev *dev; @@ -198,7 +252,14 @@ uintptr_t addr = 0, curaddr = 0; pacc = pci_alloc(); /* Get the pci_access structure */ + pacc->error = &my_libpci_generic_error; pci_init(pacc); /* Initialize the PCI library */ + /* pci_init returns void, so we have to hack it. */ + if (pci_init_failed) { + /* Yes, technically we would have to free stuff... */ + return 1; + } + pci_scan_bus(pacc); /* We want to get the list of devices */ pci_filter_init(pacc, &filter); -- http://www.hailfinger.org/

7 years, 11 months

[PATCH 1/2] libftdi complains that it is impossible to set interface on an already open device.

by Ilya A. Volynets-Evenbakh

Call to ftdi_set_interface right after ftdi_init and before call to ftdi_usb_open Signed-off-by: Ilya A. Volynets-Evenbakh <ilya(a)total-knowledge.com> --- ft2232_spi.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ft2232_spi.c b/ft2232_spi.c index aec2fd5..aaca5f3 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -276,6 +276,11 @@ int ft2232_spi_init(void) return -3; } + if (ftdi_set_interface(ftdic, ft2232_interface) < 0) { + msg_perr("Unable to select interface: %s\n", + ftdic->error_str); + } + f = ftdi_usb_open(ftdic, ft2232_vid, ft2232_type); if (f < 0 && f != -5) { @@ -290,11 +295,6 @@ int ft2232_spi_init(void) clock_5x = 0; } - if (ftdi_set_interface(ftdic, ft2232_interface) < 0) { - msg_perr("Unable to select interface: %s\n", - ftdic->error_str); - } - if (ftdi_usb_reset(ftdic) < 0) { msg_perr("Unable to reset FTDI device\n"); } -- 1.7.3.4

7 years, 11 months

Re: [flashrom] About mcp73 support on flashrom

by Stefan Tauner

On Thu, 22 Mar 2012 13:53:34 +0200 Olcay Korkmaz <olcay.mz(a)gmail.com> wrote: > Hello all > I have Zotac 630i-itx board (old pcb rev model..very old i guess) > flashrom -V log details on mail attachment > is it safe to erase/write process > extra info bios dump is ok via flashrom -r command > Hello Olcay! seems to work fine: http://www.flashrom.org/pipermail/flashrom/2012-April/009073.html -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

7 years, 11 months

[PATCH] Add Spi interface support for Tunnel Creek chipset (3)

by Feldschmid, Ingo

Hi, Last changes I submitted have been vs. trunk 1424. Since there is a new version out, I will resubmit the changes built against the new flashrom trunk version: The Intel Tunnel Creek chipset supports both an SPI and an LPC bus. Set chipset table entry for Tunnel Creek to new function "enable_flash_tunnelcreek", which will read the hardware straps and return support for the bus that has been used for booting. This function uses "ich_init_spi" with ich_generation set to 7 for initializing the SPI bus if necessary. SPI functionality tested on actual hardware (see attached file flashrom.log), Tunnel Creek LPC interface not tested yet (missing hardware for that). The attached patch has been created vs. flashrom trunk 1427. Signed-off-by: Ingo Feldschmid <ifel(a)msc-ge.com> Es gelten unsere Allgemeinen Leistungsbedingungen die unter http://www.msc-ge.com/alb abrufbar sind. Our standard terms and conditions apply which are available under http://www.msc-ge.com/alb . MSC Vertriebs GmbH Sitz der Gesellschaft: Industriestrasse 16, 76297 Stutensee Handelsregister: Mannheim, HRB Nr. 10 3631 Geschaftsfuhrung: Manfred Schwarztrauber, Lothar Kummerlin, Rudiger Kuhn, Silvano Geissler Umsatzsteuer ID Nr.: DE 143 585 507 WEEE Reg. Nr. : DE 31011852 Gleichmann & Co. Electronics GmbH Sitz der Gesellschaft: Schraderstrasse 44, 67227 Frankenthal Handelsregister: Ludwigshafen, HRB Nr. 21305 Geschaftsfuhrung: Manfred Schwarztrauber, Thomas Klein Umsatzsteuer ID Nr. : DE 148 421 329 WEEE Reg. Nr.: DE 72277043 Diese E-Mail enthalt vertrauliche und/ oder rechtlich geschutzte Informationen. Wenn Sie nicht der beabsichtigte Empfanger sind, informieren Sie bitte sofort den Absender und loschen Sie diese E-Mail. The information contained in this message is confidential and/ or protected by law. If you are not the intended recipient, please contact the sender and delete this message.

7 years, 11 months

[PATCH] Return code for spi_read_status_register

by Carl-Daniel Hailfinger

spi_read_status_register now returns success/failure and stores the status register value via call-by-reference. That way, status register reading failure (only possible if the programmer couldn't run RDSR) can be detected and acted upon in the future. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-spi_rdsr_errorcheck/it87spi.c =================================================================== --- flashrom-spi_rdsr_errorcheck/it87spi.c (Revision 1539) +++ flashrom-spi_rdsr_errorcheck/it87spi.c (Arbeitskopie) @@ -321,6 +321,7 @@ { unsigned int i; int result; + uint8_t status; chipaddr bios = flash->virtual_memory; result = spi_write_enable(flash); @@ -335,7 +336,7 @@ /* Wait until the Write-In-Progress bit is cleared. * This usually takes 1-10 ms, so wait in 1 ms steps. */ - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(1000); return 0; } Index: flashrom-spi_rdsr_errorcheck/a25.c =================================================================== --- flashrom-spi_rdsr_errorcheck/a25.c (Revision 1539) +++ flashrom-spi_rdsr_errorcheck/a25.c (Arbeitskopie) @@ -33,7 +33,7 @@ { uint8_t status; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); msg_cdbg("Chip status register is %02x\n", status); spi_prettyprint_status_register_amic_a25_srwd(status); @@ -49,7 +49,7 @@ { uint8_t status; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); msg_cdbg("Chip status register is %02x\n", status); spi_prettyprint_status_register_amic_a25_srwd(status); @@ -64,7 +64,7 @@ { uint8_t status; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); msg_cdbg("Chip status register is %02x\n", status); spi_prettyprint_status_register_amic_a25_srwd(status); @@ -82,7 +82,7 @@ { uint8_t status; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); msg_cdbg("Chip status register is %02x\n", status); spi_prettyprint_status_register_amic_a25_srwd(status); Index: flashrom-spi_rdsr_errorcheck/at25.c =================================================================== --- flashrom-spi_rdsr_errorcheck/at25.c (Revision 1539) +++ flashrom-spi_rdsr_errorcheck/at25.c (Arbeitskopie) @@ -61,7 +61,7 @@ { uint8_t status; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); msg_cdbg("Chip status register is %02x\n", status); spi_prettyprint_status_register_atmel_at25_srpl(status); @@ -84,7 +84,7 @@ { uint8_t status; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); msg_cdbg("Chip status register is %02x\n", status); spi_prettyprint_status_register_atmel_at25_srpl(status); @@ -103,7 +103,7 @@ { uint8_t status; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); msg_cdbg("Chip status register is %02x\n", status); msg_cdbg("Chip status register: Status Register Write Protect (WPEN) " @@ -127,7 +127,7 @@ { uint8_t status; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); msg_cdbg("Chip status register is %02x\n", status); msg_cdbg("Chip status register: Status Register Write Protect (WPEN) " @@ -151,7 +151,7 @@ { uint8_t status; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); msg_cdbg("Chip status register is %02x\n", status); spi_prettyprint_status_register_atmel_at25_srpl(status); @@ -168,7 +168,7 @@ uint8_t status; int result; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); /* If block protection is disabled, stop here. */ if ((status & (3 << 2)) == 0) return 0; @@ -195,7 +195,7 @@ msg_cerr("spi_write_status_register failed\n"); return result; } - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); if ((status & (3 << 2)) != 0) { msg_cerr("Block protection could not be disabled!\n"); return 1; @@ -223,7 +223,7 @@ uint8_t status; int result; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); /* If block protection is disabled, stop here. */ if ((status & 0x6c) == 0) return 0; @@ -244,7 +244,7 @@ msg_cerr("spi_write_status_register failed\n"); return result; } - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); if ((status & 0x6c) != 0) { msg_cerr("Block protection could not be disabled!\n"); return 1; @@ -257,7 +257,7 @@ uint8_t status; int result; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); /* If block protection is disabled, stop here. */ if ((status & 0x7c) == 0) return 0; @@ -278,7 +278,7 @@ msg_cerr("spi_write_status_register failed\n"); return result; } - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); if ((status & 0x7c) != 0) { msg_cerr("Block protection could not be disabled!\n"); return 1; Index: flashrom-spi_rdsr_errorcheck/spi25.c =================================================================== --- flashrom-spi_rdsr_errorcheck/spi25.c (Revision 1539) +++ flashrom-spi_rdsr_errorcheck/spi25.c (Arbeitskopie) @@ -301,7 +301,7 @@ return 1; } -uint8_t spi_read_status_register(struct flashctx *flash) +int spi_read_status_register(struct flashctx *flash, uint8_t *status) { static const unsigned char cmd[JEDEC_RDSR_OUTSIZE] = { JEDEC_RDSR }; /* FIXME: No workarounds for driver/hardware bugs in generic code. */ @@ -311,10 +311,14 @@ /* Read Status Register */ ret = spi_send_command(flash, sizeof(cmd), sizeof(readarr), cmd, readarr); - if (ret) + if (ret) { msg_cerr("RDSR failed!\n"); + *status = 0xff; + return ret; + } - return readarr[0]; + *status = readarr[0]; + return 0; } /* Prettyprint the status register. Common definitions. */ @@ -418,7 +422,7 @@ { uint8_t status; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); msg_cdbg("Chip status register is %02x\n", status); switch (flash->manufacture_id) { case ST_ID: @@ -451,6 +455,7 @@ int spi_chip_erase_60(struct flashctx *flash) { int result; + uint8_t status; struct spi_command cmds[] = { { .writecnt = JEDEC_WREN_OUTSIZE, @@ -479,7 +484,7 @@ * This usually takes 1-85 s, so wait in 1 s steps. */ /* FIXME: We assume spi_read_status_register will never fail. */ - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(1000 * 1000); /* FIXME: Check the status register for errors. */ return 0; @@ -488,6 +493,7 @@ int spi_chip_erase_c7(struct flashctx *flash) { int result; + uint8_t status; struct spi_command cmds[] = { { .writecnt = JEDEC_WREN_OUTSIZE, @@ -515,7 +521,7 @@ * This usually takes 1-85 s, so wait in 1 s steps. */ /* FIXME: We assume spi_read_status_register will never fail. */ - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(1000 * 1000); /* FIXME: Check the status register for errors. */ return 0; @@ -525,6 +531,7 @@ unsigned int blocklen) { int result; + uint8_t status; struct spi_command cmds[] = { { .writecnt = JEDEC_WREN_OUTSIZE, @@ -557,7 +564,7 @@ /* Wait until the Write-In-Progress bit is cleared. * This usually takes 100-4000 ms, so wait in 100 ms steps. */ - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(100 * 1000); /* FIXME: Check the status register for errors. */ return 0; @@ -572,6 +579,7 @@ unsigned int blocklen) { int result; + uint8_t status; struct spi_command cmds[] = { { .writecnt = JEDEC_WREN_OUTSIZE, @@ -604,7 +612,7 @@ /* Wait until the Write-In-Progress bit is cleared. * This usually takes 100-4000 ms, so wait in 100 ms steps. */ - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(100 * 1000); /* FIXME: Check the status register for errors. */ return 0; @@ -617,6 +625,7 @@ unsigned int blocklen) { int result; + uint8_t status; struct spi_command cmds[] = { { .writecnt = JEDEC_WREN_OUTSIZE, @@ -649,7 +658,7 @@ /* Wait until the Write-In-Progress bit is cleared. * This usually takes 100-4000 ms, so wait in 100 ms steps. */ - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(100 * 1000); /* FIXME: Check the status register for errors. */ return 0; @@ -660,6 +669,7 @@ unsigned int blocklen) { int result; + uint8_t status; struct spi_command cmds[] = { { .writecnt = JEDEC_WREN_OUTSIZE, @@ -692,7 +702,7 @@ /* Wait until the Write-In-Progress bit is cleared. * This usually takes 15-800 ms, so wait in 10 ms steps. */ - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(10 * 1000); /* FIXME: Check the status register for errors. */ return 0; @@ -764,7 +774,8 @@ * This is according the SST25VF016 datasheet, who knows it is more * generic that this... */ -static int spi_write_status_register_flag(struct flashctx *flash, int status, const unsigned char enable_opcode) +static int spi_write_status_register_flag(struct flashctx *flash, uint8_t status, + const unsigned char enable_opcode) { int result; int i = 0; @@ -781,7 +792,7 @@ .readarr = NULL, }, { .writecnt = JEDEC_WRSR_OUTSIZE, - .writearr = (const unsigned char[]){ JEDEC_WRSR, (unsigned char) status }, + .writearr = (const unsigned char[]){ JEDEC_WRSR, status }, .readcnt = 0, .readarr = NULL, }, { @@ -805,7 +816,7 @@ * 100 ms, then wait in 10 ms steps until a total of 5 s have elapsed. */ programmer_delay(100 * 1000); - while (spi_read_status_register(flash) & SPI_SR_WIP) { + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) { if (++i > 490) { msg_cerr("Error: WIP bit after WRSR never cleared\n"); return TIMEOUT_ERROR; @@ -925,7 +936,7 @@ uint8_t status; int result; - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); /* If block protection is disabled, stop here. */ if ((status & 0x3c) == 0) return 0; @@ -936,7 +947,7 @@ msg_cerr("spi_write_status_register failed\n"); return result; } - status = spi_read_status_register(flash); + spi_read_status_register(flash, &status); if ((status & 0x3c) != 0) { msg_cerr("Block protection could not be disabled!\n"); return 1; @@ -1007,6 +1018,7 @@ unsigned int len, unsigned int chunksize) { int rc = 0; + uint8_t status; unsigned int i, j, starthere, lenhere, towrite; /* FIXME: page_size is the wrong variable. We need max_writechunk_size * in struct flashctx to do this properly. All chips using @@ -1035,7 +1047,7 @@ rc = spi_nbyte_program(flash, starthere + j, buf + starthere - start + j, towrite); if (rc) break; - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(10); } if (rc) @@ -1056,13 +1068,14 @@ unsigned int len) { unsigned int i; + uint8_t status; int result = 0; for (i = start; i < start + len; i++) { result = spi_byte_program(flash, i, buf[i - start]); if (result) return 1; - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(10); } @@ -1074,6 +1087,7 @@ { uint32_t pos = start; int result; + uint8_t status; unsigned char cmd[JEDEC_AAI_WORD_PROGRAM_CONT_OUTSIZE] = { JEDEC_AAI_WORD_PROGRAM, }; @@ -1157,7 +1171,7 @@ */ return result; } - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(10); /* We already wrote 2 bytes in the multicommand step. */ @@ -1169,7 +1183,7 @@ cmd[2] = buf[pos++ - start]; spi_send_command(flash, JEDEC_AAI_WORD_PROGRAM_CONT_OUTSIZE, 0, cmd, NULL); - while (spi_read_status_register(flash) & SPI_SR_WIP) + while (spi_read_status_register(flash, &status), status & SPI_SR_WIP) programmer_delay(10); } Index: flashrom-spi_rdsr_errorcheck/chipdrivers.h =================================================================== --- flashrom-spi_rdsr_errorcheck/chipdrivers.h (Revision 1539) +++ flashrom-spi_rdsr_errorcheck/chipdrivers.h (Arbeitskopie) @@ -45,7 +45,7 @@ int spi_chip_write_1(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_write_256(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int spi_chip_read(struct flashctx *flash, uint8_t *buf, unsigned int start, int unsigned len); -uint8_t spi_read_status_register(struct flashctx *flash); +int spi_read_status_register(struct flashctx *flash, uint8_t *status); int spi_write_status_register(struct flashctx *flash, int status); void spi_prettyprint_status_register_bit(uint8_t status, int bit); void spi_prettyprint_status_register_bp3210(uint8_t status, int bp); -- http://www.hailfinger.org/

7 years, 11 months

[PATCH] Fix flashrom -L

by Carl-Daniel Hailfinger

flashrom -L output did not contain a list of programmers nor were all programmers listed. Fix it. (Well, mostly. Some programmers have no devices listed. And formatting on 80 column screens is totally broken for the flash chip list.) Wiki output is unchanged, and will need separate fixups. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> New output from flashrom -L follows: flashrom v0.9.2-r1196 on Linux 2.6.22.19-0.2-default (i686), built with libpci 2.2.6, LLVM Clang 2.8 (trunk 108130), little endian flashrom is free software, get the source code at http://www.flashrom.org Supported flash chips (total: 261): Vendor Device Tested Known Size/KB: Type: OK Broken (P = PROBE, R = READ, E = ERASE, W = WRITE) AMD Am29F010A/B P R E W 128 Parallel AMD Am29F002(N)BB 256 Parallel AMD Am29F002(N)BT 256 Parallel AMD Am29F016D 2048 Parallel AMD Am29F040B 512 Parallel AMD Am29F080B 1024 Parallel AMD Am29LV040B P R E W 512 Parallel AMD Am29LV081B 1024 Parallel AMIC A25L05PT 64 SPI AMIC A25L05PU 64 SPI AMIC A25L10PT 128 SPI AMIC A25L10PU 128 SPI AMIC A25L20PT 256 SPI AMIC A25L20PU 256 SPI AMIC A25L40PT P R W 512 SPI AMIC A25L40PU P R W 512 SPI AMIC A25L80P P R E W 1024 SPI AMIC A25L16PT 2048 SPI AMIC A25L16PU P R W 2048 SPI AMIC A25L512 64 SPI AMIC A25L010 128 SPI AMIC A25L020 256 SPI AMIC A25L040 512 SPI AMIC A25L080 1024 SPI AMIC A25L016 2048 SPI AMIC A25L032 4096 SPI AMIC A25LQ032 4096 SPI AMIC A29002B 256 Parallel AMIC A29002T P R W 256 Parallel AMIC A29040B 512 Parallel AMIC A49LF040A P R E W 512 LPC Atmel AT25DF021 256 SPI Atmel AT25DF041A 512 SPI Atmel AT25DF081 1024 SPI Atmel AT25DF081A 1024 SPI Atmel AT25DF161 2048 SPI Atmel AT25DF321 P R E W 4096 SPI Atmel AT25DF321A 4096 SPI Atmel AT25DF641 8192 SPI Atmel AT25DQ161 2048 SPI Atmel AT25F512B 64 SPI Atmel AT25FS010 128 SPI Atmel AT25FS040 512 SPI Atmel AT26DF041 512 SPI Atmel AT26DF081A P R 1024 SPI Atmel AT26DF161 2048 SPI Atmel AT26DF161A 2048 SPI Atmel AT26F004 512 SPI Atmel AT29C512 64 Parallel Atmel AT29C010A P R E W 128 Parallel Atmel AT29C020 256 Parallel Atmel AT29C040A 512 Parallel Atmel AT45CS1282 R 16896 SPI Atmel AT45DB011D R 128 SPI Atmel AT45DB021D R 256 SPI Atmel AT45DB041D R 512 SPI Atmel AT45DB081D R 1024 SPI Atmel AT45DB161D R 2048 SPI Atmel AT45DB321C R 4224 SPI Atmel AT45DB321D R 4096 SPI Atmel AT45DB642D R 8192 SPI Atmel AT49BV512 64 Parallel Atmel AT49F020 P R E W 256 Parallel Atmel AT49F002(N) 256 Parallel Atmel AT49F002(N)T P R W 256 Parallel Bright BM29F040 P R 512 Parallel EMST F49B002UA 256 Parallel EMST F25L008A 1024 SPI Eon EN25B05 64 SPI Eon EN25B05T 64 SPI Eon EN25B10 128 SPI Eon EN25B10T 128 SPI Eon EN25B20 256 SPI Eon EN25B20T 256 SPI Eon EN25B40 512 SPI Eon EN25B40T 512 SPI Eon EN25B80 1024 SPI Eon EN25B80T 1024 SPI Eon EN25B16 2048 SPI Eon EN25B16T 2048 SPI Eon EN25B32 4096 SPI Eon EN25B32T 4096 SPI Eon EN25B64 8192 SPI Eon EN25B64T 8192 SPI Eon EN25D16 2048 SPI Eon EN25F05 64 SPI Eon EN25F10 128 SPI Eon EN25F20 256 SPI Eon EN25F40 P 512 SPI Eon EN25F80 P R E W 1024 SPI Eon EN25F16 2048 SPI Eon EN25F32 4096 SPI Eon EN29F010 P R E W 128 Parallel Eon EN29F002(A)(N)B P R W 256 Parallel Eon EN29F002(A)(N)T P R W 256 Parallel Fujitsu MBM29F004BC 512 Parallel Fujitsu MBM29F004TC 512 Parallel Fujitsu MBM29F400BC W 512 Parallel Fujitsu MBM29F400TC 512 Parallel Hyundai HY29F002T P R E W 256 Parallel Hyundai HY29F002B 256 Parallel Hyundai HY29F040A 512 Parallel Intel 28F001BN/BX-B 128 Parallel Intel 28F001BN/BX-T 128 Parallel Intel 28F002BC/BL/BV/BX-T P R E W 256 Parallel Intel 28F008S3/S5/SC 512 Parallel Intel 28F004B5/BE/BV/BX-B 512 Parallel Intel 28F004B5/BE/BV/BX-T 512 Parallel Intel 28F400BV/BX/CE/CV-B 512 Parallel Intel 28F400BV/BX/CE/CV-T 512 Parallel Intel 82802AB P R 512 FWH Intel 82802AC P R 1024 FWH Macronix MX25L512 64 SPI Macronix MX25L1005 128 SPI Macronix MX25L2005 256 SPI Macronix MX25L4005 P R W 512 SPI Macronix MX25L8005 P R E W 1024 SPI Macronix MX25L1605 P R W 2048 SPI Macronix MX25L1635D 2048 SPI Macronix MX25L1635E 2048 SPI Macronix MX25L3205 P R W 4096 SPI Macronix MX25L3235D 4096 SPI Macronix MX25L6405 P 8192 SPI Macronix MX25L12805 16384 SPI Macronix MX29F001B 128 Parallel Macronix MX29F001T 128 Parallel Macronix MX29F002B 256 Parallel Macronix MX29F002T P R W 256 Parallel Macronix MX29F040 512 Parallel Macronix MX29LV040 512 Parallel MoselVitelic V29C51000B 64 Parallel MoselVitelic V29C51000T 64 Parallel MoselVitelic V29C51400B 512 Parallel MoselVitelic V29C51400T 512 Parallel MoselVitelic V29LC51000 64 Parallel MoselVitelic V29LC51001 128 Parallel MoselVitelic V29LC51002 256 Parallel Numonyx M25PE10 128 SPI Numonyx M25PE20 256 SPI Numonyx M25PE40 512 SPI Numonyx M25PE80 P R E W 1024 SPI Numonyx M25PE16 2048 SPI PMC Pm25LV010 128 SPI PMC Pm25LV016B 2048 SPI PMC Pm25LV020 256 SPI PMC Pm25LV040 512 SPI PMC Pm25LV080B 1024 SPI PMC Pm25LV512 64 SPI PMC Pm29F002T P R E W 256 Parallel PMC Pm29F002B 256 Parallel PMC Pm39LV010 P R E W 128 Parallel PMC Pm39LV020 256 Parallel PMC Pm39LV040 512 Parallel PMC Pm49FL002 P R E W 256 LPC,FWH PMC Pm49FL004 P R E W 512 LPC,FWH Sanyo LF25FW203A 2048 SPI Sharp LHF00L04 1024 FWH Spansion S25FL008A P R E W 1024 SPI Spansion S25FL016A P R W 2048 SPI SST SST25VF016B P R E W 2048 SPI SST SST25VF032B P R E W 4096 SPI SST SST25VF064C P R E W 8192 SPI SST SST25VF040.REMS P R 512 SPI SST SST25VF040B 512 SPI SST SST25LF040A.RES P 512 SPI SST SST25VF040B.REMS P R 512 SPI SST SST25VF080B P R E W 1024 SPI SST SST28SF040A 512 Parallel SST SST29EE010 P R W 128 Parallel SST SST29LE010 128 Parallel SST SST29EE020A P R E W 256 Parallel SST SST29LE020 P R E W 256 Parallel SST SST39SF512 64 Parallel SST SST39SF010A P R W 128 Parallel SST SST39SF020A P R E W 256 Parallel SST SST39SF040 P R E W 512 Parallel SST SST39VF512 P R E W 64 Parallel SST SST39VF010 P R E W 128 Parallel SST SST39VF020 256 Parallel SST SST39VF040 512 Parallel SST SST39VF080 1024 Parallel SST SST49LF002A/B P R E W 256 FWH SST SST49LF003A/B P R 384 FWH SST SST49LF004A/B P R E W 512 FWH SST SST49LF004C 512 FWH SST SST49LF008A P R E W 1024 FWH SST SST49LF008C 1024 FWH SST SST49LF016C P R W 2048 FWH SST SST49LF020 P R E W 256 LPC SST SST49LF020A P R E W 256 LPC SST SST49LF040 P R E W 512 LPC SST SST49LF040B P R E W 512 LPC SST SST49LF080A P R E W 1024 LPC SST SST49LF160C P R E W 2048 LPC ST M25P05-A 64 SPI ST M25P05.RES 64 SPI ST M25P10-A P R E W 128 SPI ST M25P10.RES 128 SPI ST M25P20 256 SPI ST M25P40 P R W 512 SPI ST M25P40-old 512 SPI ST M25P80 P R W 1024 SPI ST M25P16 P R W 2048 SPI ST M25P32 P R W 4096 SPI ST M25P64 8192 SPI ST M25P128 16384 SPI ST M25PX32 P R E W 4096 SPI ST M25PX64 P R E W 8192 SPI ST M29F002B 256 Parallel ST M29F002T/NT 256 Parallel ST M29F040B 512 Parallel ST M29F400BB W 512 Parallel ST M29F400BT 512 Parallel ST M29W010B 128 Parallel ST M29W040B 512 Parallel ST M29W512B P R E W 64 Parallel ST M50FLW040A 512 LPC,FWH ST M50FLW040B 512 LPC,FWH ST M50FLW080A P R E W 1024 LPC,FWH ST M50FLW080B 1024 LPC,FWH ST M50FW002 256 FWH ST M50FW016 2048 FWH ST M50FW040 P R 512 FWH ST M50FW080 P R 1024 FWH ST M50LPW116 2048 LPC SyncMOS/MoselVitelic {F,S,V}29C51001B 128 Parallel SyncMOS/MoselVitelic {F,S,V}29C51001T 128 Parallel SyncMOS/MoselVitelic {F,S,V}29C51002B 256 Parallel SyncMOS/MoselVitelic {F,S,V}29C51002T P R E W 256 Parallel SyncMOS/MoselVitelic {F,S,V}29C51004B 512 Parallel SyncMOS/MoselVitelic {F,S,V}29C51004T 512 Parallel SyncMOS/MoselVitelic {S,V}29C31004B 512 Parallel SyncMOS/MoselVitelic {S,V}29C31004T 512 Parallel TI TMS29F002RB 256 Parallel TI TMS29F002RT 256 Parallel Winbond W25Q80 P R E W 1024 SPI Winbond W25Q16 2048 SPI Winbond W25Q32 P R E W 4096 SPI Winbond W25Q64 P R W 8192 SPI Winbond W25x10 128 SPI Winbond W25x20 256 SPI Winbond W25x40 P R E W 512 SPI Winbond W25x80 P R E W 1024 SPI Winbond W25x16 P R E W 2048 SPI Winbond W25x32 P 4096 SPI Winbond W25x64 8192 SPI Winbond W29C010(M)/W29C011A/W29EE011/W29EE012 P R W 128 Parallel Winbond W29C020(C)/W29C022 P R E W 256 Parallel Winbond W29C040/P 512 Parallel Winbond W29C010(M)/W29C011A/W29EE011/W29EE012 P R E W 128 Parallel Winbond W39V040A P R W 512 LPC Winbond W39V040(F)B P R E W 512 LPC Winbond W39V040(F)C 512 LPC Winbond W39V040FA P R E W 512 FWH Winbond W39V080A 1024 LPC Winbond W49F002U/N P R E W 256 Parallel Winbond W49F020 P 256 Parallel Winbond W49V002A P R E W 256 LPC Winbond W49V002FA P R W 256 FWH Winbond W39V080FA P R E W 1024 FWH Winbond W39V080FA (dual mode) 512 FWH Supported programmers: internal, dummy, nic3com, nicrealtek, nicsmc1211, nicnatsemi, gfxnvidia, drkaiser, satasii, atahpt, it87spi, ft2232_spi, serprog, buspirate_spi, dediprog, rayer_spi, nicintel_spi Supported devices for the internal programmer: Supported chipsets (total: 152): Vendor: Chipset: PCI IDs: ALi M1533 10b9:1533 AMD AMD-768 1022:7440 AMD AMD8111 1022:7468 AMD CS5530(A) 1078:0100 AMD CS5536 1022:2080 AMD CS5536 1022:2090 AMD Elan SC520 1022:3000 AMD SB600 1002:438d AMD SB700/SB710/SB750 1002:439d AMD SC1100 100b:0510 (untested) ATI SB400 1002:4377 Broadcom OSB4 1166:0200 Broadcom HT-1000 1166:0205 Intel 3400 Desktop 8086:3b00 (untested) Intel 3400 Mobile 8086:3b01 (untested) Intel P55 8086:3b02 (untested) Intel PM55 8086:3b03 (untested) Intel H55 8086:3b06 (untested) Intel QM57 8086:3b07 Intel H57 8086:3b08 (untested) Intel HM55 8086:3b09 (untested) Intel Q57 8086:3b0a (untested) Intel HM57 8086:3b0b (untested) Intel 3400 Mobile SFF 8086:3b0d (untested) Intel B55 8086:3b0e (untested) Intel QS57 8086:3b0f (untested) Intel 3400 8086:3b12 (untested) Intel 3420 8086:3b14 (untested) Intel 3450 8086:3b16 (untested) Intel B55 8086:3b1e (untested) Intel 440MX 8086:7198 Intel 6300ESB 8086:25a1 Intel 631xESB/632xESB/3100 8086:2670 Intel EP80579 8086:5031 Intel ICH0 8086:2420 Intel ICH10 8086:3a18 Intel ICH10D 8086:3a1a Intel ICH10DO 8086:3a14 Intel ICH10R 8086:3a16 Intel ICH2 8086:2440 Intel ICH2-M 8086:244c Intel ICH3-M 8086:248c Intel ICH3-S 8086:2480 Intel ICH4/ICH4-L 8086:24c0 Intel ICH4-M 8086:24cc Intel ICH5/ICH5R 8086:24d0 Intel ICH6/ICH6R 8086:2640 Intel ICH6-M 8086:2641 Intel ICH7DH 8086:27b0 Intel ICH7/ICH7R 8086:27b8 Intel ICH7M 8086:27b9 Intel ICH7MDH 8086:27bd Intel NM10 8086:27bc Intel ICH 8086:2410 Intel ICH8DH 8086:2812 Intel ICH8DO 8086:2814 Intel ICH8/ICH8R 8086:2810 Intel ICH8M 8086:2815 Intel ICH8M-E 8086:2811 Intel ICH9 8086:2918 Intel ICH9DH 8086:2912 Intel ICH9DO 8086:2914 Intel ICH9M 8086:2919 Intel ICH9M-E 8086:2917 Intel ICH9R 8086:2916 Intel ICH9 Engineering Sample 8086:2910 Intel MPIIX 8086:1234 (untested) Intel PIIX3 8086:7000 Intel PIIX4/4E/4M 8086:7110 Intel PIIX 8086:122e Intel Poulsbo 8086:8119 NVIDIA nForce4/MCP4 10de:0030 NVIDIA CK804 10de:0050 NVIDIA CK804 10de:0051 NVIDIA NForce2 10de:0060 NVIDIA NForce3 10de:00e0 NVIDIA CK804 10de:00d3 NVIDIA MCP51 10de:0260 (untested) NVIDIA MCP51 10de:0261 (untested) NVIDIA MCP51 10de:0262 (untested) NVIDIA MCP51 10de:0263 (untested) NVIDIA MCP55 10de:0360 NVIDIA MCP55 10de:0362 NVIDIA MCP55 10de:0363 NVIDIA MCP55 10de:0364 NVIDIA MCP55 10de:0365 NVIDIA MCP55 10de:0366 NVIDIA MCP55 10de:0367 NVIDIA MCP61 10de:03e0 (untested) NVIDIA MCP61 10de:03e1 (untested) NVIDIA MCP61 10de:03e2 (untested) NVIDIA MCP61 10de:03e3 (untested) NVIDIA MCP65 10de:0440 (untested) NVIDIA MCP65 10de:0441 (untested) NVIDIA MCP65 10de:0442 (untested) NVIDIA MCP65 10de:0443 (untested) NVIDIA MCP67 10de:0548 NVIDIA MCP78S 10de:075c (untested) NVIDIA MCP78S 10de:075d (untested) NVIDIA MCP73 10de:07d7 (untested) NVIDIA MCP79 10de:0aac (untested) NVIDIA MCP79 10de:0aad (untested) NVIDIA MCP79 10de:0aae (untested) NVIDIA MCP79 10de:0aaf (untested) SiS 85C496+497 1039:0496 (untested) SiS 501/5101/5501 1039:0406 (untested) SiS 5511 1039:5511 (untested) SiS 5596 1039:5596 (untested) SiS 5571 1039:5571 (untested) SiS 5591/5592 1039:5591 (untested) SiS 5597/5598/5581/5120 1039:5597 (untested) SiS 530 1039:0530 (untested) SiS 600 1039:5600 (untested) SiS 620 1039:0620 (untested) SiS 540 1039:0540 (untested) SiS 630 1039:0630 (untested) SiS 635 1039:0635 (untested) SiS 640 1039:0640 (untested) SiS 645 1039:0645 (untested) SiS 645DX 1039:0646 (untested) SiS 648 1039:0648 (untested) SiS 650 1039:0650 (untested) SiS 651 1039:0651 (untested) SiS 655 1039:0655 (untested) SiS 661 1039:0661 SiS 730 1039:0730 (untested) SiS 733 1039:0733 (untested) SiS 735 1039:0735 SiS 740 1039:0740 (untested) SiS 741 1039:0741 SiS 745 1039:0745 SiS 746 1039:0746 (untested) SiS 748 1039:0748 (untested) SiS 755 1039:0755 (untested) VIA VT82C585VPX 1106:0585 (untested) VIA VT82C595 1106:0595 (untested) VIA VT82C597 1106:0597 (untested) VIA VT82C69x 1106:0691 (untested) VIA VT8601/VT8601A 1106:0601 (untested) VIA VT8601T 1106:8601 (untested) VIA CX700 1106:8324 VIA VT8231 1106:8231 (untested) VIA VT8233 1106:3074 (untested) VIA VT8233A 1106:3147 VIA VT8235 1106:3177 VIA VT8237 1106:3227 VIA VT8237A 1106:3337 VIA VT8237S 1106:3372 VIA VX800 1106:8353 VIA VT82C596 1106:0596 VIA VT82C586A/B 1106:0586 VIA VT82C686A/B 1106:0686 (untested) Known boards (good: 259, bad: 18): Vendor: Board: Status: Required option: A-Trend ATC-6220 OK abit AN-M2 OK (autodetected) abit AX8 OK abit BM6 OK (autodetected) abit Fatal1ty F-I90HD OK abit IC7 OK (autodetected) abit IP35 OK (autodetected) abit IP35 Pro OK (autodetected) abit IS-10 BAD abit KN8 Ultra OK (autodetected) abit NF-M2 nView OK (autodetected) abit NF7-S OK (autodetected) abit VA6 OK (autodetected) abit VT6X4 OK -m abit:vt6x4 Acorp 6A815EPD OK (autodetected) Advantech PCM-5820 OK agami Aruma OK -m AGAMI:ARUMA Albatron PM266A Pro OK (autodetected) AOpen vKM400Am-S OK Artec Group DBE61 OK -m artecgroup:dbe61 Artec Group DBE62 OK -m artecgroup:dbe62 ASI MB-5BLMP OK ASRock 775i65G OK (autodetected) ASRock 939A785GMH/128M OK ASRock A330GC OK ASRock A770CrossFire OK ASRock ALiveNF6G-DVI OK ASRock K7S41 OK (autodetected) ASRock K7VT4A+ BAD ASRock K8S8X OK ASRock M3A790GXH/128M OK ASRock P4i65GV OK (autodetected) ASUS A7N8X Deluxe OK ASUS A7N8X-E Deluxe OK ASUS A7V133 OK ASUS A7V333 OK (autodetected) ASUS A7V400-MX OK ASUS A7V600-X OK (autodetected) ASUS A7V8X OK (autodetected) ASUS A7V8X-MX OK ASUS A7V8X-MX SE OK (autodetected) ASUS A7V8X-X OK (autodetected) ASUS A8Jm OK (autodetected) ASUS A8N OK (autodetected) ASUS A8N-E OK ASUS A8N-LA (Nagami-GL8E) OK (autodetected) ASUS A8N-SLI OK ASUS A8N-SLI Premium OK ASUS A8N-VM CSM OK (autodetected) ASUS A8NE-FM/S OK ASUS A8V Deluxe OK ASUS A8V-E Deluxe OK ASUS A8V-E SE OK ASUS K8V OK ASUS K8V SE Deluxe OK ASUS K8V-X SE OK ASUS M2A-MX OK ASUS M2A-VM OK ASUS M2N32-SLI Deluxe OK ASUS M2N-E OK ASUS M2N-SLI Deluxe OK ASUS M2NBP-VM CSM OK (autodetected) ASUS M2NPV-VM OK ASUS M2V OK ASUS M2V-MX OK (autodetected) ASUS M3A76-CM OK ASUS M3A78-EM OK ASUS M4A785TD-M EVO OK ASUS M4A79T Deluxe OK ASUS M4A87TD/USB3 OK ASUS MEW-AM BAD ASUS MEW-VM BAD ASUS P2B OK ASUS P2B-D OK ASUS P2B-DS OK ASUS P2B-F OK ASUS P2B-N OK (autodetected) ASUS P2E-M OK ASUS P2L97-S OK ASUS P3B-F BAD ASUS P4B266 OK (autodetected) ASUS P4B266-LM OK (autodetected) ASUS P4B533-E OK (autodetected) ASUS P4C800-E Deluxe OK (autodetected) ASUS P4P800 OK (autodetected) ASUS P4P800-E Deluxe OK (autodetected) ASUS P4SC-E OK (autodetected) ASUS P4SD-LA OK (autodetected) ASUS P4S800-MX OK (autodetected) ASUS P5A OK -m asus:p5a ASUS P5B OK ASUS P5B-Deluxe OK ASUS P5BV-M BAD ASUS P5GC-MX/1333 OK ASUS P5GDC Deluxe OK (autodetected) ASUS P5KC OK ASUS P5L-MX OK ASUS P5GD1 Pro OK (autodetected) ASUS P5ND2-SLI Deluxe OK (autodetected) ASUS P5PE-VM OK (autodetected) ASUS P6T SE OK ASUS P6T Deluxe OK ASUS P6T Deluxe V2 OK ASUS Z8NA-D6C OK BCOM WinNET100 OK Biostar M6TBA BAD Biostar M7NCD Pro OK Biostar P4M80-M4 OK Biostar TA780G M2+ OK Boser HS-6637 BAD Congatec conga-X852 OK Dell OptiPlex GX1 OK (autodetected) Dell PowerEdge 1850 OK (autodetected) DFI 855GME-MGF BAD DFI Blood-Iron P35 T2RL OK Elitegroup GeForce6100SM-M OK Elitegroup K7S5A OK Elitegroup K7S6A OK Elitegroup K7VTA3 OK (autodetected) Elitegroup P6IWP-Fe OK Elitegroup P6VAP-A+ OK Elitegroup RS485M-M OK Emerson ATCA-7360 OK EPoX EP-8K5A2 OK (autodetected) EPoX EP-8RDA3+ OK (autodetected) EPoX EP-BX3 OK -m epox:ep-bx3 FIC VA-502 BAD Foxconn A6VMX OK Fujitsu-Siemens ESPRIMO P5915 OK GIGABYTE GA-2761GXDK OK GIGABYTE GA-6BXC OK GIGABYTE GA-6BXDU OK GIGABYTE GA-6IEM OK (autodetected) GIGABYTE GA-6ZMA OK GIGABYTE GA-MA785GMT-UD2H OK GIGABYTE GA-770TA-UD3 OK GIGABYTE GA-7DXR OK GIGABYTE GA-7VT600 OK GIGABYTE GA-7ZM OK (autodetected) GIGABYTE GA-8IRML OK (autodetected) GIGABYTE GA-8PE667 Ultra 2 OK (autodetected) GIGABYTE GA-965P-DS4 OK GIGABYTE GA-EP35-DS3L OK GIGABYTE GA-EX58-UD4P OK GIGABYTE GA-K8N-SLI OK (autodetected) GIGABYTE GA-K8N51GMF-9 OK (autodetected) GIGABYTE GA-M57SLI-S4 OK GIGABYTE GA-M61P-S3 OK GIGABYTE GA-MA69VM-S2 OK GIGABYTE GA-MA74GM-S2H (rev. 3.0) OK GIGABYTE GA-MA770T-UD3P OK GIGABYTE GA-MA78G-DS3H OK GIGABYTE GA-MA78GM-S2H OK GIGABYTE GA-MA78GPM-DS2H OK GIGABYTE GA-MA790FX-DQ6 OK GIGABYTE GA-MA790GP-DS4H OK HP ProLiant DL145 G3 OK -m hp:dl145_g3 HP ProLiant DL165 G6 OK -m hp:dl165_g6 HP Puffer2-UL8E OK (autodetected) HP Vectra VL400 OK (autodetected) HP Vectra VL420 SFF OK (autodetected) HP xw9400 OK (autodetected) IBASE MB899 OK -m ibase:mb899 IBM x3455 OK (autodetected) IEI PICOe-9452 OK Intel D201GLY OK (autodetected) Intel EP80759 OK Intel Foxhollow OK Intel Greencity OK Intel SE440BX-2 BAD (autodetected) IWILL DK8-HTX OK -m iwill:dk8_htx Jetway J7F4K1G5D-PB OK Kontron 986LCD-M OK -m kontron:986lcd-m Lex CV700A OK Mitac 6513WU OK (autodetected) MSI MS-6153 OK MSI MS-6156 OK MSI MS-6163 (MS-6163 Pro) OK (autodetected) MSI MS-6178 BAD MSI MS-6330 (K7T Turbo) OK MSI MS-6561 (745 Ultra) OK (autodetected) MSI MS-6570 (K7N2) OK MSI MS-6577 (Xenon) OK (autodetected) MSI MS-6590 (KT4 Ultra) OK (autodetected) MSI MS-6702E (K8T Neo2-F) OK (autodetected) MSI MS-6712 (KT4V) OK (autodetected) MSI MS-6787 (P4MAM-V/P4MAM-L) OK -m msi:ms6787 MSI MS-7005 (651M-L) OK (autodetected) MSI MS-7025 (K8N Neo2 Platinum) OK (autodetected) MSI MS-7046 OK (autodetected) MSI MS-7061 (KM4M-V/KM4AM-V) OK (autodetected) MSI MS-7065 OK MSI MS-7135 (K8N Neo3) OK -m msi:k8n-neo3 MSI MS-7168 (Orion) OK MSI MS-7207 (K8NGM2-L) OK (autodetected) MSI MS-7211 (PM8M3-V) OK MSI MS-7236 (945PL Neo3) OK MSI MS-7253 (K9VGM-V) OK MSI MS-7255 (P4M890M) OK MSI MS-7260, (K9N Neo) BAD MSI MS-7312 (K9MM-V) OK MSI MS-7345 (P35 Neo2-FIR) OK MSI MS-7368 (K9AG Neo2-Digital) OK MSI MS-7376 (K9A2 Platinum) OK MSI MS-7642 (890GXM-G65) OK NEC PowerMate 2000 OK Nokia IP530 OK (autodetected) PC Engines Alix.1c OK PC Engines Alix.2c2 OK PC Engines Alix.2c3 OK PC Engines Alix.3c3 OK PC Engines Alix.3d3 OK PC Engines WRAP.2E OK Portwell PEB-4700VLA OK RCA RM4100 OK Samsung Polaris 32 OK (autodetected) Shuttle AK31 OK -m shuttle:ak31 Shuttle AK38N OK (autodetected) Shuttle AV11V30 OK Shuttle FD37 OK Shuttle FN25 OK (autodetected) Shuttle X50/X50(B) OK Soyo SY-5VD BAD Soyo SY-6BA+ III OK Soyo SY-7VCA OK (autodetected) Sun Blade x6250 OK Sun Fire x4150 BAD Sun Fire x4200 BAD Sun Fire x4540 BAD Sun Fire x4600 BAD Supermicro H8QC8 OK Supermicro X8DTT-F OK T-Online S-100 OK Tekram P6Pro-A5 OK (autodetected) Termtek TK-3370 (Rev:2.5B) OK (autodetected) Thomson IP1000 OK TriGem Lomita OK Tyan S5375-1U (Tempest i5100X) OK Tyan S1846 (Tsunami ATX) OK Tyan S2466 (Tiger MPX) OK Tyan S2498 (Tomcat K7M) OK (autodetected) Tyan S2881 (Thunder K8SR) OK Tyan S2882 (Thunder K8S Pro) OK Tyan S2882-D (Thunder K8SD Pro) OK Tyan S2891 (Thunder K8SRE) OK Tyan S2892 (Thunder K8SE) OK Tyan S2895 (Thunder K8WE) OK Tyan S2915 (Thunder n6650W) OK Tyan S2915-E (Thunder n6650W) OK Tyan S2933 (Thunder n3600S) OK Tyan S3095 (Tomcat i945GM) OK Tyan S3992 (Thunder h2000M) OK Tyan S5180 (Toledo i965R) OK Tyan S5191 (Toledo i3000R) OK Tyan S5197 (Toledo i3010W) OK Tyan S5211 (Toledo i3210W) OK Tyan S5211-1U (Toledo i3200R) OK Tyan S5220 (Toledo q35T) OK Tyan S5375 (Tempest i5100X) OK Tyan S5376 (Tempest i5100W) OK Tyan S5377 (Tempest i5100T) OK Tyan S5382 (Tempest i5000PW) OK Tyan S5397 (Tempest i5400PW) OK VIA EPIA M/MII/... OK (autodetected) VIA EPIA SP OK VIA EPIA-CN OK VIA EPIA EK OK (autodetected) VIA EPIA-EX15000G OK VIA EPIA-LN OK VIA EPIA-M700 OK VIA EPIA-N/NL OK (autodetected) VIA EPIA-NX15000G OK VIA NAB74X0 OK VIA pc2500e OK VIA PC3500G OK VIA VB700X OK ZOTAC ZBOX HD-ID11 OK Known laptops (good: 2, bad: 7): Vendor: Board: Status: Required option: Acer Aspire 1520 OK Acer Aspire One BAD ASUS Eee PC 701 4G BAD Dell Latitude CPi A366XT BAD HP/Compaq nx9005 BAD HP/Compaq nx9010 BAD IBM/Lenovo Thinkpad T40p BAD IBM/Lenovo 240 BAD Lenovo 3000 V100 TF05Cxx OK Supported devices for the dummy programmer: Supported devices for the nic3com programmer: PCI devices: 3COM 3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-TX [10b7:9055] 3COM 3C90xB: PCI 10/100 Mbps; shared 10BASE-T/100BASE-T4 [10b7:9001] (untested) 3COM 3C90xB: PCI 10BASE-T (TPO) [10b7:9004] 3COM 3C90xB: PCI 10BASE-T/10BASE2/AUI (COMBO) [10b7:9005] (untested) 3COM 3C90xB: PCI 10BASE-T/10BASE2 (TPC) [10b7:9006] (untested) 3COM 3C90xB: PCI 10BASE-FL [10b7:900a] (untested) 3COM 3C90xB: PCI 10BASE-FX [10b7:905a] (untested) 3COM 3C905B: Cyclone 10/100/BNC [10b7:9058] 3COM 3C905C: EtherLink 10/100 PCI (TX) [10b7:9200] 3COM 3C980C: EtherLink Server 10/100 PCI (TX) [10b7:9805] (untested) Supported devices for the nicrealtek programmer: PCI devices: Realtek RTL8139/8139C/8139C+ [10ec:8139] Supported devices for the nicsmc1211 programmer: PCI devices: SMC2 1211TX [1113:1211] Supported devices for the nicnatsemi programmer: PCI devices: National Semiconductor DP83815/DP83816 [100b:20] (untested) National Semiconductor DP83820 [100b:22] (untested) Supported devices for the gfxnvidia programmer: PCI devices: NVIDIA Mutara V08 [NV2] [10de:10] (untested) NVIDIA RIVA 128 [10de:18] (untested) NVIDIA RIVA TNT [10de:20] (untested) NVIDIA RIVA TNT2/TNT2 Pro [10de:28] (untested) NVIDIA RIVA TNT2 Ultra [10de:29] (untested) NVIDIA Vanta/Vanta LT [10de:2c] (untested) NVIDIA RIVA TNT2 Model 64/Model 64 Pro [10de:2d] NVIDIA Aladdin TNT2 [10de:a0] (untested) NVIDIA GeForce 256 [10de:100] (untested) NVIDIA GeForce DDR [10de:101] (untested) NVIDIA Quadro [10de:103] (untested) NVIDIA GeForce2 MX [10de:110] (untested) NVIDIA GeForce2 MX [10de:111] (untested) NVIDIA GeForce2 GO [10de:112] (untested) NVIDIA Quadro2 MXR [10de:113] (untested) NVIDIA GeForce2 GTS/Pro [10de:150] (untested) NVIDIA GeForce2 GTS [10de:151] (untested) NVIDIA GeForce2 Ultra [10de:152] (untested) NVIDIA Quadro2 Pro [10de:153] (untested) NVIDIA GeForce 3 nFX [10de:200] (untested) NVIDIA GeForce 3 nFX [10de:201] (untested) NVIDIA GeForce 3 nFX Ultra [10de:202] (untested) NVIDIA Quadro 3 DDC [10de:203] (untested) Supported devices for the drkaiser programmer: PCI devices: Dr. Kaiser PC-Waechter (Actel FPGA) [1803:5057] Supported devices for the satasii programmer: PCI devices: Silicon Image PCI0680 Ultra ATA-133 Host Ctrl [1095:680] Silicon Image SiI 3112 [SATALink/SATARaid] SATA Ctrl [1095:3112] Silicon Image SiI 3114 [SATALink/SATARaid] SATA Ctrl [1095:3114] Silicon Image SiI 3124 PCI-X SATA Ctrl [1095:3124] Silicon Image SiI 3132 SATA Raid II Ctrl [1095:3132] Silicon Image SiI 3512 [SATALink/SATARaid] SATA Ctrl [1095:3512] Supported devices for the atahpt programmer: PCI devices: Highpoint HPT366/368/370/370A/372/372N [1103:04] (untested) Highpoint HPT372A/372N [1103:05] (untested) Highpoint HPT302/302N [1103:06] (untested) Supported devices for the ft2232_spi programmer: USB devices: FTDI FT2232H [0403:6010] FTDI FT4232H [0403:6011] Amontec JTAGkey [0403:cff8] Supported devices for the serprog programmer: Supported devices for the buspirate_spi programmer: Supported devices for the dediprog programmer: Supported devices for the rayer_spi programmer: Supported devices for the nicintel_spi programmer: PCI devices: Intel 82571EB Gigabit Ethernet Controller [8086:105e] Intel 82541PI Gigabit Ethernet Controller [8086:107c] Intel 82572EI Gigabit Ethernet Controller [8086:10b9] Patch: Index: flashrom-list_supported_programmers/flash.h =================================================================== --- flashrom-list_supported_programmers/flash.h (Revision 1196) +++ flashrom-list_supported_programmers/flash.h (Arbeitskopie) @@ -200,6 +200,7 @@ char *strcat_realloc(char *dest, const char *src); void print_version(void); void print_banner(void); +void list_programmers_linebreak(int startcol, int cols, int paren); int selfcheck(void); int doit(struct flashchip *flash, int force, char *filename, int read_it, int write_it, int erase_it, int verify_it); Index: flashrom-list_supported_programmers/pcidev.c =================================================================== --- flashrom-list_supported_programmers/pcidev.c (Revision 1196) +++ flashrom-list_supported_programmers/pcidev.c (Arbeitskopie) @@ -132,6 +132,7 @@ { int i; + msg_pinfo("PCI devices:\n"); for (i = 0; devs[i].vendor_name != NULL; i++) { msg_pinfo("%s %s [%02x:%02x]%s\n", devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, Index: flashrom-list_supported_programmers/cli_classic.c =================================================================== --- flashrom-list_supported_programmers/cli_classic.c (Revision 1196) +++ flashrom-list_supported_programmers/cli_classic.c (Arbeitskopie) @@ -33,11 +33,6 @@ static void cli_classic_usage(const char *name) { - const char *pname; - int pnamelen; - int remaining = 0; - enum programmer p; - printf("Usage: flashrom [-n] [-V] [-f] [-h|-R|-L|" #if CONFIG_PRINT_WIKI == 1 "-z|" @@ -83,32 +78,9 @@ "in wiki syntax\n" #endif " -p | --programmer <name>[:<param>] specify the programmer " - "device"); + "device\n"); - for (p = 0; p < PROGRAMMER_INVALID; p++) { - pname = programmer_table[p].name; - pnamelen = strlen(pname); - if (remaining - pnamelen - 2 < 0) { - printf("\n "); - remaining = 43; - } else { - printf(" "); - remaining--; - } - if (p == 0) { - printf("("); - remaining--; - } - printf("%s", pname); - remaining -= pnamelen; - if (p < PROGRAMMER_INVALID - 1) { - printf(","); - remaining--; - } else { - printf(")\n"); - } - } - + list_programmers_linebreak(37, 80, 1); printf("\nYou can specify one of -h, -R, -L, " #if CONFIG_PRINT_WIKI == 1 "-z, " Index: flashrom-list_supported_programmers/atahpt.c =================================================================== --- flashrom-list_supported_programmers/atahpt.c (Revision 1196) +++ flashrom-list_supported_programmers/atahpt.c (Arbeitskopie) @@ -30,7 +30,7 @@ #define PCI_VENDOR_ID_HPT 0x1103 -struct pcidev_status ata_hpt[] = { +const struct pcidev_status ata_hpt[] = { {0x1103, 0x0004, NT, "Highpoint", "HPT366/368/370/370A/372/372N"}, {0x1103, 0x0005, NT, "Highpoint", "HPT372A/372N"}, {0x1103, 0x0006, NT, "Highpoint", "HPT302/302N"}, Index: flashrom-list_supported_programmers/ft2232_spi.c =================================================================== --- flashrom-list_supported_programmers/ft2232_spi.c (Revision 1196) +++ flashrom-list_supported_programmers/ft2232_spi.c (Arbeitskopie) @@ -346,6 +346,7 @@ { int i; + msg_pinfo("USB devices:\n"); for (i = 0; devs[i].vendor_name != NULL; i++) { msg_pinfo("%s %s [%04x:%04x]%s\n", devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, Index: flashrom-list_supported_programmers/flashrom.c =================================================================== --- flashrom-list_supported_programmers/flashrom.c (Revision 1196) +++ flashrom-list_supported_programmers/flashrom.c (Arbeitskopie) @@ -1332,6 +1332,46 @@ msg_ginfo("\n"); } +void list_programmers_linebreak(int startcol, int cols, int paren) +{ + const char *pname; + int pnamelen; + int remaining = 0; + int firstline = 1; + enum programmer p; + + for (p = 0; p < PROGRAMMER_INVALID; p++) { + pname = programmer_table[p].name; + pnamelen = strlen(pname); + if (remaining - pnamelen - 2 < 0) { + if (firstline) + firstline = 0; + else + printf("\n"); + for (int i = 0; i < startcol; i++) + printf(" "); + remaining = cols - startcol; + } else { + printf(" "); + remaining--; + } + if (paren && (p == 0)) { + printf("("); + remaining--; + } + printf("%s", pname); + remaining -= pnamelen; + if (p < PROGRAMMER_INVALID - 1) { + printf(","); + remaining--; + } else { + if (paren) + printf(")"); + printf("\n"); + } + } +} + void print_sysinfo(void) { #if HAVE_UTSNAME == 1 Index: flashrom-list_supported_programmers/print.c =================================================================== --- flashrom-list_supported_programmers/print.c (Revision 1196) +++ flashrom-list_supported_programmers/print.c (Arbeitskopie) @@ -223,50 +223,90 @@ void print_supported(void) { - print_supported_chips(); + print_supported_chips(); + + printf("\nSupported programmers:\n"); + list_programmers_linebreak(0, 80, 0); #if CONFIG_INTERNAL == 1 - print_supported_chipsets(); - print_supported_boards_helper(boards_known, "boards"); - print_supported_boards_helper(laptops_known, "laptops"); + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_INTERNAL].name); + print_supported_chipsets(); + print_supported_boards_helper(boards_known, "boards"); + print_supported_boards_helper(laptops_known, "laptops"); #endif -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT >= 1 - printf("\nSupported PCI devices flashrom can use " - "as programmer:\n\n"); +#if CONFIG_DUMMY == 1 + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_DUMMY].name); + /* FIXME */ #endif #if CONFIG_NIC3COM == 1 - print_supported_pcidevs(nics_3com); + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_NIC3COM].name); + print_supported_pcidevs(nics_3com); #endif #if CONFIG_NICREALTEK == 1 - print_supported_pcidevs(nics_realtek); - print_supported_pcidevs(nics_realteksmc1211); + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_NICREALTEK].name); + print_supported_pcidevs(nics_realtek); + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_NICREALTEK2].name); + print_supported_pcidevs(nics_realteksmc1211); #endif #if CONFIG_NICNATSEMI == 1 - print_supported_pcidevs(nics_natsemi); + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_NICNATSEMI].name); + print_supported_pcidevs(nics_natsemi); #endif #if CONFIG_GFXNVIDIA == 1 - print_supported_pcidevs(gfx_nvidia); + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_GFXNVIDIA].name); + print_supported_pcidevs(gfx_nvidia); #endif #if CONFIG_DRKAISER == 1 - print_supported_pcidevs(drkaiser_pcidev); + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_DRKAISER].name); + print_supported_pcidevs(drkaiser_pcidev); #endif #if CONFIG_SATASII == 1 - print_supported_pcidevs(satas_sii); + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_SATASII].name); + print_supported_pcidevs(satas_sii); #endif #if CONFIG_ATAHPT == 1 - print_supported_pcidevs(ata_hpt); + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_ATAHPT].name); + print_supported_pcidevs(ata_hpt); #endif -#if CONFIG_NICINTEL_SPI == 1 - print_supported_pcidevs(nics_intel_spi); +#if CONFIG_FT2232_SPI == 1 + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_FT2232_SPI].name); + print_supported_usbdevs(devs_ft2232spi); #endif - -#if CONFIG_FT2232_SPI+CONFIG_DEDIPROG >= 1 - printf("\nSupported USB devices flashrom can use " - "as programmer:\n\n"); +#if CONFIG_SERPROG == 1 + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_SERPROG].name); + /* FIXME */ #endif - -#if CONFIG_FT2232_SPI == 1 - print_supported_usbdevs(devs_ft2232spi); +#if CONFIG_BUSPIRATE_SPI == 1 + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_BUSPIRATE_SPI].name); + /* FIXME */ #endif +#if CONFIG_DEDIPROG == 1 + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_DEDIPROG].name); + /* FIXME */ +#endif +#if CONFIG_RAYER_SPI == 1 + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_RAYER_SPI].name); + /* FIXME */ +#endif +#if CONFIG_NICINTEL_SPI == 1 + printf("\nSupported devices for the %s programmer:\n", + programmer_table[PROGRAMMER_NICINTEL_SPI].name); + print_supported_pcidevs(nics_intel_spi); +#endif } #if CONFIG_INTERNAL == 1 -- http://www.hailfinger.org/

7 years, 11 months

Re: [flashrom] [PATCH 6/8] use getpagesize() to determine physmap's length in nicintel_spi.c

by Carl-Daniel Hailfinger

Am 15.03.2011 16:29 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner<stefan.tauner(a)student.tuwien.ac.at> > Right, this is a really good idea. Could you patch physmap instead to round down the requested address and round up the end of the range? Then we could just request the amount we need without having to care in each programmer driver about page size. I think somewhere in flashrom we even have rounding code for physmap, it just needs to be moved from a driver to the generic physmap. Your code looks solid. > --- > nicintel_spi.c | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/nicintel_spi.c b/nicintel_spi.c > index 5a6e04d..811ed6e 100644 > --- a/nicintel_spi.c > +++ b/nicintel_spi.c > @@ -26,11 +26,14 @@ > */ > > #include<stdlib.h> > +#include<unistd.h> > #include "flash.h" > #include "programmer.h" > > #define PCI_VENDOR_ID_INTEL 0x8086 > > +#define MEMMAP_SIZE getpagesize() > + > #define EECD 0x10 > #define FLA 0x1c > > @@ -148,7 +151,7 @@ int nicintel_spi_init(void) > io_base_addr = pcidev_init(PCI_BASE_ADDRESS_0, nics_intel_spi); > > nicintel_spibar = physmap("Intel Gigabit NIC w/ SPI flash", > - io_base_addr, 4096); > + io_base_addr, MEMMAP_SIZE); > tmp = pci_mmio_readl(nicintel_spibar + EECD); > tmp&= ~FLASH_WRITES_DISABLED; > tmp |= FLASH_WRITES_ENABLED; > @@ -173,7 +176,7 @@ int nicintel_spi_shutdown(void) > tmp |= FLASH_WRITES_DISABLED; > pci_mmio_writel(tmp, nicintel_spibar + EECD); > > - physunmap(nicintel_spibar, 4096); > + physunmap(nicintel_spibar, MEMMAP_SIZE); > pci_cleanup(pacc); > release_io_perms(); > > Regards, Carl-Daniel -- http://www.hailfinger.org/

7 years, 11 months

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom June 2012