|
@@ -24,9 +24,7 @@ struct cpuidle_driver pseries_idle_driver = {
|
|
|
.owner = THIS_MODULE,
|
|
|
};
|
|
|
|
|
|
-#define MAX_IDLE_STATE_COUNT 2
|
|
|
-
|
|
|
-static int max_idle_state = MAX_IDLE_STATE_COUNT - 1;
|
|
|
+static int max_idle_state;
|
|
|
static struct cpuidle_state *cpuidle_state_table;
|
|
|
|
|
|
static inline void idle_loop_prolog(unsigned long *in_purr)
|
|
@@ -134,7 +132,7 @@ static int shared_cede_loop(struct cpuidle_device *dev,
|
|
|
/*
|
|
|
* States for dedicated partition case.
|
|
|
*/
|
|
|
-static struct cpuidle_state dedicated_states[MAX_IDLE_STATE_COUNT] = {
|
|
|
+static struct cpuidle_state dedicated_states[] = {
|
|
|
{ /* Snooze */
|
|
|
.name = "snooze",
|
|
|
.desc = "snooze",
|
|
@@ -154,7 +152,7 @@ static struct cpuidle_state dedicated_states[MAX_IDLE_STATE_COUNT] = {
|
|
|
/*
|
|
|
* States for shared partition case.
|
|
|
*/
|
|
|
-static struct cpuidle_state shared_states[MAX_IDLE_STATE_COUNT] = {
|
|
|
+static struct cpuidle_state shared_states[] = {
|
|
|
{ /* Shared Cede */
|
|
|
.name = "Shared Cede",
|
|
|
.desc = "Shared Cede",
|
|
@@ -225,12 +223,8 @@ static int pseries_cpuidle_driver_init(void)
|
|
|
|
|
|
drv->state_count = 0;
|
|
|
|
|
|
- for (idle_state = 0; idle_state < MAX_IDLE_STATE_COUNT; ++idle_state) {
|
|
|
-
|
|
|
- if (idle_state > max_idle_state)
|
|
|
- break;
|
|
|
-
|
|
|
- /* is the state not enabled? */
|
|
|
+ for (idle_state = 0; idle_state < max_idle_state; ++idle_state) {
|
|
|
+ /* Is the state not enabled? */
|
|
|
if (cpuidle_state_table[idle_state].enter == NULL)
|
|
|
continue;
|
|
|
|
|
@@ -253,16 +247,14 @@ static int pseries_idle_probe(void)
|
|
|
if (cpuidle_disable != IDLE_NO_OVERRIDE)
|
|
|
return -ENODEV;
|
|
|
|
|
|
- if (max_idle_state == 0) {
|
|
|
- printk(KERN_DEBUG "pseries processor idle disabled.\n");
|
|
|
- return -EPERM;
|
|
|
- }
|
|
|
-
|
|
|
if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
|
|
|
- if (lppaca_shared_proc(get_lppaca()))
|
|
|
+ if (lppaca_shared_proc(get_lppaca())) {
|
|
|
cpuidle_state_table = shared_states;
|
|
|
- else
|
|
|
+ max_idle_state = ARRAY_SIZE(shared_states);
|
|
|
+ } else {
|
|
|
cpuidle_state_table = dedicated_states;
|
|
|
+ max_idle_state = ARRAY_SIZE(dedicated_states);
|
|
|
+ }
|
|
|
} else
|
|
|
return -ENODEV;
|
|
|
|