From patchwork Fri Oct 2 16:21:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Starikovskiy X-Patchwork-Id: 51394 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 n92GM6dJ027621 for ; Fri, 2 Oct 2009 16:22:07 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754024AbZJBQVi (ORCPT ); Fri, 2 Oct 2009 12:21:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754502AbZJBQVi (ORCPT ); Fri, 2 Oct 2009 12:21:38 -0400 Received: from charybdis-ext.suse.de ([195.135.221.2]:55643 "EHLO emea5-mh.id5.novell.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754024AbZJBQVh (ORCPT ); Fri, 2 Oct 2009 12:21:37 -0400 Received: from [127.0.1.1] ([149.44.162.75]) by emea5-mh.id5.novell.com with ESMTP; Fri, 02 Oct 2009 18:21:40 +0200 From: Alexey Starikovskiy To: Len Brown Cc: Linux-acpi@vger.kernel.org Subject: [PATCH 2/2] ACPI: EC: Don't parse DSDT for EC early init on Compal Date: Fri, 02 Oct 2009 20:21:40 +0400 Message-ID: <20091002162140.14126.5393.stgit@thinkpad> In-Reply-To: <20091002162133.14126.81642.stgit@thinkpad> References: <20091002162133.14126.81642.stgit@thinkpad> User-Agent: StGIT/0.14.2 MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 3fcb913..2c790b5 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -120,6 +120,7 @@ static struct acpi_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 */ /* -------------------------------------------------------------------------- Transaction Management @@ -900,6 +901,13 @@ 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) { @@ -917,6 +925,10 @@ static int ec_flag_msi(const struct dmi_system_id *id) 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"), DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star") }, NULL}, @@ -959,6 +971,9 @@ int __init acpi_ec_ecdt_probe(void) /* fall through */ } + if (EC_FLAGS_SKIP_DSDT_SCAN) + 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");