Author: stefanct Date: Tue Sep 25 23:08:41 2012 New Revision: 1606 URL: http://flashrom.org/trac/flashrom/changeset/1606
Log: Whitelist known working Thinkpads of the T60 and X60 series.
This should get rid of the need to specify the laptop force parameter on T60 and X60 series Thinkpads (including T60s and X60s) that are using one of the Intel 94x northbridges and are known to have no interfering EC. Please note that although the EC is no problem, flashrom is not able to access the entire flash chip with the vendor BIOS, see the coreboot wiki for details: http://www.coreboot.org/Lenovo_x60x
Signed-off-by: Stefan Tauner stefan.tauner@student.tuwien.ac.at Acked-by: Paul Menzel paulepanter@users.sourceforge.net
Modified: trunk/board_enable.c
Modified: trunk/board_enable.c ============================================================================== --- trunk/board_enable.c Mon Sep 24 23:29:29 2012 (r1605) +++ trunk/board_enable.c Tue Sep 25 23:08:41 2012 (r1606) @@ -2243,6 +2243,17 @@ return 0; }
+/* + * Suited for all laptops, which are known to *not* have interfering embedded controllers. + */ +static int p2_whitelist_laptop(void) +{ + is_laptop = 1; + laptop_ok = 1; + msg_pdbg("Whitelisted laptop detected.\n"); + return 0; +} + #endif
/* @@ -2396,6 +2407,8 @@ {0x8086, 0x7190, 0, 0, 0x8086, 0x7110, 0, 0, "^SE440BX-2$", NULL, NULL, P3, "Intel", "SE440BX-2", 0, NT, intel_piix4_gpo27_lower}, {0x1022, 0x7468, 0, 0, 0x1022, 0x7460, 0, 0, NULL, "iwill", "dk8_htx", P3, "IWILL", "DK8-HTX", 0, OK, w83627hf_gpio24_raise_2e}, {0x8086, 0x27A0, 0x8086, 0x27a0, 0x8086, 0x27b8, 0x8086, 0x27b8, NULL, "kontron", "986lcd-m", P3, "Kontron", "986LCD-M", 0, OK, board_kontron_986lcd_m}, + {0x8086, 0x27a0, 0x17aa, 0x2017, 0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad T60", NULL, NULL, P2, "Lenovo", "T60(s)", 0, OK, p2_whitelist_laptop}, + {0x8086, 0x27a0, 0x17aa, 0x2017, 0x8086, 0x27b9, 0x17aa, 0x2009, "^ThinkPad X60", NULL, NULL, P2, "Lenovo", "X60(s)", 0, OK, p2_whitelist_laptop}, {0x8086, 0x2411, 0x8086, 0x2411, 0x8086, 0x7125, 0x0e11, 0xb165, NULL, NULL, NULL, P3, "Mitac", "6513WU", 0, OK, board_mitac_6513wu}, {0x8086, 0x8186, 0x8086, 0x8186, 0x8086, 0x8800, 0x0000, 0x0000, "^MSC Vertriebs GmbH$", NULL, NULL, P2, "MSC", "Q7-TCTC", 0, OK, p2_not_a_laptop}, {0x10DE, 0x005E, 0x1462, 0x7125, 0x10DE, 0x0052, 0x1462, 0x7125, NULL, NULL, NULL, P3, "MSI", "K8N Neo4-F", 0, OK, nvidia_mcp_gpio2_raise}, /* TODO: Should probably be K8N Neo4 Platinum, see http://www.coreboot.org/pipermail/flashrom/2010-August/004362.html. */
On Tue, Sep 25, 2012 at 11:08:41PM +0200, repository service wrote:
Author: stefanct Date: Tue Sep 25 23:08:41 2012 New Revision: 1606 URL: http://flashrom.org/trac/flashrom/changeset/1606
Log: Whitelist known working Thinkpads of the T60 and X60 series.
Not working here, see output of flashrom, lspci and beginning of dmidecode.
Ciao Jörg
jmayer@egg:~/work/bios/coreboot/flashrom/trunk> sudo flashrom -V -r fff -p internal flashrom v0.9.6.1-r1610 on Linux 3.1.10-1.16-desktop (i686) flashrom is free software, get the source code at http://www.flashrom.org
flashrom was built with libpci 3.1.7, GCC 4.7.2 20120920 [gcc-4_7-branch revision 191568], little endian Command line (5 args): flashrom -V -r fff -p internal Calibrating delay loop... OS timer resolution is 2 usecs, 1319M loops per second, 10 myus = 11 us, 100 myus = 100 us, 1000 myus = 1003 us, 10000 myus = 10005 us, 8 myus = 9 us, OK. Initializing internal programmer No coreboot table found. DMI string system-manufacturer: "LENOVO" DMI string system-product-name: "200763G" DMI string system-version: "ThinkPad T60" DMI string baseboard-manufacturer: "LENOVO" DMI string baseboard-product-name: "200763G" DMI string baseboard-version: "Not Available" DMI string chassis-type: "Notebook" Laptop detected via DMI. ======================================================================== 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.
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.
jmayer@egg:~/work/bios/coreboot/flashrom/trunk> lspci -nnv 00:00.0 Host bridge [0600]: Intel Corporation Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub [8086:27a0] (rev 03) Subsystem: Lenovo ThinkPad T60 [17aa:2015] Flags: bus master, fast devsel, latency 0 Capabilities: <access denied>
00:01.0 PCI bridge [0604]: Intel Corporation Mobile 945GM/PM/GMS, 943/940GML and 945GT Express PCI Express Root Port [8086:27a1] (rev 03) (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=01, subordinate=01, sec-latency=0 I/O behind bridge: 00002000-00002fff Memory behind bridge: ee100000-ee1fffff Prefetchable memory behind bridge: 00000000d8000000-00000000dfffffff Capabilities: <access denied> Kernel driver in use: pcieport
00:1b.0 Audio device [0403]: Intel Corporation N10/ICH 7 Family High Definition Audio Controller [8086:27d8] (rev 02) Subsystem: Lenovo ThinkPad T60/R60 series [17aa:2010] Flags: bus master, fast devsel, latency 0, IRQ 47 Memory at ee400000 (64-bit, non-prefetchable) [size=16K] Capabilities: <access denied> Kernel driver in use: snd_hda_intel
00:1c.0 PCI bridge [0604]: Intel Corporation N10/ICH 7 Family PCI Express Port 1 [8086:27d0] (rev 02) (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=02, subordinate=02, sec-latency=0 I/O behind bridge: 00003000-00003fff Memory behind bridge: ee000000-ee0fffff Prefetchable memory behind bridge: 00000000c0000000-00000000c01fffff Capabilities: <access denied> Kernel driver in use: pcieport
00:1c.1 PCI bridge [0604]: Intel Corporation N10/ICH 7 Family PCI Express Port 2 [8086:27d2] (rev 02) (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=03, subordinate=03, sec-latency=0 I/O behind bridge: 00004000-00005fff Memory behind bridge: ec000000-edffffff Prefetchable memory behind bridge: 00000000e4000000-00000000e40fffff Capabilities: <access denied> Kernel driver in use: pcieport
00:1c.2 PCI bridge [0604]: Intel Corporation N10/ICH 7 Family PCI Express Port 3 [8086:27d4] (rev 02) (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=04, subordinate=0b, sec-latency=0 I/O behind bridge: 00006000-00007fff Memory behind bridge: e8000000-e9ffffff Prefetchable memory behind bridge: 00000000e4100000-00000000e41fffff Capabilities: <access denied> Kernel driver in use: pcieport
00:1c.3 PCI bridge [0604]: Intel Corporation N10/ICH 7 Family PCI Express Port 4 [8086:27d6] (rev 02) (prog-if 00 [Normal decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=0c, subordinate=13, sec-latency=0 I/O behind bridge: 00008000-00009fff Memory behind bridge: ea000000-ebffffff Prefetchable memory behind bridge: 00000000e4200000-00000000e42fffff Capabilities: <access denied> Kernel driver in use: pcieport
00:1d.0 USB Controller [0c03]: Intel Corporation N10/ICH 7 Family USB UHCI Controller #1 [8086:27c8] (rev 02) (prog-if 00 [UHCI]) Subsystem: Lenovo ThinkPad T60/R60 series [17aa:200a] Flags: bus master, medium devsel, latency 0, IRQ 16 I/O ports at 1800 [size=32] Kernel driver in use: uhci_hcd
00:1d.1 USB Controller [0c03]: Intel Corporation N10/ICH 7 Family USB UHCI Controller #2 [8086:27c9] (rev 02) (prog-if 00 [UHCI]) Subsystem: Lenovo ThinkPad T60/R60 series [17aa:200a] Flags: bus master, medium devsel, latency 0, IRQ 17 I/O ports at 1820 [size=32] Kernel driver in use: uhci_hcd 00:1d.2 USB Controller [0c03]: Intel Corporation N10/ICH 7 Family USB UHCI Controller #3 [8086:27ca] (rev 02) (prog-if 00 [UHCI]) Subsystem: Lenovo ThinkPad T60/R60 series [17aa:200a] Flags: bus master, medium devsel, latency 0, IRQ 18 I/O ports at 1840 [size=32] Kernel driver in use: uhci_hcd
00:1d.3 USB Controller [0c03]: Intel Corporation N10/ICH 7 Family USB UHCI Controller #4 [8086:27cb] (rev 02) (prog-if 00 [UHCI]) Subsystem: Lenovo ThinkPad T60/R60 series [17aa:200a] Flags: bus master, medium devsel, latency 0, IRQ 19 I/O ports at 1860 [size=32] Kernel driver in use: uhci_hcd
00:1d.7 USB Controller [0c03]: Intel Corporation N10/ICH 7 Family USB2 EHCI Controller [8086:27cc] (rev 02) (prog-if 20 [EHCI]) Subsystem: Lenovo ThinkPad T60/R60 series [17aa:200b] Flags: bus master, medium devsel, latency 0, IRQ 19 Memory at ee404000 (32-bit, non-prefetchable) [size=1K] Capabilities: <access denied> Kernel driver in use: ehci_hcd
00:1e.0 PCI bridge [0604]: Intel Corporation 82801 Mobile PCI Bridge [8086:2448] (rev e2) (prog-if 01 [Subtractive decode]) Flags: bus master, fast devsel, latency 0 Bus: primary=00, secondary=15, subordinate=18, sec-latency=32 I/O behind bridge: 0000a000-0000dfff Memory behind bridge: e4300000-e7ffffff Prefetchable memory behind bridge: 00000000e0000000-00000000e3ffffff Capabilities: <access denied>
00:1f.0 ISA bridge [0601]: Intel Corporation 82801GBM (ICH7-M) LPC Interface Bridge [8086:27b9] (rev 02) Subsystem: Lenovo ThinkPad T60/R60 series [17aa:2009] Flags: bus master, medium devsel, latency 0 Capabilities: <access denied>
00:1f.1 IDE interface [0101]: Intel Corporation 82801G (ICH7 Family) IDE Controller [8086:27df] (rev 02) (prog-if 8a [Master SecP PriP]) Subsystem: Lenovo ThinkPad T60/R60 series [17aa:200c] Flags: bus master, medium devsel, latency 0, IRQ 16 I/O ports at 01f0 [size=8] I/O ports at 03f4 [size=1] I/O ports at 0170 [size=8] I/O ports at 0374 [size=1] I/O ports at 1880 [size=16] Kernel driver in use: ata_piix 00:1f.2 SATA controller [0106]: Intel Corporation 82801GBM/GHM (ICH7 Family) SATA AHCI Controller [8086:27c5] (rev 02) (prog-if 01 [AHCI 1.0]) Subsystem: Lenovo ThinkPad T60/R60 series [17aa:200d] Flags: bus master, 66MHz, medium devsel, latency 0, IRQ 45 I/O ports at 18c8 [size=8] I/O ports at 18ac [size=4] I/O ports at 18c0 [size=8] I/O ports at 18a8 [size=4] I/O ports at 18b0 [size=16] Memory at ee404400 (32-bit, non-prefetchable) [size=1K] Capabilities: <access denied> Kernel driver in use: ahci
00:1f.3 SMBus [0c05]: Intel Corporation N10/ICH 7 Family SMBus Controller [8086:27da] (rev 02) Subsystem: Lenovo ThinkPad T60/R60 series [17aa:200f] Flags: medium devsel, IRQ 23 I/O ports at 18e0 [size=32] Kernel driver in use: i801_smbus
01:00.0 VGA compatible controller [0300]: ATI Technologies Inc Radeon Mobility X1400 [1002:7145] (prog-if 00 [VGA controller]) Subsystem: Lenovo Thinkpad T60 model 2007 [17aa:2006] Flags: bus master, fast devsel, latency 0, IRQ 46 Memory at d8000000 (32-bit, prefetchable) [size=128M] I/O ports at 2000 [size=256] Memory at ee100000 (32-bit, non-prefetchable) [size=64K] [virtual] Expansion ROM at ee120000 [disabled] [size=128K] Capabilities: <access denied> Kernel driver in use: radeon 02:00.0 Ethernet controller [0200]: Intel Corporation 82573L Gigabit Ethernet Controller [8086:109a] Subsystem: Lenovo ThinkPad T60 [17aa:2001] Flags: bus master, fast devsel, latency 0, IRQ 48 Memory at ee000000 (32-bit, non-prefetchable) [size=128K] I/O ports at 3000 [size=32] Capabilities: <access denied> Kernel driver in use: e1000e
03:00.0 Network controller [0280]: Intel Corporation PRO/Wireless 3945ABG [Golan] Network Connection [8086:4227] (rev 02) Subsystem: Intel Corporation ThinkPad R60e/X60s [8086:1011] Flags: bus master, fast devsel, latency 0, IRQ 49 Memory at edf00000 (32-bit, non-prefetchable) [size=4K] Capabilities: <access denied> Kernel driver in use: iwl3945
15:00.0 CardBus bridge [0607]: Texas Instruments PCI1510 PC card Cardbus Controller [104c:ac56] Subsystem: Lenovo ThinkPad T60/R60 series [17aa:2012] Flags: bus master, medium devsel, latency 168, IRQ 16 Memory at e4300000 (32-bit, non-prefetchable) [size=4K] Bus: primary=15, secondary=16, subordinate=17, sec-latency=176 Memory window 0: e0000000-e3fff000 (prefetchable) Memory window 1: c4000000-c7fff000 I/O window 0: 0000a400-0000a4ff I/O window 1: 0000a000-0000a0ff 16-bit legacy interface ports at 0001 Kernel driver in use: yenta_cardbus
jmayer@egg:~/work/bios/coreboot/flashrom/trunk> sudo dmidecode # dmidecode 2.11 SMBIOS 2.4 present. 68 structures occupying 2250 bytes. Table at 0x000E0010.
Handle 0x0000, DMI type 0, 24 bytes BIOS Information Vendor: LENOVO Version: 79ETE7WW (2.27 ) Release Date: 03/21/2011 Address: 0xDC000 Runtime Size: 144 kB ROM Size: 2048 kB Characteristics: PCI is supported PC Card (PCMCIA) is supported PNP is supported BIOS is upgradeable BIOS shadowing is allowed ESCD support is available Boot from CD is supported Selectable boot is supported BIOS ROM is socketed EDD is supported ACPI is supported USB legacy is supported BIOS boot specification is supported Targeted content distribution is supported BIOS Revision: 2.39 Firmware Revision: 1.7
Handle 0x0001, DMI type 1, 27 bytes System Information Manufacturer: LENOVO Product Name: 200763G Version: ThinkPad T60 Serial Number: L3AH521 UUID: A980BC81-4824-11CB-995D-AAAC3DDEE8F5 Wake-up Type: Power Switch SKU Number: Not Specified Family: ThinkPad T60 ...
On Wed, 26 Sep 2012 12:33:20 +0200 Joerg Mayer jmayer@loplof.de wrote:
00:00.0 Host bridge [0600]: Intel Corporation Mobile 945GM/PM/GMS, 943/940GML and 945GT Express Memory Controller Hub [8086:27a0] (rev 03) Subsystem: Lenovo ThinkPad T60 [17aa:2015]
thanks for testing! (a few hours earlier would have been even better ;) i have fixed the issue in my testing_stuff branch as discussed on IRC. thanks again!
-
Joerg Mayer -
repository service -
Stefan Tauner