flashrom June 2011

flashrom@flashrom.org

50 participants
297 discussions

Start a nNew thread

[PATCH] don't print dmidecode shell error
by Stefan Reinauer 27 Jun '11

27 Jun '11

See patch

5 10

flashrom -V output
by DeLa 27 Jun '11

27 Jun '11

flashrom v0.9.3-r1357 on Linux 2.6.38-8-generic (i686), built with libpci 3.1.7, GCC 4.5.2, little endian flashrom is free software, get the source code at http://www.flashrom.org Calibrating delay loop... OS timer resolution is 3 usecs, 1352M loops per second, 10 myus = 11 us, 100 myus = 102 us, 1000 myus = 998 us, 10000 myus = 10012 us, 12 myus = 13 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "To Be Filled By O.E.M." DMI string system-product-name: "To Be Filled By O.E.M." DMI string system-version: "To Be Filled By O.E.M." DMI string baseboard-manufacturer: " " DMI string baseboard-product-name: "ALiveNF6G-GLAN" DMI string baseboard-version: " " DMI string chassis-type: "Desktop" Found chipset "NVIDIA MCP61", enabling flash write... chipset PCI ID is 10de:03e0, This chipset is not really supported yet. Guesswork... ISA/LPC bridge reg 0x8a contents: 0x00, bit 6 is 0, bit 5 is 0 Flash bus type is LPC Found SMBus device 10de:03eb at 00:01:1 MCP SPI BAR is at 0x00000000 MCP SPI is not used. Please send the output of "flashrom -V" to flashrom(a)flashrom.org with your board name: flashrom -V as the subject to help us finish support for your chipset. Thanks. OK. This chipset supports the following protocols: LPC. Probing for AMIC A49LF040A, 512 kB: probe_jedec_common: id1 0xda, id2 0x50 Probing for PMC Pm49FL002, 256 kB: probe_jedec_common: id1 0xda, id2 0x50 Probing for PMC Pm49FL004, 512 kB: probe_jedec_common: id1 0xda, id2 0x50 Probing for SST SST49LF020, 256 kB: probe_jedec_common: id1 0xda, id2 0x50 Probing for SST SST49LF020A, 256 kB: probe_jedec_common: id1 0xda, id2 0x50 Probing for SST SST49LF040, 512 kB: probe_jedec_common: id1 0xda, id2 0x50 Probing for SST SST49LF040B, 512 kB: probe_jedec_common: id1 0xda, id2 0x50 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 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 M50LPW116, 2048 kB: probe_82802ab: 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 0xda, id2 0x50 Probing for Winbond W39V040B, 512 kB: probe_jedec_common: id1 0xda, id2 0x50 Probing for Winbond W39V040C, 512 kB: probe_jedec_common: id1 0xda, id2 0x50 Found chip "Winbond W39V040C" (512 kB, LPC) at physical address 0xfff80000. Lockout bits: Hardware bootblock locking (#TBL) is not active. Hardware remaining chip locking (#WP) is not active.. 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 W49V002A, 256 kB: probe_jedec_common: id1 0xda, id2 0x50 === This flash part has status UNTESTED for operations: PROBE READ ERASE WRITE The test status of this chip may have been updated in the latest development version of flashrom. If you are running the latest development version, please email a report to flashrom(a)flashrom.org if any of the above operations work correctly for you with this flash part. Please include the flashrom output with the additional -V option for all operations you tested (-V, -Vr, -Vw, -VE), and mention which mainboard or programmer you tested. Please mention your board in the subject line. Thanks for your help! No operations were specified. Restoring PCI config space for 00:01:0 reg 0x90 Restoring PCI config space for 00:01:0 reg 0x8c Restoring PCI config space for 00:01:0 reg 0x88

1 0

[PATCH 2/2] add printing of chip voltage ranges to print_wiki.c
by Stefan Tauner 27 Jun '11

27 Jun '11

- add voltage ranges - center some headers (test values OK, No, ? are centered via wiki templates) - fix style error in header (align:right -> text-align:right) Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- print_wiki.c | 46 ++++++++++++++++++++++++++++++++-------------- 1 files changed, 32 insertions(+), 14 deletions(-) diff --git a/print_wiki.c b/print_wiki.c index 6280aff..e1fe045 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -29,7 +29,8 @@ static const char wiki_header[] = "= Supported devices =\n\n\ <div style=\"margin-top:0.5em; padding:0.5em 0.5em 0.5em 0.5em; \ -background-color:#eeeeee; align:right; border:1px solid #aabbcc;\"><small>\n\ +background-color:#eeeeee; text-align:right; border:1px solid #aabbcc;\">\ +<small>\n\ Please do '''not''' edit these tables in the wiki directly, they are \ generated by pasting '''flashrom -z''' output.<br />\ '''Last update:''' %s(generated by flashrom %s)\n</small></div>\n"; @@ -37,12 +38,13 @@ generated by pasting '''flashrom -z''' output.<br />\ #if CONFIG_INTERNAL == 1 static const char chipset_th[] = "{| border=\"0\" style=\"font-size: smaller\"\n\ |- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Southbridge\n! align=\"left\" | PCI IDs\n\ -! align=\"left\" | Status\n\n"; +! align=\"left\" | Southbridge\n! align=\"center\" | PCI IDs\n\ +! align=\"center\" | Status\n\n"; static const char board_th[] = "{| border=\"0\" style=\"font-size: smaller\" \ valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Mainboard\n! align=\"left\" | Required option\n! align=\"left\" | Status\n\n"; +! align=\"left\" | Mainboard\n! align=\"left\" | Required option\n\ +! align=\"center\" | Status\n\n"; static const char board_intro[] = "\ \n== Supported mainboards ==\n\n\ @@ -57,20 +59,26 @@ not work (we don't know, someone has to give it a try). Please report any \ further verified mainboards on the [[Mailinglist|mailing list]].\n"; #endif -static const char chip_th[] = "{| border=\"0\" style=\"font-size: smaller\" \ -valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Device\n! align=\"left\" | Size / kB\n\ -! align=\"left\" | Type\n! align=\"left\" colspan=\"4\" | Status\n\n\ +static const char chip_th[] = "{\ +| border=\"0\" style=\"font-size: smaller\"valign=\"top\"\n\ +|- bgcolor=\"#6699dd\"\n\ +! align=\"left\" | Vendor\n\ +! align=\"left\" | Device\n\ +! align=\"center\" | Size [kB]\n\ +! align=\"center\" | Type\n\ +! align=\"center\" colspan=\"4\" | Status\n\ +! align=\"center\" colspan=\"2\" | Voltage [V]\n\n\ |- bgcolor=\"#6699ff\"\n| colspan=\"4\" |  \n\ -| Probe\n| Read\n| Erase\n| Write\n\n"; +| Probe\n| Read\n| Erase\n| Write\n\ +| align=\"center\" | min \n| align=\"center\" | max\n\n"; static const char programmer_section[] = "\ \n== Supported programmers ==\n\nThis is a list \ of supported PCI devices flashrom can use as programmer:\n\n{| border=\"0\" \ valign=\"top\"\n| valign=\"top\"|\n\n{| border=\"0\" style=\"font-size: \ smaller\" valign=\"top\"\n|- bgcolor=\"#6699dd\"\n! align=\"left\" | Vendor\n\ -! align=\"left\" | Device\n! align=\"left\" | PCI IDs\n\ -! align=\"left\" | Status\n\n"; +! align=\"left\" | Device\n! align=\"center\" | PCI IDs\n\ +! align=\"center\" | Status\n\n"; #if CONFIG_INTERNAL == 1 static const char laptop_intro[] = "\n== Supported laptops/notebooks ==\n\n\ @@ -204,6 +212,9 @@ static void print_supported_chips_wiki(int cols) const struct flashchip *f, *old = NULL; uint32_t t; char *s; + char vmax[6]; + char vmin[6]; + const char *na = "N/A"; for (f = flashchips; f->name != NULL; f++) chipcount++; @@ -223,8 +234,13 @@ static void print_supported_chips_wiki(int cols) t = f->tested; s = flashbuses_to_text(f->bustype); - printf("|- bgcolor=\"#%s\"\n| %s || %s || %d " - "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}\n", + sprintf(vmin, "%0.03f", f->voltage.min/(double)1000); + sprintf(vmax, "%0.03f", f->voltage.max/(double)1000); + /* '{{%s}}' is used in combination with 'OK', 'No' and '?3' to + * select special formatting templates for the bg color. */ + printf("|- bgcolor=\"#%s\"\n| %s || %s || align=\"right\" | %d " + "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}" + "|| %s || %s \n", (c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name, f->total_size, s, (t & TEST_OK_PROBE) ? "OK" : @@ -234,7 +250,9 @@ static void print_supported_chips_wiki(int cols) (t & TEST_OK_ERASE) ? "OK" : (t & TEST_BAD_ERASE) ? "No" : "?3", (t & TEST_OK_WRITE) ? "OK" : - (t & TEST_BAD_WRITE) ? "No" : "?3"); + (t & TEST_BAD_WRITE) ? "No" : "?3", + f->voltage.min ? vmin : na, + f->voltage.min ? vmax : na); free(s); /* Split table into 'cols' columns. */ -- 1.7.1

1 0

[PATCH 1/2] reformat -L output and add printing of chip voltage ranges to print.c
by Stefan Tauner 27 Jun '11

27 Jun '11

besides adding output for the voltage ranges, this patch also changes various aspects of the -L output: - sizes are right aligned now with a fixed length of 5 - space between columns is selectable with a constant - test results are always shown in the same column ("PR" and " R" instead of "PR" and "R ") - vendor and device names are split on a delimiter (currently '/') and spread over mutliple lines but only if the tokens are not too short. all other columns are printed on the first line of a chip. - voltage ranges are printed in verbose mode only it also gets rid of POS_PRINT and digits Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- print.c | 273 ++++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 216 insertions(+), 57 deletions(-) diff --git a/print.c b/print.c index b9f7a43..3f1fb3a 100644 --- a/print.c +++ b/print.c @@ -59,40 +59,68 @@ char *flashbuses_to_text(enum chipbustype bustype) return ret; } -#define POS_PRINT(x) do { pos += strlen(x); msg_ginfo(x); } while (0) - -static int digits(int n) -{ - int i; - - if (!n) - return 1; - - for (i = 0; n; ++i) - n /= 10; - - return i; -} - static void print_supported_chips(void) { - int okcol = 0, pos = 0, i, chipcount = 0; + const char *delim = "/"; + const int mintoklen = 5; + const int border = 2; + int i, chipcount = 0; int maxvendorlen = strlen("Vendor") + 1; int maxchiplen = strlen("Device") + 1; + int maxtypelen = strlen("Type") + 1; const struct flashchip *f; char *s; + char *tmpven, *tmpdev; + int tmpvenlen, tmpdevlen, curvenlen, curdevlen; + /* calculate maximum column widths and by iterating over all chips */ for (f = flashchips; f->name != NULL; f++) { /* Ignore "unknown XXXX SPI chip" entries. */ if (!strncmp(f->name, "unknown", 7)) continue; chipcount++; - maxvendorlen = max(maxvendorlen, strlen(f->vendor)); - maxchiplen = max(maxchiplen, strlen(f->name)); + + /* Find maximum vendor length (respecting line splitting). */ + tmpven = (char *)f->vendor; + do { + /* and take minimum token lengths into account */ + tmpvenlen = 0; + do { + tmpvenlen += strcspn(tmpven, delim); + /* skip to the address after the first token */ + tmpven += tmpvenlen; + if (tmpven[0] == '\0') + break; + tmpven++; + } while (tmpvenlen < mintoklen); + maxvendorlen = max(maxvendorlen, tmpvenlen); + if (tmpven[0] == '\0') + break; + } while (1); + + /* same for device name */ + tmpdev = (char *)f->name; + do { + tmpdevlen = 0; + do { + tmpdevlen += strcspn(tmpdev, delim); + tmpdev += tmpdevlen; + if (tmpdev[0] == '\0') + break; + tmpdev++; + } while (tmpdevlen < mintoklen); + maxchiplen = max(maxchiplen, tmpdevlen); + if (tmpdev[0] == '\0') + break; + } while (1); + + s = flashbuses_to_text(f->bustype); + maxtypelen = max(maxtypelen, strlen(s)); + free(s); } - maxvendorlen++; - maxchiplen++; - okcol = maxvendorlen + maxchiplen; + maxvendorlen += border; + maxchiplen += border; + maxtypelen += border; msg_ginfo("Supported flash chips (total: %d):\n\n", chipcount); msg_ginfo("Vendor"); @@ -102,10 +130,35 @@ static void print_supported_chips(void) for (i = strlen("Device"); i < maxchiplen; i++) msg_ginfo(" "); - msg_ginfo("Tested Known Size/kB: Type:\n"); - for (i = 0; i < okcol; i++) + msg_ginfo("Test"); + for (i = 0; i < border; i++) + msg_ginfo(" "); + msg_ginfo("Known"); + for (i = 0; i < border; i++) + msg_ginfo(" "); + msg_ginfo(" Size"); + for (i = 0; i < border; i++) + msg_ginfo(" "); + + msg_ginfo("Type"); + for (i = strlen("Type"); i < maxtypelen; i++) + msg_ginfo(" "); + msg_gdbg("Voltage"); + msg_ginfo("\n"); + + for (i = 0; i < maxvendorlen + maxchiplen; i++) + msg_ginfo(" "); + msg_ginfo("OK "); + for (i = 0; i < border; i++) + msg_ginfo(" "); + msg_ginfo("Broken"); + for (i = 0; i < border; i++) msg_ginfo(" "); - msg_ginfo("OK Broken\n\n"); + msg_ginfo("[kB]"); + for (i = 0; i < border + maxtypelen; i++) + msg_ginfo(" "); + msg_gdbg("range [V]"); + msg_ginfo("\n\n"); msg_ginfo("(P = PROBE, R = READ, E = ERASE, W = WRITE)\n\n"); for (f = flashchips; f->name != NULL; f++) { @@ -113,50 +166,156 @@ static void print_supported_chips(void) if (!strncmp(f->name, "unknown", 7)) continue; - msg_ginfo("%s", f->vendor); - for (i = strlen(f->vendor); i < maxvendorlen; i++) - msg_ginfo(" "); - msg_ginfo("%s", f->name); - for (i = strlen(f->name); i < maxchiplen; i++) - msg_ginfo(" "); - - pos = maxvendorlen + maxchiplen; - if ((f->tested & TEST_OK_MASK)) { - if ((f->tested & TEST_OK_PROBE)) - POS_PRINT("P "); - if ((f->tested & TEST_OK_READ)) - POS_PRINT("R "); - if ((f->tested & TEST_OK_ERASE)) - POS_PRINT("E "); - if ((f->tested & TEST_OK_WRITE)) - POS_PRINT("W "); + /* support for multiline vendor names: + * - make a copy of the original vendor name + * - use strok to put the first token in tmpven + * - keep track of the length of all tokens on the current line + * for ' '-padding in curvenlen + * - check if additional tokens should be printed on the current + * line + * - after all other values are printed print the surplus tokens + * on fresh lines + */ + tmpven = malloc(strlen(f->vendor) + 1); + if (tmpven == NULL) { + msg_gerr("Out of memory!\n"); + exit(1); } - while (pos < okcol + 9) { + strcpy(tmpven, f->vendor); + + tmpven = strtok(tmpven, delim); + msg_ginfo("%s", tmpven); + curvenlen = strlen(tmpven); + while ((tmpven = strtok(NULL, delim)) != NULL) { + msg_ginfo("%s", delim); + curvenlen++; + tmpvenlen = strlen(tmpven); + if (tmpvenlen >= mintoklen) + break; /* big enough to be on its own line */ + msg_ginfo("%s", tmpven); + curvenlen += tmpvenlen; + } + + for (i = curvenlen; i < maxvendorlen; i++) msg_ginfo(" "); - pos++; + + /* support for multiline device names as above */ + tmpdev = malloc(strlen(f->name) + 1); + if (tmpdev == NULL) { + msg_gerr("Out of memory!\n"); + exit(1); } - if ((f->tested & TEST_BAD_MASK)) { - if ((f->tested & TEST_BAD_PROBE)) - POS_PRINT("P "); - if ((f->tested & TEST_BAD_READ)) - POS_PRINT("R "); - if ((f->tested & TEST_BAD_ERASE)) - POS_PRINT("E "); - if ((f->tested & TEST_BAD_WRITE)) - POS_PRINT("W "); + strcpy(tmpdev, f->name); + + tmpdev = strtok(tmpdev, delim); + msg_ginfo("%s", tmpdev); + curdevlen = strlen(tmpdev); + while ((tmpdev = strtok(NULL, delim)) != NULL) { + msg_ginfo("%s", delim); + curdevlen++; + tmpdevlen = strlen(tmpdev); + if (tmpdevlen >= mintoklen) + break; /* big enough to be on its own line */ + msg_ginfo("%s", tmpdev); + curdevlen += tmpdevlen; } - while (pos < okcol + 18) { + for (i = curdevlen; i < maxchiplen; i++) msg_ginfo(" "); - pos++; - } - msg_ginfo("%d", f->total_size); - for (i = 0; i < 10 - digits(f->total_size); i++) + + if ((f->tested & TEST_OK_PROBE)) + msg_ginfo("P"); + else + msg_ginfo(" "); + if ((f->tested & TEST_OK_READ)) + msg_ginfo("R"); + else + msg_ginfo(" "); + if ((f->tested & TEST_OK_ERASE)) + msg_ginfo("E"); + else + msg_ginfo(" "); + if ((f->tested & TEST_OK_WRITE)) + msg_ginfo("W"); + else + msg_ginfo(" "); + for (i = 0; i < border; i++) + msg_ginfo(" "); + + if ((f->tested & TEST_BAD_PROBE)) + msg_ginfo("P"); + else + msg_ginfo(" "); + if ((f->tested & TEST_BAD_READ)) + msg_ginfo("R"); + else + msg_ginfo(" "); + if ((f->tested & TEST_BAD_ERASE)) + msg_ginfo("E"); + else + msg_ginfo(" "); + if ((f->tested & TEST_BAD_WRITE)) + msg_ginfo("W"); + else + msg_ginfo(" "); + for (i = 0; i < border + 1; i++) + msg_ginfo(" "); + + msg_ginfo("%5d", f->total_size); + for (i = 0; i < border; i++) msg_ginfo(" "); s = flashbuses_to_text(f->bustype); - msg_ginfo("%s\n", s); + msg_ginfo("%s", s); + for (i = strlen(s); i < maxtypelen; i++) + msg_ginfo(" "); free(s); + + if (f->voltage.min == 0 && f->voltage.max == 0) + msg_gdbg("no info"); + else + msg_gdbg("%0.02f;%0.02f", + f->voltage.min/(double)1000, + f->voltage.max/(double)1000); + + /* print surplus vendor and device name tokens */ + while (tmpven != NULL || tmpdev != NULL) { + msg_ginfo("\n"); + if (tmpven != NULL){ + msg_ginfo("%s", tmpven); + curvenlen = strlen(tmpven); + while ((tmpven = strtok(NULL, delim)) != NULL) { + msg_ginfo("%s", delim); + curvenlen++; + tmpvenlen = strlen(tmpven); + /* big enough to be on its own line */ + if (tmpvenlen >= mintoklen) + break; + msg_ginfo("%s", tmpven); + curvenlen += tmpvenlen; + } + } else + curvenlen = 0; + + for (i = curvenlen; i < maxvendorlen; i++) + msg_ginfo(" "); + + if (tmpdev != NULL){ + msg_ginfo("%s", tmpdev); + curdevlen = strlen(tmpdev); + while ((tmpdev = strtok(NULL, delim)) != NULL) { + msg_ginfo("%s", delim); + curdevlen++; + tmpdevlen = strlen(tmpdev); + /* big enough to be on its own line */ + if (tmpdevlen >= mintoklen) + break; + msg_ginfo("%s", tmpdev); + curdevlen += tmpdevlen; + } + } + } + msg_ginfo("\n"); } } -- 1.7.1

1 0

[PATCH 0/2] voltage printing 3.0
by Stefan Tauner 27 Jun '11

27 Jun '11

if you are still missing some feature in print_supported_chips please shoot me. and no, support for multiple delimiters is no such missing feature. Stefan Tauner (2): reformat -L output and add printing of chip voltage ranges to print.c add printing of chip voltage ranges to print_wiki.c print.c | 273 ++++++++++++++++++++++++++++++++++++++++++++++------------ print_wiki.c | 46 +++++++--- 2 files changed, 248 insertions(+), 71 deletions(-)

1 0

Re: [flashrom] [PATCH] add calculating and printing of MD5 hashes of flash and file contents
by Stefan Tauner 27 Jun '11

27 Jun '11

On Sun, 26 Jun 2011 03:02:44 +0200 Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> wrote: > The MD5 hashes of the files and flash contents are computed and printed whenever a file > or a whole flash device is read. This can be disabled by setting CONFIG_MD5 to no in the > makefile. > It uses a simple self-contained MD5 "library" with a permissive license in md5.[hc]. > Its author is added to the (new) acknowledgments section in the manpage. > because there seem to be a bit of misunderstanding on the purpose of printing md5 hashes: this should not help you when you are using flashrom correctly (md5sum et al. are fine) but the poor souls (and the ones helping fixing them stuff i.e. you) when they have misused flashrom in one or another way. this allows us to verify for every log we receive which file has been used (together with the upcoming log file patch) without costing much when dealing with untrustworthy third parties (== euphemism :). size of flashrom with md5 (and libftdi linked): text data bss dec hex filename 309905 1412 9960 321277 4e6fd flashrom without the patch at all: text data bss dec hex filename 306613 1412 9960 317985 4da21 flashrom i.e. ~1% of text size. the patch does integrate well and obviously i am pro using it, but i am not insisting on this at all if the majority objects it. i just thought it is a good idea and gave it a try :) -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

2 2

Re: [flashrom] [PATCH 2/4] fix memleaks due to incorrect usage of flashbuses_to_text
by Carl-Daniel Hailfinger 26 Jun '11

26 Jun '11

Am 18.06.2011 22:53 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > The memleak fixes are needed, but I'm not so happy about the long variable name for a temp. Could you just use tmp instead of tmp_bus_str or are there conflicts caused by other uses of tmp? > diff --git a/chipset_enable.c b/chipset_enable.c > index 0c77f07..70c9bae 100644 > --- a/chipset_enable.c > +++ b/chipset_enable.c > @@ -1206,6 +1206,7 @@ int chipset_flash_enable(void) > struct pci_dev *dev = NULL; > int ret = -2; /* Nothing! */ > int i; > + char *tmp_bus_str; > > /* Now let's try to find the chipset we have... */ > for (i = 0; chipset_enables[i].vendor_name != NULL; i++) { > @@ -1244,8 +1245,10 @@ int chipset_flash_enable(void) > msg_pinfo("PROBLEMS, continuing anyway\n"); > } > > + tmp_bus_str = flashbuses_to_text(buses_supported); > msg_pinfo("This chipset supports the following protocols: %s.\n", > - flashbuses_to_text(buses_supported)); > + tmp_bus_str); > + free(tmp_bus_str); > > return ret; > } > diff --git a/flashrom.c b/flashrom.c > index cfee1a1..3e400d1 100644 > --- a/flashrom.c > +++ b/flashrom.c > @@ -1119,7 +1119,7 @@ int probe_flash(int startchip, struct flashchip *fill_flash, int force) > char location[64]; > uint32_t size; > enum chipbustype buses_common; > - char *tmp; > + char *tmp_bus_str; > Is that change really needed? We don't use i_counter either. > > for (flash = flashchips + startchip; flash && flash->name; flash++) { > if (chip_to_probe && strcmp(flash->name, chip_to_probe) != 0) > @@ -1128,13 +1128,13 @@ int probe_flash(int startchip, struct flashchip *fill_flash, int force) > if (!buses_common) { > msg_gspew("Probing for %s %s, %d kB: skipped. ", > flash->vendor, flash->name, flash->total_size); > - tmp = flashbuses_to_text(buses_supported); > - msg_gspew("Host bus type %s ", tmp); > - free(tmp); > - tmp = flashbuses_to_text(flash->bustype); > + tmp_bus_str = flashbuses_to_text(buses_supported); > + msg_gspew("Host bus type %s ", tmp_bus_str); > + free(tmp_bus_str); > + tmp_bus_str = flashbuses_to_text(flash->bustype); > msg_gspew("and chip bus type %s are incompatible.", > - tmp); > - free(tmp); > + tmp_bus_str); > + free(tmp_bus_str); > msg_gspew("\n"); > continue; > } > @@ -1186,10 +1186,12 @@ notfound: > #endif > snprintf(location, sizeof(location), "on %s", programmer_table[programmer].name); > > + tmp_bus_str = flashbuses_to_text(flash->bustype); > msg_cinfo("%s chip \"%s %s\" (%d kB, %s) %s.\n", > force ? "Assuming" : "Found", > flash->vendor, flash->name, flash->total_size, > - flashbuses_to_text(flash->bustype), location); > + tmp_bus_str, location); > + free(tmp_bus_str); > > /* Flash registers will not be mapped if the chip was forced. Lock info > * may be stored in registers, so avoid lock info printing. > diff --git a/print.c b/print.c > index af3edc1..80316cb 100644 > --- a/print.c > +++ b/print.c > @@ -28,7 +28,7 @@ > > /* > * Return a string corresponding to the bustype parameter. > - * Memory is obtained with malloc() and can be freed with free(). > + * Memory is obtained with malloc() and must be freed with free() by the caller. > */ > char *flashbuses_to_text(enum chipbustype bustype) > { > @@ -80,6 +80,7 @@ static void print_supported_chips(void) > int maxvendorlen = strlen("Vendor") + 1; > int maxchiplen = strlen("Device") + 1; > const struct flashchip *f; > + char *tmp_bus_str; > > for (f = flashchips; f->name != NULL; f++) { > /* Ignore "unknown XXXX SPI chip" entries. */ > @@ -152,7 +153,11 @@ static void print_supported_chips(void) > msg_ginfo("%d", f->total_size); > for (i = 0; i < 10 - digits(f->total_size); i++) > msg_ginfo(" "); > - msg_ginfo("%s\n", flashbuses_to_text(f->bustype)); > + > + tmp_bus_str = flashbuses_to_text(f->bustype); > + msg_ginfo("%s", tmp_bus_str); > + free(tmp_bus_str); > + msg_ginfo("\n"); > } > } > > diff --git a/print_wiki.c b/print_wiki.c > index e9ccc8b..684c4e0 100644 > --- a/print_wiki.c > +++ b/print_wiki.c > @@ -203,6 +203,7 @@ static void print_supported_chips_wiki(int cols) > int i = 0, c = 1, chipcount = 0; > const struct flashchip *f, *old = NULL; > uint32_t t; > + char *tmp_bus_str; > > for (f = flashchips; f->name != NULL; f++) > chipcount++; > @@ -221,10 +222,11 @@ static void print_supported_chips_wiki(int cols) > c = !c; > > t = f->tested; > + tmp_bus_str = flashbuses_to_text(f->bustype); > printf("|- bgcolor=\"#%s\"\n| %s || %s || %d " > "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}\n", > (c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name, > - f->total_size, flashbuses_to_text(f->bustype), > + f->total_size, tmp_bus_str, > (t & TEST_OK_PROBE) ? "OK" : > (t & TEST_BAD_PROBE) ? "No" : "?3", > (t & TEST_OK_READ) ? "OK" : > @@ -233,6 +235,7 @@ static void print_supported_chips_wiki(int cols) > (t & TEST_BAD_ERASE) ? "No" : "?3", > (t & TEST_OK_WRITE) ? "OK" : > (t & TEST_BAD_WRITE) ? "No" : "?3"); > + free(tmp_bus_str); > > /* Split table into 'cols' columns. */ > if (i >= (chipcount / cols + 1)) { > Looks good otherwise. If you change the variable names, this is Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1357 - trunk
by repository service 26 Jun '11

26 Jun '11

Author: stefanct Date: Sun Jun 26 22:45:35 2011 New Revision: 1357 URL: http://flashrom.org/trac/flashrom/changeset/1357 Log: fix memleaks due to incorrect usage of flashbuses_to_text 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/chipset_enable.c trunk/flashrom.c trunk/print.c trunk/print_wiki.c Modified: trunk/chipset_enable.c ============================================================================== --- trunk/chipset_enable.c Sun Jun 26 20:28:58 2011 (r1356) +++ trunk/chipset_enable.c Sun Jun 26 22:45:35 2011 (r1357) @@ -1206,6 +1206,7 @@ struct pci_dev *dev = NULL; int ret = -2; /* Nothing! */ int i; + char *s; /* Now let's try to find the chipset we have... */ for (i = 0; chipset_enables[i].vendor_name != NULL; i++) { @@ -1244,8 +1245,9 @@ msg_pinfo("PROBLEMS, continuing anyway\n"); } - msg_pinfo("This chipset supports the following protocols: %s.\n", - flashbuses_to_text(buses_supported)); + s = flashbuses_to_text(buses_supported); + msg_pinfo("This chipset supports the following protocols: %s.\n", s); + free(s); return ret; } Modified: trunk/flashrom.c ============================================================================== --- trunk/flashrom.c Sun Jun 26 20:28:58 2011 (r1356) +++ trunk/flashrom.c Sun Jun 26 22:45:35 2011 (r1357) @@ -1186,10 +1186,11 @@ #endif snprintf(location, sizeof(location), "on %s", programmer_table[programmer].name); + tmp = flashbuses_to_text(flash->bustype); msg_cinfo("%s chip \"%s %s\" (%d kB, %s) %s.\n", - force ? "Assuming" : "Found", - fill_flash->vendor, fill_flash->name, fill_flash->total_size, - flashbuses_to_text(fill_flash->bustype), location); + force ? "Assuming" : "Found", fill_flash->vendor, + fill_flash->name, fill_flash->total_size, tmp, location); + free(tmp); /* Flash registers will not be mapped if the chip was forced. Lock info * may be stored in registers, so avoid lock info printing. Modified: trunk/print.c ============================================================================== --- trunk/print.c Sun Jun 26 20:28:58 2011 (r1356) +++ trunk/print.c Sun Jun 26 22:45:35 2011 (r1357) @@ -28,7 +28,7 @@ /* * Return a string corresponding to the bustype parameter. - * Memory is obtained with malloc() and can be freed with free(). + * Memory is obtained with malloc() and must be freed with free() by the caller. */ char *flashbuses_to_text(enum chipbustype bustype) { @@ -80,6 +80,7 @@ int maxvendorlen = strlen("Vendor") + 1; int maxchiplen = strlen("Device") + 1; const struct flashchip *f; + char *s; for (f = flashchips; f->name != NULL; f++) { /* Ignore "unknown XXXX SPI chip" entries. */ @@ -152,7 +153,10 @@ msg_ginfo("%d", f->total_size); for (i = 0; i < 10 - digits(f->total_size); i++) msg_ginfo(" "); - msg_ginfo("%s\n", flashbuses_to_text(f->bustype)); + + s = flashbuses_to_text(f->bustype); + msg_ginfo("%s\n", s); + free(s); } } Modified: trunk/print_wiki.c ============================================================================== --- trunk/print_wiki.c Sun Jun 26 20:28:58 2011 (r1356) +++ trunk/print_wiki.c Sun Jun 26 22:45:35 2011 (r1357) @@ -203,6 +203,7 @@ int i = 0, c = 1, chipcount = 0; const struct flashchip *f, *old = NULL; uint32_t t; + char *s; for (f = flashchips; f->name != NULL; f++) chipcount++; @@ -221,10 +222,11 @@ c = !c; t = f->tested; + s = flashbuses_to_text(f->bustype); printf("|- bgcolor=\"#%s\"\n| %s || %s || %d " "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}\n", (c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name, - f->total_size, flashbuses_to_text(f->bustype), + f->total_size, s, (t & TEST_OK_PROBE) ? "OK" : (t & TEST_BAD_PROBE) ? "No" : "?3", (t & TEST_OK_READ) ? "OK" : @@ -233,6 +235,7 @@ (t & TEST_BAD_ERASE) ? "No" : "?3", (t & TEST_OK_WRITE) ? "OK" : (t & TEST_BAD_WRITE) ? "No" : "?3"); + free(s); /* Split table into 'cols' columns. */ if (i >= (chipcount / cols + 1)) {

1 0

Re: [flashrom] [PATCH] make Makefile's test programs (more) -W safe
by Carl-Daniel Hailfinger 26 Jun '11

26 Jun '11

Am 24.06.2011 19:10 schrieb Stefan Tauner: > Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> > --- > Makefile | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Makefile b/Makefile > index 3dda8c2..5cbe034 100644 > --- a/Makefile > +++ b/Makefile > @@ -413,7 +413,7 @@ strip: $(PROGRAM)$(EXEC_SUFFIX) > compiler: featuresavailable > @printf "Checking for a C compiler... " > @$(shell ( echo "int main(int argc, char **argv)"; \ > - echo "{ return 0; }"; ) > .test.c ) > + echo "{ (void) argc; (void) argv; return 0; }"; ) > .test.c ) > @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .test.c -o .test$(EXEC_SUFFIX) >/dev/null && \ > echo "found." || ( echo "not found."; \ > rm -f .test.c .test$(EXEC_SUFFIX); exit 1) > @@ -427,7 +427,7 @@ pciutils: compiler > echo "#include <pci/pci.h>"; \ > echo "struct pci_access *pacc;"; \ > echo "int main(int argc, char **argv)"; \ > - echo "{ pacc = pci_alloc(); return 0; }"; ) > .test.c ) > + echo "{ (void) argc; (void) argv; pacc = pci_alloc(); return 0; }"; ) > .test.c ) > @$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >/dev/null 2>&1 && \ > echo "found." || ( echo "not found."; echo; \ > echo "Please install libpci headers (package pciutils-devel)."; \ > Ugh. Is this needed because some compiler complains about unused parameters? If yes, can you add that information to the commit message? That said, the same conversion is needed for CONFIG_FT2232_SPI=yes. If you take care of all argc/argv cases, this is Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Regards, Carl-Daniel -- http://www.hailfinger.org/

2 1

[commit] r1356 - trunk
by repository service 26 Jun '11

26 Jun '11

Author: stefanct Date: Sun Jun 26 20:28:58 2011 New Revision: 1356 URL: http://flashrom.org/trac/flashrom/changeset/1356 Log: make Makefile's test programs safe(r) we don't use -W or similarly strict compiler checks (yet), but enabling its use is a good thing. if you add -W to the cflags without this patch, detection of the compiler will fail with gcc 4.4 for example, because compiling of the test program will fail due to a warning of unused arguments and -Werror. similarly the other checks involving compiling test programs would fail. 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/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Jun 26 19:47:40 2011 (r1355) +++ trunk/Makefile Sun Jun 26 20:28:58 2011 (r1356) @@ -413,7 +413,7 @@ compiler: featuresavailable @printf "Checking for a C compiler... " @$(shell ( echo "int main(int argc, char **argv)"; \ - echo "{ return 0; }"; ) > .test.c ) + echo "{ (void) argc; (void) argv; return 0; }"; ) > .test.c ) @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .test.c -o .test$(EXEC_SUFFIX) >/dev/null && \ echo "found." || ( echo "not found."; \ rm -f .test.c .test$(EXEC_SUFFIX); exit 1) @@ -427,7 +427,7 @@ echo "#include <pci/pci.h>"; \ echo "struct pci_access *pacc;"; \ echo "int main(int argc, char **argv)"; \ - echo "{ pacc = pci_alloc(); return 0; }"; ) > .test.c ) + echo "{ (void) argc; (void) argv; pacc = pci_alloc(); return 0; }"; ) > .test.c ) @$(CC) -c $(CPPFLAGS) $(CFLAGS) .test.c -o .test.o >/dev/null 2>&1 && \ echo "found." || ( echo "not found."; echo; \ echo "Please install libpci headers (package pciutils-devel)."; \ @@ -469,7 +469,7 @@ @$(shell ( echo "#include <ftdi.h>"; \ echo "struct ftdi_context *ftdic = NULL;"; \ echo "int main(int argc, char **argv)"; \ - echo "{ return ftdi_init(ftdic); }"; ) > .featuretest.c ) + echo "{ (void) argc; (void) argv; return ftdi_init(ftdic); }"; ) > .featuretest.c ) @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) $(FTDILIBS) $(LIBS) >/dev/null 2>&1 && \ ( echo "found."; echo "FTDISUPPORT := yes" >> .features.tmp ) || \ ( echo "not found."; echo "FTDISUPPORT := no" >> .features.tmp ) @@ -477,7 +477,7 @@ @$(shell ( echo "#include <sys/utsname.h>"; \ echo "struct utsname osinfo;"; \ echo "int main(int argc, char **argv)"; \ - echo "{ uname (&osinfo); return 0; }"; ) > .featuretest.c ) + echo "{ (void) argc; (void) argv; uname (&osinfo); return 0; }"; ) > .featuretest.c ) @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) >/dev/null 2>&1 && \ ( echo "found."; echo "UTSNAME := yes" >> .features.tmp ) || \ ( echo "not found."; echo "UTSNAME := no" >> .features.tmp ) @@ -490,7 +490,7 @@ @$(shell ( echo "#include <sys/utsname.h>"; \ echo "struct utsname osinfo;"; \ echo "int main(int argc, char **argv)"; \ - echo "{ uname (&osinfo); return 0; }"; ) > .featuretest.c ) + echo "{ (void) argc; (void) argv; uname (&osinfo); return 0; }"; ) > .featuretest.c ) @$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) .featuretest.c -o .featuretest$(EXEC_SUFFIX) >/dev/null 2>&1 && \ ( echo "found."; echo "UTSNAME := yes" >> .features.tmp ) || \ ( echo "not found."; echo "UTSNAME := no" >> .features.tmp )

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom June 2011