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: 32602 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C85D3201EF for ; Fri, 27 Jun 2014 03:50:45 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id va2sf25070190obc.6 for ; Thu, 26 Jun 2014 20:50:45 -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=gNw11LGHVJtCnXg8WhTt8iCAQ8n4aITrPeV8/Pl/wRY=; b=PY7hLyMSuMR/4sEb9tVtMw6EGoG3b/XiSDPPXr9EddUl048e0Rrn2a7t8YqxxAfH9N JGuHr6udvDCiKlJAuD7i+57uwVXPRf+u7omlW2ASlZKUMS46ChOS8cT2FJxWQJxbGPBN dzW9kX7M+utcwm2vrtREjNNS5ogTMznBZPstWh0h21FcUv4sSdLYHmV5NcihZVv+chfS dIgsZek8oawWeeWRD7TWsnvtVohZdicVEwuUNgapLK2cN763/lK3ObiylEqQcBZUQeB3 b783TVaxnifcjGJGX/ndwGgu3qKi9Rbco/Y5pLUYJDJi3vf9kHYj3LHYgTiQ8qCOlhpm ipJA== X-Gm-Message-State: ALoCoQlRDLucFPUkwriR9x3Fqt+Pu9bCdfQEsanyLX1vLvzmKDQazpH6JFEu+0bOdtD1o5CWnTwb X-Received: by 10.42.49.138 with SMTP id w10mr9341828icf.13.1403841045436; Thu, 26 Jun 2014 20:50:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.117 with SMTP id c108ls502895qge.67.gmail; Thu, 26 Jun 2014 20:50:45 -0700 (PDT) X-Received: by 10.52.53.69 with SMTP id z5mr14914043vdo.42.1403841045333; Thu, 26 Jun 2014 20:50:45 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id or9si5713229vcb.81.2014.06.26.20.50.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Jun 2014 20:50:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so4725857veb.34 for ; Thu, 26 Jun 2014 20:50:45 -0700 (PDT) X-Received: by 10.52.252.193 with SMTP id zu1mr14794148vdc.7.1403841045225; Thu, 26 Jun 2014 20:50:45 -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 tc5csp76975vcb; Thu, 26 Jun 2014 20:50:44 -0700 (PDT) X-Received: by 10.68.97.37 with SMTP id dx5mr26724917pbb.119.1403841044482; Thu, 26 Jun 2014 20:50:44 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hr7si1241780pac.109.2014.06.26.20.50.43; Thu, 26 Jun 2014 20:50:43 -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 S1752411AbaF0Duk (ORCPT + 8 others); Thu, 26 Jun 2014 23:50:40 -0400 Received: from mail-pb0-f54.google.com ([209.85.160.54]:50742 "EHLO mail-pb0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751406AbaF0Duj (ORCPT ); Thu, 26 Jun 2014 23:50:39 -0400 Received: by mail-pb0-f54.google.com with SMTP id un15so4026002pbc.13 for ; Thu, 26 Jun 2014 20:50:39 -0700 (PDT) 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 Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Bjorn Helgaas , rric@kernel.org, Grant Likely , Sudeep Holla , Mark Rutland , Charles.Garcia-Tobin@arm.com, lorenzo.pieralisi@arm.com, linaro-acpi@lists.linaro.org, Graeme Gregory 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> 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.175 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 --- 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. */