From: guohanjun@huawei•com (Hanjun Guo)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v10 06/21] ACPI / sleep: Introduce CONFIG_ACPI_GENERIC_SLEEP
Date: Fri, 13 Mar 2015 11:31:38 +0800 [thread overview]
Message-ID: <55025A1A.7020507@huawei.com> (raw)
In-Reply-To: <3629643.daQYNeVrsM@vostro.rjw.lan>
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 <graeme.gregory@linaro•org>
>>
>> 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 <rjw@rjwysocki•net>
>> Suggested-by: Rafael J. Wysocki <rafael.j.wysocki@intel•com>
>> Acked-by: Robert Richter <rrichter@cavium•com>
>> Signed-off-by: Graeme Gregory <graeme.gregory@linaro•org>
>> Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro•org>
>> Signed-off-by: Hanjun Guo <hanjun.guo@linaro•org>
>> ---
>> 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
next prev parent reply other threads:[~2015-03-13 3:31 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-11 12:39 [PATCH v10 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 01/21] ACPI / table: Use pr_debug() instead of pr_info() for MADT table scanning Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 02/21] ACPI: add arm64 to the platforms that use ioremap Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 03/21] ARM64: allow late use of early_ioremap Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 04/21] ARM64 / ACPI: Get RSDP and ACPI boot-time tables Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 05/21] ACPI: fix acpi_os_ioremap for arm64 Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 06/21] ACPI / sleep: Introduce CONFIG_ACPI_GENERIC_SLEEP Hanjun Guo
2015-03-12 9:32 ` Lorenzo Pieralisi
2015-03-12 22:57 ` Rafael J. Wysocki
2015-03-13 3:31 ` Hanjun Guo [this message]
2015-03-11 12:39 ` [PATCH v10 07/21] ARM64 / ACPI: Introduce PCI stub functions for ACPI Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 08/21] ARM64 / ACPI: Introduce early_param "acpi=" to enable/disable ACPI Hanjun Guo
2015-03-18 11:35 ` Lorenzo Pieralisi
2015-03-18 20:07 ` Ard Biesheuvel
2015-03-19 2:30 ` Hanjun Guo
2015-03-19 10:04 ` Lorenzo Pieralisi
2015-03-11 12:39 ` [PATCH v10 09/21] ARM64 / ACPI: If we chose to boot from acpi then disable FDT Hanjun Guo
2015-03-18 16:52 ` Catalin Marinas
2015-03-11 12:39 ` [PATCH v10 10/21] ARM64 / ACPI: Get PSCI flags in FADT for PSCI init Hanjun Guo
2015-03-13 14:51 ` Lorenzo Pieralisi
2015-03-16 11:45 ` Hanjun Guo
2015-03-16 18:41 ` Lorenzo Pieralisi
2015-03-11 12:39 ` [PATCH v10 11/21] ACPI / table: Print GIC information when MADT is parsed Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 12/21] ARM64 / ACPI: Parse MADT for SMP initialization Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 13/21] ACPI / processor: Introduce phys_cpuid_t for CPU hardware ID Hanjun Guo
2015-03-12 9:51 ` Lorenzo Pieralisi
2015-03-12 10:16 ` Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 14/21] ACPI / processor: Make it possible to get CPU hardware ID via GICC Hanjun Guo
2015-03-12 15:41 ` Lorenzo Pieralisi
2015-03-12 23:02 ` Rafael J. Wysocki
2015-03-11 12:39 ` [PATCH v10 15/21] ARM64 / ACPI: Introduce ACPI_IRQ_MODEL_GIC and register device's gsi Hanjun Guo
2015-03-18 18:41 ` Will Deacon
2015-03-19 3:45 ` Hanjun Guo
2015-03-19 10:12 ` Lorenzo Pieralisi
2015-03-19 19:37 ` Will Deacon
2015-03-20 13:07 ` Hanjun Guo
2015-03-20 14:25 ` Lorenzo Pieralisi
2015-03-21 21:38 ` Lorenzo Pieralisi
2015-03-11 12:39 ` [PATCH v10 16/21] irqchip: Add GICv2 specific ACPI boot support Hanjun Guo
[not found] ` <CACxGe6uWwts6X=Yc2ioBdQizXkF1_YgoNNOsREWirk2MFBVDHg@mail.gmail.com>
2015-03-11 23:11 ` Jason Cooper
2015-03-12 1:46 ` Hanjun Guo
2015-03-12 5:12 ` Jason Cooper
2015-03-12 7:31 ` Hanjun Guo
2015-03-13 17:15 ` Jason Cooper
2015-03-14 8:47 ` Grant Likely
2015-03-14 11:43 ` Catalin Marinas
2015-03-12 10:14 ` Marc Zyngier
2015-03-14 18:44 ` Jason Cooper
2015-03-11 12:39 ` [PATCH v10 17/21] clocksource / arch_timer: Parse GTDT to initialize arch timer Hanjun Guo
2015-03-18 18:34 ` Will Deacon
2015-03-20 13:49 ` Daniel Lezcano
2015-03-11 12:39 ` [PATCH v10 18/21] ARM64 / ACPI: Select ACPI_REDUCED_HARDWARE_ONLY if ACPI is enabled on ARM64 Hanjun Guo
2015-03-12 18:21 ` Lorenzo Pieralisi
2015-03-13 3:28 ` Hanjun Guo
2015-03-13 11:04 ` Lorenzo Pieralisi
2015-03-16 11:33 ` Hanjun Guo
2015-03-17 12:50 ` Lorenzo Pieralisi
2015-03-18 9:18 ` Lorenzo Pieralisi
2015-03-18 15:06 ` Rafael J. Wysocki
2015-03-19 1:16 ` Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 19/21] ARM64 / ACPI: Enable ARM64 in Kconfig Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 20/21] Documentation: ACPI for ARM64 Hanjun Guo
2015-03-11 12:39 ` [PATCH v10 21/21] ARM64 / ACPI: additions of ACPI documentation for arm64 Hanjun Guo
2015-03-12 13:26 ` [PATCH v10 00/21] Introduce ACPI for ARM64 based on ACPI 5.1 Timur Tabi
2015-03-16 5:07 ` Suthikulpanit, Suravee
2015-03-18 19:05 ` Will Deacon
2015-03-18 19:09 ` Will Deacon
2015-03-19 4:09 ` Hanjun Guo
2015-03-19 10:17 ` Lorenzo Pieralisi
2015-03-19 19:39 ` Will Deacon
2015-03-24 22:02 ` Grant Likely
2015-03-25 11:24 ` Will Deacon
2015-03-25 11:54 ` Rafael J. Wysocki
2015-03-25 11:38 ` Will Deacon
2015-03-25 12:16 ` Rafael J. Wysocki
2015-03-28 12:34 ` Grant Likely
2015-03-26 10:24 ` Lorenzo Pieralisi
2015-03-20 18:54 ` Will Deacon
2015-03-21 3:17 ` Hanjun Guo
2015-03-21 7:03 ` Hanjun Guo
[not found] ` <CAFoFrHatzS3MwGVeOPPjY1R1sfBRYnJjgbQjvfzi6xS+XYD14g@mail.gmail.com>
2015-03-22 21:05 ` Julien Grall
2015-03-22 21:49 ` Rafael J. Wysocki
2015-03-22 21:32 ` Julien Grall
2015-03-22 22:11 ` Rafael J. Wysocki
2015-03-23 1:37 ` Hanjun Guo
2015-03-23 18:39 ` Stefano Stabellini
2015-03-23 18:32 ` Stefano Stabellini
2015-03-24 13:46 ` Hanjun Guo
2015-03-20 13:18 ` Mark Salter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=55025A1A.7020507@huawei.com \
--to=guohanjun@huawei$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox