flashrom

flashrom@flashrom.org

5 participants
9186 discussions

Report for successful operation: WRITE on Lanner EM-8510C V1.1B (Flash SST49LF004A/B)
by Christian Motz 18 Jun '11

18 Jun '11

To whom it may concern, I just tested the WRITE operation with the SVN r1216 version of flashrom on a Lanner EM-8510C mainboard (V1.1B, chip "SST SST49LF004A/B") with POSITIVE result. Attached find the log of the operation (flashrom -Vw) as requested. Best regards, -- Christian Motz Software Engineer Funkwerk IP-Appliances GmbH Mönchhaldenstr. 28 D-70191 Stuttgart Tel: +49 711 900300 - 66 Fax: +49 711 900300 - 90 E-Mail: christian.motz(a)funkwerk-ec.com Location: GmbH Nuernberg, Local Court Nuernberg, HRB 25481 Managing Directors: Bernd Büttner -------------------------------- The information contained in this e-mail has been carefully researched, but the possibility of it being inapplicable in individual cases cannot be ruled out. We therefore regret that we cannot accept responsibility or liability of any kind whatsoever for the correctness of the information given. Please notify us if you discover that information is inapplicable.

2 1

Asus P5VD1-X: Instant success
by Olle Gross 18 Jun '11

18 Jun '11

Hi, just wanted to tell that i successfully flashed the bios of my old Asus P5VD1-X with flashrom, so i guess it could be added to the supported list. Attaching output of flashrom -V, lspci -nnvvvxxx, superiotool -deV. New bios version 0704 downloaded from asus.com, can't link directly cos they require captcha for download. Everything works just fine, and the bios menu reports the new version. Just one thing that might or might not be of any importance, i noted that lspci reports the board as "ASUSTeK Computer Inc. P4V800D-X Mainboard [1043:8199]". This is wrong, it's a P5VD1-X - at least it says so on the board. You think this could cause any problems, or is it just cosmetic? Regards, Olof

2 1

SST39SF020A write ok, and message question
by Andrew Morgan 18 Jun '11

18 Jun '11

Log attached. When running 'flashrom' on its own I got this message: This flash part has status UNTESTED for operations: 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! Should the text "Please mention your board in the subject line." in this case say "flash part" or "flash chp" instead of "board"? I'm assuming the board name is important for un-tested boards or board enables, whereas in this case it is the flash chip name which is important? -- Andrew.

2 1

Success report: Tyan S2723
by Uwe Hermann 18 Jun '11

18 Jun '11

Hi, I tested flashrom on the Tyan S2723 board, works fine. Logs attached. Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

1 1

Test results for flashrom on Asus P5N32-E SLI motherboard
by Paul Brookman 18 Jun '11

18 Jun '11

This is the output from flashing the bios chip on an Asus P5N32-E motherboard. Flashrom worked without a problem backing up and updating the bios. Many thanks, Paul Brookman

2 1

Re: [flashrom] Flashrom Feedback
by Uwe Hermann 18 Jun '11

18 Jun '11

Hi, On Thu, Oct 07, 2010 at 02:00:38PM +0100, Andrew Wierzan wrote: > I have successfully flashed ASUS P7H57-D-EVO using the current trunk at svn://coreboot.org/flashrom/trunk (trunk @ 1199). I used an Ubuntu 9.1 Live USB environment and followed the guide on the downloads page. > > The latest Asus BIOS (1606) for this board disables the ability to roll-back bios version using their own utility EZFlash. Many many thanks for continuing this project, it's saved a lot of hassle :) Thanks, we marked that board as supported. Sorry for the delay. Uwe. -- http://hermann-uwe.de | http://sigrok.org http://randomprojects.org | http://unmaintained-free-software.org

1 0

[commit] r1345 - trunk
by repository service 18 Jun '11

18 Jun '11

Author: uwe Date: Sun Jun 19 00:56:14 2011 New Revision: 1345 URL: http://flashrom.org/trac/flashrom/changeset/1345 Log: Various board status updates. Mark the following boards as OK: - ASUS P7H57D-V EVO (reported by Andrew Wierzan <andrew(a)emerginguk.com>) http://www.flashrom.org/pipermail/flashrom/2010-October/005042.html - Tyan S2723 (Tiger i7501) (reported by Uwe Hermann <uwe(a)hermann-uwe.de>) http://www.flashrom.org/pipermail/flashrom/2010-October/005156.html - ASUS P5VD1-X (reported by Olle Gross <gusgross(a)student.gu.se>) http://www.flashrom.org/pipermail/flashrom/2010-October/005205.html - Lanner EM-8510C (reported by Christian Motz <christian.motz(a)funkwerk-ec.com>) http://www.flashrom.org/pipermail/flashrom/2010-October/005240.html - ASUS A8N-VM (reported by Dave B <flashrom(a)d10.karoo.co.uk>) http://www.flashrom.org/pipermail/flashrom/2010-October/005247.html - GIGABYTE GA-6VXE7+ (reported by Justin Doiel <justin.doiel(a)gmail.com>) http://www.flashrom.org/pipermail/flashrom/2010-October/005251.html - Supermicro X7SPA-HF (reported by Jochen Schulz <ml(a)well-adjusted.de>) http://www.flashrom.org/pipermail/flashrom/2010-November/005346.html - ASUS M4A78-EM (reported by Jani Uusitalo <jani(a)mummila.net>) http://www.flashrom.org/pipermail/flashrom/2010-December/005587.html - ASUS P5N32-E SLI (reported by Paul Brookman <paul_brookman(a)sky.com>) http://www.flashrom.org/pipermail/flashrom/2010-December/005559.html Mark the following chips as OK: - SST SST39SF020A (reported by Andrew Morgan <ziltro(a)ziltro.com>) http://www.flashrom.org/pipermail/flashrom/2010-October/005107.html - ST M25P80 (reported by Harald Gutmann <harald.gutmann(a)gmx.net>) http://www.flashrom.org/pipermail/flashrom/2010-November/005334.html Signed-off-by: Uwe Hermann <uwe(a)hermann-uwe.de> Acked-by: Uwe Hermann <uwe(a)hermann-uwe.de> Modified: trunk/flashchips.c trunk/print.c Modified: trunk/flashchips.c ============================================================================== --- trunk/flashchips.c Sat Jun 18 20:45:56 2011 (r1344) +++ trunk/flashchips.c Sun Jun 19 00:56:14 2011 (r1345) @@ -5798,7 +5798,7 @@ .total_size = 256, .page_size = 4096, .feature_bits = FEATURE_EITHER_RESET, - .tested = TEST_OK_PRE, + .tested = TEST_OK_PREW, .probe = probe_jedec, .probe_timing = 1, /* 150 ns */ .block_erasers = @@ -6597,7 +6597,7 @@ .model_id = ST_M25P80, .total_size = 1024, .page_size = 256, - .tested = TEST_OK_PR, + .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = Modified: trunk/print.c ============================================================================== --- trunk/print.c Sat Jun 18 20:45:56 2011 (r1344) +++ trunk/print.c Sun Jun 19 00:56:14 2011 (r1345) @@ -420,6 +420,7 @@ B("ASUS", "A8N-LA (Nagami-GL8E)", 1, "http://h10025.www1.hp.com/ewfrf/wc/document?lc=en&cc=us&docname=c00647121&d…", "This is an OEM board from HP, the HP name is Nagami-GL8E."), B("ASUS", "A8N-SLI", 1, "http://www.asus.com/product.aspx?P_ID=J9FKa8z2xVId3pDK", NULL), B("ASUS", "A8N-SLI Premium", 1, "http://www.asus.com/product.aspx?P_ID=nbulqxniNmzf0mH1", NULL), + B("ASUS", "A8N-VM", 1, "http://www.asus.com/Motherboards/AMD_Socket_939/A8NVM/", NULL), B("ASUS", "A8N-VM CSM", 1, "http://www.asus.com/product.aspx?P_ID=JBqqlpj4cspbSa3s", NULL), B("ASUS", "A8NE-FM/S", 1, "http://www.hardwareschotte.de/hardware/preise/proid_1266090/preis_ASUS+A8NE…", NULL), B("ASUS", "A8V Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=tvpdgPNCPaABZRVU", NULL), @@ -439,6 +440,7 @@ B("ASUS", "M2V-MX", 1, "http://www.asus.com/product.aspx?P_ID=7grf8Ci4yxnqzt3z", NULL), B("ASUS", "M3A76-CM", 1, NULL, NULL), B("ASUS", "M3A78-EM", 1, "http://www.asus.com/product.aspx?P_ID=KjpYqzmAd9vsTM2D", NULL), + B("ASUS", "M4A78-EM", 1, "http://www.asus.com/product.aspx?P_ID=0KyowHKUFAQqH2DO", NULL), B("ASUS", "M4A785TD-M EVO", 1, "http://www.asus.com/product.aspx?P_ID=QHbvGVB1mXmmD8qQ", NULL), B("ASUS", "M4A79T Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=lhJiLTN5huPfCVkW", NULL), B("ASUS", "M4A87TD/USB3", 1, "http://www.asus.com/product.aspx?P_ID=nlWYrI9wlNIYHAaa", NULL), @@ -470,11 +472,14 @@ B("ASUS", "P5KC", 1, "http://www.asus.com/product.aspx?P_ID=fFZ8oUIGmLpwNMjj", NULL), B("ASUS", "P5L-MX", 1, "http://www.asus.com/product.aspx?P_ID=X70d3NCzH2DE9vWH", NULL), B("ASUS", "P5GD1 Pro", 1, "http://www.asus.com/product.aspx?P_ID=50M49xQh71EZOeM1", NULL), + B("ASUS", "P5N32-E SLI", 1, "http://www.asus.com/product.aspx?P_ID=vBZLIBtPzYB2bLcb", NULL), B("ASUS", "P5ND2-SLI Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=WY7XroDuUImVbgp5", NULL), B("ASUS", "P5PE-VM", 1, "http://www.asus.com/product.aspx?P_ID=k3h0ZFVu9Lo1dUvk", NULL), + B("ASUS", "P5VD1-X", 1, "http://www.asus.com/Motherboards/Intel_Socket_775/P5VD1X/", NULL), B("ASUS", "P6T SE", 1, "http://www.asus.com/product.aspx?P_ID=t4yhK6y9W9o7iQ9E", NULL), B("ASUS", "P6T Deluxe", 1, "http://www.asus.com/product.aspx?P_ID=vXixf82co6Q5v0BZ", NULL), B("ASUS", "P6T Deluxe V2", 1, "http://www.asus.com/product.aspx?P_ID=iRlP8RG9han6saZx", NULL), + B("ASUS", "P7H57D-V EVO", 1, "http://www.asus.com/Motherboards/Intel_Socket_1156/P7H57DV_EVO/", NULL), B("ASUS", "Z8NA-D6C", 1, "http://www.asus.com/product.aspx?P_ID=k81cpN8uEB01BpQ6", NULL), B("BCOM", "WinNET100", 1, "http://www.coreboot.org/BCOM_WINNET100", "Used in the IGEL-316 thin client."), B("Biostar", "M6TBA", 0, "ftp://ftp.biostar-usa.com/manuals/M6TBA/", "No public report found. Owned by Uwe Hermann <uwe(a)hermann-uwe.de>. May work now."), @@ -509,6 +514,7 @@ B("GIGABYTE", "GA-6BXC", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1445", NULL), B("GIGABYTE", "GA-6BXDU", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1429", NULL), B("GIGABYTE", "GA-6IEM", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1379", NULL), + B("GIGABYTE", "GA-6VXE7+", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=2410", NULL), B("GIGABYTE", "GA-6ZMA", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=1541", NULL), B("GIGABYTE", "GA-MA785GMT-UD2H", 1, "http://www.gigabyte.de/Products/Motherboard/Products_Overview.aspx?ProductI…", NULL), B("GIGABYTE", "GA-770TA-UD3", 1, "http://www.gigabyte.com/products/product-page.aspx?pid=3272#ov", NULL), @@ -557,6 +563,7 @@ B("IWILL", "DK8-HTX", 1, "http://web.archive.org/web/20060507170150/http://www.iwill.net/product_2.as…", NULL), B("Jetway", "J7F4K1G5D-PB", 1, "http://www.jetway.com.tw/jetway/system/productshow2.asp?id=389&proname=J7F4…", NULL), B("Kontron", "986LCD-M", 1, "http://de.kontron.com/products/boards+and+mezzanines/embedded+motherboards/…", NULL), + B("Lanner", "EM-8510C", 1, NULL, NULL), B("Lex", "CV700A", 1, "http://www.lex.com.tw/product/CV700A-spec.htm", NULL), B("Mitac", "6513WU", 1, "http://web.archive.org/web/20050313054828/http://www.mitac.com/micweb/produ…", NULL), B("MSI", "MS-6153", 1, "http://www.msi.com/index.php?func=proddesc&maincat_no=1&prod_no=336", NULL), @@ -622,6 +629,7 @@ B("Sun", "Fire x4600", 0, "http://www.sun.com/servers/x64/x4600/", "No public report found. May work now."), B("Supermicro", "H8QC8", 1, "http://www.supermicro.com/Aplus/motherboard/Opteron/nforce/H8QC8.cfm", NULL), B("Supermicro", "X5DP8-G2", 1, "http://www.supermicro.com/products/motherboard/Xeon/E7501/X5DP8-G2.cfm", NULL), + B("Supermicro", "X7SPA-HF", 1, "http://www.supermicro.com/products/motherboard/ATOM/ICH9/X7SPA.cfm?typ=H&IP…", NULL), B("Supermicro", "X8DT3", 1, "http://www.supermicro.com/products/motherboard/QPI/5500/X8DT3.cfm", NULL), B("Supermicro", "X8DTH-6F", 1, "http://www.supermicro.com/products/motherboard/QPI/5500/X8DTH-6F.cfm", NULL), B("Supermicro", "X8DTT-F", 1, "http://www.supermicro.com/products/motherboard/QPI/5500/X8DTT-F.cfm", NULL), @@ -637,6 +645,7 @@ B("Tyan", "S1846 (Tsunami ATX)", 1, "http://www.tyan.com/archive/products/html/tsunamiatx.html", NULL), B("Tyan", "S2466 (Tiger MPX)", 1, "http://www.tyan.com/product_board_detail.aspx?pid=461", NULL), B("Tyan", "S2498 (Tomcat K7M)", 1, "http://www.tyan.com/archive/products/html/tomcatk7m.html", NULL), + B("Tyan", "S2723 (Tiger i7501)", 1, "http://www.tyan.com/archive/products/html/tigeri7501.html", NULL), B("Tyan", "S2881 (Thunder K8SR)", 1, "http://www.tyan.com/product_board_detail.aspx?pid=115", NULL), B("Tyan", "S2882 (Thunder K8S Pro)", 1, "http://www.tyan.com/product_board_detail.aspx?pid=121", NULL), B("Tyan", "S2882-D (Thunder K8SD Pro)", 1, "http://www.tyan.com/product_board_detail.aspx?pid=127", NULL),

1 0

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

18 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 684c4e0..e2b2eca 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 *tmp_bus_str; + char tmp_max_str[6]; + char tmp_min_str[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; tmp_bus_str = flashbuses_to_text(f->bustype); - printf("|- bgcolor=\"#%s\"\n| %s || %s || %d " - "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}\n", + sprintf(tmp_min_str, "%0.03f", f->voltage.min/(double)1000); + sprintf(tmp_max_str, "%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, tmp_bus_str, (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 ? tmp_min_str : na, + f->voltage.min ? tmp_max_str : na); free(tmp_bus_str); /* Split table into 'cols' columns. */ -- 1.7.1

1 0

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

18 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 - test results are always shown in the same column ("PR" and " R" instead of "PR" and "R ") - get rid of POS_PRINT and digits - wideness reductions on the whole with a remarkable detail: vendor names are split on '/' and spread over mutliple lines while all other columns are printed on the first line. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- print.c | 149 +++++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 102 insertions(+), 47 deletions(-) diff --git a/print.c b/print.c index 80316cb..b110ff9 100644 --- a/print.c +++ b/print.c @@ -59,27 +59,16 @@ 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; + int i, chipcount = 0; int maxvendorlen = strlen("Vendor") + 1; int maxchiplen = strlen("Device") + 1; + int maxtypelen = strlen("Type") + 1; const struct flashchip *f; + const char *delim ="/"; + char *tmp_ven_str; + int tmp_ven_len; char *tmp_bus_str; for (f = flashchips; f->name != NULL; f++) { @@ -87,12 +76,22 @@ static void print_supported_chips(void) if (!strncmp(f->name, "unknown", 7)) continue; chipcount++; - maxvendorlen = max(maxvendorlen, strlen(f->vendor)); + tmp_ven_str = (char *)f->vendor; + do { + tmp_ven_len = strcspn(tmp_ven_str, delim); + maxvendorlen = max(maxvendorlen, tmp_ven_len); + tmp_ven_str += tmp_ven_len; + } while (tmp_ven_len != 0); + maxchiplen = max(maxchiplen, strlen(f->name)); + tmp_bus_str = flashbuses_to_text(f->bustype); + maxtypelen = max(maxtypelen, + strlen(flashbuses_to_text(f->bustype))); + free(tmp_bus_str); } - maxvendorlen++; - maxchiplen++; - okcol = maxvendorlen + maxchiplen; + maxvendorlen += 1; + maxchiplen += 1; + maxtypelen += 1; msg_ginfo("Supported flash chips (total: %d):\n\n", chipcount); msg_ginfo("Vendor"); @@ -102,10 +101,21 @@ 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 Known Size "); + + 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 Broken [kB]"); + for (i = 0; i < maxtypelen; i++) msg_ginfo(" "); - msg_ginfo("OK Broken\n\n"); + 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 +123,95 @@ 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++) + /* support for multiline vendor names: + * - make a copy of the original vendor name + * - use strok to put the next token in tmp_ven_str repeatedly + * - keep track of the last token's length for ' '-padding + */ + tmp_ven_str = malloc(strlen(f->vendor) + 1); + if (tmp_ven_str == NULL) { + msg_gerr("Out of memory!\n"); + exit(1); + } + strcpy(tmp_ven_str, f->vendor); + + tmp_ven_str = strtok(tmp_ven_str, delim); + tmp_ven_len = strlen(tmp_ven_str); + msg_ginfo("%s", tmp_ven_str); + tmp_ven_str = strtok(NULL, delim); + if (tmp_ven_str != NULL) { + msg_ginfo("%s", delim); + tmp_ven_len++; + } + + for (i = tmp_ven_len; 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 "); + msg_ginfo("P"); + else + msg_ginfo(" "); if ((f->tested & TEST_OK_READ)) - POS_PRINT("R "); + msg_ginfo("R"); + else + msg_ginfo(" "); if ((f->tested & TEST_OK_ERASE)) - POS_PRINT("E "); + msg_ginfo("E"); + else + msg_ginfo(" "); if ((f->tested & TEST_OK_WRITE)) - POS_PRINT("W "); - } - while (pos < okcol + 9) { - msg_ginfo(" "); - pos++; - } + msg_ginfo("W "); + else + msg_ginfo(" "); + } else + msg_ginfo(" "); + if ((f->tested & TEST_BAD_MASK)) { if ((f->tested & TEST_BAD_PROBE)) - POS_PRINT("P "); + msg_ginfo("P"); + else + msg_ginfo(" "); if ((f->tested & TEST_BAD_READ)) - POS_PRINT("R "); + msg_ginfo("R"); + else + msg_ginfo(" "); if ((f->tested & TEST_BAD_ERASE)) - POS_PRINT("E "); + msg_ginfo("E"); + else + msg_ginfo(" "); if ((f->tested & TEST_BAD_WRITE)) - POS_PRINT("W "); - } + msg_ginfo("W "); + else + msg_ginfo(" "); + } else + msg_ginfo(" "); - while (pos < okcol + 18) { - msg_ginfo(" "); - pos++; - } - msg_ginfo("%d", f->total_size); - for (i = 0; i < 10 - digits(f->total_size); i++) - msg_ginfo(" "); + msg_ginfo("%5d ", f->total_size); tmp_bus_str = flashbuses_to_text(f->bustype); msg_ginfo("%s", tmp_bus_str); + for (i = strlen(tmp_bus_str); + i < maxtypelen; + i++) + msg_ginfo(" "); free(tmp_bus_str); + + 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); + + while (tmp_ven_str != NULL) { + msg_ginfo("\n%s", tmp_ven_str); + tmp_ven_str = strtok(NULL, delim); + } msg_ginfo("\n"); } } -- 1.7.1

1 0

[PATCH 2/4] fix memleaks due to incorrect usage of flashbuses_to_text
by Stefan Tauner 18 Jun '11

18 Jun '11

Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- chipset_enable.c | 5 ++++- flashrom.c | 18 ++++++++++-------- print.c | 9 +++++++-- print_wiki.c | 5 ++++- 4 files changed, 25 insertions(+), 12 deletions(-) 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; 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)) { -- 1.7.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom