Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 35ec4216 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: Voluntary leave_mm before entering deeper
  acpi_idle: add missing \n to printk
  intel_idle: add missing __percpu markup
  intel_idle: Change mode 755 => 644
  cpuidle: Fix typos
  intel_idle: PCI quirk to prevent Lenovo Ideapad s10-3 boot hang
parents 3c729087 6110a1f4

drivers/acpi/processor_driver.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ static int __init acpi_processor_init(void) 
		printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",

			acpi_idle_driver.name);

	} else {

		printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s",

		printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s\n",

			cpuidle_get_driver()->name);

	}

drivers/cpuidle/governors/menu.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ 
 * Limiting Performance Impact

 * ---------------------------

 * C states, especially those with large exit latencies, can have a real

 * noticable impact on workloads, which is not acceptable for most sysadmins,

 * noticeable impact on workloads, which is not acceptable for most sysadmins,

 * and in addition, less performance has a power price of its own.

 *

 * As a general rule of thumb, menu assumes that the following heuristic

drivers/idle/intel_idle.c

100755 → 100644
+15 −5
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static unsigned int mwait_substates; 
/* Reliable LAPIC Timer States, bit 1 for C1 etc.  */

static unsigned int lapic_timer_reliable_states;



static struct cpuidle_device *intel_idle_cpuidle_devices;

static struct cpuidle_device __percpu *intel_idle_cpuidle_devices;

static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state);



static struct cpuidle_state *cpuidle_state_table;
@@ -108,7 +108,7 @@ static struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.name = "NHM-C3",

		.desc = "MWAIT 0x10",

		.driver_data = (void *) 0x10,

		.flags = CPUIDLE_FLAG_TIME_VALID,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 20,

		.power_usage = 500,

		.target_residency = 80,
@@ -117,7 +117,7 @@ static struct cpuidle_state nehalem_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.name = "NHM-C6",

		.desc = "MWAIT 0x20",

		.driver_data = (void *) 0x20,

		.flags = CPUIDLE_FLAG_TIME_VALID,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 200,

		.power_usage = 350,

		.target_residency = 800,
@@ -149,7 +149,7 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.name = "ATM-C4",

		.desc = "MWAIT 0x30",

		.driver_data = (void *) 0x30,

		.flags = CPUIDLE_FLAG_TIME_VALID,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 100,

		.power_usage = 250,

		.target_residency = 400,
@@ -159,7 +159,7 @@ static struct cpuidle_state atom_cstates[MWAIT_MAX_NUM_CSTATES] = { 
		.name = "ATM-C6",

		.desc = "MWAIT 0x40",

		.driver_data = (void *) 0x40,

		.flags = CPUIDLE_FLAG_TIME_VALID,

		.flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,

		.exit_latency = 200,

		.power_usage = 150,

		.target_residency = 800,
@@ -185,6 +185,16 @@ 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.

	 */

	if (state->flags & CPUIDLE_FLAG_TLB_FLUSHED ||

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

		leave_mm(cpu);



	if (!(lapic_timer_reliable_states & (1 << (cstate))))

		clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu);

drivers/pci/quirks.c

+20 −0
Original line number Diff line number Diff line
@@ -162,6 +162,26 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_1, quirk_isa_d 
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC,	PCI_DEVICE_ID_NEC_CBUS_2,	quirk_isa_dma_hangs);

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC,	PCI_DEVICE_ID_NEC_CBUS_3,	quirk_isa_dma_hangs);



/*

 * Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear

 * for some HT machines to use C4 w/o hanging.

 */

static void __devinit quirk_tigerpoint_bm_sts(struct pci_dev *dev)

{

	u32 pmbase;

	u16 pm1a;



	pci_read_config_dword(dev, 0x40, &pmbase);

	pmbase = pmbase & 0xff80;

	pm1a = inw(pmbase);



	if (pm1a & 0x10) {

		dev_info(&dev->dev, FW_BUG "TigerPoint LPC.BM_STS cleared\n");

		outw(0x10, pmbase);

	}

}

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TGP_LPC, quirk_tigerpoint_bm_sts);



/*

 *	Chipsets where PCI->PCI transfers vanish or hang

 */

include/linux/cpuidle.h

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ struct cpuidle_state { 
#define CPUIDLE_FLAG_BALANCED	(0x40) /* medium latency, moderate savings */

#define CPUIDLE_FLAG_DEEP	(0x80) /* high latency, large savings */

#define CPUIDLE_FLAG_IGNORE	(0x100) /* ignore during this idle period */

#define CPUIDLE_FLAG_TLB_FLUSHED (0x200) /* tlb will be flushed */



#define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)