flashrom November 2012

flashrom@flashrom.org

36 participants
95 discussions

[PATCH 1/3] Refactor PCI and USB device status printing.
by Stefan Tauner 17 Nov '12

17 Nov '12

To be able to get rid of lots of #ifdefs and centralize programmer-specific data more... - introduce two new fields to struct programmer_entry, namely enum type (OTHER, USB, PCI) and union devices (pcidev_status, usbdev_status or char *note). - use those fields to generate device listings in print.c and print_wiki.c. Bonus: add printing of USB devices to print_wiki.c and count supported PCI and USB devices. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- flashrom.c | 48 ++++++++++++++++++- ft2232_spi.c | 13 ------ pcidev.c | 13 ------ print.c | 148 +++++++++++++++++++--------------------------------------- print_wiki.c | 141 ++++++++++++++++++++++++++++++++++--------------------- programmer.h | 41 ++++++++++------ 6 files changed, 211 insertions(+), 193 deletions(-) diff --git a/flashrom.c b/flashrom.c index 2299b06..d873276 100644 --- a/flashrom.c +++ b/flashrom.c @@ -64,6 +64,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_INTERNAL == 1 { .name = "internal", + .type = OTHER, + .devices.note = NULL, .init = internal_init, .map_flash_region = physmap, .unmap_flash_region = physunmap, @@ -74,6 +76,9 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_DUMMY == 1 { .name = "dummy", + .type = OTHER, + /* FIXME */ + .devices.note = "Dummy device, does nothing and logs all accesses\n", .init = dummy_init, .map_flash_region = dummy_map, .unmap_flash_region = dummy_unmap, @@ -84,6 +89,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_NIC3COM == 1 { .name = "nic3com", + .type = PCI, + .devices.pci = nics_3com, .init = nic3com_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -95,6 +102,8 @@ const struct programmer_entry programmer_table[] = { { /* This programmer works for Realtek RTL8139 and SMC 1211. */ .name = "nicrealtek", + .type = PCI, + .devices.pci = nics_realtek, .init = nicrealtek_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -105,6 +114,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_NICNATSEMI == 1 { .name = "nicnatsemi", + .type = PCI, + .devices.pci = nics_natsemi, .init = nicnatsemi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -115,6 +126,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_GFXNVIDIA == 1 { .name = "gfxnvidia", + .type = PCI, + .devices.pci = gfx_nvidia, .init = gfxnvidia_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -125,6 +138,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_DRKAISER == 1 { .name = "drkaiser", + .type = PCI, + .devices.pci = drkaiser_pcidev, .init = drkaiser_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -135,6 +150,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_SATASII == 1 { .name = "satasii", + .type = PCI, + .devices.pci = satas_sii, .init = satasii_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -145,6 +162,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_ATAHPT == 1 { .name = "atahpt", + .type = PCI, + .devices.pci = ata_hpt, .init = atahpt_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -155,6 +174,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_FT2232_SPI == 1 { .name = "ft2232_spi", + .type = USB, + .devices.usb = devs_ft2232spi, .init = ft2232_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -165,6 +186,9 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_SERPROG == 1 { .name = "serprog", + .type = OTHER, + /* FIXME */ + .devices.note = "All programmer devices speaking the serprog protocol\n", .init = serprog_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -175,6 +199,9 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_BUSPIRATE_SPI == 1 { .name = "buspirate_spi", + .type = OTHER, + /* FIXME */ + .devices.note = "Dangerous Prototypes Bus Pirate\n", .init = buspirate_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -185,6 +212,9 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_DEDIPROG == 1 { .name = "dediprog", + .type = OTHER, + /* FIXME */ + .devices.note = "Dediprog SF100\n", .init = dediprog_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -195,6 +225,9 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_RAYER_SPI == 1 { .name = "rayer_spi", + .type = OTHER, + /* FIXME */ + .devices.note = "RayeR parallel port programmer\n", .init = rayer_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -205,16 +238,21 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_PONY_SPI == 1 { .name = "pony_spi", + .type = OTHER, + /* FIXME */ + .devices.note = "Programmers compatible with SI-Prog, serbang or AJAWe\n", .init = pony_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, .delay = internal_delay, -}, + }, #endif #if CONFIG_NICINTEL == 1 { .name = "nicintel", + .type = PCI, + .devices.pci = nics_intel, .init = nicintel_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -225,6 +263,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_NICINTEL_SPI == 1 { .name = "nicintel_spi", + .type = PCI, + .devices.pci = nics_intel_spi, .init = nicintel_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -235,6 +275,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_OGP_SPI == 1 { .name = "ogp_spi", + .type = PCI, + .devices.pci = ogp_spi, .init = ogp_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -245,6 +287,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_SATAMV == 1 { .name = "satamv", + .type = PCI, + .devices.pci = satas_mv, .init = satamv_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, @@ -255,6 +299,8 @@ const struct programmer_entry programmer_table[] = { #if CONFIG_LINUX_SPI == 1 { .name = "linux_spi", + .type = OTHER, + .devices.note = "Device files /dev/spidev*.*\n", .init = linux_spi_init, .map_flash_region = fallback_map, .unmap_flash_region = fallback_unmap, diff --git a/ft2232_spi.c b/ft2232_spi.c index c09405e..dc17d00 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -482,17 +482,4 @@ static int ft2232_spi_send_command(struct flashctx *flash, return failed ? -1 : 0; } -void print_supported_usbdevs(const struct usbdev_status *devs) -{ - 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, - devs[i].device_id, - (devs[i].status == NT) ? " (untested)" : ""); - } -} - #endif diff --git a/pcidev.c b/pcidev.c index c1b6d6a..bfc8a5d 100644 --- a/pcidev.c +++ b/pcidev.c @@ -224,19 +224,6 @@ uintptr_t pcidev_init(int bar, const struct pcidev_status *devs) return curaddr; } -void print_supported_pcidevs(const struct pcidev_status *devs) -{ - int i; - - msg_pinfo("PCI 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, - devs[i].device_id, - (devs[i].status == NT) ? " (untested)" : ""); - } -} - enum pci_write_type { pci_write_type_byte, pci_write_type_word, diff --git a/print.c b/print.c index d7bdbfe..4b23ca0 100644 --- a/print.c +++ b/print.c @@ -433,8 +433,32 @@ static void print_supported_boards_helper(const struct board_info *boards, } #endif +void print_supported_usbdevs(const struct usbdev_status *devs) +{ + 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, + devs[i].device_id, (devs[i].status == NT) ? " (untested)" : ""); + } +} + +#if NEED_PCI == 1 +void print_supported_pcidevs(const struct pcidev_status *devs) +{ + int i; + + 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, + devs[i].device_id, (devs[i].status == NT) ? " (untested)" : ""); + } +} +#endif + int print_supported(void) { + unsigned int i; if (print_supported_chips()) return 1; @@ -449,107 +473,31 @@ int print_supported(void) msg_ginfo("\n"); print_supported_boards_helper(laptops_known, "laptops"); #endif -#if CONFIG_DUMMY == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_DUMMY].name); - /* FIXME */ - msg_ginfo("Dummy device, does nothing and logs all accesses\n"); -#endif -#if CONFIG_NIC3COM == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NIC3COM].name); - print_supported_pcidevs(nics_3com); -#endif -#if CONFIG_NICREALTEK == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NICREALTEK].name); - print_supported_pcidevs(nics_realtek); -#endif -#if CONFIG_NICNATSEMI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NICNATSEMI].name); - print_supported_pcidevs(nics_natsemi); -#endif -#if CONFIG_GFXNVIDIA == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_GFXNVIDIA].name); - print_supported_pcidevs(gfx_nvidia); -#endif -#if CONFIG_DRKAISER == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_DRKAISER].name); - print_supported_pcidevs(drkaiser_pcidev); -#endif -#if CONFIG_SATASII == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_SATASII].name); - print_supported_pcidevs(satas_sii); -#endif -#if CONFIG_ATAHPT == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_ATAHPT].name); - print_supported_pcidevs(ata_hpt); -#endif -#if CONFIG_FT2232_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_FT2232_SPI].name); - print_supported_usbdevs(devs_ft2232spi); -#endif -#if CONFIG_SERPROG == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_SERPROG].name); - /* FIXME */ - msg_ginfo("All programmer devices speaking the serprog protocol\n"); -#endif -#if CONFIG_BUSPIRATE_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_BUSPIRATE_SPI].name); - /* FIXME */ - msg_ginfo("Dangerous Prototypes Bus Pirate\n"); -#endif -#if CONFIG_DEDIPROG == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_DEDIPROG].name); - /* FIXME */ - msg_ginfo("Dediprog SF100\n"); -#endif -#if CONFIG_RAYER_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_RAYER_SPI].name); - /* FIXME */ - msg_ginfo("RayeR parallel port programmer\n"); -#endif -#if CONFIG_PONY_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_PONY_SPI].name); - /* FIXME */ - msg_ginfo("SI-Prog, serbang and AJAWe serial port programmers\n"); -#endif -#if CONFIG_NICINTEL == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NICINTEL].name); - print_supported_pcidevs(nics_intel); -#endif -#if CONFIG_NICINTEL_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_NICINTEL_SPI].name); - print_supported_pcidevs(nics_intel_spi); -#endif -#if CONFIG_OGP_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_OGP_SPI].name); - print_supported_pcidevs(ogp_spi); -#endif -#if CONFIG_SATAMV == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_SATAMV].name); - print_supported_pcidevs(satas_mv); -#endif -#if CONFIG_LINUX_SPI == 1 - msg_ginfo("\nSupported devices for the %s programmer:\n", - programmer_table[PROGRAMMER_LINUX_SPI].name); - msg_ginfo("Device files /dev/spidev*.*\n"); + for (i = 0; i < PROGRAMMER_INVALID; i++) { + const struct programmer_entry prog = programmer_table[i]; + switch (prog.type) { + case USB: + msg_ginfo("\nSupported USB devices for the %s programmer:\n", prog.name); + print_supported_usbdevs(prog.devices.usb); + break; +#if NEED_PCI == 1 + case PCI: + msg_ginfo("\nSupported PCI devices for the %s programmer:\n", prog.name); + print_supported_pcidevs(prog.devices.pci); + break; #endif + case OTHER: + if (prog.devices.note == NULL) + break; + msg_ginfo("\nSupported devices for the %s programmer:\n", prog.name); + msg_ginfo("%s", prog.devices.note); + break; + default: + msg_gerr("\n%s: %s: Uninitialized programmer type! Please report a bug at " + "flashrom(a)flashrom.org\n", __func__, prog.name); + break; + } + } return 0; } diff --git a/print_wiki.c b/print_wiki.c index 617053c..17e2e85 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -79,13 +79,9 @@ static const char chip_th[] = "\ static const char programmer_th[] = "\ ! align=\"left\" | Vendor\n\ ! align=\"left\" | Device\n\ -! align=\"center\" | PCI IDs\n\ +! align=\"center\" | IDs\n\ ! align=\"center\" | Status\n\n"; -static const char programmer_intro[] = "\ -\n== Supported programmers ==\n\n\ -This is a list of supported PCI devices flashrom can use as programmer:\n\n{"; - #if CONFIG_INTERNAL == 1 static const char laptop_intro[] = "\n== Supported laptops/notebooks ==\n\n\ In general, flashing laptops is more difficult because laptops\n\n\ @@ -139,7 +135,7 @@ static void print_supported_chipsets_wiki(int cols) printf("\n\n|}\n"); } -static void wiki_helper(const char *devicetype, int cols, const struct board_info boards[]) +static void print_supported_boards_wiki_helper(const char *devicetype, int cols, const struct board_info boards[]) { int i, k; unsigned int boardcount, lines_per_col; @@ -222,10 +218,10 @@ static void wiki_helper(const char *devicetype, int cols, const struct board_inf static void print_supported_boards_wiki(void) { printf("%s", board_intro); - wiki_helper("boards", 2, boards_known); + print_supported_boards_wiki_helper("boards", 2, boards_known); printf("%s", laptop_intro); - wiki_helper("laptops", 1, laptops_known); + print_supported_boards_wiki_helper("laptops", 1, laptops_known); } #endif @@ -302,9 +298,18 @@ static void print_supported_chips_wiki(int cols) printf("|}\n\n"); } -/* Not needed for CONFIG_INTERNAL, but for all other PCI-based programmers. */ -#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL+CONFIG_NICINTEL_SPI+CONFIG_OGP_SPI+CONFIG_SATAMV >= 1 -static void print_supported_pcidevs_wiki(const struct pcidev_status *devs) +/* Following functions are not needed when no PCI/USB programmers are compiled in, + * but since print_wiki code has no size constraints we include it unconditionally. */ +static int count_supported_pcidevs_wiki(const struct pcidev_status *devs) +{ + unsigned int count = 0; + unsigned int i = 0; + for (i = 0; devs[i].vendor_name != NULL; i++) + count++; + return count; +} + +static void print_supported_pcidevs_wiki_helper(const struct pcidev_status *devs) { int i = 0; static int c = 0; @@ -313,14 +318,81 @@ static void print_supported_pcidevs_wiki(const struct pcidev_status *devs) c = !c; for (i = 0; devs[i].vendor_name != NULL; i++) { - printf("|- bgcolor=\"#%s\"\n| %s || %s || " - "%04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", - devs[i].vendor_name, devs[i].device_name, - devs[i].vendor_id, devs[i].device_id, + printf("|- bgcolor=\"#%s\"\n| %s || %s || %04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", + devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, (devs[i].status == NT) ? "?3" : "OK"); } } -#endif + +static int count_supported_usbdevs_wiki(const struct usbdev_status *devs) +{ + unsigned int count = 0; + unsigned int i = 0; + for (i = 0; devs[i].vendor_name != NULL; i++) + count++; + return count; +} + +static void print_supported_usbdevs_wiki_helper(const struct usbdev_status *devs) +{ + int i = 0; + static int c = 0; + + /* Alternate colors if the vendor changes. */ + c = !c; + + for (i = 0; devs[i].vendor_name != NULL; i++) { + printf("|- bgcolor=\"#%s\"\n| %s || %s || %04x:%04x || {{%s}}\n", (c) ? "eeeeee" : "dddddd", + devs[i].vendor_name, devs[i].device_name, devs[i].vendor_id, devs[i].device_id, + (devs[i].status == NT) ? "?3" : "OK"); + } +} + +static void print_supported_devs_wiki() +{ + unsigned int pci_count = 0; + unsigned int usb_count = 0; + unsigned int i; + + for (i = 0; i < PROGRAMMER_INVALID; i++) { + const struct programmer_entry prog = programmer_table[i]; + switch (prog.type) { + case USB: + usb_count += count_supported_usbdevs_wiki(prog.devices.usb); + break; + case PCI: + pci_count += count_supported_pcidevs_wiki(prog.devices.pci); + break; + case OTHER: + default: + break; + } + } + + printf("\n== PCI Devices ==\n\n" + "Total amount of supported PCI devices flashrom can use as a programmer: '''%d'''\n\n" + "{%s%s", pci_count, th_start, programmer_th); + + for (i = 0; i < PROGRAMMER_INVALID; i++) { + const struct programmer_entry prog = programmer_table[i]; + if (prog.type == PCI) { + print_supported_pcidevs_wiki_helper(prog.devices.pci); + } + } + printf("\n|}\n\n|}\n"); + + printf("\n== USB Devices ==\n\n" + "Total amount of supported USB devices flashrom can use as a programmer: '''%d'''\n\n" + "{%s%s", usb_count, th_start, programmer_th); + + for (i = 0; i < PROGRAMMER_INVALID; i++) { + const struct programmer_entry prog = programmer_table[i]; + if (prog.type == USB) { + print_supported_usbdevs_wiki_helper(prog.devices.usb); + } + } + printf("\n|}\n\n|}\n"); +} void print_supported_wiki(void) { @@ -332,41 +404,6 @@ void print_supported_wiki(void) print_supported_chipsets_wiki(3); print_supported_boards_wiki(); #endif - printf("%s%s%s", programmer_intro, th_start, programmer_th); - -#if CONFIG_NIC3COM == 1 - print_supported_pcidevs_wiki(nics_3com); -#endif -#if CONFIG_NICREALTEK == 1 - print_supported_pcidevs_wiki(nics_realtek); -#endif -#if CONFIG_NICNATSEMI == 1 - print_supported_pcidevs_wiki(nics_natsemi); -#endif -#if CONFIG_GFXNVIDIA == 1 - print_supported_pcidevs_wiki(gfx_nvidia); -#endif -#if CONFIG_DRKAISER == 1 - print_supported_pcidevs_wiki(drkaiser_pcidev); -#endif -#if CONFIG_SATASII == 1 - print_supported_pcidevs_wiki(satas_sii); -#endif -#if CONFIG_ATAHPT == 1 - print_supported_pcidevs_wiki(ata_hpt); -#endif -#if CONFIG_NICINTEL == 1 - print_supported_pcidevs_wiki(nics_intel); -#endif -#if CONFIG_NICINTEL_SPI == 1 - print_supported_pcidevs_wiki(nics_intel_spi); -#endif -#if CONFIG_OGP_SPI == 1 - print_supported_pcidevs_wiki(ogp_spi); -#endif -#if CONFIG_SATAMV == 1 - print_supported_pcidevs_wiki(satas_mv); -#endif - printf("\n|}\n\n|}\n"); + print_supported_devs_wiki(); } diff --git a/programmer.h b/programmer.h index dedec67..21fa707 100644 --- a/programmer.h +++ b/programmer.h @@ -90,9 +90,21 @@ enum programmer { PROGRAMMER_INVALID /* This must always be the last entry. */ }; +enum programmer_type { + PCI = 1, /* to detect uninitialized values */ + USB, + OTHER, +}; + struct programmer_entry { const char *vendor; const char *name; + const enum programmer_type type; + union { + const struct pcidev_status *const pci; + const struct usbdev_status *const usb; + const char *const note; + } devices; int (*init) (void); @@ -221,13 +233,6 @@ void internal_delay(int usecs); extern uint32_t io_base_addr; extern struct pci_access *pacc; extern struct pci_dev *pcidev_dev; -struct pcidev_status { - uint16_t vendor_id; - uint16_t device_id; - const enum test_state status; - const char *vendor_name; - const char *device_name; -}; uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); uintptr_t pcidev_init(int bar, const struct pcidev_status *devs); /* rpci_write_* are reversible writes. The original PCI config space register @@ -244,6 +249,21 @@ int rpci_write_long(struct pci_dev *dev, int reg, uint32_t data); void print_supported_pcidevs(const struct pcidev_status *devs); #endif +struct usbdev_status { + uint16_t vendor_id; + uint16_t device_id; + const enum test_state status; + const char *vendor_name; + const char *device_name; +}; +struct pcidev_status { + uint16_t vendor_id; + uint16_t device_id; + const enum test_state status; + const char *vendor_name; + const char *device_name; +}; + #if CONFIG_INTERNAL == 1 /* board_enable.c */ int board_parse_parameter(const char *boardstring, const char **vendor, const char **model); @@ -422,13 +442,6 @@ extern const struct pcidev_status ata_hpt[]; /* ft2232_spi.c */ #if CONFIG_FT2232_SPI == 1 -struct usbdev_status { - uint16_t vendor_id; - uint16_t device_id; - const enum test_state status; - const char *vendor_name; - const char *device_name; -}; int ft2232_spi_init(void); extern const struct usbdev_status devs_ft2232spi[]; void print_supported_usbdevs(const struct usbdev_status *devs); -- Kind regards, Stefan Tauner

1 0

[PATCH 0/3] wiki patches 4.0
by Stefan Tauner 17 Nov '12

17 Nov '12

1 0

[PATCH] dediprog: Use asynchronous bulk transfers for reading
by Nico Huber 16 Nov '12

16 Nov '12

This utilizes libusb-1.0's interface for asynchronous transfers. A read is split into 512 byte chunks as required by the dediprog hardware. Up to eight chunks are scheduled for asynchronous transfer which results in a viable speed-up. First tests have shown a three times speed increase. It's based on "Bump dediprog driver to use libusb-1.0". Signed-off-by: Nico Huber <nico.huber(a)secunet.com> diff --git a/dediprog.c b/dediprog.c index a558285..f1c03d8 100644 --- a/dediprog.c +++ b/dediprog.c @@ -29,6 +29,7 @@ #define FIRMWARE_VERSION(x,y,z) ((x << 16) | (y << 8) | z) #define DEFAULT_TIMEOUT 3000 +#define DEDIPROG_ASYNC_TRANSFERS 8 /* at most 8 asynchronous transfers */ static libusb_context *usb_ctx; static libusb_device_handle *dediprog_handle; static int dediprog_firmwareversion; @@ -176,6 +177,38 @@ static int dediprog_set_spi_speed(unsigned int spispeed_idx) return 0; } +struct dediprog_transfer_status { + int status; /* OK if 0, ERROR else */ + unsigned int queued_idx; + unsigned int finished_idx; +}; + +static void dediprog_bulk_read_cb(struct libusb_transfer *const transfer) +{ + struct dediprog_transfer_status *const status = (struct dediprog_transfer_status *)transfer->user_data; + if (transfer->status != LIBUSB_TRANSFER_COMPLETED) { + status->status = 1; + msg_perr("SPI bulk read failed!\n"); + } + ++status->finished_idx; +} + +static int dediprog_bulk_read_poll(const struct dediprog_transfer_status *const status, const int finish) +{ + if (status->finished_idx >= status->queued_idx) + return 0; + + do { + struct timeval timeout = { 10, 0 }; + const int ret = libusb_handle_events_timeout_completed(usb_ctx, &timeout, NULL); + if (ret < 0) { + msg_perr("Polling read events failed: %i %s!\n", ret, libusb_error_name(ret)); + return 1; + } + } while (finish && (status->finished_idx < status->queued_idx)); + return 0; +} + /* Bulk read interface, will read multiple 512 byte chunks aligned to 512 bytes. * @start start address * @len length @@ -184,7 +217,7 @@ static int dediprog_set_spi_speed(unsigned int spispeed_idx) static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len) { - int ret, transferred; + int ret, err = 1; unsigned int i; /* chunksize must be 512, other sizes will NOT work at all. */ const unsigned int chunksize = 0x200; @@ -194,6 +227,10 @@ static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, chunksize & 0xff, (chunksize >> 8) & 0xff }; + struct dediprog_transfer_status status = { 0, 0, 0 }; + struct libusb_transfer *transfers[DEDIPROG_ASYNC_TRANSFERS] = { NULL, }; + struct libusb_transfer *transfer; + if ((start % chunksize) || (len % chunksize)) { msg_perr("%s: Unaligned start=%i, len=%i! Please report a bug " "at flashrom(a)flashrom.org\n", __func__, start, len); @@ -214,17 +251,54 @@ static int dediprog_spi_bulk_read(struct flashctx *flash, uint8_t *buf, return 1; } - for (i = 0; i < count; i++) { - ret = libusb_bulk_transfer(dediprog_handle, 0x80 | dediprog_endpoint, - buf + i * chunksize, chunksize, &transferred, DEFAULT_TIMEOUT); - if ((ret < 0) || (transferred != chunksize)) { - msg_perr("SPI bulk read %i failed, expected %i, got %i %s!\n", - i, chunksize, ret, libusb_error_name(ret)); - return 1; + /* + * Ring buffer of bulk transfers. + * Poll until at least one transfer is ready, + * schedule next transfers until buffer is full. + */ + + /* Allocate bulk transfers. */ + for (i = 0; i < min(DEDIPROG_ASYNC_TRANSFERS, count); ++i) { + transfers[i] = libusb_alloc_transfer(0); + if (!transfers[i]) { + msg_perr("Allocating libusb transfer %i failed: %s!\n", i, libusb_error_name(ret)); + goto _err_free; } } - return 0; + /* Now transfer requested chunks using libusb's asynchronous interface. */ + while (status.queued_idx < count) { + while ((status.queued_idx - status.finished_idx) < DEDIPROG_ASYNC_TRANSFERS) { + transfer = transfers[status.queued_idx % DEDIPROG_ASYNC_TRANSFERS]; + libusb_fill_bulk_transfer(transfer, dediprog_handle, 0x80 | dediprog_endpoint, + (unsigned char *)buf + status.queued_idx * chunksize, chunksize, + dediprog_bulk_read_cb, &status, DEFAULT_TIMEOUT); + transfer->flags |= LIBUSB_TRANSFER_SHORT_NOT_OK; + ret = libusb_submit_transfer(transfer); + if (ret < 0) { + msg_perr("Submitting SPI bulk read %i failed: %i %s!\n", + status.queued_idx, ret, libusb_error_name(ret)); + goto _err_free; + } + ++status.queued_idx; + } + if (dediprog_bulk_read_poll(&status, 0)) + goto _err_free; + } + /* Wait for transfers to finish. */ + if (dediprog_bulk_read_poll(&status, 1)) + goto _err_free; + /* Check if everything has been transmitted. */ + if ((status.finished_idx < count) || status.status) + goto _err_free; + + err = 0; + +_err_free: + dediprog_bulk_read_poll(&status, 1); + for (i = 0; i < DEDIPROG_ASYNC_TRANSFERS; ++i) + if (transfers[i]) libusb_free_transfer(transfers[i]); + return err; } static int dediprog_spi_read(struct flashctx *flash, uint8_t *buf,

1 0

Re: [flashrom] Intel DH67CL verbose log
by Stefan Tauner 15 Nov '12

15 Nov '12

On Thu, 15 Nov 2012 20:31:18 +0200 Ville Herva <vherva(a)gmail.com> wrote: > Ripping the battery off for a good while helped, and I was able to upgrade > the BIOS at POST. usually there is also a jumper (CMOS or NVRAM reset) that does the same. > Anyway, it would be cool to be able to flash BIOS from Linux. that is (or was) the goal of course, but intel (and microsoft) try to block access to the flash chip more and more to have more control over what the user can run. they try to sell this as a security feature, but that is only a part of it. if it would be about security only, then the user would be in control. in the secure boot scheme on x86 machines the user IS in control about the boot loader certificates, but this is only out of fear of competition laws IMHO. ATM it IS possible to flash the BIOS region, even if other regions are locked. we just do not know if it is safe in all cases or if the management engine interferes (as this is not documented anywhere publicly) and hence give the warnings. in the future (i.e. starting with the haswell family of processors) flashrom will most probably be crippled even more on these platforms according to recently leaked information. so... nag intel please, not us ;) see also http://blogs.coreboot.org/blog/2011/08/17/gsoc-2011-flashrom-part-5-–-dear-… -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Re: [flashrom] [PATCH] Add Altera USB-Blaster SPI programmer.
by Kyösti Mälkki 15 Nov '12

15 Nov '12

On Mon, 2012-10-29 at 01:33 +0100, Stefan Tauner wrote: > Adds support for the Altera USB-Blaster programming dongle in > Active Serial (AS) mode. > Tested on both original product and a clone dongle. > > Signed-off-by: James Laird <jhl(a)mafipulation.org> > Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > > Rebased on Kyösti's version. > Fixed Makefile and whitespace, cleaned up a few things, > added a manpage... please retest on hardware. > > Can someone please explain to me why send_read() does what it does? > Thanks, your clean-up looks good. Tested on both a clone with C8051F321 and the original product. The blaster design is described here: http://sourceforge.net/apps/mediawiki/urjtag/index.php?title=Cable_Altera_U… As for send_read(), to read a byte from SPI, one must first write a byte to the USB. Stupid, but that is the design. This hardware has particularly bad performance penalty when reading in small chunks of pagesize or 256 bytes. With non-blocking bulk submits in libusb-1.0, the raw read speed can be increased by factor of 2 for clone and by 5 for original product. Regards, KM

2 1

Re: [flashrom] Intel DH67CL verbose log
by Stefan Tauner 15 Nov '12

15 Nov '12

On Tue, 6 Nov 2012 22:09:13 +0200 Ville Herva <vherva(a)gmail.com> wrote: > 0x54: 0x00000000 FREG0: WARNING: Flash Descriptor region (0x00000000-0x00000fff) is read-only. > 0x58: 0x03ff0185 FREG1: BIOS region (0x00185000-0x003fffff) is read-write. > 0x5C: 0x01840003 FREG2: WARNING: Management Engine region (0x00003000-0x00184fff) is locked. Hello Ville, thanks for your report! The problem is the locked ME region as quoted above and the SMM protection, which is both not trivial to work around, sorry. I have added the board to our list of (un)supported boards (with an appropriate note) and will commit that later together with other small changes. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 1

Re: [flashrom] Shuttle XPC SB61G2 (FB61 mainboard) success!
by Stefan Tauner 15 Nov '12

15 Nov '12

On Sat, 3 Nov 2012 23:55:35 -0600 Lineage <lineage2005(a)gmail.com> wrote: > http://www.shuttle.eu/_archive/older/en/sb61g2.htm > This appears to be the machine based on case identifiers. > Mainboard and BIOS identifiers make it out as an FB61: > http://www.shuttle.eu/_archive/older/en/fb61.htm#mainboardfb6 > > No required switches beyond normal operations. > > Successfully wrote a new BIOS from the Manufacturer on two "identical" > systems. Only captured the log of the second machine, silly me, but the > first looked the same (at least results-wise. :D) Hello, thanks for your report! I have added your board to our list of supported hardware and will commit that later together with other small changes. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

AT25DF321A Support
by Christophe Fauvel 14 Nov '12

14 Nov '12

Hello, I am using an FT2232H mini module for flashing an AT25DF321A SPI flash under linux (Ubuntu 10.10, kernel 2.6.35-32-generic), which is supported according to your Supported Hardware list. I have tested several flashrom revisions (v0.9.2 pré-compiled, v0.9.5 and V0.9.6.xx compiled with GCC 4.4.5). * with rev0.9.2, the device is listed as UNTESTED when reading, writing or erasing. I have multiple errors when accessing the device but I can read, write and erase small amount of data. * with rev0.9.5, I also have some issues with the device, but with a few retries I am able to fully read, write and erase the chip, which is also listed as UNTESTED. * with rev0.9.6, however, the device is listed as Unknown SPI chip and I cannot access it. Have you already noticed this issue ? Best regards, -- Christophe Fauvel GOOBIE Tel: +336 76 63 93 25 +331 75 45 80 62 Mail: christophe.fauvel(a)goobie.fr Adresse: 23 avenue Louis Bréguet, Santos Dumont, 78140 Vélizy-Villacoublay FRANCE

2 1

Need help with failed flash
by simon 13 Nov '12

13 Nov '12

Flashrom: Your flash chip is in an unknown state. chipset "SiS 650" with PCI ID 1039:0650. Any sugestions please? ---- # dmidecode --type bios: <begin> # dmidecode 2.11 SMBIOS 2.3 present. Handle 0x0000, DMI type 0, 20 bytes BIOS Information Vendor: American Megatrends Inc. Version: 07.00T Release Date: 04/02/01 Address: 0xF0000 Runtime Size: 64 kB ROM Size: 256 kB Characteristics: ISA is supported PCI is supported PNP is supported APM is supported BIOS is upgradeable BIOS shadowing is allowed ESCD support is available Boot from CD is supported Selectable boot is supported BIOS ROM is socketed EDD is supported 5.25"/360 kB floppy services are supported (int 13h) 5.25"/1.2 MB floppy services are supported (int 13h) 3.5"/720 kB floppy services are supported (int 13h) 3.5"/2.88 MB floppy services are supported (int 13h) Print screen service is supported (int 5h) 8042 keyboard services are supported (int 9h) Printer services are supported (int 17h) CGA/mono video services are supported (int 10h) ACPI is supported USB legacy is supported AGP is supported LS-120 boot is supported ATAPI Zip drive boot is supported BIOS boot specification is supported Handle 0x0016, DMI type 13, 22 bytes BIOS Language Information Language Description Format: Abbreviated Installable Languages: 4 English Traditional Chinese Simplified Chinese Japanese Currently Installed Language: Not Specified <end> verbose output from flashrom: <begin> #flashrom -Vw a9280820.rom flashrom v0.9.5.2-r1517 on Linux 3.2.0-32-generic-pae (i686), built with libpci 3.1.8, GCC 4.6.3, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OS timer resolution is 34 usecs, 1040M loops per second, delay more than 10% too short (got 87% of expected delay), recalculating... 1187M loops per second, 10 myus = 11 us, 100 myus = 123 us, 1000 myus = 1025 us, 10000 myus = 10095 us, 136 myus = 269 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "Elitegroup Co. " DMI string system-product-name: "i-Buddie " DMI string system-version: "1.0 " DMI string baseboard-manufacturer: " " DMI string baseboard-product-name: "Ref.NO:A928-020313-OT-01-00-10-FF$" DMI string baseboard-version: "2.0 " DMI string chassis-type: "Desktop" Found chipset "SiS 650" with PCI ID 1039:0650. This chipset is marked as untested. If you are using an up-to-date version of flashrom please email a report to flashrom(a)flashrom.org including a verbose (-V) log. Thank you! Enabling flash write... Found southbridge 1039:0961 at 00:02:0 OK. The following protocols are supported: Non-SPI. Probing for AMD Am29F010A/B, 128 kB: probe_jedec_common: id1 0x29, id2 0xf3, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F002(N)BT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F016D, 2048 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29F080B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV001BB, 128 kB: probe_jedec_common: id1 0x29, id2 0xf3, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV001BT, 128 kB: probe_jedec_common: id1 0x29, id2 0xf3, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV002BB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV002BT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV004BB, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV004BT, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV008BB, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV008BT, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMD Am29LV081B, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29002T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A29040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for AMIC A49LF040A, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT29C512, 64 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Atmel AT29C010A, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Atmel AT29C020, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Atmel AT29C040A, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49BV512, 64 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Atmel AT49F020, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Atmel AT49F002(N), 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Atmel AT49F002(N)T, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Atmel AT49LH002, 256 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Catalyst CAT28F512, 64 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Bright BM29F040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for EMST F49B002UA, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Eon EN29F010, 128 kB: probe_jedec_common: id1 0x29, id2 0xf3, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29F002(A)(N)B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Eon EN29F002(A)(N)T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F004BC, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F004TC, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Fujitsu MBM29F400BC, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Fujitsu MBM29F400TC, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for Hyundai HY29F002T, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Hyundai HY29F002B, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Hyundai HY29F040A, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F001BN/BX-B, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Intel 28F001BN/BX-T, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Intel 28F002BC/BL/BV/BX-T, 256 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F008S3/S5/SC, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F004B5/BE/BV/BX-B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F004B5/BE/BV/BX-T, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F400BV/BX/CE/CV-B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 28F400BV/BX/CE/CV-T, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AB, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AC, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F001B, 128 kB: probe_jedec_common: id1 0x29, id2 0xf3, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F001T, 128 kB: probe_jedec_common: id1 0x29, id2 0xf3, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F002(N)B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F002(N)T, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29F040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Macronix MX29LV040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51000B, 64 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for MoselVitelic V29C51000T, 64 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for MoselVitelic V29C51400B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29C51400T, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for MoselVitelic V29LC51000, 64 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for MoselVitelic V29LC51001, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for MoselVitelic V29LC51002, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for PMC Pm29F002T, 256 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm29F002B, 256 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV010, 128 kB: probe_jedec_common: id1 0x29, id2 0xf3, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV020, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm39LV040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL002, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for PMC Pm49FL004, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Sharp LH28F008BJT-BTLZ1, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Sharp LHF00L04, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST28SF040A, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST29EE010, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST29LE010, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST29EE020A, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST29LE020, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST39SF512, 64 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST39SF010A, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST39SF020A, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST39SF040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF512, 64 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST39VF010, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST39VF020, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST39VF040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST39VF080, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF002A/B, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST49LF003A/B, 384 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004A/B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004C, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008A, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008C, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF016C, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF020, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST49LF020A, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SST SST49LF040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF080A, 1024 kB: Chip lacks correct probe timing information, using default 10mS/40uS. probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF160C, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F002B, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F002T/NT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29F400BB, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for ST M29F400BT, 512 kB: probe_m29f400bt: id1 0xff, id2 0xff Probing for ST M29W010B, 128 kB: probe_jedec_common: id1 0x29, id2 0xf3, id1 is normal flash content, id2 is normal flash content Probing for ST M29W040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M29W512B, 64 kB: probe_jedec_common: id1 0x9c, id2 0x7a, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040A, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040B, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080A, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080B, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW002, 256 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW016, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW040, 512 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW080, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50LPW116, 2048 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51001B, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SyncMOS/MoselVitelic {F,S,V}29C51001T, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SyncMOS/MoselVitelic {F,S,V}29C51002B, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SyncMOS/MoselVitelic {F,S,V}29C51002T, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for SyncMOS/MoselVitelic {F,S,V}29C51004B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {F,S,V}29C51004T, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {S,V}29C31004B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SyncMOS/MoselVitelic {S,V}29C31004T, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for TI TMS29F002RB, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for TI TMS29F002RT, 256 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012-old, 128 kB: Old Winbond W29* probe method disabled because the probing sequence puts the AMIC A49LF040A in a funky state. Use 'flashrom -c W29C010(M)/W29C011A/W29EE011/W29EE012-old' if you have a board with such a chip. Probing for Winbond W29C010(M)/W29C011A/W29EE011/W29EE012, 128 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Winbond W29C020(C)/W29C022, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Winbond W29C040/P, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39L040, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040A, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040B, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040C, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FA, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FB, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FC, 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080A, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49F002U/N, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Found Winbond flash chip "W49F002U/N" (256 kB, Parallel) at physical address 0xfffc0000. Probing for Winbond W49F020, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Winbond W49V002A, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Winbond W49V002FA, 256 kB: probe_jedec_common: id1 0xda, id2 0x0b Probing for Winbond W39V080FA, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080FA (dual mode), 512 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Found Winbond flash chip "W49F002U/N" (256 kB, Parallel). Flash image seems to be a legacy BIOS. Disabling coreboot-related checks. Reading old flash chip contents... done. Erasing and writing flash chip... Trying erase function 0... 0x000000-0x01ffff:EW, 0x020000-0x037fff:EW, 0x038000-0x039fff:E, 0x03a000-0x03bfff:E, 0x03c000-0x03ffff:EERASE FAILED at 0x0003c000! Expected=0xff, Read=0x9c, failed byte count from 0x0003c000-0x0003ffff: 0x3f1f ERASE FAILED! Reading current flash chip contents... done. Looking for another erase function. Trying erase function 1... 0x000000-0x03ffff:EERASE FAILED at 0x0003c000! Expected=0xff, Read=0x9c, failed byte count from 0x00000000-0x0003ffff: 0x3f1f ERASE FAILED! Looking for another erase function. No usable erase functions left. FAILED! Uh oh. Erase/write failed. Checking if anything changed. Your flash chip is in an unknown state. Get help on IRC at irc.freenode.net (channel #flashrom) or mail flashrom(a)flashrom.org with FAILED: your board name in the subject line! ------------------------------------------------------------------------------- DO NOT REBOOT OR POWEROFF! Restoring PCI config space for 00:02:0 reg 0x45 Restoring PCI config space for 00:02:0 reg 0x40 <end>

1 0

[PATCH] autotest mode
by Carl-Daniel Hailfinger 11 Nov '12

11 Nov '12

This patch needs the following changes to be mergeable: - layout support - man page - message printing cosmetics Autotest mode tests all usable erase functions of a flash chip with a few test patterns, then restores the original flash contents. To make sure you can recover the original flash chip contents even if the autotest run is aborted, you have to specify a filename parameter for --autotest where the flash chip contents are saved. Example usage: flashrom -p dummy:emulate=SST25VF032B --output autotest.log --autotest scratch.img Please note that autotest uses roughly 10 erase cycles per usable erase function and repeated usage will cause serious flash wear. Speed isn't really good even with dummy, and I expect a 8 Mbit SPI chip on a real fast programmer to take at least 10 minutes for autotest (10*erasefn+1 all-sectors chip write, 10*erasefn+1.all-sectors erase, 30*erasefn+2 all-sectors read). The patch seems to work, at least during my tests with dummy. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-autotest/flash.h =================================================================== --- flashrom-autotest/flash.h (Revision 1622) +++ flashrom-autotest/flash.h (Arbeitskopie) @@ -239,7 +239,7 @@ void print_banner(void); void list_programmers_linebreak(int startcol, int cols, int paren); int selfcheck(void); -int doit(struct flashctx *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it); +int doit(struct flashctx *flash, int force, const char *filename, int read_it, int write_it, int erase_it, int verify_it, int autotest_it); int read_buf_from_file(unsigned char *buf, unsigned long size, const char *filename); int write_buf_to_file(unsigned char *buf, unsigned long size, const char *filename); Index: flashrom-autotest/cli_classic.c =================================================================== --- flashrom-autotest/cli_classic.c (Revision 1622) +++ flashrom-autotest/cli_classic.c (Arbeitskopie) @@ -118,17 +118,18 @@ #if CONFIG_PRINT_WIKI == 1 int list_supported_wiki = 0; #endif - int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0; + int read_it = 0, write_it = 0, erase_it = 0, verify_it = 0, autotest_it = 0; int dont_verify_it = 0, list_supported = 0, operation_specified = 0; enum programmer prog = PROGRAMMER_INVALID; int ret = 0; - static const char optstring[] = "r:Rw:v:nVEfc:l:i:p:Lzho:"; + static const char optstring[] = "r:Rw:v:a:nVEfc:l:i:p:Lzho:"; static const struct option long_options[] = { {"read", 1, NULL, 'r'}, {"write", 1, NULL, 'w'}, {"erase", 0, NULL, 'E'}, {"verify", 1, NULL, 'v'}, + {"autotest", 1, NULL, 'a'}, {"noverify", 0, NULL, 'n'}, {"chip", 1, NULL, 'c'}, {"verbose", 0, NULL, 'V'}, @@ -196,6 +197,15 @@ filename = strdup(optarg); verify_it = 1; break; + case 'a': + if (++operation_specified > 1) { + fprintf(stderr, "More than one operation " + "specified. Aborting.\n"); + cli_classic_abort_usage(); + } + filename = strdup(optarg); + autotest_it = 1; + break; case 'n': if (verify_it) { fprintf(stderr, "--verify and --noverify are" @@ -506,7 +516,7 @@ goto out_shutdown; } - if (!(read_it | write_it | verify_it | erase_it)) { + if (!(read_it || write_it || verify_it || erase_it || autotest_it)) { msg_ginfo("No operations were specified.\n"); goto out_shutdown; } @@ -520,7 +530,7 @@ * Give the chip time to settle. */ programmer_delay(100000); - ret |= doit(fill_flash, force, filename, read_it, write_it, erase_it, verify_it); + ret |= doit(fill_flash, force, filename, read_it, write_it, erase_it, verify_it, autotest_it); /* Note: doit() already calls programmer_shutdown(). */ goto out; Index: flashrom-autotest/dediprog.c =================================================================== --- flashrom-autotest/dediprog.c (Revision 1622) +++ flashrom-autotest/dediprog.c (Arbeitskopie) @@ -34,17 +34,6 @@ #define DEDI_SPI_CMD_PAGEWRITE 0x1 #define DEDI_SPI_CMD_AAIWRITE 0x4 -#if 0 -/* Might be useful for other pieces of code as well. */ -static void print_hex(void *buf, size_t len) -{ - size_t i; - - for (i = 0; i < len; i++) - msg_pdbg(" %02x", ((uint8_t *)buf)[i]); -} -#endif - /* Might be useful for other USB devices as well. static for now. */ static struct usb_device *get_device_by_vid_pid(uint16_t vid, uint16_t pid) { Index: flashrom-autotest/flashrom.c =================================================================== --- flashrom-autotest/flashrom.c (Revision 1622) +++ flashrom-autotest/flashrom.c (Arbeitskopie) @@ -448,6 +448,14 @@ return i; } +void print_hex(void *buf, size_t len) +{ + size_t i; + + for (i = 0; i < len; i++) + msg_pdbg(" %02x", ((uint8_t *)buf)[i]); +} + void tolower_string(char *str) { for (; *str != '\0'; str++) @@ -873,6 +881,9 @@ case 13: memset(buf, 0xff, size); break; + default: + msg_gerr("Invalid pattern %i\n", variant); + return 1; } if ((variant >= 0) && (variant <= 7)) { @@ -1328,8 +1339,7 @@ return 0; } -int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, - uint8_t *newcontents) +int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents) { int k, ret = 1; uint8_t *curcontents; @@ -1720,12 +1730,59 @@ return 0; } +int autotest_flash(struct flashctx *flash) +{ + const int patternlist[] = {0, 4, 2, 5, 1, 3, 8, 9, 13, 12}; + unsigned long size = flash->chip->total_size * 1024; + int erasefn, pattern, ret = 0; + uint8_t *oldcontents, *newcontents; + + oldcontents = malloc(size); + if (!oldcontents) { + msg_gerr("Out of memory!\n"); + exit(1); + } + newcontents = malloc(size); + if (!newcontents) { + msg_gerr("Out of memory!\n"); + exit(1); + } + msg_cinfo("Starting autotest.\n"); + /* outer loop: erase functions, inner loop: test patterns */ + for (erasefn = 0; erasefn < NUM_ERASEFUNCTIONS; erasefn++) { + msg_cdbg("Trying erase function %i... ", erasefn); + if (check_block_eraser(flash, erasefn, 1)) + continue; + for (pattern = 0; pattern < ARRAY_SIZE(patternlist); pattern++) { + msg_cinfo("Reading current flash chip contents... "); + if (flash->chip->read(flash, oldcontents, 0, size)) { + msg_cinfo("FAILED.\n"); + return 1; + } + msg_cinfo("done.\n"); + msg_cinfo("Erasing and writing flash chip... "); + if (generate_testpattern(newcontents, size, patternlist[pattern])) { + msg_gerr("Pattern %i generation failed!\n", patternlist[pattern]); + continue; + } + msg_ginfo("Writing pattern %i:\n", patternlist[pattern]); + print_hex(newcontents, 16); + ret |= walk_eraseregions(flash, erasefn, &erase_and_write_block_helper, oldcontents, + newcontents); + /* Work around chips which need some time to calm down. */ + programmer_delay(1000*1000); + ret |= verify_range(flash, newcontents, 0, size); + } + } + return ret; +} + /* This function signature is horrible. We need to design a better interface, * but right now it allows us to split off the CLI code. * Besides that, the function itself is a textbook example of abysmal code flow. */ -int doit(struct flashctx *flash, int force, const char *filename, int read_it, - int write_it, int erase_it, int verify_it) +int doit(struct flashctx *flash, int force, const char *filename, int read_it, int write_it, int erase_it, + int verify_it, int autotest_it) { uint8_t *oldcontents; uint8_t *newcontents; @@ -1744,9 +1801,11 @@ if (flash->chip->unlock) flash->chip->unlock(flash); - if (read_it) { + if (read_it || autotest_it) { ret = read_flash_to_file(flash, filename); - goto out_nofree; + /* Only quit if we are doing a pure read. */ + if (read_it) + goto out_nofree; } oldcontents = malloc(size); @@ -1802,14 +1861,27 @@ } #endif } + if (autotest_it) { + //FIXME: We completely ignore layouts in autotest mode. + autotest_flash(flash); + /* Restore original contents. */ + if (read_buf_from_file(newcontents, size, filename)) { + /* FIXME: Proper error message. */ + ret = 1; + goto out; + } + msg_ginfo("Restoring original chip contents:"); + } + + /* Read the whole chip to be able to check whether regions need to be * erased and to give better diagnostics in case write fails. * The alternative would be to read only the regions which are to be * preserved, but in that case we might perform unneeded erase which * takes time as well. */ - msg_cinfo("Reading old flash chip contents... "); + msg_cinfo("Reading current flash chip contents... "); if (flash->chip->read(flash, oldcontents, 0, size)) { ret = 1; msg_cinfo("FAILED.\n"); @@ -1817,17 +1889,19 @@ } msg_cinfo("done.\n"); - // This should be moved into each flash part's code to do it - // cleanly. This does the job. - handle_romentries(flash, oldcontents, newcontents); + /* All included romentries will be written. In autotest mode, included + * romentries will be tested with the patterns, the rest will be left + * alone. + */ + if (!autotest_it) + handle_romentries(flash, oldcontents, newcontents); - // //////////////////////////////////////////////////////////// - - if (write_it) { + if (write_it || autotest_it) { if (erase_and_write_flash(flash, oldcontents, newcontents)) { msg_cerr("Uh oh. Erase/write failed. Checking if " "anything changed.\n"); - if (!flash->chip->read(flash, newcontents, 0, size)) { + /* If this is the restore step of autotest, we want to complain in any case. */ + if (!autotest_it && !flash->chip->read(flash, newcontents, 0, size)) { if (!memcmp(oldcontents, newcontents, size)) { msg_cinfo("Good. It seems nothing was " "changed.\n"); @@ -1842,10 +1916,10 @@ } } - if (verify_it) { + if (verify_it || autotest_it) { msg_cinfo("Verifying flash... "); - if (write_it) { + if (write_it || autotest_it) { /* Work around chips which need some time to calm down. */ programmer_delay(1000*1000); ret = verify_range(flash, newcontents, 0, size); -- http://www.hailfinger.org/

2 2

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom November 2012