From patchwork Wed Mar 18 06:46:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 45919 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D665B2153B for ; Wed, 18 Mar 2015 06:47:33 +0000 (UTC) Received: by lbiz11 with SMTP id z11sf5639048lbi.2 for ; Tue, 17 Mar 2015 23:47:32 -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:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=A0UbGxuq1RlAgsKuhfHvrS2NnzDcEcrv9B6qBKjLfqs=; b=GQ0ElkeD4AS56ofqzTB45O7iUXY2TFXN4AhXEVTDNN6YNefOOFXTp0caUNK1R1g+Cn ZqDvr0L8vt1A1yBPKx6zBMUwLBgt66aEFUa5FhDxra3IjiCzNbo+0Q9G5JcWlwhTuTeU TdUNKtloK48a1ozJ56lgBKgcsD8ekb+HhGZ+ahnJbQy2cdjRExYHiOGl+cUdoGfidOCs pWViEDOMu4ZHk3RCISPb0BDwxzB0PAiyypkyc9fTBwQ3KhtXtRact3Qx/8mgkaE7yJYc RktS0MGJmNlDE0+skQdPTsbJfK0od4htC6F0dBEyfdf+qlqoNQ0JzaGXqyqZAE0zSRBv tgUg== X-Gm-Message-State: ALoCoQl+Z87c8RuUOWFWermVsb5c+2UThqr1EaDyw0D01c3tKTuS0q8TUD5sE2LGwXhw//4SRrF+ X-Received: by 10.112.224.12 with SMTP id qy12mr10566306lbc.10.1426661252209; Tue, 17 Mar 2015 23:47:32 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.36 with SMTP id b4ls105102lae.46.gmail; Tue, 17 Mar 2015 23:47:31 -0700 (PDT) X-Received: by 10.152.30.103 with SMTP id r7mr59234215lah.76.1426661251729; Tue, 17 Mar 2015 23:47:31 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id lu7si12200609lbb.124.2015.03.17.23.47.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Mar 2015 23:47:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by ladw1 with SMTP id w1so27980824lad.0 for ; Tue, 17 Mar 2015 23:47:31 -0700 (PDT) X-Received: by 10.112.204.197 with SMTP id la5mr62291748lbc.29.1426661251288; Tue, 17 Mar 2015 23:47:31 -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.112.35.133 with SMTP id h5csp965215lbj; Tue, 17 Mar 2015 23:47:30 -0700 (PDT) X-Received: by 10.70.138.69 with SMTP id qo5mr81419725pdb.124.1426661249456; Tue, 17 Mar 2015 23:47:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z3si34044279pas.35.2015.03.17.23.47.28; Tue, 17 Mar 2015 23:47:29 -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 S1754975AbbCRGrY (ORCPT + 27 others); Wed, 18 Mar 2015 02:47:24 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:34435 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753379AbbCRGrU (ORCPT ); Wed, 18 Mar 2015 02:47:20 -0400 Received: by pdbni2 with SMTP id ni2so33946811pdb.1 for ; Tue, 17 Mar 2015 23:47:19 -0700 (PDT) X-Received: by 10.70.43.198 with SMTP id y6mr1242771pdl.85.1426661239527; Tue, 17 Mar 2015 23:47:19 -0700 (PDT) Received: from localhost ([180.150.157.4]) by mx.google.com with ESMTPSA id os6sm25718108pac.28.2015.03.17.23.47.17 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Tue, 17 Mar 2015 23:47:18 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Will Deacon , Olof Johansson , Grant Likely Cc: Lorenzo Pieralisi , Arnd Bergmann , Mark Rutland , Graeme Gregory , Sudeep Holla , Jon Masters , Marc Zyngier , Mark Brown , Robert Richter , Timur Tabi , Ashwin Chaugule , suravee.suthikulpanit@amd.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Tomasz Nowicki , Hanjun Guo Subject: [update][PATCH v10 06/21] ACPI / sleep: Introduce CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT Date: Wed, 18 Mar 2015 14:46:51 +0800 Message-Id: <1426661211-14272-1-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.9.1 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.215.52 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 ACPI 5.1 does not currently support S states for ARM64 hardware but ACPI code will call acpi_target_system_state() and acpi_sleep_init() for device power management, so introduce CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT and select it for x86 and ia64 only to make sleep functions available, and also introduce stub function to allow other drivers to function until S states are defined for ARM64. It will be no functional change for x86 and IA64. Suggested-by: Rafael J. Wysocki Acked-by: Lorenzo Pieralisi Signed-off-by: Graeme Gregory Signed-off-by: Tomasz Nowicki Signed-off-by: Hanjun Guo --- Hi Lorenzo, Since this patch only updated the config name with no fucntion change, I assume your ACK still apply, if not, please let me know. Thanks Hanjun --- arch/ia64/Kconfig | 1 + arch/x86/Kconfig | 1 + drivers/acpi/Kconfig | 4 ++++ drivers/acpi/Makefile | 2 +- drivers/acpi/internal.h | 4 ++++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 074e52b..cc3414f 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -10,6 +10,7 @@ config IA64 select ARCH_MIGHT_HAVE_PC_SERIO select PCI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM) + select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select HAVE_UNSTABLE_SCHED_CLOCK select HAVE_IDE diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index b7d31ca..c3ea9f9 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -22,6 +22,7 @@ config X86_64 ### Arch settings config X86 def_bool y + select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS select ARCH_HAS_FAST_MULTIPLIER diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index e6c3ddd..a726381 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -48,9 +48,13 @@ config ACPI_LEGACY_TABLES_LOOKUP config ARCH_MIGHT_HAVE_ACPI_PDC bool +config ACPI_SYSTEM_POWER_STATES_SUPPORT + bool + config ACPI_SLEEP bool depends on SUSPEND || HIBERNATION + depends on ACPI_SYSTEM_POWER_STATES_SUPPORT default y config ACPI_PROCFS_POWER diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 623b117..db153c6 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -23,7 +23,7 @@ acpi-y += nvs.o # Power management related files acpi-y += wakeup.o -acpi-y += sleep.o +acpi-$(CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT) += sleep.o acpi-y += device_pm.o acpi-$(CONFIG_ACPI_SLEEP) += proc.o diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h index 56b321a..ba4a61e 100644 --- a/drivers/acpi/internal.h +++ b/drivers/acpi/internal.h @@ -161,7 +161,11 @@ void acpi_ec_remove_query_handler(struct acpi_ec *ec, u8 query_bit); /*-------------------------------------------------------------------------- Suspend/Resume -------------------------------------------------------------------------- */ +#ifdef CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT extern int acpi_sleep_init(void); +#else +static inline int acpi_sleep_init(void) { return -ENXIO; } +#endif #ifdef CONFIG_ACPI_SLEEP int acpi_sleep_proc_init(void);