From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755906AbbCMDcI (ORCPT ); Thu, 12 Mar 2015 23:32:08 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:25550 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751124AbbCMDcE (ORCPT ); Thu, 12 Mar 2015 23:32:04 -0400 Message-ID: <55025A1A.7020507@huawei.com> Date: Fri, 13 Mar 2015 11:31:38 +0800 From: Hanjun Guo User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: "Rafael J. Wysocki" , 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 , , , , , , Tomasz Nowicki , Zhangdianfang Subject: Re: [PATCH v10 06/21] ACPI / sleep: Introduce CONFIG_ACPI_GENERIC_SLEEP References: <1426077587-1561-1-git-send-email-hanjun.guo@linaro.org> <1426077587-1561-7-git-send-email-hanjun.guo@linaro.org> <3629643.daQYNeVrsM@vostro.rjw.lan> In-Reply-To: <3629643.daQYNeVrsM@vostro.rjw.lan> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.17.188] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2015/3/13 6:57, Rafael J. Wysocki wrote: > On Wednesday, March 11, 2015 08:39:32 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_GENERIC_SLEEP >> 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. >> >> CC: Rafael J. Wysocki >> Suggested-by: Rafael J. Wysocki >> Acked-by: Robert Richter >> Signed-off-by: Graeme Gregory >> Signed-off-by: Tomasz Nowicki >> Signed-off-by: Hanjun Guo >> --- >> 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..e8728d7 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_GENERIC_SLEEP 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..9804431 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_GENERIC_SLEEP 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..a7b9120 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_GENERIC_SLEEP >> + bool >> + >> config ACPI_SLEEP >> bool >> depends on SUSPEND || HIBERNATION >> + depends on ACPI_GENERIC_SLEEP >> default y >> >> config ACPI_PROCFS_POWER >> diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile >> index 623b117..2397822 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_GENERIC_SLEEP) += 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..b5eef4c 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_GENERIC_SLEEP >> extern int acpi_sleep_init(void); >> +#else >> +static inline int acpi_sleep_init(void) { return -ENOSYS; } > Please change the return value here, preferably to -ENXIO. > > -ENOSYS *specifically* means "system call not implemented" and should only be > used to indicate this particular condition. Oops, you mentioned this for another patch, I will send a updated patch for this one. Thanks Hanjun