| Message ID | 1442411963-14398-5-git-send-email-sudeep.holla@arm.com |
|---|---|
| State | New |
| Headers | show |
Hi Sudeep, On 16 September 2015 at 09:59, Sudeep Holla <sudeep.holla@arm.com> wrote: > ACPI 6.0 adds a new method to specify the CPU idle states(C-states) > called Low Power Idle(LPI) states. Since new architectures like ARM64 > use only LPIs, introduce ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE to > encapsulate all the code supporting the old style C-states(_CST) > > This patch will help to extend the processor_idle module to support > LPI. > > Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > --- > arch/ia64/Kconfig | 1 + > arch/x86/Kconfig | 1 + > drivers/acpi/Kconfig | 3 +++ > drivers/acpi/processor_idle.c | 57 +++++++++++++++++++++++++++++++------------ > include/acpi/processor.h | 3 ++- > 5 files changed, 49 insertions(+), 16 deletions(-) > > diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig > index eb0249e37981..dbfa3c3a49e1 100644 > --- a/arch/ia64/Kconfig > +++ b/arch/ia64/Kconfig > @@ -16,6 +16,7 @@ config IA64 > select PCI if (!IA64_HP_SIM) > select ACPI if (!IA64_HP_SIM) > select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI > + select ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE 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 7aef2d52daa0..173075c48df8 100644 > --- a/arch/x86/Kconfig > +++ b/arch/x86/Kconfig > @@ -34,6 +34,7 @@ config X86 > select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI > select ARCH_MIGHT_HAVE_PC_PARPORT > select ARCH_MIGHT_HAVE_PC_SERIO > + select ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE if ACPI > select ARCH_SUPPORTS_ATOMIC_RMW > select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT > select ARCH_SUPPORTS_INT128 if X86_64 > diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig > index 5d1015c26ff4..1eb0b8a84a65 100644 > --- a/drivers/acpi/Kconfig > +++ b/drivers/acpi/Kconfig > @@ -48,6 +48,9 @@ config ACPI_LEGACY_TABLES_LOOKUP > config ARCH_MIGHT_HAVE_ACPI_PDC > bool > > +config ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE > + bool > + > config ACPI_GENERIC_GSI > bool > Can't this be auto selected under ACPI_PROCESSOR_IDLE if X86 || IA64 instead? Regards, Ashwin. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On 24/09/15 11:31, Ashwin Chaugule wrote: > Hi Sudeep, > > On 16 September 2015 at 09:59, Sudeep Holla <sudeep.holla@arm.com> wrote: >> ACPI 6.0 adds a new method to specify the CPU idle states(C-states) >> called Low Power Idle(LPI) states. Since new architectures like ARM64 >> use only LPIs, introduce ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE to >> encapsulate all the code supporting the old style C-states(_CST) >> >> This patch will help to extend the processor_idle module to support >> LPI. >> >> Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> >> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> [...] >> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig >> index 7aef2d52daa0..173075c48df8 100644 >> --- a/arch/x86/Kconfig >> +++ b/arch/x86/Kconfig >> @@ -34,6 +34,7 @@ config X86 >> select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI >> select ARCH_MIGHT_HAVE_PC_PARPORT >> select ARCH_MIGHT_HAVE_PC_SERIO >> + select ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE if ACPI >> select ARCH_SUPPORTS_ATOMIC_RMW >> select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT >> select ARCH_SUPPORTS_INT128 if X86_64 >> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig >> index 5d1015c26ff4..1eb0b8a84a65 100644 >> --- a/drivers/acpi/Kconfig >> +++ b/drivers/acpi/Kconfig >> @@ -48,6 +48,9 @@ config ACPI_LEGACY_TABLES_LOOKUP >> config ARCH_MIGHT_HAVE_ACPI_PDC >> bool >> >> +config ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE >> + bool >> + >> config ACPI_GENERIC_GSI >> bool >> > > Can't this be auto selected under ACPI_PROCESSOR_IDLE if X86 || IA64 > instead? It can be done. The idea was to have ACPI_PROCESSOR_IDLE selected on both x86 and ARM64. processor_idle driver will support both _CST and _LPI 1. to avoid some code duplication 2. for easy enabling of _LPI on x86 if needed in future Regards, Sudeep -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index eb0249e37981..dbfa3c3a49e1 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -16,6 +16,7 @@ config IA64 select PCI if (!IA64_HP_SIM) select ACPI if (!IA64_HP_SIM) select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI + select ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE 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 7aef2d52daa0..173075c48df8 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -34,6 +34,7 @@ config X86 select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI select ARCH_MIGHT_HAVE_PC_PARPORT select ARCH_MIGHT_HAVE_PC_SERIO + select ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE if ACPI select ARCH_SUPPORTS_ATOMIC_RMW select ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT select ARCH_SUPPORTS_INT128 if X86_64 diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index 5d1015c26ff4..1eb0b8a84a65 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -48,6 +48,9 @@ config ACPI_LEGACY_TABLES_LOOKUP config ARCH_MIGHT_HAVE_ACPI_PDC bool +config ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE + bool + config ACPI_GENERIC_GSI bool diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index fadce354d2b7..9ca840c88f48 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -59,6 +59,12 @@ module_param(latency_factor, uint, 0644); static DEFINE_PER_CPU(struct cpuidle_device *, acpi_cpuidle_device); +struct cpuidle_driver acpi_idle_driver = { + .name = "acpi_idle", + .owner = THIS_MODULE, +}; + +#ifdef CONFIG_ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE static DEFINE_PER_CPU(struct acpi_processor_cx * [CPUIDLE_STATE_MAX], acpi_cstate); @@ -804,11 +810,6 @@ static void acpi_idle_enter_freeze(struct cpuidle_device *dev, acpi_idle_do_entry(cx); } -struct cpuidle_driver acpi_idle_driver = { - .name = "acpi_idle", - .owner = THIS_MODULE, -}; - /** * acpi_processor_setup_cpuidle_cx - prepares and configures CPUIDLE * device i.e. per-cpu data @@ -925,6 +926,41 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) return 0; } +static inline void acpi_processor_cstate_first_run_checks(void) +{ + static int first_run; + + if (first_run) + return; + dmi_check_system(processor_power_dmi_table); + max_cstate = acpi_processor_cstate_check(max_cstate); + if (max_cstate < ACPI_C_STATES_MAX) + pr_notice("ACPI: processor limited to max C-state %d\n", + max_cstate); + first_run++; +} +#else + +static inline int disabled_by_idle_boot_param(void) { return 0; } +static inline void acpi_processor_cstate_first_run_checks(void) { } +static int acpi_processor_get_power_info(struct acpi_processor *pr) +{ + return -ENODEV; +} + +static int acpi_processor_setup_cpuidle_cx(struct acpi_processor *pr, + struct cpuidle_device *dev) +{ + return -EINVAL; +} + +static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) +{ + return -EINVAL; +} + +#endif + int acpi_processor_hotplug(struct acpi_processor *pr) { int ret = 0; @@ -1018,20 +1054,11 @@ int acpi_processor_power_init(struct acpi_processor *pr) acpi_status status; int retval; struct cpuidle_device *dev; - static int first_run; if (disabled_by_idle_boot_param()) return 0; - if (!first_run) { - dmi_check_system(processor_power_dmi_table); - max_cstate = acpi_processor_cstate_check(max_cstate); - if (max_cstate < ACPI_C_STATES_MAX) - printk(KERN_NOTICE - "ACPI: processor limited to max C-state %d\n", - max_cstate); - first_run++; - } + acpi_processor_cstate_first_run_checks(); if (acpi_gbl_FADT.cst_control && !nocst) { status = diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 0abcab53dbe5..b447952f8236 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h @@ -242,7 +242,8 @@ extern int acpi_processor_get_performance_info(struct acpi_processor *pr); DECLARE_PER_CPU(struct acpi_processor *, processors); extern struct acpi_processor_errata errata; -#ifdef ARCH_HAS_POWER_INIT +#if defined(ARCH_HAS_POWER_INIT) && \ + defined(CONFIG_ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE) void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags, unsigned int cpu); int acpi_processor_ffh_cstate_probe(unsigned int cpu,
ACPI 6.0 adds a new method to specify the CPU idle states(C-states) called Low Power Idle(LPI) states. Since new architectures like ARM64 use only LPIs, introduce ARCH_SUPPORTS_ACPI_PROCESSOR_CSTATE to encapsulate all the code supporting the old style C-states(_CST) This patch will help to extend the processor_idle module to support LPI. Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- arch/ia64/Kconfig | 1 + arch/x86/Kconfig | 1 + drivers/acpi/Kconfig | 3 +++ drivers/acpi/processor_idle.c | 57 +++++++++++++++++++++++++++++++------------ include/acpi/processor.h | 3 ++- 5 files changed, 49 insertions(+), 16 deletions(-)