From patchwork Wed Jul 2 08:47:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 4464251 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8743DBEEAA for ; Wed, 2 Jul 2014 08:57:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B9DB8202FF for ; Wed, 2 Jul 2014 08:57:26 +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 EE246202E5 for ; Wed, 2 Jul 2014 08:57:25 +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 1X2GJz-0004D3-Ix; Wed, 02 Jul 2014 08:55:19 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X2GJU-0003Vp-PA for linux-arm-kernel@lists.infradead.org; Wed, 02 Jul 2014 08:54:49 +0000 Received: by mail-pa0-f47.google.com with SMTP id kq14so12106925pab.6 for ; Wed, 02 Jul 2014 01:54:27 -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=ApLgi2TLV8a5zZnuRFE5tkosUlR+9EuIyc3AIcCZJtU=; b=CUO6777OO6D81NlEITo9gjNUq8xUrq3t3MK/VDxMkBJsl69YgxoWwT/IfO+61DOVhU hs2opIcQD1+TaQRTTTX5drac+mpqxoFeZK9NNFkuIVb1c8RMqoHYacj8TwnqXhvZ5kVv tGXet+VlR3SU9Xj3CIwWGemspRq+qj/KE7CiUnicOgMVhvlMLG8ENMooggR0uqVgVpXO xMGJK4fpfx6xCaxm1w3S+j4V0GOEUeoIpbkoSAv0UhbAkp5LLdtuG3OTeeJe+5H0EL3/ DcqIB3ObDoBsjjUwOZ+Xo+BLmE2RXaxUmC2px4sazZUPm3aVdo2RM+OtWjPzYLFnP1Cp /36w== X-Gm-Message-State: ALoCoQkWbRpbCkgeJtlZjkbPlJrMP0AyoClOlSn35OXmxRCq33Vk4inJZtrHzWE50v5W+mfosPNz X-Received: by 10.66.236.161 with SMTP id uv1mr2455751pac.85.1404290902622; Wed, 02 Jul 2014 01:48:22 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id co3sm36126350pbb.89.2014.07.02.01.48.18 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 02 Jul 2014 01:48:22 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" Subject: [PATCH 1/4] ACPI: ARM64 does not have a BIOS add config for BIOS table scan. Date: Wed, 2 Jul 2014 16:47:23 +0800 Message-Id: <1404290847-7671-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404290847-7671-1-git-send-email-hanjun.guo@linaro.org> References: <1404290847-7671-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140702_015448_935144_96846B8C X-CRM114-Status: GOOD ( 14.14 ) X-Spam-Score: -1.4 (-) 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=-1.9 required=5.0 tests=BAYES_00, T_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..f82b352 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_SCAN_BIOS_NOT_EFI 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..4865d44 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_SCAN_BIOS_NOT_EFI config INSTRUCTION_DECODER def_bool y diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index a34a228..70eaf7a 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -2,6 +2,9 @@ # ACPI Configuration # +config ACPI_SCAN_BIOS_NOT_EFI + bool + menuconfig ACPI bool "ACPI (Advanced Configuration and Power Interface) Support" depends on !IA64_HP_SIM diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index bad25b0..5ba0b74 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_SCAN_BIOS_NOT_EFI)) { 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. */