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: 32955 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f198.google.com (mail-ig0-f198.google.com [209.85.213.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 18A9020560 for ; Wed, 2 Jul 2014 08:48:35 +0000 (UTC) Received: by mail-ig0-f198.google.com with SMTP id h3sf76892igd.9 for ; Wed, 02 Jul 2014 01:48:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=dvU0muKPnSGY1e4I4CwKNeTdudB7eh6+gP2PAMy9KO8=; b=D1H6bcsqi26c9F+VTtr6KqKXuNVxlEnsQoZyBi3jwf4I3xAFhHFJ+mDrMh1LEAX3A7 fbfV2U0V3dvrbPku7k/UFMhwF6euRI9NBZqibRKa9ySaVIAccZfoCDLE2CP7zJ9VpGZr pV/y9ZM9tIomRJzPY9v8X7lrFK3Y8mGwadBGVRWL2xWPYXVQfgqlDsYLDsjVYdru5wwf 0SkfL+ky68e4ckeuyP5sUIPZpcSgg8oIYTvCt2HTLkSY0QaIJkEjpqRLp8CXWVGV5t5l FpFLCA6/YwpTFvG3hOHPOV/mj+6ONUN6se0Z0tIzcFRNGtqxv0Ht7/vnlt8moybjBaAZ UtKg== X-Gm-Message-State: ALoCoQkYtKih3LiKtE1pwDg6zAYNuKyXN+hLHqG1a/vFonmPhOx+RrL9BoSsJiu4P+K/z3pT1O/n X-Received: by 10.182.148.1 with SMTP id to1mr26967123obb.50.1404290914614; Wed, 02 Jul 2014 01:48:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.34.36 with SMTP id k33ls2406588qgk.40.gmail; Wed, 02 Jul 2014 01:48:34 -0700 (PDT) X-Received: by 10.58.245.194 with SMTP id xq2mr48496897vec.26.1404290914510; Wed, 02 Jul 2014 01:48:34 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id j8si12623632vcr.60.2014.07.02.01.48.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 01:48:34 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id i13so10772045veh.36 for ; Wed, 02 Jul 2014 01:48:34 -0700 (PDT) X-Received: by 10.52.92.82 with SMTP id ck18mr3603137vdb.6.1404290914433; Wed, 02 Jul 2014 01:48:34 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp277250vcb; Wed, 2 Jul 2014 01:48:34 -0700 (PDT) X-Received: by 10.66.180.34 with SMTP id dl2mr2491795pac.124.1404290913735; Wed, 02 Jul 2014 01:48:33 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fu6si29617878pac.106.2014.07.02.01.48.33; Wed, 02 Jul 2014 01:48:33 -0700 (PDT) Received-SPF: none (google.com: linux-acpi-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752188AbaGBIsa (ORCPT + 8 others); Wed, 2 Jul 2014 04:48:30 -0400 Received: from mail-pd0-f173.google.com ([209.85.192.173]:43498 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751375AbaGBIsX (ORCPT ); Wed, 2 Jul 2014 04:48:23 -0400 Received: by mail-pd0-f173.google.com with SMTP id r10so11564518pdi.18 for ; Wed, 02 Jul 2014 01:48:22 -0700 (PDT) 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" Cc: Catalin Marinas , Graeme Gregory , Tony Luck , Thomas Gleixner , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo 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> Sender: linux-acpi-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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. */