flashrom June 2014

flashrom@flashrom.org

29 participants
115 discussions

by repository service

Author: stefanct Date: Sun Jun 1 04:21:02 2014 New Revision: 1808 URL: http://flashrom.org/trac/flashrom/changeset/1808 Log: Combine block_erase*_en29lv640b and block_erase*_m29f400bt respectively. This patch combines two identical block and chip erase functions respectively: - Merge block_erase_m29f400bt and block_erase_en29lv640b into erase_block_shifted_jedec. - Merge block_erase_chip_m29f400bt and block_erase_chip_en29lv640b into erase_chip_block_shifted_jedec. Leave their implementations in en29lv640b.c for now. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/chipdrivers.h trunk/en29lv640b.c trunk/flashchips.c trunk/m29f400bt.c Modified: trunk/chipdrivers.h ============================================================================== --- trunk/chipdrivers.h Sun Jun 1 04:13:23 2014 (r1807) +++ trunk/chipdrivers.h Sun Jun 1 04:21:02 2014 (r1808) @@ -147,8 +147,6 @@ /* m29f400bt.c */ int probe_m29f400bt(struct flashctx *flash); -int block_erase_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len); -int block_erase_chip_m29f400bt(struct flashctx *flash, unsigned int start, unsigned int len); int write_m29f400bt(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); void protect_m29f400bt(struct flashctx *flash, chipaddr bios); @@ -199,8 +197,8 @@ /* en29lv640b.c */ int probe_en29lv640b(struct flashctx *flash); -int block_erase_en29lv640b(struct flashctx *flash, unsigned int start, unsigned int len); -int block_erase_chip_en29lv640b(struct flashctx *flash, unsigned int start, unsigned int len); +int erase_block_shifted_jedec(struct flashctx *flash, unsigned int start, unsigned int len); +int erase_chip_block_shifted_jedec(struct flashctx *flash, unsigned int start, unsigned int len); int write_en29lv640b(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len); #endif /* !__CHIPDRIVERS_H__ */ Modified: trunk/en29lv640b.c ============================================================================== --- trunk/en29lv640b.c Sun Jun 1 04:13:23 2014 (r1807) +++ trunk/en29lv640b.c Sun Jun 1 04:21:02 2014 (r1808) @@ -86,7 +86,7 @@ return 0; } -int erase_en29lv640b(struct flashctx *flash) +static int erase_chip_shifted_jedec(struct flashctx *flash) { chipaddr bios = flash->virtual_memory; @@ -105,8 +105,7 @@ return 0; } -int block_erase_en29lv640b(struct flashctx *flash, unsigned int start, - unsigned int len) +int erase_block_shifted_jedec(struct flashctx *flash, unsigned int start, unsigned int len) { chipaddr bios = flash->virtual_memory; chipaddr dst = bios + start; @@ -126,12 +125,11 @@ return 0; } -int block_erase_chip_en29lv640b(struct flashctx *flash, unsigned int address, - unsigned int blocklen) +int erase_chip_block_shifted_jedec(struct flashctx *flash, unsigned int address, unsigned int blocklen) { if ((address != 0) || (blocklen != flash->chip->total_size * 1024)) { msg_cerr("%s called with incorrect arguments\n", __func__); return -1; } - return erase_en29lv640b(flash); + return erase_chip_shifted_jedec(flash); } Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sun Jun 1 04:13:23 2014 (r1807) +++ trunk/flashchips.c Sun Jun 1 04:21:02 2014 (r1808) @@ -4730,10 +4730,10 @@ {8 * 1024, 8}, {64 * 1024, 127}, }, - .block_erase = block_erase_en29lv640b, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {8 * 1024 * 1024, 1} }, - .block_erase = block_erase_chip_en29lv640b, + .block_erase = erase_chip_block_shifted_jedec, }, }, .write = write_en29lv640b, @@ -4827,10 +4827,10 @@ {32 * 1024, 1}, {64 * 1024, 7}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {512 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, }, }, .write = write_m29f400bt, @@ -4859,10 +4859,10 @@ {8 * 1024, 2}, {16 * 1024, 1}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {512 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, }, }, .write = write_m29f400bt, @@ -4891,10 +4891,10 @@ {32 * 1024, 1}, {64 * 1024, 31}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {2048 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, }, }, .write = write_m29f400bt, /* Supports a fast mode too */ @@ -4923,10 +4923,10 @@ {8 * 1024, 2}, {16 * 1024, 1}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {2048 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, }, }, .write = write_m29f400bt, /* Supports a fast mode too */ @@ -11292,10 +11292,10 @@ {32 * 1024, 1}, {64 * 1024, 7}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {512 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, } }, .write = write_m29f400bt, @@ -11324,10 +11324,10 @@ {8 * 1024, 2}, {16 * 1024, 1}, }, - .block_erase = block_erase_m29f400bt, + .block_erase = erase_block_shifted_jedec, }, { .eraseblocks = { {512 * 1024, 1} }, - .block_erase = block_erase_chip_m29f400bt, + .block_erase = erase_chip_block_shifted_jedec, } }, .write = write_m29f400bt, Modified: trunk/m29f400bt.c ============================================================================== --- trunk/m29f400bt.c Sun Jun 1 04:13:23 2014 (r1807) +++ trunk/m29f400bt.c Sun Jun 1 04:21:02 2014 (r1808) @@ -85,54 +85,3 @@ return 0; } - -int erase_m29f400bt(struct flashctx *flash) -{ - chipaddr bios = flash->virtual_memory; - - chip_writeb(flash, 0xAA, bios + 0xAAA); - chip_writeb(flash, 0x55, bios + 0x555); - chip_writeb(flash, 0x80, bios + 0xAAA); - - chip_writeb(flash, 0xAA, bios + 0xAAA); - chip_writeb(flash, 0x55, bios + 0x555); - chip_writeb(flash, 0x10, bios + 0xAAA); - - programmer_delay(10); - toggle_ready_jedec(flash, bios); - - /* FIXME: Check the status register for errors. */ - return 0; -} - -int block_erase_m29f400bt(struct flashctx *flash, unsigned int start, - unsigned int len) -{ - chipaddr bios = flash->virtual_memory; - chipaddr dst = bios + start; - - chip_writeb(flash, 0xAA, bios + 0xAAA); - chip_writeb(flash, 0x55, bios + 0x555); - chip_writeb(flash, 0x80, bios + 0xAAA); - - chip_writeb(flash, 0xAA, bios + 0xAAA); - chip_writeb(flash, 0x55, bios + 0x555); - chip_writeb(flash, 0x30, dst); - - programmer_delay(10); - toggle_ready_jedec(flash, bios); - - /* FIXME: Check the status register for errors. */ - return 0; -} - -int block_erase_chip_m29f400bt(struct flashctx *flash, unsigned int address, - unsigned int blocklen) -{ - if ((address != 0) || (blocklen != flash->chip->total_size * 1024)) { - msg_cerr("%s called with incorrect arguments\n", - __func__); - return -1; - } - return erase_m29f400bt(flash); -}

7 years, 3 months

Re: [flashrom] [PATCH 1/2] print.c: improve device printing.

by Carl-Daniel Hailfinger

Am 30.05.2014 05:15 schrieb Stefan Tauner: > Add headers and columns (i.e. print device entries in a table-like manner). > Also, add and use test_state_to_text() to support the new test states. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Thanks! Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

7 years, 3 months

[commit] r1807 - trunk

by repository service

Author: stefanct Date: Sun Jun 1 04:13:23 2014 New Revision: 1807 URL: http://flashrom.org/trac/flashrom/changeset/1807 Log: print.c: improve device printing. Add headers and columns (i.e. print device entries in a table-like manner). Also, add and use test_state_to_text() to support the new test states. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/print.c Modified: trunk/print.c ============================================================================== --- trunk/print.c Fri May 30 21:34:00 2014 (r1806) +++ trunk/print.c Sun Jun 1 04:13:23 2014 (r1807) @@ -47,6 +47,18 @@ } #endif +static const char *test_state_to_text(enum test_state test_state) +{ + switch (test_state) { + case OK: return "OK"; + case BAD: return "Not working"; + case NA: return "N/A"; + case DEP: return "Config-dependent"; + case NT: + default: return "Untested"; + } +} + /* * Return a string corresponding to the bustype parameter. * Memory is obtained with malloc() and must be freed with free() by the caller. @@ -469,13 +481,40 @@ void print_supported_devs(const struct programmer_entry prog, const char *const type) { - int i; - const struct dev_entry *const devs = prog.devs.dev; msg_ginfo("\nSupported %s devices for the %s programmer:\n", type, prog.name); + unsigned int maxvendorlen = strlen("Vendor") + 1; + unsigned int maxdevlen = strlen("Device") + 1; + + unsigned int i; + for (i = 0; devs[i].vendor_name != NULL; i++) { + maxvendorlen = max(maxvendorlen, strlen(devs[i].vendor_name)); + maxdevlen = max(maxdevlen, strlen(devs[i].device_name)); + } + maxvendorlen++; + maxdevlen++; + + msg_ginfo("Vendor"); + for (i = strlen("Vendor"); i < maxvendorlen; i++) + msg_ginfo(" "); + + msg_ginfo("Device"); + for (i = strlen("Device"); i < maxdevlen; i++) + msg_ginfo(" "); + + msg_ginfo(" %s IDs Status\n", type); + 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)" : ""); + msg_ginfo("%s", devs[i].vendor_name); + unsigned int j; + for (j = strlen(devs[i].vendor_name); j < maxvendorlen; j++) + msg_ginfo(" "); + msg_ginfo("%s", devs[i].device_name); + for (j = strlen(devs[i].device_name); j < maxdevlen; j++) + msg_ginfo(" "); + + msg_pinfo(" %04x:%04x %s\n", devs[i].vendor_id, devs[i].device_id, + test_state_to_text(devs[i].status)); } }

7 years, 3 months

[PATCH] board_enable selfcheck

by Carl-Daniel Hailfinger

Found this bitrotting away on my disk. Rebased from r1645, last time all snippets compiled was r1539. If you kill the cli_classic.c hunk, it should compile. That hunk was in the patch to make sure the msg_gspew() calls in selfcheck() aren't no-ops by default. Hm. This seems to be a bug still in HEAD. Not for direct merge, there are other random changes in there as well. Stefan, you already wrote a patch doing a board enable array selfcheck, and AFAICS yours checks some more bits. AFAICS the most interesting point in this patch are the verbose messages/comments. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-boardenable_selfcheck/cli_classic.c =================================================================== --- flashrom-boardenable_selfcheck/cli_classic.c (Revision 1806) +++ flashrom-boardenable_selfcheck/cli_classic.c (Arbeitskopie) @@ -139,8 +139,10 @@ print_version(); print_banner(); + verbose = 2; if (selfcheck()) exit(1); + verbose = 0; setbuf(stdout, NULL); /* FIXME: Delay all operation_specified checks until after command Index: flashrom-boardenable_selfcheck/flashrom.c =================================================================== --- flashrom-boardenable_selfcheck/flashrom.c (Revision 1806) +++ flashrom-boardenable_selfcheck/flashrom.c (Arbeitskopie) @@ -1303,6 +1303,10 @@ eraser.eraseblocks[i].size; } /* Empty eraseblock definition with erase function. */ + /* FIXME: This message will never trigger because spew and debug + * messages are not printed at this stage before debug variable + * initialization. + */ if (!done && eraser.block_erase) msg_gspew("Strange: Empty eraseblock definition with " "non-empty erase function. Not an error.\n"); @@ -1768,7 +1772,11 @@ ret = 1; } } + ret = 1; } + if (selfcheck_boardenables()) { + msg_gerr("Board enable self check failed!\n"); + } /* TODO: implement similar sanity checks for other arrays where deemed necessary. */ return ret; Index: flashrom-boardenable_selfcheck/programmer.h =================================================================== --- flashrom-boardenable_selfcheck/programmer.h (Revision 1806) +++ flashrom-boardenable_selfcheck/programmer.h (Arbeitskopie) @@ -263,6 +263,7 @@ uint8_t sio_read(uint16_t port, uint8_t reg); void sio_write(uint16_t port, uint8_t reg, uint8_t data); void sio_mask(uint16_t port, uint8_t reg, uint8_t data, uint8_t mask); +int selfcheck_boardenables(void); void board_handle_before_superio(void); void board_handle_before_laptop(void); int board_flash_enable(const char *vendor, const char *model, const char *cb_vendor, const char *cb_model); Index: flashrom-boardenable_selfcheck/board_enable.c =================================================================== --- flashrom-boardenable_selfcheck/board_enable.c (Revision 1806) +++ flashrom-boardenable_selfcheck/board_enable.c (Arbeitskopie) @@ -2532,9 +2532,72 @@ return NULL; } +int selfcheck_boardenables(void) +{ + struct board_pciid_enable *board = board_pciid_enables; + int ret = 0; + int i = 0; + + for (; board->vendor_name; board++) { + if (!board->first_vendor) { + /* This would only be valid for boards which don't have + * any onboard PCI devices at all. + */ + msg_gerr("Zero first vendor in position %i " + "of the board enable table\n", i); + ret = 1; + } + if (!board->first_device) { + /* This would only be valid for boards which don't have + * any onboard PCI devices at all. + */ + msg_gerr("Zero first device in position %i " + "of the board enable table\n", i); + ret = 1; + } + if (!board->board_name) { + /* A nameless board in the list is a maintenance + * nightmare. + */ + msg_gerr("Missing board name in position %i " + "of the board enable table\n", i); + ret = 1; + } + if (!board->first_card_vendor && !board->dmi_pattern) { + msg_gerr("Zero first subsystem vendor and no DMI " + "pattern in position %i of the board enable " + "table\n", i); + ret = 1; + } + if (!board->first_card_device && !board->dmi_pattern) { + msg_gerr("Zero first subsystem device and no DMI " + "pattern in position %i of the board enable " + "table\n", i); + ret = 1; + } + if (!board->first_card_vendor && board->dmi_pattern) { + /* Such boards are usually really old. No error. */ + msg_gspew("Zero first subsystem vendor but with DMI pattern in position %i " + "of the board enable table\n", i); + } + if (!board->first_card_device && board->dmi_pattern) { + /* Such boards are usually really old. No error. */ + msg_gspew("Zero first subsystem device but with DMI pattern in position %i " + "of the board enable table\n", i); + } + + i++; + } + + return ret; +} + /* * Match boards on PCI IDs and subsystem IDs. * Second set of IDs can be either main+subsystem IDs, main IDs or no IDs. + * + * Logic of this function: First PCI dev has to match ven/dev/subven/subdev. + * The second PCI dev is completely optional (bad idea). */ const static struct board_match *board_match_pci_ids(enum board_match_phase phase) { -- http://www.hailfinger.org/

7 years, 3 months

[PATCH] Improve messages on failed erases with default verbosity.

by Stefan Tauner

From: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Without this... Erasing and writing flash chip... ERASE FAILED at 0x00001000! Expected=0xff, Read=0xb4, failed byte count from 0x00000000-0x0000ffff: 0xef09 ERASE FAILED! Reading current flash chip contents... done. <loooooong break while the next eraser and writing is tried> Erase/write done. Verifying flash... VERIFIED. Even if there is not a long temporal pause, it is very confusing for the user to first see a failed erase, followed by a read, a done message and eventually the verification message. This patch inserts "Looking for another erase function." where there is just a silent break above. Signed-off-by: Stefan Tauner <stefan.tauner(a)alumni.tuwien.ac.at> --- flashrom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flashrom.c b/flashrom.c index 98101b7..4438dc6 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1470,9 +1470,9 @@ int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, uint8_t for (k = 0; k < NUM_ERASEFUNCTIONS; k++) { if (k != 0) - msg_cdbg("Looking for another erase function.\n"); + msg_cinfo("Looking for another erase function.\n"); if (!usable_erasefunctions) { - msg_cdbg("No usable erase functions left.\n"); + msg_cinfo("No usable erase functions left.\n"); break; } msg_cdbg("Trying erase function %i... ", k); -- Kind regards, Stefan Tauner

7 years, 3 months

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom June 2014