Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
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: recognize ARAT on WSM-EX
+3
-9
drivers/idle/intel_idle.c
+3
-9
drivers/idle/intel_idle.c
···
273
273
274
274
pr_debug(PREFIX "MWAIT substates: 0x%x\n", mwait_substates);
275
275
276
-
if (boot_cpu_has(X86_FEATURE_ARAT)) /* Always Reliable APIC Timer */
277
-
lapic_timer_reliable_states = 0xFFFFFFFF;
278
276
279
277
if (boot_cpu_data.x86 != 6) /* family 6 */
280
278
return -ENODEV;
···
284
286
case 0x1F: /* Core i7 and i5 Processor - Nehalem */
285
287
case 0x2E: /* Nehalem-EX Xeon */
286
288
case 0x2F: /* Westmere-EX Xeon */
287
-
lapic_timer_reliable_states = (1 << 1); /* C1 */
288
-
289
289
case 0x25: /* Westmere */
290
290
case 0x2C: /* Westmere */
291
291
cpuidle_state_table = nehalem_cstates;
···
291
295
292
296
case 0x1C: /* 28 - Atom Processor */
293
297
case 0x26: /* 38 - Lincroft Atom Processor */
294
-
lapic_timer_reliable_states = (1 << 1); /* C1 */
295
298
cpuidle_state_table = atom_cstates;
296
299
break;
297
300
···
298
303
case 0x2D: /* SNB Xeon */
299
304
cpuidle_state_table = snb_cstates;
300
305
break;
301
-
#ifdef FUTURE_USE
302
-
case 0x17: /* 23 - Core 2 Duo */
303
-
lapic_timer_reliable_states = (1 << 2) | (1 << 1); /* C2, C1 */
304
-
#endif
305
306
306
307
default:
307
308
pr_debug(PREFIX "does not run on family %d model %d\n",
308
309
boot_cpu_data.x86, boot_cpu_data.x86_model);
309
310
return -ENODEV;
310
311
}
312
+
313
+
if (boot_cpu_has(X86_FEATURE_ARAT)) /* Always Reliable APIC Timer */
314
+
lapic_timer_reliable_states = 0xFFFFFFFF;
311
315
312
316
pr_debug(PREFIX "v" INTEL_IDLE_VERSION
313
317
" model 0x%X\n", boot_cpu_data.x86_model);