From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934020AbbCROMN (ORCPT ); Wed, 18 Mar 2015 10:12:13 -0400 Received: from v094114.home.net.pl ([79.96.170.134]:65430 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S934003AbbCROMH (ORCPT ); Wed, 18 Mar 2015 10:12:07 -0400 From: "Rafael J. Wysocki" To: Hanjun Guo Cc: Catalin Marinas , Will Deacon , Olof Johansson , Grant Likely , 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 Subject: Re: [update][PATCH v10 06/21] ACPI / sleep: Introduce CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT Date: Wed, 18 Mar 2015 15:36:01 +0100 Message-ID: <356700098.jFZbVDoYAQ@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.19.0+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1426661211-14272-1-git-send-email-hanjun.guo@linaro.org> References: <1426661211-14272-1-git-send-email-hanjun.guo@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wednesday, March 18, 2015 02:46:51 PM Hanjun Guo wrote: > 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 Acked-by: Rafael J. Wysocki > --- > 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); > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center.