From patchwork Sun Nov 29 11:20:00 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Starikovskiy X-Patchwork-Id: 63519 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nATBe6Qa009607 for ; Sun, 29 Nov 2009 11:40:06 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754242AbZK2Lj6 (ORCPT ); Sun, 29 Nov 2009 06:39:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754269AbZK2Lj6 (ORCPT ); Sun, 29 Nov 2009 06:39:58 -0500 Received: from nat.nue.novell.com ([195.135.221.3]:49551 "EHLO emea5-mh.id5.novell.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754242AbZK2Lj5 (ORCPT ); Sun, 29 Nov 2009 06:39:57 -0500 X-Greylist: delayed 1200 seconds by postgrey-1.27 at vger.kernel.org; Sun, 29 Nov 2009 06:39:56 EST Received: from [192.168.101.190] ([149.44.162.75]) by emea5-mh.id5.novell.com with ESMTP; Sun, 29 Nov 2009 12:20:00 +0100 Message-ID: <4B1258E0.7040203@suse.de> Date: Sun, 29 Nov 2009 14:20:00 +0300 From: Alexey Starikovskiy User-Agent: Thunderbird 2.0.0.23 (X11/20090817) MIME-Version: 1.0 To: ykzhao CC: Alexey Starikovskiy , "linux-acpi@vger.kernel.org" , "Kay, Allen M" , "lenb@kernel.org" Subject: Re: [ACPI] ACPI error during Sandybridge boot References: <57C9024A16AD2D4C97DC78E552063EA3E39CC12C@orsmsx505.amr.corp.intel.com> <1259113351.2552.13.camel@localhost.localdomain> <4B0CE645.9000705@gmail.com> <1259197886.2552.25.camel@localhost.localdomain> In-Reply-To: <1259197886.2552.25.camel@localhost.localdomain> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org ACPI: EC: Simplify DMI workarounds scanning From: Alexey Starikovskiy Signed-off-by: Alexey Starikovskiy --- drivers/acpi/ec.c | 31 ++++++++----------------------- 1 files changed, 8 insertions(+), 23 deletions(-) diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 7511029..ce7132c 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -119,8 +119,7 @@ static struct acpi_ec { } *boot_ec, *first_ec; static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */ -static int EC_FLAGS_VALIDATE_ECDT; /* ASUStec ECDTs need to be validated */ -static int EC_FLAGS_SKIP_DSDT_SCAN; /* Not all BIOS survive early DSDT scan */ +static int EC_FLAGS_ASUS; /* Out-of-spec ASUStek BIOS */ /* -------------------------------------------------------------------------- Transaction Management @@ -899,17 +898,10 @@ static const struct acpi_device_id ec_device_ids[] = { {"", 0}, }; -/* Some BIOS do not survive early DSDT scan, skip it */ -static int ec_skip_dsdt_scan(const struct dmi_system_id *id) -{ - EC_FLAGS_SKIP_DSDT_SCAN = 1; - return 0; -} - /* ASUStek often supplies us with broken ECDT, validate it */ -static int ec_validate_ecdt(const struct dmi_system_id *id) +static int ec_flag_asus(const struct dmi_system_id *id) { - EC_FLAGS_VALIDATE_ECDT = 1; + EC_FLAGS_ASUS = 1; return 0; } @@ -918,16 +910,11 @@ static int ec_flag_msi(const struct dmi_system_id *id) { printk(KERN_DEBUG PREFIX "Detected MSI hardware, enabling workarounds.\n"); EC_FLAGS_MSI = 1; - EC_FLAGS_VALIDATE_ECDT = 1; return 0; } static struct dmi_system_id __initdata ec_dmi_table[] = { { - ec_skip_dsdt_scan, "Compal JFL92", { - DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"), - DMI_MATCH(DMI_BOARD_NAME, "JFL92") }, NULL}, - { ec_flag_msi, "MSI hardware", { DMI_MATCH(DMI_BIOS_VENDOR, "Micro-Star")}, NULL}, { @@ -937,7 +924,7 @@ static struct dmi_system_id __initdata ec_dmi_table[] = { ec_flag_msi, "MSI hardware", { DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star")}, NULL}, { - ec_validate_ecdt, "ASUS hardware", { + ec_flag_asus, "ASUS hardware", { DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL}, {}, }; @@ -966,7 +953,7 @@ int __init acpi_ec_ecdt_probe(void) boot_ec->handle = ACPI_ROOT_OBJECT; acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle); /* Don't trust ECDT, which comes from ASUSTek */ - if (!EC_FLAGS_VALIDATE_ECDT) + if (!EC_FLAGS_MSI && !EC_FLAGS_ASUS) goto install; saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL); if (!saved_ec) @@ -975,9 +962,8 @@ int __init acpi_ec_ecdt_probe(void) /* fall through */ } - if (EC_FLAGS_SKIP_DSDT_SCAN) + if (!EC_FLAGS_MSI && !EC_FLAGS_ASUS) return -ENODEV; - /* This workaround is needed only on some broken machines, * which require early EC, but fail to provide ECDT */ printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n"); @@ -1004,9 +990,8 @@ int __init acpi_ec_ecdt_probe(void) * Keep boot_ec struct as it will be needed soon. */ acpi_handle dummy; - if (!dmi_name_in_vendors("ASUS") || - ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", - &dummy))) + if (EC_FLAGS_ASUS && + ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &dummy))) return -ENODEV; } install: