flashrom

flashrom@flashrom.org

3 participants
9188 discussions

New flash chips, AT49F010 and CAT28F512
by Andrew Morgan 13 Aug '12

13 Aug '12

AT49F010 patch is basically a copy of the existing AT49F020 code, but with half the size and the correct ID. The log was from a write of random data, after the chip already contained different random data. I did separate read, erase, write tests before but this log seems to show that PREW all work. CAT28F512 I have successfully probed and read data from, but erase fails. Could be because it needs 12v VPP. The CAT28F512 I have is soldered on to a NIC. I haven't investigated if VPP is connected at all yet. Thought I'd include the patch as-is anyway. Both patches: Signed-off-by: Andrew Morgan <ziltro(a)ziltro.com> -- Andrew.

3 10

[commit] r1572 - trunk
by repository service 13 Aug '12

13 Aug '12

Author: stefanct Date: Tue Aug 14 01:43:46 2012 New Revision: 1572 URL: http://flashrom.org/trac/flashrom/changeset/1572 Log: Add support for Atmel AT49(H)F010, AT49F080 and AT49F080T. Also, alter the page size of the other family members to indicate that it is unused. Maybe we this accelerates the deletion of this field... haha. Signed-off-by: Andrew Morgan <ziltro(a)ziltro.com> Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/flashchips.c trunk/flashchips.h Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Mon Aug 13 18:33:04 2012 (r1571) +++ trunk/flashchips.c Tue Aug 14 01:43:46 2012 (r1572) @@ -2317,12 +2317,37 @@ { .vendor = "Atmel", + .name = "AT49(H)F010", + .bustype = BUS_PARALLEL, + .manufacture_id = ATMEL_ID, + .model_id = ATMEL_AT49F010, + .total_size = 128, + .page_size = 0, /* unused */ + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_OK_PREW, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ + .block_erasers = + { + { + .eraseblocks = { {128 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + }, + .printlock = printlock_at49f, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {4500, 5500}, + }, + + { + .vendor = "Atmel", .name = "AT49F020", .bustype = BUS_PARALLEL, .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT49F020, .total_size = 256, - .page_size = 256, + .page_size = 0, /* unused */ .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_OK_PRE, .probe = probe_jedec, @@ -2353,7 +2378,7 @@ .manufacture_id = ATMEL_ID, .model_id = ATMEL_AT49F040, .total_size = 512, - .page_size = 512, + .page_size = 0, /* unused */ .feature_bits = FEATURE_EITHER_RESET, .tested = TEST_UNTESTED, .probe = probe_jedec, @@ -2370,6 +2395,69 @@ * FIXME: add another eraser when partial erasers are * supported. */ + }, + .printlock = printlock_at49f, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {4500, 5500}, + }, + + { + .vendor = "Atmel", + .name = "AT49F080", + .bustype = BUS_PARALLEL, + .manufacture_id = ATMEL_ID, + .model_id = ATMEL_AT49F080, + .total_size = 1024, + .page_size = 0, /* unused */ + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ + .block_erasers = + { + { + .eraseblocks = { {1024 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + /* Chip features an optional permanent write protection + * of the first 16 kB. The erase function is the same as + * above, but 00000H to 03FFFH will not be erased. + * FIXME: add another eraser when partial erasers are + * supported. + */ + }, + .printlock = printlock_at49f, + .write = write_jedec_1, + .read = read_memmapped, + .voltage = {4500, 5500}, + }, + + { + /* 'top' version of AT49F080. equal in all aspects but the boot block address */ + .vendor = "Atmel", + .name = "AT49F080T", + .bustype = BUS_PARALLEL, + .manufacture_id = ATMEL_ID, + .model_id = ATMEL_AT49F080T, + .total_size = 1024, + .page_size = 0, /* unused */ + .feature_bits = FEATURE_EITHER_RESET, + .tested = TEST_UNTESTED, + .probe = probe_jedec, + .probe_timing = TIMING_ZERO, /* Datasheet has no timing info specified */ + .block_erasers = + { + { + .eraseblocks = { {1024 * 1024, 1} }, + .block_erase = erase_chip_block_jedec, + } + /* Chip features an optional permanent write protection + * of the first 16 kB. The erase function is the same as + * above, but FC000H to FFFFFH will not be erased. + * FIXME: add another eraser when partial erasers are + * supported. + */ }, .printlock = printlock_at49f, .write = write_jedec_1, Modified: trunk/flashchips.h ============================================================================== --- trunk/flashchips.h Mon Aug 13 18:33:04 2012 (r1571) +++ trunk/flashchips.h Tue Aug 14 01:43:46 2012 (r1572) @@ -187,8 +187,11 @@ #define ATMEL_AT49F002N 0x07 /* for AT49F002(N) */ #define ATMEL_AT49LH002 0xE9 #define ATMEL_AT49F002NT 0x08 /* for AT49F002(N)T */ +#define ATMEL_AT49F010 0x17 /* Same as AT49HF010 */ #define ATMEL_AT49F020 0x0B #define ATMEL_AT49F040 0x13 +#define ATMEL_AT49F080 0x23 +#define ATMEL_AT49F080T 0x27 /* Bright Microelectronics has the same manufacturer ID as Hyundai... */ #define BRIGHT_ID 0xAD /* Bright Microelectronics */

1 0

[PATCH] Clean up board enable matching
by Carl-Daniel Hailfinger 13 Aug '12

13 Aug '12

This is an update of a really old patch. User-visible changes: You have to specify vendor+mainboard for the internal:mainboard= parameter. The vendor name is no longer optional. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Index: flashrom-cbtable_matching_cleanup/board_enable.c =================================================================== --- flashrom-cbtable_matching_cleanup/board_enable.c (Revision 1567) +++ flashrom-cbtable_matching_cleanup/board_enable.c (Arbeitskopie) @@ -2447,37 +2447,50 @@ * Match boards on coreboot table gathered vendor and part name. * Require main PCI IDs to match too as extra safety. */ -static const struct board_match *board_match_cbname(const char *vendor, - const char *part) +static const struct board_match *board_match_cbname(const char *vendor, const char *part) { const struct board_match *board = board_matches; const struct board_match *partmatch = NULL; + /* If a board uses coreboot, we have full vendor+part name. + * If a board doesn't use coreboot, we have DMI. + * If a board has no useful DMI and no coreboot table and no subsystem IDs, the user should specify + * full board vendor+part name. + */ + if ((!vendor && part) || (vendor && !part)) { + msg_pinfo("Please supply board vendor and part name.\n"); + return NULL; + } + if (!vendor && !part) + return NULL; + for (; board->vendor_name; board++) { - if (vendor && (!board->lb_vendor - || strcasecmp(board->lb_vendor, vendor))) + if (!board->lb_vendor || strcasecmp(board->lb_vendor, vendor)) continue; if (!board->lb_part || strcasecmp(board->lb_part, part)) continue; - if (!pci_dev_find(board->first_vendor, board->first_device)) + if (!pci_dev_find(board->first_vendor, board->first_device)) { + msg_pdbg("Odd. coreboot name \"%s\":\"%s\" matches, but first PCI device %04x:%04x " + "doesn't.\n", vendor, part, board->first_vendor, board->first_device); continue; + } + /* FIXME: Once the entries for agami Aruma and IWILL DK8-HTX are fixed to have a second PCI + * device, we can run pci_dev_find unconditionally. + */ if (board->second_vendor && - !pci_dev_find(board->second_vendor, board->second_device)) + !pci_dev_find(board->second_vendor, board->second_device)) { + msg_pdbg("Odd. coreboot name \"%s\":\"%s\" matches, but second PCI device %04x:%04x " + "doesn't.\n", vendor, part, board->second_vendor, board->second_device); continue; + } - if (vendor) - return board; - if (partmatch) { - /* a second entry has a matching part name */ - msg_pinfo("AMBIGUOUS BOARD NAME: %s\n", part); - msg_pinfo("At least vendors '%s' and '%s' match.\n", - partmatch->lb_vendor, board->lb_vendor); - msg_perr("Please use the full -p internal:mainboard=" - "vendor:part syntax.\n"); + /* More than one entry has a matching name. */ + msg_perr("Board name \"%s\":\"%s\" and PCI IDs matched more than one board enable " + "entry. Please report a bug at flashrom(a)flashrom.org\n", part, vendor); return NULL; } partmatch = board; @@ -2487,12 +2500,10 @@ return partmatch; if (!partvendor_from_cbtable) { - /* Only warn if the mainboard type was not gathered from the - * coreboot table. If it was, the coreboot implementor is - * expected to fix flashrom, too. + /* Only warn if the mainboard type was not gathered from the coreboot table. If it was, the + * coreboot implementor is expected to fix flashrom, too. */ - msg_perr("\nUnknown vendor:board from -p internal:mainboard=" - " programmer parameter:\n%s:%s\n\n", + msg_perr("\nUnknown vendor:board from -p internal:mainboard= programmer parameter:\n%s:%s\n\n", vendor, part); } return NULL; -- http://www.hailfinger.org/

2 1

Re: [flashrom] [PATCH] serprog: Add support for setting the SPI frequency.
by Stefan Tauner 13 Aug '12

13 Aug '12

On Fri, 3 Feb 2012 23:14:43 +0100 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > Introduce a new opcode (0x14) that sends the requested frequency as a 32b > long value in Hertz to the programmer and receives the frequency eventually > chosen by the programmer. The user can specify this with the programmer > parameter "spispeed" (named after the similar parameter for the buspirate) > including an optional suffix of 'M' or 'k' for specifying megahertz or kilohertz > respectively (lowercase suffixes are also accepted). > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Self-acked and committed after small refinements in r1571. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1571 - in trunk: . Documentation
by repository service 13 Aug '12

13 Aug '12

Author: stefanct Date: Mon Aug 13 18:33:04 2012 New Revision: 1571 URL: http://flashrom.org/trac/flashrom/changeset/1571 Log: serprog: Add support for setting the SPI frequency. Introduce a new opcode (0x14) that sends the requested frequency as a 32b long value in Hertz to the programmer and receives the frequency eventually chosen by the programmer. The user can specify this with the programmer parameter "spispeed" (named after the similar parameter for the buspirate) including an optional suffix of 'M' or 'k' for specifying megahertz or kilohertz respectively (lowercase suffixes are also accepted). Thanks to Idwer and Uwe (and maybe others) for their feedback especially regarding the unit of frequency to use. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/Documentation/serprog-protocol.txt trunk/flashrom.8 trunk/serprog.c Modified: trunk/Documentation/serprog-protocol.txt ============================================================================== --- trunk/Documentation/serprog-protocol.txt Mon Aug 13 10:45:13 2012 (r1570) +++ trunk/Documentation/serprog-protocol.txt Mon Aug 13 18:33:04 2012 (r1571) @@ -33,6 +33,7 @@ 0x12 Set used bustype 8-bit flags (as with 0x05) ACK / NAK 0x13 Perform SPI operation 24-bit slen + 24-bit rlen ACK + rlen bytes of data / NAK + slen bytes of data +0x14 Set SPI clock frequency in Hz 32-bit requested frequency ACK + 32-bit set frequency / NAK 0x?? unimplemented command - invalid. @@ -73,6 +74,14 @@ Maximum slen is Q_WRNMAXLEN in case Q_BUSTYPE returns SPI only or S_BUSTYPE was used to set SPI exclusively before. Same for rlen and Q_RDNMAXLEN. This operation is immediate, meaning it doesnt use the operation buffer. + 0x14 (S_SPI_FREQ): + Set the SPI clock frequency. The 32-bit value indicates the + requested frequency in Hertz. Value 0 is reserved and should + be NAKed by the programmer. The requested frequency should be + mapped by the programmer software to a supported frequency + lower than the one requested. If there is no lower frequency + available the lowest possible should be used. The value + chosen is sent back in the reply with an ACK. About mandatory commands: The only truly mandatory commands for any device are 0x00, 0x01, 0x02 and 0x10, but one can't really do anything with these commands. @@ -107,3 +116,4 @@ #define S_CMD_Q_RDNMAXLEN 0x11 /* Query read-n maximum length */ #define S_CMD_S_BUSTYPE 0x12 /* Set used bustype(s). */ #define S_CMD_O_SPIOP 0x13 /* Perform SPI operation. */ +#define S_CMD_S_SPI_FREQ 0x14 /* Set SPI clock frequency */ Modified: trunk/flashrom.8 ============================================================================== --- trunk/flashrom.8 Mon Aug 13 10:45:13 2012 (r1570) +++ trunk/flashrom.8 Mon Aug 13 18:33:04 2012 (r1571) @@ -598,7 +598,17 @@ .sp .B " flashrom \-p serprog:ip=ipaddr:port" .sp -instead. More information about serprog is available in +instead. In case the device supports it, you can set the SPI clock frequency +with the optional +.B spispeed +parameter. The frequency is parsed as Hertz, unless an +.BR M ", or " k +suffix is given, then megahertz or kilohertz are used respectively. +Example that sets the frequency to 2 MHz: +.sp +.B "flashrom \-p serprog:dev=/dev/device:baud,spispeed=2M" +.sp +More information about serprog is available in .B serprog-protocol.txt in the source distribution. .SS Modified: trunk/serprog.c ============================================================================== --- trunk/serprog.c Mon Aug 13 10:45:13 2012 (r1570) +++ trunk/serprog.c Mon Aug 13 18:33:04 2012 (r1571) @@ -69,6 +69,7 @@ #define S_CMD_Q_RDNMAXLEN 0x11 /* Query read-n maximum length */ #define S_CMD_S_BUSTYPE 0x12 /* Set used bustype(s). */ #define S_CMD_O_SPIOP 0x13 /* Perform SPI operation. */ +#define S_CMD_S_SPI_FREQ 0x14 /* Set SPI clock frequency */ static uint16_t sp_device_serbuf_size = 16; static uint16_t sp_device_opbuf_size = 300; @@ -482,6 +483,7 @@ /* Check for the minimum operational set of commands. */ if (serprog_buses_supported & BUS_SPI) { uint8_t bt = BUS_SPI; + char *spispeed; if (sp_check_commandavail(S_CMD_O_SPIOP) == 0) { msg_perr("Error: SPI operation not supported while the " "bustype is SPI\n"); @@ -513,6 +515,51 @@ spi_programmer_serprog.max_data_read = v; msg_pdbg(MSGHEADER "Maximum read-n length is %d\n", v); } + spispeed = extract_programmer_param("spispeed"); + if (spispeed && strlen(spispeed)) { + uint32_t f_spi_req, f_spi; + uint8_t buf[4]; + char *f_spi_suffix; + + errno = 0; + f_spi_req = strtol(spispeed, &f_spi_suffix, 0); + if (errno != 0 || spispeed == f_spi_suffix) { + msg_perr("Error: Could not convert 'spispeed'.\n"); + return 1; + } + if (strlen(f_spi_suffix) == 1) { + if (!strcasecmp(f_spi_suffix, "M")) + f_spi_req *= 1000000; + else if (!strcasecmp(f_spi_suffix, "k")) + f_spi_req *= 1000; + else { + msg_perr("Error: Garbage following 'spispeed' value.\n"); + return 1; + } + } else if (strlen(f_spi_suffix) > 1) { + msg_perr("Error: Garbage following 'spispeed' value.\n"); + return 1; + } + + buf[0] = (f_spi_req >> (0 * 8)) & 0xFF; + buf[1] = (f_spi_req >> (1 * 8)) & 0xFF; + buf[2] = (f_spi_req >> (2 * 8)) & 0xFF; + buf[3] = (f_spi_req >> (3 * 8)) & 0xFF; + + if (sp_check_commandavail(S_CMD_S_SPI_FREQ) == 0) + msg_perr(MSGHEADER "Warning: Setting the SPI clock rate is not supported!\n"); + else if (sp_docommand(S_CMD_S_SPI_FREQ, 4, buf, 4, buf) + == 0) { + f_spi = buf[0]; + f_spi |= buf[1] << (1 * 8); + f_spi |= buf[2] << (2 * 8); + f_spi |= buf[3] << (3 * 8); + msg_pdbg(MSGHEADER "Requested to set SPI clock frequency to %u Hz. " + "It was actually set to %u Hz\n", f_spi_req, f_spi); + } else + msg_pdbg(MSGHEADER "Setting SPI clock rate to %u Hz failed!\n", f_spi_req); + } + free(spispeed); bt = serprog_buses_supported; if (sp_docommand(S_CMD_S_BUSTYPE, 1, &bt, 0, NULL)) return 1;

1 0

[patch] board enable for ASUS P4P800-X (with erasing/writing SST SST49LF003A/B)
by Idwer Vollering 13 Aug '12

13 Aug '12

Enable writing/erasing on the ASUS P4P800-X, tested by mindcat on IRC. This board enable is inspired by the board enable for the ASUS P4P800-VM. As a bonus, testin the erasing/writing functionality on the SST SST49LF003A/B chip is now known to work. Signed-off-by: Idwer Vollering <vidwer(a)gmail.com> --- Before (r1205/v0.9.3): Write report: http://paste.flashrom.org/view.php?id=465 Write report: http://paste.flashrom.org/view.php?id=466 After (r1285): Erase report: http://paste.flashrom.org/view.php?id=467

3 7

[commit] r1570 - in trunk: . util/ich_descriptors_tool
by repository service 13 Aug '12

13 Aug '12

Author: stefanct Date: Mon Aug 13 10:45:13 2012 New Revision: 1570 URL: http://flashrom.org/trac/flashrom/changeset/1570 Log: Clean up ICH descriptor code. - allows for compilation with -Werror=shadow, - use extended line limit to fix the most awful line breaks. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/ich_descriptors.c trunk/util/ich_descriptors_tool/ich_descriptors_tool.c Modified: trunk/ich_descriptors.c ============================================================================== --- trunk/ich_descriptors.c Sat Aug 11 18:07:08 2012 (r1569) +++ trunk/ich_descriptors.c Mon Aug 13 10:45:13 2012 (r1570) @@ -85,26 +85,16 @@ msg_pdbg2("\n"); msg_pdbg2("--- Details ---\n"); - msg_pdbg2("NR (Number of Regions): %5d\n", - cont->NR + 1); - msg_pdbg2("FRBA (Flash Region Base Address): 0x%03x\n", - getFRBA(cont)); - msg_pdbg2("NC (Number of Components): %5d\n", - cont->NC + 1); - msg_pdbg2("FCBA (Flash Component Base Address): 0x%03x\n", - getFCBA(cont)); - msg_pdbg2("ISL (ICH/PCH Strap Length): %5d\n", - cont->ISL); - msg_pdbg2("FISBA/FPSBA (Flash ICH/PCH Strap Base Address): 0x%03x\n", - getFISBA(cont)); - msg_pdbg2("NM (Number of Masters): %5d\n", - cont->NM + 1); - msg_pdbg2("FMBA (Flash Master Base Address): 0x%03x\n", - getFMBA(cont)); - msg_pdbg2("MSL/PSL (MCH/PROC Strap Length): %5d\n", - cont->MSL); - msg_pdbg2("FMSBA (Flash MCH/PROC Strap Base Address): 0x%03x\n", - getFMSBA(cont)); + msg_pdbg2("NR (Number of Regions): %5d\n", cont->NR + 1); + msg_pdbg2("FRBA (Flash Region Base Address): 0x%03x\n", getFRBA(cont)); + msg_pdbg2("NC (Number of Components): %5d\n", cont->NC + 1); + msg_pdbg2("FCBA (Flash Component Base Address): 0x%03x\n", getFCBA(cont)); + msg_pdbg2("ISL (ICH/PCH Strap Length): %5d\n", cont->ISL); + msg_pdbg2("FISBA/FPSBA (Flash ICH/PCH Strap Base Address): 0x%03x\n", getFISBA(cont)); + msg_pdbg2("NM (Number of Masters): %5d\n", cont->NM + 1); + msg_pdbg2("FMBA (Flash Master Base Address): 0x%03x\n", getFMBA(cont)); + msg_pdbg2("MSL/PSL (MCH/PROC Strap Length): %5d\n", cont->MSL); + msg_pdbg2("FMSBA (Flash MCH/PROC Strap Base Address): 0x%03x\n", getFMSBA(cont)); msg_pdbg2("\n"); } @@ -520,8 +510,8 @@ msg_pdbg2("Integrated Clocking Configuration used: %d\n", s->cougar.ICC_SEL); - msg_pdbg2("PCH Signal CL_RST1# does %sassert when Intel ME performs a " - "reset.\n", s->ibex.MER_CL1 ? "" : "not "); + msg_pdbg2("PCH Signal CL_RST1# does %sassert when Intel ME performs a reset.\n", + s->ibex.MER_CL1 ? "" : "not "); msg_pdbg2("ICC Profile is selected by %s.\n", s->cougar.ICC_PRO_SEL ? "Softstraps" : "BIOS"); msg_pdbg2("Deep SX is %ssupported on the platform.\n", @@ -538,8 +528,7 @@ s->cougar.IWL_EN ? "en" : "dis"); msg_pdbg2("Chipset configuration Softstrap 5: %d\n", s->cougar.cs_ss5); msg_pdbg2("SMLink1 provides temperature from %s.\n", - s->cougar.SMLINK1_THERM_SEL ? - "PCH only" : "the CPU, PCH and DIMMs"); + s->cougar.SMLINK1_THERM_SEL ? "PCH only" : "the CPU, PCH and DIMMs"); msg_pdbg2("GPIO29 is used as %s.\n", s->cougar.SLP_LAN_GP29_SEL ? "general purpose output" : "SLP_LAN#"); @@ -552,32 +541,32 @@ void prettyprint_ich_descriptor_straps(enum ich_chipset cs, const struct ich_descriptors *desc) { - unsigned int i, max; + unsigned int i, max_count; msg_pdbg2("=== Softstraps ===\n"); if (sizeof(desc->north.STRPs) / 4 + 1 < desc->content.MSL) { - max = sizeof(desc->north.STRPs) / 4 + 1; - msg_pdbg2("MSL (%u) is greater than the current maximum of %u " - "entries.\n", desc->content.MSL, max + 1); - msg_pdbg2("Only the first %u entries will be printed.\n", max); + max_count = sizeof(desc->north.STRPs) / 4 + 1; + msg_pdbg2("MSL (%u) is greater than the current maximum of %u entries.\n", + desc->content.MSL, max_count + 1); + msg_pdbg2("Only the first %u entries will be printed.\n", max_count); } else - max = desc->content.MSL; + max_count = desc->content.MSL; - msg_pdbg2("--- North/MCH/PROC (%d entries) ---\n", max); - for (i = 0; i < max; i++) + msg_pdbg2("--- North/MCH/PROC (%d entries) ---\n", max_count); + for (i = 0; i < max_count; i++) msg_pdbg2("STRP%-2d = 0x%08x\n", i, desc->north.STRPs[i]); msg_pdbg2("\n"); if (sizeof(desc->south.STRPs) / 4 < desc->content.ISL) { - max = sizeof(desc->south.STRPs) / 4; - msg_pdbg2("ISL (%u) is greater than the current maximum of %u " - "entries.\n", desc->content.ISL, max); - msg_pdbg2("Only the first %u entries will be printed.\n", max); + max_count = sizeof(desc->south.STRPs) / 4; + msg_pdbg2("ISL (%u) is greater than the current maximum of %u entries.\n", + desc->content.ISL, max_count); + msg_pdbg2("Only the first %u entries will be printed.\n", max_count); } else - max = desc->content.ISL; + max_count = desc->content.ISL; - msg_pdbg2("--- South/ICH/PCH (%d entries) ---\n", max); - for (i = 0; i < max; i++) + msg_pdbg2("--- South/ICH/PCH (%d entries) ---\n", max_count); + for (i = 0; i < max_count; i++) msg_pdbg2("STRP%-2d = 0x%08x\n", i, desc->south.STRPs[i]); msg_pdbg2("\n"); @@ -608,8 +597,7 @@ case CHIPSET_ICH_UNKNOWN: break; default: - msg_pdbg2("The meaning of the descriptor straps are unknown " - "yet.\n\n"); + msg_pdbg2("The meaning of the descriptor straps are unknown yet.\n\n"); break; } } @@ -634,8 +622,7 @@ msg_pdbg2("\n"); msg_pdbg2("VSCC Table: %d entries\n", umap->VTL/2); - for (i = 0; i < umap->VTL/2; i++) - { + for (i = 0; i < umap->VTL/2; i++) { uint32_t jid = umap->vscc_table[i].JID; uint32_t vscc = umap->vscc_table[i].VSCC; msg_pdbg2(" JID%d = 0x%08x\n", i, jid); @@ -651,7 +638,7 @@ /* len is the length of dump in bytes */ int read_ich_descriptors_from_dump(const uint32_t *dump, unsigned int len, struct ich_descriptors *desc) { - unsigned int i, max; + unsigned int i, max_count; uint8_t pch_bug_offset = 0; if (dump == NULL || desc == NULL) @@ -708,10 +695,8 @@ return ICH_RET_OOB; for (i = 0; i < desc->upper.VTL/2; i++) { - desc->upper.vscc_table[i].JID = - dump[(getVTBA(&desc->upper) >> 2) + i * 2 + 0]; - desc->upper.vscc_table[i].VSCC = - dump[(getVTBA(&desc->upper) >> 2) + i * 2 + 1]; + desc->upper.vscc_table[i].JID = dump[(getVTBA(&desc->upper) >> 2) + i * 2 + 0]; + desc->upper.vscc_table[i].VSCC = dump[(getVTBA(&desc->upper) >> 2) + i * 2 + 1]; } /* MCH/PROC (aka. North) straps */ @@ -719,20 +704,18 @@ return ICH_RET_OOB; /* limit the range to be written */ - max = min(sizeof(desc->north.STRPs) / 4, desc->content.MSL); - for (i = 0; i < max; i++) - desc->north.STRPs[i] = - dump[(getFMSBA(&desc->content) >> 2) + i]; + max_count = min(sizeof(desc->north.STRPs) / 4, desc->content.MSL); + for (i = 0; i < max_count; i++) + desc->north.STRPs[i] = dump[(getFMSBA(&desc->content) >> 2) + i]; /* ICH/PCH (aka. South) straps */ if (len < getFISBA(&desc->content) + desc->content.ISL * 4) return ICH_RET_OOB; /* limit the range to be written */ - max = min(sizeof(desc->south.STRPs) / 4, desc->content.ISL); - for (i = 0; i < max; i++) - desc->south.STRPs[i] = - dump[(getFISBA(&desc->content) >> 2) + i]; + max_count = min(sizeof(desc->south.STRPs) / 4, desc->content.ISL); + for (i = 0; i < max_count; i++) + desc->south.STRPs[i] = dump[(getFISBA(&desc->content) >> 2) + i]; return ICH_RET_OK; } @@ -755,13 +738,12 @@ size_enc = desc->component.comp2_density; break; default: - msg_perr("Only ICH SPI component index 0 or 1 are supported " - "yet.\n"); + msg_perr("Only ICH SPI component index 0 or 1 are supported yet.\n"); return 0; } if (size_enc > 5) { - msg_perr("Density of ICH SPI component with index %d is " - "invalid. Encoded density is 0x%x.\n", idx, size_enc); + msg_perr("Density of ICH SPI component with index %d is invalid. Encoded density is 0x%x.\n", + idx, size_enc); return 0; } return (1 << (19 + size_enc)); @@ -804,8 +786,7 @@ return ICH_RET_ERR; } - msg_pdbg2("Reading flash descriptors " - "mapped by the chipset via FDOC/FDOD..."); + msg_pdbg2("Reading flash descriptors mapped by the chipset via FDOC/FDOD..."); /* content section */ desc->content.FLVALSIG = read_descriptor_reg(0, 0, spibar); desc->content.FLMAP0 = read_descriptor_reg(0, 1, spibar); Modified: trunk/util/ich_descriptors_tool/ich_descriptors_tool.c ============================================================================== --- trunk/util/ich_descriptors_tool/ich_descriptors_tool.c Sat Aug 11 18:07:08 2012 (r1569) +++ trunk/util/ich_descriptors_tool/ich_descriptors_tool.c Mon Aug 13 10:45:13 2012 (r1570) @@ -40,7 +40,7 @@ #include <sys/mman.h> #endif -static void dump_file(const char *basename, const uint32_t *dump, unsigned int len, struct ich_desc_region *reg, unsigned int i) +static void dump_file(const char *prefix, const uint32_t *dump, unsigned int len, struct ich_desc_region *reg, unsigned int i) { int ret; char *fn; @@ -54,8 +54,7 @@ reg_name = region_names[i]; if (base > limit) { - printf("The %s region is unused and thus not dumped.\n", - reg_name); + printf("The %s region is unused and thus not dumped.\n", reg_name); return; } @@ -68,13 +67,13 @@ return; } - fn = malloc(strlen(basename) + strlen(reg_name) + strlen(".bin") + 2); + fn = malloc(strlen(prefix) + strlen(reg_name) + strlen(".bin") + 2); if (!fn) { fprintf(stderr, "Out of memory!\n"); exit(1); } - snprintf(fn, strlen(basename) + strlen(reg_name) + strlen(".bin") + 2, - "%s.%s.bin", basename, reg_name); + snprintf(fn, strlen(prefix) + strlen(reg_name) + strlen(".bin") + 2, + "%s.%s.bin", prefix, reg_name); printf("Dumping %u bytes of the %s region from 0x%08x-0x%08x to %s... ", file_len, region_names[i], base, limit, fn); int fh = open(fn, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR); @@ -95,12 +94,12 @@ close(fh); } -void dump_files(const char *n, const uint32_t *buf, unsigned int len, struct ich_desc_region *reg) +void dump_files(const char *name, const uint32_t *buf, unsigned int len, struct ich_desc_region *reg) { unsigned int i; printf("=== Dumping region files ===\n"); for (i = 0; i < 5; i++) - dump_file(n, buf, len, reg, i); + dump_file(name, buf, len, reg, i); printf("\n"); } @@ -157,8 +156,7 @@ } } if (fn == NULL) - usage(argv, - "Need a file name of a descriptor image to read from."); + usage(argv, "Need the file name of a descriptor image to read from."); fd = open(fn, O_RDONLY); if (fd < 0) @@ -209,8 +207,7 @@ printf("Image not in descriptor mode.\n"); exit(1); case ICH_RET_OOB: - printf("Tried to access a location out of bounds of the image. " - "- Corrupt image?\n"); + printf("Tried to access a location out of bounds of the image. - Corrupt image?\n"); exit(1); default: printf("Unhandled return value at %s:%u, please report this.\n",

1 0

Re: [flashrom] [PATCH] Move show_id to where it belongs.
by Carl-Daniel Hailfinger 12 Aug '12

12 Aug '12

Am 11.08.2012 04:56 schrieb Stefan Tauner: > And remove the unused force parameter. > > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > i forgot to move the declaration in the header, and i noticed that the > force parameter is useless because we use the global variable instead. > this should actually change eventually, but for now just kill the > parameter because it is doubtful that it will be part of the solution. Can you please rename show_id to check_image_matches_hardware or something like that (e.g. check_image_matches_cbtable_id)? show_id is a totally misleading name. AFAICS the rest is a pure code move, and makes a lot of sense. Oh, and please downgrade the following message to pdbg: msg_pinfo("Flash image seems to be a legacy BIOS. Disabling coreboot-related checks.\n"); Maybe downgrade the following message as well: msg_pinfo("Flash image seems to have garbage in the ID location. Disabling checks.\n"); Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 2

[commit] r1569 - trunk
by repository service 11 Aug '12

11 Aug '12

Author: stefanct Date: Sat Aug 11 18:07:08 2012 New Revision: 1569 URL: http://flashrom.org/trac/flashrom/changeset/1569 Log: Move show_id to where it belongs. And remove the unused force parameter. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/cbtable.c trunk/flashrom.c trunk/layout.c trunk/programmer.h Modified: trunk/cbtable.c ============================================================================== --- trunk/cbtable.c Sat Aug 11 04:33:20 2012 (r1568) +++ trunk/cbtable.c Sat Aug 11 18:07:08 2012 (r1569) @@ -25,6 +25,7 @@ #include <unistd.h> #include <stdio.h> #include <stdlib.h> +#include <ctype.h> #include <string.h> #include "flash.h" #include "programmer.h" @@ -32,6 +33,9 @@ char *lb_part = NULL, *lb_vendor = NULL; int partvendor_from_cbtable = 0; +static char *def_name = "DEFAULT"; +static char *mainboard_vendor = NULL; +static char *mainboard_part = NULL; /* Parse the [<vendor>:]<board> string specified by the user as part of * -p internal:mainboard=[<vendor>:]<board> and set lb_vendor and lb_part @@ -56,6 +60,82 @@ free(tempstr); } +int show_id(uint8_t *bios, int size) +{ + unsigned int *walk; + unsigned int mb_part_offset, mb_vendor_offset; + char *mb_part, *mb_vendor; + + mainboard_vendor = def_name; + mainboard_part = def_name; + + walk = (unsigned int *)(bios + size - 0x10); + walk--; + + if ((*walk) == 0 || ((*walk) & 0x3ff) != 0) { + /* We might have an NVIDIA chipset BIOS which stores the ID information somewhere else. */ + walk = (unsigned int *)(bios + size - 0x80); + walk--; + } + + /* + * Check if coreboot last image size is 0 or not a multiple of 1k or + * bigger than the chip or if the pointers to vendor ID or mainboard ID + * are outside the image of if the start of ID strings are nonsensical + * (nonprintable and not \0). + */ + mb_part_offset = *(walk - 1); + mb_vendor_offset = *(walk - 2); + if ((*walk) == 0 || ((*walk) & 0x3ff) != 0 || (*walk) > size || + mb_part_offset > size || mb_vendor_offset > size) { + msg_pinfo("Flash image seems to be a legacy BIOS. Disabling coreboot-related checks.\n"); + return 0; + } + + mb_part = (char *)(bios + size - mb_part_offset); + mb_vendor = (char *)(bios + size - mb_vendor_offset); + if (!isprint((unsigned char)*mb_part) || + !isprint((unsigned char)*mb_vendor)) { + msg_pinfo("Flash image seems to have garbage in the ID location. Disabling checks.\n"); + return 0; + } + + msg_pdbg("coreboot last image size (not ROM size) is %d bytes.\n", *walk); + + mainboard_part = strdup(mb_part); + mainboard_vendor = strdup(mb_vendor); + msg_pdbg("Manufacturer: %s\n", mainboard_vendor); + msg_pdbg("Mainboard ID: %s\n", mainboard_part); + + /* If these are not set, the coreboot table was not found. */ + if (!lb_vendor || !lb_part) { + msg_pinfo("Note: If the following flash access fails, try " + "-p internal:mainboard=<vendor>:<mainboard>.\n"); + return 0; + } + + /* These comparisons are case insensitive to make things a little less user^Werror prone. */ + if (!strcasecmp(mainboard_vendor, lb_vendor) && + !strcasecmp(mainboard_part, lb_part)) { + msg_pdbg("This firmware image matches this mainboard.\n"); + } else { + if (force_boardmismatch) { + msg_pinfo("WARNING: This firmware image does not " + "seem to fit to this machine - forcing it.\n"); + } else { + msg_pinfo("ERROR: Your firmware image (%s:%s) does not appear to\n" + " be correct for the detected mainboard (%s:%s)\n\n" + "Override with -p internal:boardmismatch=force to ignore the board name\n" + "in the firmware image or override the detected mainboard with\n" + "-p internal:mainboard=<vendor>:<mainboard>.\n\n", + mainboard_vendor, mainboard_part, lb_vendor, lb_part); + return 1; + } + } + + return 0; +} + static unsigned long compute_checksum(void *addr, unsigned long length) { uint8_t *ptr; Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sat Aug 11 04:33:20 2012 (r1568) +++ trunk/flashrom.c Sat Aug 11 18:07:08 2012 (r1569) @@ -1815,7 +1815,7 @@ #if CONFIG_INTERNAL == 1 if (programmer == PROGRAMMER_INTERNAL) - if (show_id(newcontents, size, force)) { + if (show_id(newcontents, size)) { ret = 1; goto out; } Modified: trunk/layout.c ============================================================================== --- trunk/layout.c Sat Aug 11 04:33:20 2012 (r1568) +++ trunk/layout.c Sat Aug 11 18:07:08 2012 (r1569) @@ -21,15 +21,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <ctype.h> #include <limits.h> #include "flash.h" #include "programmer.h" -#if CONFIG_INTERNAL == 1 -char *mainboard_vendor = NULL; -char *mainboard_part = NULL; -#endif static int romimages = 0; #define MAX_ROMLAYOUT 32 @@ -49,102 +44,6 @@ static int num_include_args = 0; /* the number of valid entries. */ static romlayout_t rom_entries[MAX_ROMLAYOUT]; -#if CONFIG_INTERNAL == 1 /* FIXME: Move the whole block to cbtable.c? */ -static char *def_name = "DEFAULT"; - -int show_id(uint8_t *bios, int size, int force) -{ - unsigned int *walk; - unsigned int mb_part_offset, mb_vendor_offset; - char *mb_part, *mb_vendor; - - mainboard_vendor = def_name; - mainboard_part = def_name; - - walk = (unsigned int *)(bios + size - 0x10); - walk--; - - if ((*walk) == 0 || ((*walk) & 0x3ff) != 0) { - /* We might have an NVIDIA chipset BIOS which stores the ID - * information at a different location. - */ - walk = (unsigned int *)(bios + size - 0x80); - walk--; - } - - /* - * Check if coreboot last image size is 0 or not a multiple of 1k or - * bigger than the chip or if the pointers to vendor ID or mainboard ID - * are outside the image of if the start of ID strings are nonsensical - * (nonprintable and not \0). - */ - mb_part_offset = *(walk - 1); - mb_vendor_offset = *(walk - 2); - if ((*walk) == 0 || ((*walk) & 0x3ff) != 0 || (*walk) > size || - mb_part_offset > size || mb_vendor_offset > size) { - msg_pinfo("Flash image seems to be a legacy BIOS. " - "Disabling coreboot-related checks.\n"); - return 0; - } - - mb_part = (char *)(bios + size - mb_part_offset); - mb_vendor = (char *)(bios + size - mb_vendor_offset); - if (!isprint((unsigned char)*mb_part) || - !isprint((unsigned char)*mb_vendor)) { - msg_pinfo("Flash image seems to have garbage in the ID location." - " Disabling checks.\n"); - return 0; - } - - msg_pdbg("coreboot last image size " - "(not ROM size) is %d bytes.\n", *walk); - - mainboard_part = strdup(mb_part); - mainboard_vendor = strdup(mb_vendor); - msg_pdbg("Manufacturer: %s\n", mainboard_vendor); - msg_pdbg("Mainboard ID: %s\n", mainboard_part); - - /* - * If lb_vendor is not set, the coreboot table was - * not found. Nor was -p internal:mainboard=VENDOR:PART specified. - */ - if (!lb_vendor || !lb_part) { - msg_pinfo("Note: If the following flash access fails, try " - "-p internal:mainboard=<vendor>:<mainboard>.\n"); - return 0; - } - - /* These comparisons are case insensitive to make things - * a little less user^Werror prone. - */ - if (!strcasecmp(mainboard_vendor, lb_vendor) && - !strcasecmp(mainboard_part, lb_part)) { - msg_pdbg("This firmware image matches this mainboard.\n"); - } else { - if (force_boardmismatch) { - msg_pinfo("WARNING: This firmware image does not " - "seem to fit to this machine - forcing it.\n"); - } else { - msg_pinfo("ERROR: Your firmware image (%s:%s) does not " - "appear to\n" - " be correct for the detected " - "mainboard (%s:%s)\n\n" - "Override with -p internal:boardmismatch=" - "force to ignore the board name in the\n" - "firmware image or override the detected " - "mainboard with\n" - "-p internal:mainboard=<vendor>:<mainboard>." - "\n\n", - mainboard_vendor, mainboard_part, lb_vendor, - lb_part); - return 1; - } - } - - return 0; -} -#endif - #ifndef __LIBPAYLOAD__ int read_romlayout(char *name) { Modified: trunk/programmer.h ============================================================================== --- trunk/programmer.h Sat Aug 11 04:33:20 2012 (r1568) +++ trunk/programmer.h Sat Aug 11 18:07:08 2012 (r1569) @@ -274,6 +274,7 @@ /* cbtable.c */ void lb_vendor_dev_from_string(const char *boardstring); +int show_id(uint8_t *bios, int size); int coreboot_init(void); extern char *lb_part, *lb_vendor; extern int partvendor_from_cbtable; @@ -478,9 +479,6 @@ int check_max_decode(enum chipbustype buses, uint32_t size); char *extract_programmer_param(const char *param_name); -/* layout.c */ -int show_id(uint8_t *bios, int size, int force); - /* spi.c */ enum spi_controller { SPI_CONTROLLER_NONE,

1 0

[PATCH] Move show_id to where it belongs.
by Stefan Tauner 10 Aug '12

10 Aug '12

And remove the unused force parameter. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- i forgot to move the declaration in the header, and i noticed that the force parameter is useless because we use the global variable instead. this should actually change eventually, but for now just kill the parameter because it is doubtful that it will be part of the solution. cbtable.c | 80 ++++++++++++++++++++++++++++++++++++++++++++++ flashrom.c | 2 +- layout.c | 101 ---------------------------------------------------------- programmer.h | 4 +-- 4 files changed, 82 insertions(+), 105 deletions(-) diff --git a/cbtable.c b/cbtable.c index b4fb809..dde12ac 100644 --- a/cbtable.c +++ b/cbtable.c @@ -25,6 +25,7 @@ #include <unistd.h> #include <stdio.h> #include <stdlib.h> +#include <ctype.h> #include <string.h> #include "flash.h" #include "programmer.h" @@ -32,6 +33,9 @@ char *lb_part = NULL, *lb_vendor = NULL; int partvendor_from_cbtable = 0; +static char *def_name = "DEFAULT"; +static char *mainboard_vendor = NULL; +static char *mainboard_part = NULL; /* Parse the [<vendor>:]<board> string specified by the user as part of * -p internal:mainboard=[<vendor>:]<board> and set lb_vendor and lb_part @@ -56,6 +60,82 @@ void lb_vendor_dev_from_string(const char *boardstring) free(tempstr); } +int show_id(uint8_t *bios, int size) +{ + unsigned int *walk; + unsigned int mb_part_offset, mb_vendor_offset; + char *mb_part, *mb_vendor; + + mainboard_vendor = def_name; + mainboard_part = def_name; + + walk = (unsigned int *)(bios + size - 0x10); + walk--; + + if ((*walk) == 0 || ((*walk) & 0x3ff) != 0) { + /* We might have an NVIDIA chipset BIOS which stores the ID information somewhere else. */ + walk = (unsigned int *)(bios + size - 0x80); + walk--; + } + + /* + * Check if coreboot last image size is 0 or not a multiple of 1k or + * bigger than the chip or if the pointers to vendor ID or mainboard ID + * are outside the image of if the start of ID strings are nonsensical + * (nonprintable and not \0). + */ + mb_part_offset = *(walk - 1); + mb_vendor_offset = *(walk - 2); + if ((*walk) == 0 || ((*walk) & 0x3ff) != 0 || (*walk) > size || + mb_part_offset > size || mb_vendor_offset > size) { + msg_pinfo("Flash image seems to be a legacy BIOS. Disabling coreboot-related checks.\n"); + return 0; + } + + mb_part = (char *)(bios + size - mb_part_offset); + mb_vendor = (char *)(bios + size - mb_vendor_offset); + if (!isprint((unsigned char)*mb_part) || + !isprint((unsigned char)*mb_vendor)) { + msg_pinfo("Flash image seems to have garbage in the ID location. Disabling checks.\n"); + return 0; + } + + msg_pdbg("coreboot last image size (not ROM size) is %d bytes.\n", *walk); + + mainboard_part = strdup(mb_part); + mainboard_vendor = strdup(mb_vendor); + msg_pdbg("Manufacturer: %s\n", mainboard_vendor); + msg_pdbg("Mainboard ID: %s\n", mainboard_part); + + /* If these are not set, the coreboot table was not found. */ + if (!lb_vendor || !lb_part) { + msg_pinfo("Note: If the following flash access fails, try " + "-p internal:mainboard=<vendor>:<mainboard>.\n"); + return 0; + } + + /* These comparisons are case insensitive to make things a little less user^Werror prone. */ + if (!strcasecmp(mainboard_vendor, lb_vendor) && + !strcasecmp(mainboard_part, lb_part)) { + msg_pdbg("This firmware image matches this mainboard.\n"); + } else { + if (force_boardmismatch) { + msg_pinfo("WARNING: This firmware image does not " + "seem to fit to this machine - forcing it.\n"); + } else { + msg_pinfo("ERROR: Your firmware image (%s:%s) does not appear to\n" + " be correct for the detected mainboard (%s:%s)\n\n" + "Override with -p internal:boardmismatch=force to ignore the board name\n" + "in the firmware image or override the detected mainboard with\n" + "-p internal:mainboard=<vendor>:<mainboard>.\n\n", + mainboard_vendor, mainboard_part, lb_vendor, lb_part); + return 1; + } + } + + return 0; +} + static unsigned long compute_checksum(void *addr, unsigned long length) { uint8_t *ptr; diff --git a/flashrom.c b/flashrom.c index a925379..9544155 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1815,7 +1815,7 @@ int doit(struct flashctx *flash, int force, const char *filename, int read_it, #if CONFIG_INTERNAL == 1 if (programmer == PROGRAMMER_INTERNAL) - if (show_id(newcontents, size, force)) { + if (show_id(newcontents, size)) { ret = 1; goto out; } diff --git a/layout.c b/layout.c index 0512638..8663402 100644 --- a/layout.c +++ b/layout.c @@ -21,15 +21,10 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <ctype.h> #include <limits.h> #include "flash.h" #include "programmer.h" -#if CONFIG_INTERNAL == 1 -char *mainboard_vendor = NULL; -char *mainboard_part = NULL; -#endif static int romimages = 0; #define MAX_ROMLAYOUT 32 @@ -49,102 +44,6 @@ static char *include_args[MAX_ROMLAYOUT]; static int num_include_args = 0; /* the number of valid entries. */ static romlayout_t rom_entries[MAX_ROMLAYOUT]; -#if CONFIG_INTERNAL == 1 /* FIXME: Move the whole block to cbtable.c? */ -static char *def_name = "DEFAULT"; - -int show_id(uint8_t *bios, int size, int force) -{ - unsigned int *walk; - unsigned int mb_part_offset, mb_vendor_offset; - char *mb_part, *mb_vendor; - - mainboard_vendor = def_name; - mainboard_part = def_name; - - walk = (unsigned int *)(bios + size - 0x10); - walk--; - - if ((*walk) == 0 || ((*walk) & 0x3ff) != 0) { - /* We might have an NVIDIA chipset BIOS which stores the ID - * information at a different location. - */ - walk = (unsigned int *)(bios + size - 0x80); - walk--; - } - - /* - * Check if coreboot last image size is 0 or not a multiple of 1k or - * bigger than the chip or if the pointers to vendor ID or mainboard ID - * are outside the image of if the start of ID strings are nonsensical - * (nonprintable and not \0). - */ - mb_part_offset = *(walk - 1); - mb_vendor_offset = *(walk - 2); - if ((*walk) == 0 || ((*walk) & 0x3ff) != 0 || (*walk) > size || - mb_part_offset > size || mb_vendor_offset > size) { - msg_pinfo("Flash image seems to be a legacy BIOS. " - "Disabling coreboot-related checks.\n"); - return 0; - } - - mb_part = (char *)(bios + size - mb_part_offset); - mb_vendor = (char *)(bios + size - mb_vendor_offset); - if (!isprint((unsigned char)*mb_part) || - !isprint((unsigned char)*mb_vendor)) { - msg_pinfo("Flash image seems to have garbage in the ID location." - " Disabling checks.\n"); - return 0; - } - - msg_pdbg("coreboot last image size " - "(not ROM size) is %d bytes.\n", *walk); - - mainboard_part = strdup(mb_part); - mainboard_vendor = strdup(mb_vendor); - msg_pdbg("Manufacturer: %s\n", mainboard_vendor); - msg_pdbg("Mainboard ID: %s\n", mainboard_part); - - /* - * If lb_vendor is not set, the coreboot table was - * not found. Nor was -p internal:mainboard=VENDOR:PART specified. - */ - if (!lb_vendor || !lb_part) { - msg_pinfo("Note: If the following flash access fails, try " - "-p internal:mainboard=<vendor>:<mainboard>.\n"); - return 0; - } - - /* These comparisons are case insensitive to make things - * a little less user^Werror prone. - */ - if (!strcasecmp(mainboard_vendor, lb_vendor) && - !strcasecmp(mainboard_part, lb_part)) { - msg_pdbg("This firmware image matches this mainboard.\n"); - } else { - if (force_boardmismatch) { - msg_pinfo("WARNING: This firmware image does not " - "seem to fit to this machine - forcing it.\n"); - } else { - msg_pinfo("ERROR: Your firmware image (%s:%s) does not " - "appear to\n" - " be correct for the detected " - "mainboard (%s:%s)\n\n" - "Override with -p internal:boardmismatch=" - "force to ignore the board name in the\n" - "firmware image or override the detected " - "mainboard with\n" - "-p internal:mainboard=<vendor>:<mainboard>." - "\n\n", - mainboard_vendor, mainboard_part, lb_vendor, - lb_part); - return 1; - } - } - - return 0; -} -#endif - #ifndef __LIBPAYLOAD__ int read_romlayout(char *name) { diff --git a/programmer.h b/programmer.h index 723374d..7d06be3 100644 --- a/programmer.h +++ b/programmer.h @@ -274,6 +274,7 @@ void cleanup_cpu_msr(void); /* cbtable.c */ void lb_vendor_dev_from_string(const char *boardstring); +int show_id(uint8_t *bios, int size); int coreboot_init(void); extern char *lb_part, *lb_vendor; extern int partvendor_from_cbtable; @@ -478,9 +479,6 @@ void check_chip_supported(const struct flashctx *flash); int check_max_decode(enum chipbustype buses, uint32_t size); char *extract_programmer_param(const char *param_name); -/* layout.c */ -int show_id(uint8_t *bios, int size, int force); - /* spi.c */ enum spi_controller { SPI_CONTROLLER_NONE, -- Kind regards, Stefan Tauner

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom