Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 35ec42167bb5f13db93f1e8c13298eb564f95142

Authored by Linus Torvalds
2 parents 3c729087d4 6110a1f43c
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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

Showing 5 changed files Side-by-side Diff

drivers/acpi/processor_driver.c
Diff comments   View file @ 35ec421
... ... @@ -850,7 +850,7 @@
850 850 printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
851 851 acpi_idle_driver.name);
852 852 } else {
853   - printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s",
  853 + printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s\n",
854 854 cpuidle_get_driver()->name);
855 855 }
856 856  
drivers/cpuidle/governors/menu.c
Diff comments   View file @ 35ec421
... ... @@ -80,7 +80,7 @@
80 80 * Limiting Performance Impact
81 81 * ---------------------------
82 82 * C states, especially those with large exit latencies, can have a real
83   - * noticable impact on workloads, which is not acceptable for most sysadmins,
  83 + * noticeable impact on workloads, which is not acceptable for most sysadmins,
84 84 * and in addition, less performance has a power price of its own.
85 85 *
86 86 * As a general rule of thumb, menu assumes that the following heuristic
drivers/idle/intel_idle.c
Diff comments   View file @ 35ec421
... ... @@ -83,7 +83,7 @@
83 83 /* Reliable LAPIC Timer States, bit 1 for C1 etc. */
84 84 static unsigned int lapic_timer_reliable_states;
85 85  
86   -static struct cpuidle_device *intel_idle_cpuidle_devices;
  86 +static struct cpuidle_device __percpu *intel_idle_cpuidle_devices;
87 87 static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state);
88 88  
89 89 static struct cpuidle_state *cpuidle_state_table;
... ... @@ -108,7 +108,7 @@
108 108 .name = "NHM-C3",
109 109 .desc = "MWAIT 0x10",
110 110 .driver_data = (void *) 0x10,
111   - .flags = CPUIDLE_FLAG_TIME_VALID,
  111 + .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
112 112 .exit_latency = 20,
113 113 .power_usage = 500,
114 114 .target_residency = 80,
... ... @@ -117,7 +117,7 @@
117 117 .name = "NHM-C6",
118 118 .desc = "MWAIT 0x20",
119 119 .driver_data = (void *) 0x20,
120   - .flags = CPUIDLE_FLAG_TIME_VALID,
  120 + .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
121 121 .exit_latency = 200,
122 122 .power_usage = 350,
123 123 .target_residency = 800,
... ... @@ -149,7 +149,7 @@
149 149 .name = "ATM-C4",
150 150 .desc = "MWAIT 0x30",
151 151 .driver_data = (void *) 0x30,
152   - .flags = CPUIDLE_FLAG_TIME_VALID,
  152 + .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
153 153 .exit_latency = 100,
154 154 .power_usage = 250,
155 155 .target_residency = 400,
... ... @@ -159,7 +159,7 @@
159 159 .name = "ATM-C6",
160 160 .desc = "MWAIT 0x40",
161 161 .driver_data = (void *) 0x40,
162   - .flags = CPUIDLE_FLAG_TIME_VALID,
  162 + .flags = CPUIDLE_FLAG_TIME_VALID | CPUIDLE_FLAG_TLB_FLUSHED,
163 163 .exit_latency = 200,
164 164 .power_usage = 150,
165 165 .target_residency = 800,
... ... @@ -184,6 +184,16 @@
184 184 cstate = (((eax) >> MWAIT_SUBSTATE_SIZE) & MWAIT_CSTATE_MASK) + 1;
185 185  
186 186 local_irq_disable();
  187 +
  188 + /*
  189 + * If the state flag indicates that the TLB will be flushed or if this
  190 + * is the deepest c-state supported, do a voluntary leave mm to avoid
  191 + * costly and mostly unnecessary wakeups for flushing the user TLB's
  192 + * associated with the active mm.
  193 + */
  194 + if (state->flags & CPUIDLE_FLAG_TLB_FLUSHED ||
  195 + (&dev->states[dev->state_count - 1] == state))
  196 + leave_mm(cpu);
187 197  
188 198 if (!(lapic_timer_reliable_states & (1 << (cstate))))
189 199 clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &cpu);
drivers/pci/quirks.c
Diff comments   View file @ 35ec421
... ... @@ -163,6 +163,26 @@
163 163 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NEC, PCI_DEVICE_ID_NEC_CBUS_3, quirk_isa_dma_hangs);
164 164  
165 165 /*
  166 + * Intel NM10 "TigerPoint" LPC PM1a_STS.BM_STS must be clear
  167 + * for some HT machines to use C4 w/o hanging.
  168 + */
  169 +static void __devinit quirk_tigerpoint_bm_sts(struct pci_dev *dev)
  170 +{
  171 + u32 pmbase;
  172 + u16 pm1a;
  173 +
  174 + pci_read_config_dword(dev, 0x40, &pmbase);
  175 + pmbase = pmbase & 0xff80;
  176 + pm1a = inw(pmbase);
  177 +
  178 + if (pm1a & 0x10) {
  179 + dev_info(&dev->dev, FW_BUG "TigerPoint LPC.BM_STS cleared\n");
  180 + outw(0x10, pmbase);
  181 + }
  182 +}
  183 +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TGP_LPC, quirk_tigerpoint_bm_sts);
  184 +
  185 +/*
166 186 * Chipsets where PCI->PCI transfers vanish or hang
167 187 */
168 188 static void __devinit quirk_nopcipci(struct pci_dev *dev)
include/linux/cpuidle.h
Diff comments   View file @ 35ec421
... ... @@ -53,6 +53,7 @@
53 53 #define CPUIDLE_FLAG_BALANCED (0x40) /* medium latency, moderate savings */
54 54 #define CPUIDLE_FLAG_DEEP (0x80) /* high latency, large savings */
55 55 #define CPUIDLE_FLAG_IGNORE (0x100) /* ignore during this idle period */
  56 +#define CPUIDLE_FLAG_TLB_FLUSHED (0x200) /* tlb will be flushed */
56 57  
57 58 #define CPUIDLE_DRIVER_FLAGS_MASK (0xFFFF0000)
58 59