From patchwork Fri Jul 18 10:02:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 33826 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 52E1B20CA0 for ; Fri, 18 Jul 2014 10:03:48 +0000 (UTC) Received: by mail-ig0-f198.google.com with SMTP id h18sf1967564igc.5 for ; Fri, 18 Jul 2014 03:03:48 -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=2IZUZy46LxUgf3lWNLahjKIP9rihP1QOseqX+vc6a4g=; b=VgQ+Ew6sl2WX9EKZ0IHgBOaTk9f5bqI0p6g4tlZxIx2OVlx1Ncl+LmprbMvHBG2G45 DEKAgBMi5ZMwfDFOkekuS/x4euWPEXBlEYBKu0ynp/Z5oMTJUqs07e9vk4amnJm8pIAK pIonVZnSyyB475WQck+Zh52n8VOLfXzsKqRh4lbXjhExKxSzcx5zeW6nkDTfDX8CF3Z0 lwBjYlLUQN4e+l5Uqv7tHh7a/4wiLCFdQThT9KYvdOuTgZiVsgC41GHApoI1EGyIcUla B30BmeW2OeFa9EbIRoZOU4MMgTgqcgkkI9zVQRTsjFQL3gzCtxuWF0mRssDAq2/Et3+V y/Rg== X-Gm-Message-State: ALoCoQnQU0uPA3jEKTaZ9uOFkRWo2RD79/DviFMlo2S5/cHlVT9BEV3yEgxKI/n+5mPp+sxmO/zv X-Received: by 10.42.82.79 with SMTP id c15mr2091181icl.7.1405677828409; Fri, 18 Jul 2014 03:03:48 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.80.36 with SMTP id b33ls953343qgd.68.gmail; Fri, 18 Jul 2014 03:03:48 -0700 (PDT) X-Received: by 10.221.64.80 with SMTP id xh16mr3817047vcb.35.1405677828308; Fri, 18 Jul 2014 03:03:48 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id vk6si5111786vec.45.2014.07.18.03.03.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Jul 2014 03:03:48 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id hq11so5402107vcb.16 for ; Fri, 18 Jul 2014 03:03:48 -0700 (PDT) X-Received: by 10.221.34.13 with SMTP id sq13mr4128547vcb.16.1405677828230; Fri, 18 Jul 2014 03:03:48 -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 tc5csp107897vcb; Fri, 18 Jul 2014 03:03:47 -0700 (PDT) X-Received: by 10.70.37.71 with SMTP id w7mr3464822pdj.87.1405677827238; Fri, 18 Jul 2014 03:03:47 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cm7si2675138pdb.489.2014.07.18.03.03.46; Fri, 18 Jul 2014 03:03:46 -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 S934795AbaGRKDa (ORCPT + 23 others); Fri, 18 Jul 2014 06:03:30 -0400 Received: from mail-pd0-f170.google.com ([209.85.192.170]:55773 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934383AbaGRKD1 (ORCPT ); Fri, 18 Jul 2014 06:03:27 -0400 Received: by mail-pd0-f170.google.com with SMTP id g10so4766735pdj.15 for ; Fri, 18 Jul 2014 03:03:27 -0700 (PDT) X-Received: by 10.66.191.9 with SMTP id gu9mr3527831pac.27.1405677804665; Fri, 18 Jul 2014 03:03:24 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id v9sm6786780pdp.88.2014.07.18.03.03.21 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 18 Jul 2014 03:03:24 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" Cc: Catalin Marinas , Graeme Gregory , Tony Luck , "H. Peter Anvin" , 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 v3 1/3] ACPI: ARM64 does not have a BIOS add config for BIOS table scan. Date: Fri, 18 Jul 2014 18:02:52 +0800 Message-Id: <1405677774-16787-2-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1405677774-16787-1-git-send-email-hanjun.guo@linaro.org> References: <1405677774-16787-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.171 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 (ia64 doesn't need it either, it is EFI/UEFI based system) to do the traditional BIOS scanning for tables. Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo --- arch/x86/Kconfig | 1 + drivers/acpi/Kconfig | 3 +++ drivers/acpi/osl.c | 4 +++- 3 files changed, 7 insertions(+), 1 deletion(-) 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. */