Commit 27afe58f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6 

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: do not use the LAPIC timer for ATOM C2
  intel_idle: add initial Sandy Bridge support
  acpi_idle: delete bogus data from cpuidle_state.power_usage
  intel_idle: delete bogus data from cpuidle_state.power_usage
  intel_idle: simplify test for leave_mm()
parents 7eb901e7 c25d2995

drivers/acpi/processor_idle.c

+0 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,6 @@ static int acpi_processor_setup_cpuidle(struct acpi_processor *pr) 
		strncpy(state->desc, cx->desc, CPUIDLE_DESC_LEN);

		state->exit_latency = cx->latency;

		state->target_residency = cx->latency * latency_factor;

		state->power_usage = cx->power;



		state->flags = 0;

		switch (cx->type) {

drivers/idle/intel_idle.c

+46 −15
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int max_cstate = MWAIT_MAX_NUM_CSTATES - 1; 
static unsigned int mwait_substates;



/* Reliable LAPIC Timer States, bit 1 for C1 etc.  */

static unsigned int lapic_timer_reliable_states;

static unsigned int lapic_timer_reliable_states = (1 << 1);	 /* Default to only C1 */



static struct cpuidle_device __percpu *intel_idle_cpuidle_devices;

static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state);
@@ -94,7 +94,6 @@ static struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.driver_data = (void *) 0x00,

		.flags = CPUIDLE_FLAG_TIME_VALID,

		.exit_latency = 3,

		.power_usage = 1000,

		.target_residency = 6,

		.enter = &intel_idle },

	{ /* MWAIT C2 */
@@ -103,7 +102,6 @@ static struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.driver_data = (void *) 0x10,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 20,

		.power_usage = 500,

		.target_residency = 80,

		.enter = &intel_idle },

	{ /* MWAIT C3 */
@@ -112,11 +110,46 @@ static struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.driver_data = (void *) 0x20,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 200,

		.power_usage = 350,

		.target_residency = 800,

		.enter = &intel_idle },

};



static struct cpuidle_state snb_cstates[MWAIT_MAX_NUM_CSTATES] = {

	{ /* MWAIT C0 */ },

	{ /* MWAIT C1 */

		.name = "SNB-C1",

		.desc = "MWAIT 0x00",

		.driver_data = (void *) 0x00,

		.flags = CPUIDLE_FLAG_TIME_VALID,

		.exit_latency = 1,

		.target_residency = 4,

		.enter = &intel_idle },

	{ /* MWAIT C2 */

		.name = "SNB-C3",

		.desc = "MWAIT 0x10",

		.driver_data = (void *) 0x10,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 80,

		.target_residency = 160,

		.enter = &intel_idle },

	{ /* MWAIT C3 */

		.name = "SNB-C6",

		.desc = "MWAIT 0x20",

		.driver_data = (void *) 0x20,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 104,

		.target_residency = 208,

		.enter = &intel_idle },

	{ /* MWAIT C4 */

		.name = "SNB-C7",

		.desc = "MWAIT 0x30",

		.driver_data = (void *) 0x30,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 109,

		.target_residency = 300,

		.enter = &intel_idle },

};



static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = {

	{ /* MWAIT C0 */ },

	{ /* MWAIT C1 */
@@ -125,7 +158,6 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.driver_data = (void *) 0x00,

		.flags = CPUIDLE_FLAG_TIME_VALID,

		.exit_latency = 1,

		.power_usage = 1000,

		.target_residency = 4,

		.enter = &intel_idle },

	{ /* MWAIT C2 */
@@ -134,7 +166,6 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.driver_data = (void *) 0x10,

		.flags = CPUIDLE_FLAG_TIME_VALID,

		.exit_latency = 20,

		.power_usage = 500,

		.target_residency = 80,

		.enter = &intel_idle },

	{ /* MWAIT C3 */ },
@@ -144,7 +175,6 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.driver_data = (void *) 0x30,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 100,

		.power_usage = 250,

		.target_residency = 400,

		.enter = &intel_idle },

	{ /* MWAIT C5 */ },
@@ -154,7 +184,6 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.driver_data = (void *) 0x52,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 140,

		.power_usage = 150,

		.target_residency = 560,

		.enter = &intel_idle },

};
@@ -179,13 +208,10 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state) 
	local_irq_disable();



	/*

	 * If the state flag indicates that the TLB will be flushed or if this

	 * is the deepest c-state supported, do a voluntary leave mm to avoid

	 * costly and mostly unnecessary wakeups for flushing the user TLB's

	 * associated with the active mm.

	 * leave_mm() to avoid costly and often unnecessary wakeups

	 * for flushing the user TLB's associated with the active mm.

	 */

	if (state->flags & CPUIDLE_FLAG_TLB_FLUSHED ||

	    (&dev->states[dev->state_count - 1] == state))

	if (state->flags & CPUIDLE_FLAG_TLB_FLUSHED)

		leave_mm(cpu);



	if (!(lapic_timer_reliable_states & (1 << (cstate))))
@@ -269,9 +295,14 @@ static int intel_idle_probe(void) 


	case 0x1C:	/* 28 - Atom Processor */

	case 0x26:	/* 38 - Lincroft Atom Processor */

		lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */

		lapic_timer_reliable_states = (1 << 1); /* C1 */

		cpuidle_state_table = atom_cstates;

		break;



	case 0x2A:	/* SNB */

	case 0x2D:	/* SNB Xeon */

		cpuidle_state_table = snb_cstates;

		break;

#ifdef FUTURE_USE

	case 0x17:	/* 23 - Core 2 Duo */

		lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE