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: 33269 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 38CC1208CF for ; Wed, 9 Jul 2014 09:39:41 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id il7sf23828148vcb.8 for ; Wed, 09 Jul 2014 02:39:41 -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=mtawhK4PBzolahHmrWilcOgT9tGuID//pl5PcyUdVK4=; b=RjnxQ3xDt+8NX/xkHyhaVN8kiOVQE97DyHR+JOUmaUs5hPKcp+ESkfWHNBaBES0Hzl ftaPHAEVuc4xu6s7M2H3WRvpfWg6KvBizVkTCZ5DcjzRoxJhUK9loYlhXoaHoIBH8nCQ PvpVIX7j/74N+RiFJM2Ye0RFU2czXa3UbpH74+inlBP4L6zXR949s1ZpGOQGaaVr0cpc Anv1t2ScEOSCnLDmWIjQcPSlDhoFSGoGptvutWnZzELfQfv3gqSo++brOEZ5P0Opa4qM xhqajUuO+gO37ZlUL2isAJVywcuu4vRD7/ztYX3jFAzKNStZ8SLd7ZGQEJuyUyTNhfAV xuTA== X-Gm-Message-State: ALoCoQl/MCzE6hfiNeYGNdQhwkDYpQb4uYfhzn9VD+gqVqo7/k/UOWFp5728PJi6LRkaCxsO2Ese X-Received: by 10.58.111.73 with SMTP id ig9mr994036veb.40.1404898781100; Wed, 09 Jul 2014 02:39:41 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.80.203 with SMTP id c69ls2723521qgd.85.gmail; Wed, 09 Jul 2014 02:39:41 -0700 (PDT) X-Received: by 10.220.166.9 with SMTP id k9mr38420213vcy.20.1404898781018; Wed, 09 Jul 2014 02:39:41 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id j18si19690262vdf.99.2014.07.09.02.39.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 02:39:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id ik5so6588230vcb.35 for ; Wed, 09 Jul 2014 02:39:40 -0700 (PDT) X-Received: by 10.53.7.204 with SMTP id de12mr820799vdd.41.1404898780934; Wed, 09 Jul 2014 02:39:40 -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 tc5csp31740vcb; Wed, 9 Jul 2014 02:39:40 -0700 (PDT) X-Received: by 10.70.41.77 with SMTP id d13mr10349825pdl.3.1404898779014; Wed, 09 Jul 2014 02:39:39 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j1si45585070pbw.214.2014.07.09.02.39.38; Wed, 09 Jul 2014 02:39:38 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1755413AbaGIJjd (ORCPT + 28 others); Wed, 9 Jul 2014 05:39:33 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:56171 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755370AbaGIJj3 (ORCPT ); Wed, 9 Jul 2014 05:39:29 -0400 Received: by mail-wg0-f49.google.com with SMTP id a1so3770279wgh.20 for ; Wed, 09 Jul 2014 02:39:28 -0700 (PDT) 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" 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 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> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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.220.176 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..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. */