Commit 65b7f839 authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown

intel_idle: Split up and provide per CPU initialization func

Function split up, should have no functional change.

Provides entry point for physically hotplugged CPUs
to initialize and activate cpuidle.
Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
CC: Deepthi Dharwar <deepthi@linux.vnet.ibm.com>
CC: Shaohua Li <shaohua.li@intel.com>
CC: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3bd81a87
...@@ -478,20 +478,16 @@ static int intel_idle_cpuidle_driver_init(void) ...@@ -478,20 +478,16 @@ static int intel_idle_cpuidle_driver_init(void)
/* /*
* intel_idle_cpuidle_devices_init() * intel_idle_cpu_init()
* allocate, initialize, register cpuidle_devices * allocate, initialize, register cpuidle_devices
* @cpu: cpu/core to initialize
*/ */
static int intel_idle_cpuidle_devices_init(void) int intel_idle_cpu_init(int cpu)
{ {
int i, cstate; int cstate;
struct cpuidle_device *dev; struct cpuidle_device *dev;
intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device); dev = per_cpu_ptr(intel_idle_cpuidle_devices, cpu);
if (intel_idle_cpuidle_devices == NULL)
return -ENOMEM;
for_each_online_cpu(i) {
dev = per_cpu_ptr(intel_idle_cpuidle_devices, i);
dev->state_count = 1; dev->state_count = 1;
...@@ -510,24 +506,24 @@ static int intel_idle_cpuidle_devices_init(void) ...@@ -510,24 +506,24 @@ static int intel_idle_cpuidle_devices_init(void)
if (num_substates == 0) if (num_substates == 0)
continue; continue;
/* is the state not enabled? */ /* is the state not enabled? */
if (cpuidle_state_table[cstate].enter == NULL) { if (cpuidle_state_table[cstate].enter == NULL)
continue; continue;
}
dev->states_usage[dev->state_count].driver_data = dev->states_usage[dev->state_count].driver_data =
(void *)get_driver_data(cstate); (void *)get_driver_data(cstate);
dev->state_count += 1; dev->state_count += 1;
} }
dev->cpu = cpu;
dev->cpu = i;
if (cpuidle_register_device(dev)) { if (cpuidle_register_device(dev)) {
pr_debug(PREFIX "cpuidle_register_device %d failed!\n", pr_debug(PREFIX "cpuidle_register_device %d failed!\n", cpu);
i);
intel_idle_cpuidle_devices_uninit(); intel_idle_cpuidle_devices_uninit();
return -EIO; return -EIO;
} }
}
if (auto_demotion_disable_flags)
smp_call_function_single(cpu, auto_demotion_disable, NULL, 1);
return 0; return 0;
} }
...@@ -535,7 +531,7 @@ static int intel_idle_cpuidle_devices_init(void) ...@@ -535,7 +531,7 @@ static int intel_idle_cpuidle_devices_init(void)
static int __init intel_idle_init(void) static int __init intel_idle_init(void)
{ {
int retval; int retval, i;
/* Do not load intel_idle at all for now if idle= is passed */ /* Do not load intel_idle at all for now if idle= is passed */
if (boot_option_idle_override != IDLE_NO_OVERRIDE) if (boot_option_idle_override != IDLE_NO_OVERRIDE)
...@@ -553,11 +549,17 @@ static int __init intel_idle_init(void) ...@@ -553,11 +549,17 @@ static int __init intel_idle_init(void)
return retval; return retval;
} }
retval = intel_idle_cpuidle_devices_init(); intel_idle_cpuidle_devices = alloc_percpu(struct cpuidle_device);
if (intel_idle_cpuidle_devices == NULL)
return -ENOMEM;
for_each_online_cpu(i) {
retval = intel_idle_cpu_init(i);
if (retval) { if (retval) {
cpuidle_unregister_driver(&intel_idle_driver); cpuidle_unregister_driver(&intel_idle_driver);
return retval; return retval;
} }
}
return 0; return 0;
} }
......
...@@ -188,7 +188,14 @@ struct cpuidle_governor { ...@@ -188,7 +188,14 @@ struct cpuidle_governor {
extern int cpuidle_register_governor(struct cpuidle_governor *gov); extern int cpuidle_register_governor(struct cpuidle_governor *gov);
extern void cpuidle_unregister_governor(struct cpuidle_governor *gov); extern void cpuidle_unregister_governor(struct cpuidle_governor *gov);
#ifdef CONFIG_INTEL_IDLE
extern int intel_idle_cpu_init(int cpu);
#else #else
static inline int intel_idle_cpu_init(int cpu) { return -1; }
#endif
#else
static inline int intel_idle_cpu_init(int cpu) { return -1; }
static inline int cpuidle_register_governor(struct cpuidle_governor *gov) static inline int cpuidle_register_governor(struct cpuidle_governor *gov)
{return 0;} {return 0;}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment