From patchwork Wed Jul 9 09:39:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 4512871 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id AB39C9F26C for ; Wed, 9 Jul 2014 09:41:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DACC3202B4 for ; Wed, 9 Jul 2014 09:41:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 19959201C0 for ; Wed, 9 Jul 2014 09:41:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X4oM4-0004cx-Pg; Wed, 09 Jul 2014 09:40:00 +0000 Received: from mail-wi0-f175.google.com ([209.85.212.175]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X4oLv-0004AJ-4f for linux-arm-kernel@lists.infradead.org; Wed, 09 Jul 2014 09:39:52 +0000 Received: by mail-wi0-f175.google.com with SMTP id ho1so2391912wib.2 for ; Wed, 09 Jul 2014 02:39:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1u3/2m0rZmD7yVmBK1Qapu5AnSIvbdddZQmrOqLzoOo=; b=D3baj82/Xz+QUec/CP9e/z+JixZtvRbuwi6hLPnJvJWIFJ7UnVid9udB267nxKjT/w tHxb4nnA77i4O9kHqzSdw13XsdYzfH28uoCOXpohsy9fwV2lvqyYtJ9G2KRqzUwW3qnF BY4bCDt3aSCCiwshjEb54OyFaBpEUsuUkp9OBkAU3WDq+jgPgqDody2B/+G6RwUCNHmo nr2huDJorPMlAWxP3rK6LCI8NgnzR50KJmgsZwAGI30XzH2y6699N1jjf4m2IXKT9paK I1n1KGXNWvka0jMB7eviRi6RrRi/nk0VW9yoZ3HRdjs961hp5FGUV9XlYCW7MiSZxPza HygQ== X-Gm-Message-State: ALoCoQmRm0LTqoNe4DBYeXr9TPZJPYJaLV97sAdTl1F1Gh3z2sEHVCiXIVJbSBdO2nExRQt9yTZl X-Received: by 10.194.48.8 with SMTP id h8mr10506243wjn.106.1404898768417; Wed, 09 Jul 2014 02:39:28 -0700 (PDT) Received: from localhost ([213.122.173.130]) by mx.google.com with ESMTPSA id lb3sm16928328wjc.30.2014.07.09.02.39.26 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 09 Jul 2014 02:39:27 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" Subject: [PATCH v2 1/3] ACPI: ARM64 does not have a BIOS add config for BIOS table scan. Date: Wed, 9 Jul 2014 17:39:04 +0800 Message-Id: <1404898746-6685-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404898746-6685-1-git-send-email-hanjun.guo@linaro.org> References: <1404898746-6685-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140709_023951_367540_4E6F2619 X-CRM114-Status: GOOD ( 13.91 ) X-Spam-Score: -0.7 (/) Cc: Tony Luck , Graeme Gregory , linaro-acpi@lists.linaro.org, Catalin Marinas , linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, Hanjun Guo , Thomas Gleixner , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Graeme Gregory With the addition of ARM64 that does not have a traditional BIOS to scan, add a config option which is selected on x86 and ia64 to do the traditional BIOS scanning for tables. Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo --- arch/ia64/Kconfig | 1 + arch/x86/Kconfig | 1 + drivers/acpi/Kconfig | 3 +++ drivers/acpi/osl.c | 4 +++- 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 2f3abcf..c54bd7e 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -47,6 +47,7 @@ config IA64 select MODULES_USE_ELF_RELA select ARCH_USE_CMPXCHG_LOCKREF select HAVE_ARCH_AUDITSYSCALL + select ACPI_LEGACY_TABLES_LOOKUP if ACPI default y help The Itanium Processor Family is Intel's 64-bit successor to diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a8f749e..6d9f1d8 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -131,6 +131,7 @@ config X86 select HAVE_CC_STACKPROTECTOR select GENERIC_CPU_AUTOPROBE select HAVE_ARCH_AUDITSYSCALL + select ACPI_LEGACY_TABLES_LOOKUP if ACPI config INSTRUCTION_DECODER def_bool y diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index a34a228..970524c 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -42,6 +42,9 @@ menuconfig ACPI if ACPI +config ACPI_LEGACY_TABLES_LOOKUP + bool + config ACPI_SLEEP bool depends on SUSPEND || HIBERNATION diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index bad25b0..3abe9b2 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -259,12 +259,14 @@ acpi_physical_address __init acpi_os_get_root_pointer(void) "System description tables not found\n"); return 0; } - } else { + } else if (IS_ENABLED(CONFIG_ACPI_LEGACY_TABLES_LOOKUP)) { acpi_physical_address pa = 0; acpi_find_root_pointer(&pa); return pa; } + + return 0; } /* Must be called with 'acpi_ioremap_lock' or RCU read lock held. */