From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262648AbUE1MG4 (ORCPT ); Fri, 28 May 2004 08:06:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262580AbUE1MFL (ORCPT ); Fri, 28 May 2004 08:05:11 -0400 Received: from mail.donpac.ru ([80.254.111.2]:50356 "EHLO donpac.ru") by vger.kernel.org with ESMTP id S262453AbUE1Lzw (ORCPT ); Fri, 28 May 2004 07:55:52 -0400 Subject: [PATCH 7/13] 2.6.7-rc1-mm1, Port PnP BIOS driver to new DMI probing In-Reply-To: <10857453453701@donpac.ru> X-Mailer: gregkh_patchbomb_levon_offspring Date: Fri, 28 May 2004 15:55:49 +0400 Message-Id: <10857453492070@donpac.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII To: Andrew Morton , linux-kernel@vger.kernel.org Content-Transfer-Encoding: 7BIT From: Andrey Panin X-Spam-Score: -27 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/arch/i386/kernel/dmi_scan.c linux-2.6.7-rc1-mm1/arch/i386/kernel/dmi_scan.c --- linux-2.6.7-rc1-mm1.vanilla/arch/i386/kernel/dmi_scan.c Wed Apr 28 23:59:31 2004 +++ linux-2.6.7-rc1-mm1/arch/i386/kernel/dmi_scan.c Wed Apr 28 23:59:39 2004 @@ -279,17 +279,6 @@ static __init int reset_videomode_after_ } #endif -/* - * Exploding PnPBIOS. Don't yet know if its the BIOS or us for - * some entries - */ - -static __init int exploding_pnp_bios(struct dmi_system_id *d) -{ - printk(KERN_WARNING "%s detected. Disabling PnPBIOS\n", d->ident); - dmi_broken |= BROKEN_PNP_BIOS; - return 0; -} static __init int acer_cpufreq_pst(struct dmi_system_id *d) { @@ -386,17 +375,6 @@ static __initdata struct dmi_system_id d DMI_MATCH(DMI_PRODUCT_NAME, "PowerEdge 2400"), } }, - { exploding_pnp_bios, "Higraded P14H", { /* PnPBIOS GPF on boot */ - DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."), - DMI_MATCH(DMI_BIOS_VERSION, "07.00T"), - DMI_MATCH(DMI_SYS_VENDOR, "Higraded"), - DMI_MATCH(DMI_PRODUCT_NAME, "P14H") - } }, - { exploding_pnp_bios, "ASUS P4P800", { /* PnPBIOS GPF on boot */ - DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer Inc."), - DMI_MATCH(DMI_BOARD_NAME, "P4P800"), - } }, - /* Machines which have problems handling enabled local APICs */ { local_apic_kills_bios, "Dell Inspiron", { diff -urpN -X /usr/share/dontdiff linux-2.6.7-rc1-mm1.vanilla/drivers/pnp/pnpbios/core.c linux-2.6.7-rc1-mm1/drivers/pnp/pnpbios/core.c --- linux-2.6.7-rc1-mm1.vanilla/drivers/pnp/pnpbios/core.c Wed Apr 28 22:56:01 2004 +++ linux-2.6.7-rc1-mm1/drivers/pnp/pnpbios/core.c Wed Apr 28 23:59:39 2004 @@ -59,6 +59,7 @@ #include #include #include +#include #include #include @@ -498,10 +499,39 @@ int __init pnpbios_probe_system(void) return 0; } +static int __init exploding_pnp_bios(struct dmi_system_id *d) +{ + printk(KERN_WARNING "%s detected. Disabling PnPBIOS\n", d->ident); + return 0; +} + +static struct dmi_system_id pnpbios_dmi_table[] = { + { /* PnPBIOS GPF on boot */ + .callback = exploding_pnp_bios, + .ident = "Higraded P14H", + .matches = { + DMI_MATCH(DMI_BIOS_VENDOR, "American Megatrends Inc."), + DMI_MATCH(DMI_BIOS_VERSION, "07.00T"), + DMI_MATCH(DMI_SYS_VENDOR, "Higraded"), + DMI_MATCH(DMI_PRODUCT_NAME, "P14H"), + }, + }, + { /* PnPBIOS GPF on boot */ + .callback = exploding_pnp_bios, + .ident = "ASUS P4P800", + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer Inc."), + DMI_MATCH(DMI_BOARD_NAME, "P4P800"), + }, + }, + { } +}; + int __init pnpbios_init(void) { int ret; - if(pnpbios_disabled || (dmi_broken & BROKEN_PNP_BIOS)) { + + if (pnpbios_disabled || dmi_check_system(pnpbios_dmi_table)) { printk(KERN_INFO "PnPBIOS: Disabled\n"); return -ENODEV; }