From: Roger Luethi Date: Tue, 6 Mar 2007 18:57:37 +0000 (+0100) Subject: via-rhine: set avoid_D3 for broken BIOSes X-Git-Tag: v2.6.21-rc4~70^2~13 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e84df485c8e059bc9d8d0691ae6a3deafa1f9350;p=linux-2.6-omap-h63xx.git via-rhine: set avoid_D3 for broken BIOSes This patch sets avoid_D3 for BIOSes known to be broken. Said BIOSes fail at PXE boot if the chip is in power state D3. Signed-off-by: Roger Luethi Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index ebbda1d8f54..f3a972e74e9 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c @@ -30,8 +30,8 @@ */ #define DRV_NAME "via-rhine" -#define DRV_VERSION "1.4.2" -#define DRV_RELDATE "Sept-11-2006" +#define DRV_VERSION "1.4.3" +#define DRV_RELDATE "2007-03-06" /* A few user-configurable values. @@ -105,6 +105,7 @@ static const int multicast_filter_limit = 32; #include #include #include +#include /* These identify the driver base version and may not be removed. */ static char version[] __devinitdata = @@ -1995,6 +1996,23 @@ static struct pci_driver rhine_driver = { .shutdown = rhine_shutdown, }; +static struct dmi_system_id __initdata rhine_dmi_table[] = { + { + .ident = "EPIA-M", + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "Award Software International, Inc."), + DMI_MATCH(DMI_BIOS_VERSION, "6.00 PG"), + }, + }, + { + .ident = "KV7", + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies, LTD"), + DMI_MATCH(DMI_BIOS_VERSION, "6.00 PG"), + }, + }, + { NULL } +}; static int __init rhine_init(void) { @@ -2002,6 +2020,16 @@ static int __init rhine_init(void) #ifdef MODULE printk(version); #endif + if (dmi_check_system(rhine_dmi_table)) { + /* these BIOSes fail at PXE boot if chip is in D3 */ + avoid_D3 = 1; + printk(KERN_WARNING "%s: Broken BIOS detected, avoid_D3 " + "enabled.\n", + DRV_NAME); + } + else if (avoid_D3) + printk(KERN_INFO "%s: avoid_D3 set.\n", DRV_NAME); + return pci_register_driver(&rhine_driver); }