Commit 4f784a5b authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] handle exploding pnpbios

parent 3d8a95c7
...@@ -499,6 +499,19 @@ static __init int broken_ps2_resume(struct dmi_blacklist *d) ...@@ -499,6 +499,19 @@ static __init int broken_ps2_resume(struct dmi_blacklist *d)
return 0; return 0;
} }
/*
* Exploding PnPBIOS. Don't yet know if its the BIOS or us for
* some entries
*/
static __init int exploding_pnp_bios(struct dmi_blacklist *d)
{
printk(KERN_WARNING "%s detected. Disabling PnPBIOS\n", d->ident);
dmi_broken |= BROKEN_PNP_BIOS;
return 0;
}
/* /*
* Simple "print if true" callback * Simple "print if true" callback
...@@ -688,6 +701,13 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={ ...@@ -688,6 +701,13 @@ static __initdata struct dmi_blacklist dmi_blacklist[]={
MATCH(DMI_BIOS_DATE, "10/26/01"), NO_MATCH MATCH(DMI_BIOS_DATE, "10/26/01"), NO_MATCH
} }, } },
{ exploding_pnp_bios, "Higraded P14H", { /* BIOSPnP problem */
MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."),
MATCH(DMI_BIOS_VERSION, "07.00T"),
MATCH(DMI_SYS_VENDOR, "Higraded"),
MATCH(DMI_PRODUCT_NAME, "P14H")
} },
/* Machines which have problems handling enabled local APICs */ /* Machines which have problems handling enabled local APICs */
{ local_apic_kills_bios, "Dell Inspiron", { { local_apic_kills_bios, "Dell Inspiron", {
......
...@@ -969,7 +969,7 @@ int __init pnpbios_init(void) ...@@ -969,7 +969,7 @@ int __init pnpbios_init(void)
spin_lock_init(&pnp_bios_lock); spin_lock_init(&pnp_bios_lock);
if(pnpbios_disabled) { if(pnpbios_disabled || (dmi_broken & BROKEN_PNP_BIOS)) {
printk(KERN_INFO "PnPBIOS: Disabled\n"); printk(KERN_INFO "PnPBIOS: Disabled\n");
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment