From patchwork Tue Mar 10 03:34:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 10769 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 n2A3XNbl011716 for ; Tue, 10 Mar 2009 03:33:24 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752267AbZCJDdY (ORCPT ); Mon, 9 Mar 2009 23:33:24 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752556AbZCJDdY (ORCPT ); Mon, 9 Mar 2009 23:33:24 -0400 Received: from mga02.intel.com ([134.134.136.20]:12484 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752267AbZCJDdX (ORCPT ); Mon, 9 Mar 2009 23:33:23 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 09 Mar 2009 20:27:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.38,333,1233561600"; d="scan'208";a="393075898" Received: from yakui_zhao.sh.intel.com (HELO [10.239.36.176]) ([10.239.36.176]) by orsmga002.jf.intel.com with ESMTP; 09 Mar 2009 20:41:54 -0700 Subject: [PATCH]: ACPI: Add the dmi check to make acpi_enforce_resources strict From: yakui_zhao To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org Organization: Intel Open Source Technology Center Date: Tue, 10 Mar 2009 11:34:26 +0800 Message-Id: <1236656066.7060.25.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.22.1 (2.22.1-2.fc9) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Subject: ACPI: Add the dmi check to make acpi_enforce_resources strict From: Zhao Yakui On some boxes the SMBus PCI controller is not hidden. The SMbus I/O port will be accessed in AML code. If the i2c driver is still loaded for the SMbus PCI device, there is no synchronization between OS and BIOS. And the conflict will happen. So the dmi check is added so that the acpi_enforce_resources is strict when the box falls into the dmi check table. In such case the i2c driver won't be loaded for the SMbus pci device. http://bugzilla.kernel.org/show_bug.cgi?id=12376 Signed-off-by: Zhao Yakui Signed-off-by: Zhang Rui Acked-by: Jean Delvare --- drivers/acpi/osl.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-2.6/drivers/acpi/osl.c =================================================================== --- linux-2.6.orig/drivers/acpi/osl.c 2009-03-10 09:38:33.000000000 +0800 +++ linux-2.6/drivers/acpi/osl.c 2009-03-10 11:30:45.000000000 +0800 @@ -135,6 +135,19 @@ unsigned int known:1; } osi_linux = { 0, 0, 0, 0}; +#define ENFORCE_RESOURCES_STRICT 2 +#define ENFORCE_RESOURCES_LAX 1 +#define ENFORCE_RESOURCES_NO 0 + +static unsigned int acpi_enforce_resources = ENFORCE_RESOURCES_LAX; +static struct dmi_system_id __initdata acpi_resources_dmi_table[] = { + { + NULL, "Asus EEEPC-901", { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "901") }, NULL}, + {}, +}; + static void __init acpi_request_region (struct acpi_generic_address *addr, unsigned int length, char *desc) { @@ -179,6 +192,14 @@ acpi_request_region(&acpi_gbl_FADT.xgpe1_block, acpi_gbl_FADT.gpe1_block_length, "ACPI GPE1_BLK"); + /* + * Only when the ACPI is enabled, the dmi table will be checked. If + * the system falls into the dmi check table, the strict resource + * check will be used. + */ + if (!acpi_disabled && dmi_check_system(acpi_resources_dmi_table)) + acpi_enforce_resources = ENFORCE_RESOURCES_STRICT; + return 0; } device_initcall(acpi_reserve_resources); @@ -1073,11 +1094,6 @@ * -> ACPI Operation Region resources will not be registered * */ -#define ENFORCE_RESOURCES_STRICT 2 -#define ENFORCE_RESOURCES_LAX 1 -#define ENFORCE_RESOURCES_NO 0 - -static unsigned int acpi_enforce_resources = ENFORCE_RESOURCES_LAX; static int __init acpi_enforce_resources_setup(char *str) {