renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 17:53:56 +08:00
Code

intel_idle: delete power_policy modparam, and choose substate functions

Browse Source 
The idea behind power policy was that it would start off as a modparam,
and then hook into the new "global" in-kernel power vs energy tunable.
But that tunable isn't happening, so delete the hook here.

With the policy hook gone, the sub-state choice functions
do not do anything useful, so delete them from the critical path.

To handle sub-states in the future, we will advertise them
with dedicated cpuidle_state entries.  That is necessary
because some of the sub-states will have substantially different
properties than their peer sub-states.

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2010-07-23 16:04:46 -04:00
parent c4236282e5
commit 0394c6676e
1 changed files with 0 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/idle/intel_idle.c
View File

@ -77,10 +77,8 @@ static struct cpuidle_driver intel_idle_driver = {
}; };
/* intel_idle.max_cstate=0 disables driver */ /* intel_idle.max_cstate=0 disables driver */
static int max_cstate = MWAIT_MAX_NUM_CSTATES - 1; static int max_cstate = MWAIT_MAX_NUM_CSTATES - 1;
static int power_policy = 7; /* 0 = max perf; 15 = max powersave */
static unsigned int mwait_substates; static unsigned int mwait_substates;
static int (*choose_substate)(int);
/* Reliable LAPIC Timer States, bit 1 for C1 etc. */ /* Reliable LAPIC Timer States, bit 1 for C1 etc. */
static unsigned int lapic_timer_reliable_states; static unsigned int lapic_timer_reliable_states;
@ -168,42 +166,6 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {
.enter = NULL }, /* disabled */ .enter = NULL }, /* disabled */
}; };
/*
* choose_tunable_substate()
*
* Run-time decision on which C-state substate to invoke
* If power_policy = 0, choose shallowest substate (0)
* If power_policy = 15, choose deepest substate
* If power_policy = middle, choose middle substate etc.
*/
static int choose_tunable_substate(int cstate)
{
unsigned int num_substates;
unsigned int substate_choice;
power_policy &= 0xF; /* valid range: 0-15 */
cstate &= 7; /* valid range: 0-7 */
num_substates = (mwait_substates >> ((cstate) * 4))
& MWAIT_SUBSTATE_MASK;
if (num_substates <= 1)
return 0;
substate_choice = ((power_policy + (power_policy + 1) *
(num_substates - 1)) / 16);
return substate_choice;
}
/*
* choose_zero_substate()
*/
static int choose_zero_substate(int cstate)
{
return 0;
}
/** /**
* intel_idle * intel_idle
* @dev: cpuidle_device * @dev: cpuidle_device
@ -221,8 +183,6 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state)
cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1; cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1;
eax = eax + (choose_substate)(cstate);
local_irq_disable(); local_irq_disable();
if (!(lapic_timer_reliable_states & (1 << (cstate)))) if (!(lapic_timer_reliable_states & (1 << (cstate))))
@ -301,13 +261,11 @@ static int intel_idle_probe(void)
case 0x25: /* Westmere */ case 0x25: /* Westmere */
case 0x2C: /* Westmere */ case 0x2C: /* Westmere */
cpuidle_state_table = nehalem_cstates; cpuidle_state_table = nehalem_cstates;
choose_substate = choose_tunable_substate;
break; break;
case 0x1C: /* 28 - Atom Processor */ case 0x1C: /* 28 - Atom Processor */
lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */ lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */
cpuidle_state_table = atom_cstates; cpuidle_state_table = atom_cstates;
choose_substate = choose_zero_substate;
break; break;
#ifdef FUTURE_USE #ifdef FUTURE_USE
case 0x17: /* 23 - Core 2 Duo */ case 0x17: /* 23 - Core 2 Duo */
@ -447,7 +405,6 @@ static void __exit intel_idle_exit(void)
module_init(intel_idle_init); module_init(intel_idle_init);
module_exit(intel_idle_exit); module_exit(intel_idle_exit);
module_param(power_policy, int, 0644);
module_param(max_cstate, int, 0444); module_param(max_cstate, int, 0444);
MODULE_AUTHOR("Len Brown <len.brown@intel.com>"); MODULE_AUTHOR("Len Brown <len.brown@intel.com>");