From patchwork Fri Jun 27 03:49:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 4433131 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 E6478BEEAA for ; Fri, 27 Jun 2014 03:53:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EE5CD2039E for ; Fri, 27 Jun 2014 03:53:09 +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 28A2F201EF for ; Fri, 27 Jun 2014 03:53:09 +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 1X0NBn-0003zV-0z; Fri, 27 Jun 2014 03:51:03 +0000 Received: from mail-pb0-f48.google.com ([209.85.160.48]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X0NBk-0003xQ-Co for linux-arm-kernel@lists.infradead.org; Fri, 27 Jun 2014 03:51:00 +0000 Received: by mail-pb0-f48.google.com with SMTP id rq2so4001799pbb.7 for ; Thu, 26 Jun 2014 20:50:39 -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=UFWYh4h2z/68KkUFV3oMEIA1Hn4+rTmRynRBD+64A3E=; b=eOKeAZHlZcuRjl7DCjd7G7P3xi7NFILewpPAEU0kfWMZUCYBT/mXLif+y+aB3BPs4t In9WjXx9tjkgT3LdIJBn2HCodyPzZ6J4mu57VcYUe0f5BWqX9/IUwYUXlaQ3yzMdfpzz StRl7CylI0rh/zY/60sfcKSsTWc18xLgGYZAGUF40TzOUpW5ekytEmSLW5ryPu4rYci5 hPVlXz4CiO/PG/itOIjvFmJ3mgIlpNmNuCH6D8az1y0vyT4gfRmUYHfs02/zExGjtV2r PHF0ggK7mOtDFcDe2/7r2NhxXe9lohioWUozi1BxGVLXynU5371PRNWk1YKOlrjRIrOL w3UQ== X-Gm-Message-State: ALoCoQkDlF/myyOtL6vzkK9EQy3qdD/UQ6tTfEbMnk53IB+1Sen8840PmE2VhcSLL87RxjTtwsLF X-Received: by 10.68.254.103 with SMTP id ah7mr27339166pbd.159.1403841039020; Thu, 26 Jun 2014 20:50:39 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id tg9sm12333685pbc.29.2014.06.26.20.50.34 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Jun 2014 20:50:38 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org Subject: [PATCH v4 01/13] acpi: arm64 does not have a BIOS add config for BIOS table scan. Date: Fri, 27 Jun 2014 11:49:24 +0800 Message-Id: <1403840976-7456-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1403840976-7456-1-git-send-email-hanjun.guo@linaro.org> References: <1403840976-7456-1-git-send-email-hanjun.guo@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140626_205100_455861_D0EF7899 X-CRM114-Status: GOOD ( 14.06 ) X-Spam-Score: -0.7 (/) Cc: Mark Rutland , lorenzo.pieralisi@arm.com, rric@kernel.org, Graeme Gregory , Arnd Bergmann , linaro-acpi@lists.linaro.org, linux-kernel@vger.kernel.org, Grant Likely , Sudeep Holla , Bjorn Helgaas , Charles.Garcia-Tobin@arm.com 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 --- 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. */