PATCH: handle exploding pnpbios

PATCH: handle exploding pnpbios

[Alan Cox]

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/arch/i386/kernel/dmi_scan.c linux-2.5.65-ac2/arch/i386/kernel/dmi_scan.c
--- linux-2.5.65/arch/i386/kernel/dmi_scan.c	2003-03-18 16:46:45.000000000 +0000
+++ linux-2.5.65-ac2/arch/i386/kernel/dmi_scan.c	2003-03-21 00:00:01.000000000 +0000
@@ -499,6 +499,19 @@
 	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
@@ -687,6 +700,13 @@
 			MATCH(DMI_BIOS_VERSION, "WXPO1Z3"),
 			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 */
 
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux-2.5.65/drivers/pnp/pnpbios/core.c linux-2.5.65-ac2/drivers/pnp/pnpbios/core.c
--- linux-2.5.65/drivers/pnp/pnpbios/core.c	2003-03-03 19:20:10.000000000 +0000
+++ linux-2.5.65-ac2/drivers/pnp/pnpbios/core.c	2003-03-20 18:13:07.000000000 +0000
@@ -969,7 +969,7 @@
 
 	spin_lock_init(&pnp_bios_lock);
 
-	if(pnpbios_disabled) {
+	if(pnpbios_disabled || (dmi_broken & BROKEN_PNP_BIOS)) {
 		printk(KERN_INFO "PnPBIOS: Disabled\n");
 		return -ENODEV;
 	}