flashrom

flashrom@flashrom.org

7 participants
9177 discussions

Re: [flashrom] MSI K8N Neo Platinum
by Stefan Tauner 15 Sep '12

15 Sep '12

On Sat, 15 Sep 2012 11:01:12 -0400 Jud Porter <judson.porter(a)gmail.com> wrote: > http://paste.flashrom.org/view.php?id=1390 > http://paste.flashrom.org/view.php?id=1391 This one needs a board enable just like the Neo2. Committed in r1597. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

[commit] r1597 - trunk
by repository service 15 Sep '12

15 Sep '12

Author: stefanct Date: Sat Sep 15 17:51:09 2012 New Revision: 1597 URL: http://flashrom.org/trac/flashrom/changeset/1597 Log: Add board enable for MSI K8N Neo Platinum. It's the same as for the Neo2. Thanks to roxfan and twice11 who did the RE! Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Tested-by: Jud Porter Acked-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> Modified: trunk/board_enable.c trunk/print.c Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Fri Sep 7 10:27:46 2012 (r1596) +++ trunk/board_enable.c Sat Sep 15 17:51:09 2012 (r1597) @@ -1165,6 +1165,7 @@ /* * Suited for: + * - MSI K8N Neo Platinum: Socket 754 + nForce3 Ultra + CK8 * - MSI K8N Neo2 Platinum: Socket 939 + nForce3 Ultra + CK8 */ static int nvidia_mcp_gpio0c_raise(void) @@ -2404,6 +2405,7 @@ {0x8086, 0x24d3, 0x1462, 0x7880, 0x8086, 0x2570, 0, 0, NULL, NULL, NULL, P3, "MSI", "MS-6788-040 (848P NeoV)", 0, OK, intel_ich_gpio32_raise}, {0x1039, 0x7012, 0x1462, 0x0050, 0x1039, 0x6325, 0x1462, 0x0058, NULL, NULL, NULL, P3, "MSI", "MS-7005 (651M-L)", 0, OK, sis_gpio0_raise_and_w836xx_memw}, {0x10DE, 0x00E0, 0x1462, 0x0250, 0x10DE, 0x00E1, 0x1462, 0x0250, NULL, NULL, NULL, P3, "MSI", "MS-7025 (K8N Neo2 Platinum)", 0, OK, nvidia_mcp_gpio0c_raise}, + {0x10DE, 0x00E0, 0x1462, 0x0300, 0x10DE, 0x00E1, 0x1462, 0x0300, NULL, NULL, NULL, P3, "MSI", "MS-7030 (K8N Neo Platinum)", 0, OK, nvidia_mcp_gpio0c_raise}, {0x8086, 0x2658, 0x1462, 0x7046, 0x1106, 0x3044, 0x1462, 0x046d, NULL, NULL, NULL, P3, "MSI", "MS-7046", 0, OK, intel_ich_gpio19_raise}, {0x8086, 0x244b, 0x1462, 0x3910, 0x8086, 0x2442, 0x1462, 0x3910, NULL, NULL, NULL, P3, "MSI", "MS-6391 (845 Pro4)", 0, OK, intel_ich_gpio23_raise}, {0x1106, 0x3149, 0x1462, 0x7061, 0x1106, 0x3227, 0, 0, NULL, NULL, NULL, P3, "MSI", "MS-7061 (KM4M-V/KM4AM-V)", 0, OK, w836xx_memw_enable_2e}, Modified: trunk/print.c ============================================================================== --- trunk/print.c Fri Sep 7 10:27:46 2012 (r1596) +++ trunk/print.c Sat Sep 15 17:51:09 2012 (r1597) @@ -895,6 +895,7 @@ B("MSI", "MS-6787 (P4MAM-V/P4MAM-L)", OK, "http://www.msi.com/service/search/?kw=6787&type=product", NULL), B("MSI", "MS-7005 (651M-L)", OK, "http://www.msi.com/product/mb/651M-L.html", NULL), B("MSI", "MS-7025 (K8N Neo2 Platinum)", OK, "http://www.msi.com/product/mb/K8N-Neo2-Platinum.html", NULL), + B("MSI", "MS-7030 (K8N Neo Platinum)", OK, "http://www.msi.com/product/mb/K8N-Neo-Platinum.html", NULL), B("MSI", "MS-7046", OK, "http://www.heimir.de/ms7046/", NULL), B("MSI", "MS-7061 (KM4M-V/KM4AM-V)", OK, "http://www.msi.com/service/search/?kw=7061&type=product", NULL), B("MSI", "MS-7065", OK, "http://browse.geekbench.ca/geekbench2/view/53114", NULL),

1 0

MSI K8N Neo Platinum
by Jud Porter 15 Sep '12

15 Sep '12

http://paste.flashrom.org/view.php?id=1390 http://paste.flashrom.org/view.php?id=1391

1 0

Re: [flashrom] [coreboot] New laptop: Lenovo ThinkPad X230 tablet, with dumps to go with it
by Idwer Vollering 15 Sep '12

15 Sep '12

CC: flashrom(a)flashrom.org 2012/9/15 Keith Hui <buurin(a)gmail.com>: > Hi all, > > I'm back. With a new laptop. > > I'm now rocking a Lenovo x230 tablet, dual-booting Windows 7 and > Fuduntu, both 64-bit. Knowing the last time I contributed to coreboot > it was the good old 440BX when life was much simpler, it could be a > while before I can get up to speed again, so I'll for now just put > forth the obligatory lspci/superiotool dump to give any interested > parties a heads-up of what support needs to be programmed for. > > Another interesting thing is it does UEFI. > > Below is output of flashrom 0.9.6.1. I cannot get it to identify the > flash chip. lspci and superiotool dumps are attached. This thread mentions that it runs QM77: http://forums.lenovo.com/t5/X-Series-Tablet-ThinkPad-Laptops/X230-Tablet-Ch… > > # /usr/src/flashrom-0.9.6.1/flashrom -V -p internal > flashrom v0.9.6.1-r1564 on Linux 3.4.9-1.fu2012.x86_64 (x86_64) > flashrom is free software, get the source code at http://www.flashrom.org > > flashrom was built with libpci 3.1.7, GCC 4.6.3 20120306 (Red Hat > 4.6.3-2), little endian > Command line (3 args): /usr/src/flashrom-0.9.6.1/flashrom -V -p internal > Calibrating delay loop... OS timer resolution is 1 usecs, 3243M loops > per second, 10 myus = 10 us, 100 myus = 119 us, 1000 myus = 1026 us, > 10000 myus = 10097 us, 4 myus = 4 us, OK. > Initializing internal programmer > No coreboot table found. > DMI string system-manufacturer: "LENOVO" > DMI string system-product-name: "3434CTO" > DMI string system-version: "ThinkPad X230 Tablet" > DMI string baseboard-manufacturer: "LENOVO" > DMI string baseboard-product-name: "3434CTO" > DMI string baseboard-version: "Not Available" > DMI string chassis-type: "Notebook" > Laptop detected via DMI. > W836xx enter config mode worked or we were already in config mode. > W836xx leave config mode had no effect. > Active config mode, unknown reg 0x20 ID: 00. > Please send the output of "flashrom -V" to > flashrom(a)flashrom.org with W836xx: your board name: flashrom -V > as the subject to help us finish support for your Super I/O. Thanks. > ======================================================================== > WARNING! You seem to be running flashrom on an unsupported laptop. > Laptops, notebooks and netbooks are difficult to support and we > recommend to use the vendor flashing utility. The embedded controller > (EC) in these machines often interacts badly with flashing. > See http://www.flashrom.org/Laptops for details. Also, see the "Laptops" section in flashrom's man page. > > If flash is shared with the EC, erase is guaranteed to brick your laptop > and write may brick your laptop. > Read and probe may irritate your EC and cause fan failure, backlight > failure and sudden poweroff. > You have been warned. > ======================================================================== > Aborting. > Error: Programmer initialization failed. You'll want to do a little investigation on which external programmer [1] suits your needs. [1] http://flashrom.org/Supported_programmers

1 0

[PATCH] Fix flashrom running on boards with coreboot.
by Stefan Tauner 14 Sep '12

14 Sep '12

In r1577 we removed the discrimination of coreboot IDs and user-specified mainboards. The problem is that the board enable code required to find a board enable if either of these model strings were set. Therefore boards running coreboot that do not need a board enable failed to execute flashrom since then. This patch fixes this by handling coreboot IDs and user-supplied IDs differently again. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- board_enable.c | 20 +++++++++++++++----- internal.c | 10 +++------- programmer.h | 2 +- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/board_enable.c b/board_enable.c index 2668f10..bdd5ebb 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2493,7 +2493,6 @@ static const struct board_match *board_match_name(const char *vendor, const char if (partmatch) return partmatch; - msg_perr("No suitable board enable found for vendor=\"%s\", model=\"%s\".\n", vendor, model); return NULL; } @@ -2603,16 +2602,27 @@ void board_handle_before_laptop(void) board_handle_phase(P2); } -int board_flash_enable(const char *vendor, const char *model) +int board_flash_enable(const char *vendor, const char *model, const char *cb_vendor, const char *cb_model) { const struct board_match *board = NULL; int ret = 0; - if (vendor && model) { + if (cb_vendor != NULL && cb_model != NULL) { + board = board_match_name(cb_vendor, cb_model); + if (!board) { /* Failure is an option here, because many cb boards don't require an enable. */ + msg_pdbg2("No board enable found matching coreboot IDs vendor=\"%s\", model=\"%s\".\n", + vendor, model); + } + } + if (board == NULL && vendor && model) { board = board_match_name(vendor, model); - if (!board) /* if a board was given it has to match, else we abort here. */ + if (!board) { /* If a board was given by the user it has to match, else we abort here. */ + msg_perr("No suitable board enable found for vendor=\"%s\", model=\"%s\".\n", + vendor, model); return 1; - } else { + } + } + if (board == NULL) { board = board_match_pci_ids(P3); if (!board) /* i.e. there is just no board enable available for this board */ return 0; diff --git a/internal.c b/internal.c index 7b6cff2..b4414a5 100644 --- a/internal.c +++ b/internal.c @@ -257,12 +257,8 @@ int internal_init(void) } #if defined(__i386__) || defined(__x86_64__) - if (cb_parse_table(&cb_vendor, &cb_model) == 0) { /* coreboot IDs valid */ - /* If no -p internal:mainboard was given but there are valid coreboot IDs then use those. */ - if (board_vendor == NULL || board_model == NULL) { - board_vendor = cb_vendor; - board_model = cb_model; - } else if (strcasecmp(board_vendor, cb_vendor) || strcasecmp(board_model, cb_model)) { + if ((cb_parse_table(&cb_vendor, &cb_model) == 0) && (board_vendor != NULL) && (board_model != NULL)) { + if (strcasecmp(board_vendor, cb_vendor) || strcasecmp(board_model, cb_model)) { msg_pinfo("WARNING: The mainboard IDs set by -p internal:mainboard (%s:%s) do not\n" " match the current coreboot IDs of the mainboard (%s:%s).\n", board_vendor, board_model, cb_vendor, cb_model); @@ -339,7 +335,7 @@ int internal_init(void) init_superio_ite(); #endif - if (board_flash_enable(board_vendor, board_model)) { + if (board_flash_enable(board_vendor, board_model, cb_vendor, cb_model)) { msg_perr("Aborting to be safe.\n"); return 1; } diff --git a/programmer.h b/programmer.h index 51b9c40..dedec67 100644 --- a/programmer.h +++ b/programmer.h @@ -256,7 +256,7 @@ void sio_write(uint16_t port, uint8_t reg, uint8_t data); void sio_mask(uint16_t port, uint8_t reg, uint8_t data, uint8_t mask); void board_handle_before_superio(void); void board_handle_before_laptop(void); -int board_flash_enable(const char *vendor, const char *model); +int board_flash_enable(const char *vendor, const char *model, const char *cb_vendor, const char *cb_model); /* chipset_enable.c */ int chipset_flash_enable(void); -- Kind regards, Stefan Tauner

1 0

[PATCH 3/3] Fix memleak in the dummyflasher.
by Stefan Tauner 13 Sep '12

13 Sep '12

emu_persistent_image was not freed correctly. This bug was found thanks to valgrind. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- dummyflasher.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dummyflasher.c b/dummyflasher.c index 2803f76..655b678 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -150,8 +150,9 @@ static int dummy_shutdown(void *data) if (emu_chip != EMULATE_NONE) { if (emu_persistent_image) { msg_pdbg("Writing %s\n", emu_persistent_image); - write_buf_to_file(flashchip_contents, emu_chip_size, - emu_persistent_image); + write_buf_to_file(flashchip_contents, emu_chip_size, emu_persistent_image); + free(emu_persistent_image); + emu_persistent_image = NULL; } free(flashchip_contents); } -- Kind regards, Stefan Tauner

1 0

[PATCH 2/3] Fix memleaks in cli_classic.c.
by Stefan Tauner 13 Sep '12

13 Sep '12

Frees the memory allocated for the following strings - log file name - layout file name - image file name - programmer parameter (and reset the associated global variable in flashrom.c) Also, free the flashchip structs allocated by probe_flash. The layout image names were not fixed due to the pending layout patches. These bugs were found thanks to valgrind. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- cli_classic.c | 15 +++++++++++++++ flashrom.c | 1 + 2 files changed, 16 insertions(+) diff --git a/cli_classic.c b/cli_classic.c index 58696ad..a120532 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -146,7 +146,9 @@ int main(int argc, char *argv[]) char *filename = NULL; char *layoutfile = NULL; +#ifndef STANDALONE char *logfile = NULL; +#endif /* !STANDALONE */ char *tempstr = NULL; char *pparam = NULL; @@ -235,6 +237,8 @@ int main(int argc, char *argv[]) tempstr = strdup(optarg); if (register_include_arg(tempstr)) cli_classic_abort_usage(); + /* FIXME: The image name is saved in a static array by register_include_arg() and + * needs to be freed after processing them. */ break; case 'L': if (++operation_specified > 1) { @@ -352,6 +356,7 @@ int main(int argc, char *argv[]) cli_classic_abort_usage(); if (logfile && open_logfile(logfile)) return 1; + free(logfile); #endif /* !STANDALONE */ #if CONFIG_PRINT_WIKI == 1 @@ -478,6 +483,7 @@ int main(int argc, char *argv[]) } msg_cinfo("Please note that forced reads most likely contain garbage.\n"); ret = read_flash_to_file(&flashes[0], filename); + free(flashes[0].chip); goto out_shutdown; } ret = 1; @@ -522,6 +528,15 @@ int main(int argc, char *argv[]) out_shutdown: programmer_shutdown(); out: + for (i = 0; i < chipcount; i++) + free(flashes[i].chip); + + free(filename); + free(layoutfile); + free(pparam); + /* clean up global variables */ + free(chip_to_probe); + chip_to_probe = NULL; #ifndef STANDALONE ret |= close_logfile(); #endif /* !STANDALONE */ diff --git a/flashrom.c b/flashrom.c index fdc5412..68ed652 100644 --- a/flashrom.c +++ b/flashrom.c @@ -351,6 +351,7 @@ int programmer_shutdown(void) int i = --shutdown_fn_count; ret |= shutdown_fn[i].func(shutdown_fn[i].data); } + programmer_param = NULL; return ret; } -- Kind regards, Stefan Tauner

1 0

[PATCH 1/3] Fix memleaks in dmi.c.
by Stefan Tauner 13 Sep '12

13 Sep '12

In dmi_init() we populate static char *dmistrings[] with values that get later compared in dmi_match(). Those strings are actually strduped in get_dmi_string() and hence need to be freed later. This patch accomplishes this by registering another shutdown method. This bug was found thanks to valgrind. Signed-off-by: Stefan Tauner <stefan.tauner(a)student.tuwien.ac.at> --- dmi.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dmi.c b/dmi.c index dfc78e9..fd260a6 100644 --- a/dmi.c +++ b/dmi.c @@ -144,16 +144,28 @@ static char *get_dmi_string(const char *string_name) result = strdup(answerbuf); if (!result) - puts("WARNING: Out of memory - DMI support fails"); + msg_perr("WARNING: Out of memory - DMI support fails"); return result; } +static int dmi_shutdown(void *data) +{ + int i; + for (i = 0; i < ARRAY_SIZE(dmistrings); i++) { + free(dmistrings[i]); + } + return 0; +} + void dmi_init(void) { int i; char *chassis_type; + if (register_shutdown(dmi_shutdown, NULL)) + return; + has_dmi_support = 1; for (i = 0; i < ARRAY_SIZE(dmidecode_names); i++) { dmistrings[i] = get_dmi_string(dmidecode_names[i]); -- Kind regards, Stefan Tauner

1 0

[PATCH 0/3] Fix memleaks
by Stefan Tauner 13 Sep '12

13 Sep '12

This is probably just a start, but these patches are fixes for the most trivial problems valgrind was able to find in my tests. The libpci code leaks a lot and the cli_classic_abort_usage() function needs to die sooner than later... and the layout patches need to be merged eventually ;) For reusable variables it may make sense to create a cleanup function or macro like this: #define clean(p) free(p);(p) = NULL what do you think? Stefan Tauner (3): Fix memleaks in dmi.c. Fix memleaks in cli_classic.c. Fix memleak in the dummyflasher. cli_classic.c | 15 +++++++++++++++ dmi.c | 14 +++++++++++++- dummyflasher.c | 5 +++-- flashrom.c | 1 + 4 files changed, 32 insertions(+), 3 deletions(-) -- Kind regards, Stefan Tauner

1 0

[PATCH] Add board enable for ASUS M3N78-EM.
by Stefan Tauner 12 Sep '12

12 Sep '12

From: Joshua Roys <roysjosh(a)gmail.com> This does not work* (yet), but we want to keep it in patchwork for further refinement. * http://paste.flashrom.org/view.php?id=954 --- board_enable.c | 12 ++++++++++++ chipset_enable.c | 15 ++++++++++++++- mcp6x_spi.c | 11 +++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/board_enable.c b/board_enable.c index 2668f10..540eb7d 100644 --- a/board_enable.c +++ b/board_enable.c @@ -878,6 +878,17 @@ static int board_msi_kt4v(void) return ret; } +static int board_asus_m3n78em_enable(void) +{ + uint8_t tmp; + + tmp = INB(0xA02); + tmp |= 0x01; + OUTB(tmp, 0xA02); + + return 0; +} + /* * Suited for: * - ASUS P5A @@ -2323,6 +2334,7 @@ const struct board_match board_matches[] = { {0x10de, 0x0264, 0x1043, 0x81bc, 0x10de, 0x02f0, 0x1043, 0x81cd, NULL, NULL, NULL, P3, "ASUS", "A8N-VM CSM", 0, OK, w83627ehf_gpio22_raise_2e}, {0x10DE, 0x0264, 0x1043, 0x81C0, 0x10DE, 0x0260, 0x1043, 0x81C0, NULL, NULL, NULL, P3, "ASUS", "M2NBP-VM CSM", 0, OK, nvidia_mcp_gpio0_raise}, {0x1106, 0x1336, 0x1043, 0x80ed, 0x1106, 0x3288, 0x1043, 0x8249, NULL, NULL, NULL, P3, "ASUS", "M2V-MX", 0, OK, via_vt823x_gpio5_raise}, + {0x10de, 0x075c, 0x1043, 0x82f2, 0x10de, 0x0752, 0x1043, 0x82f2, NULL, NULL, NULL, P3, "ASUS", "M3N78-EM", 0, OK, board_asus_m3n78em_enable}, {0x8086, 0x24cc, 0, 0, 0x8086, 0x24c3, 0x1043, 0x1869, "^M6Ne$", NULL, NULL, P3, "ASUS", "M6Ne", 0, NT, intel_ich_gpio43_raise}, {0x8086, 0x7180, 0, 0, 0x8086, 0x7110, 0, 0, "^OPLX-M$", NULL, NULL, P3, "ASUS", "OPLX-M", 0, NT, intel_piix4_gpo18_lower}, {0x8086, 0x7190, 0, 0, 0x8086, 0x7110, 0, 0, "^P2B-N$", NULL, NULL, P3, "ASUS", "P2B-N", 0, OK, intel_piix4_gpo18_lower}, diff --git a/chipset_enable.c b/chipset_enable.c index e1684f9..07b7671 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -1157,6 +1157,8 @@ static int enable_flash_mcp6x_7x(struct pci_dev *dev, const char *name) msg_pinfo("This chipset is not really supported yet. Guesswork...\n"); + ret = enable_flash_mcp55(dev, name); + /* dev is the ISA bridge. No idea what the stuff below does. */ val = pci_read_byte(dev, 0x8a); msg_pdbg("ISA/LPC bridge reg 0x8a contents: 0x%02x, bit 6 is %i, bit 5 " @@ -1164,7 +1166,6 @@ static int enable_flash_mcp6x_7x(struct pci_dev *dev, const char *name) switch ((val >> 5) & 0x3) { case 0x0: - ret = enable_flash_mcp55(dev, name); internal_buses_supported = BUS_LPC; msg_pdbg("Flash bus type is LPC\n"); break; @@ -1198,6 +1199,18 @@ static int enable_flash_mcp6x_7x(struct pci_dev *dev, const char *name) if (mcp6x_spi_init(want_spi)) ret = 1; + rpci_write_byte(dev, 0x8e, 0x00); + if (pci_read_byte(dev, 0x8e) != 0x00) { + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", 0x8e, 0x00, name); + } + + rpci_write_byte(dev, 0x8f, 0x00); + if (pci_read_byte(dev, 0x8f) != 0x00) { + msg_pinfo("Setting register 0x%x to 0x%x on %s failed " + "(WARNING ONLY).\n", 0x8f, 0x00, name); + } + out_msg: msg_pinfo("Please send the output of \"flashrom -V\" to " "flashrom(a)flashrom.org with\n" diff --git a/mcp6x_spi.c b/mcp6x_spi.c index ac40557..abe8e0d 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -104,6 +104,7 @@ static const struct bitbang_spi_master bitbang_spi_master_mcp6x = { int mcp6x_spi_init(int want_spi) { + uint8_t old, new; uint16_t status; uint32_t mcp6x_spibaraddr; struct pci_dev *smbusdev; @@ -125,6 +126,16 @@ int mcp6x_spi_init(int want_spi) smbusdev->bus, smbusdev->dev, smbusdev->func); + old = pci_read_byte(smbusdev, 0xe7); + new = old | 0x80; + if (new != old) { + rpci_write_byte(smbusdev, 0xe7, new); + if (pci_read_byte(smbusdev, 0xe7) != new) { + msg_pinfo("Setting register 0x%x to 0x%x failed " + "(WARNING ONLY).\n", 0xe7, new); + } + } + /* Locate the BAR where the SPI interface lives. */ mcp6x_spibaraddr = pci_read_long(smbusdev, 0x74); /* BAR size is 64k, bits 15..4 are zero, bit 3..0 declare a -- 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