tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 66ef6aa6 1c00802d

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