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

intel_idle: delete substates DEBUG modparam

it isn't useful anymore

Signed-off-by: Len Brown <len.brown@intel.com>

Len Brown c4236282 26717172

+7 -13
unified split
+7 -13
drivers/idle/intel_idle.c
··· 79 79 static int max_cstate = MWAIT_MAX_NUM_CSTATES - 1; 80 80 static int power_policy = 7; /* 0 = max perf; 15 = max powersave */ 81 81 82 - static unsigned int substates; 82 + static unsigned int mwait_substates; 83 83 static int (*choose_substate)(int); 84 84 85 85 /* Reliable LAPIC Timer States, bit 1 for C1 etc. */ ··· 184 184 power_policy &= 0xF; /* valid range: 0-15 */ 185 185 cstate &= 7; /* valid range: 0-7 */ 186 186 187 - num_substates = (substates >> ((cstate) * 4)) & MWAIT_SUBSTATE_MASK; 187 + num_substates = (mwait_substates >> ((cstate) * 4)) 188 + & MWAIT_SUBSTATE_MASK; 188 189 189 190 if (num_substates <= 1) 190 191 return 0; ··· 260 259 */ 261 260 static int intel_idle_probe(void) 262 261 { 263 - unsigned int eax, ebx, ecx, edx; 262 + unsigned int eax, ebx, ecx; 264 263 265 264 if (max_cstate == 0) { 266 265 pr_debug(PREFIX "disabled\n"); ··· 276 275 if (boot_cpu_data.cpuid_level < CPUID_MWAIT_LEAF) 277 276 return -ENODEV; 278 277 279 - cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &edx); 278 + cpuid(CPUID_MWAIT_LEAF, &eax, &ebx, &ecx, &mwait_substates); 280 279 281 280 if (!(ecx & CPUID5_ECX_EXTENSIONS_SUPPORTED) || 282 281 !(ecx & CPUID5_ECX_INTERRUPT_BREAK)) 283 282 return -ENODEV; 284 - #ifdef DEBUG 285 - if (substates == 0) /* can over-ride via modparam */ 286 - #endif 287 - substates = edx; 288 283 289 - pr_debug(PREFIX "MWAIT substates: 0x%x\n", substates); 284 + pr_debug(PREFIX "MWAIT substates: 0x%x\n", mwait_substates); 290 285 291 286 if (boot_cpu_has(X86_FEATURE_ARAT)) /* Always Reliable APIC Timer */ 292 287 lapic_timer_reliable_states = 0xFFFFFFFF; ··· 373 376 } 374 377 375 378 /* does the state exist in CPUID.MWAIT? */ 376 - num_substates = (substates >> ((cstate) * 4)) 379 + num_substates = (mwait_substates >> ((cstate) * 4)) 377 380 & MWAIT_SUBSTATE_MASK; 378 381 if (num_substates == 0) 379 382 continue; ··· 449 452 450 453 module_param(power_policy, int, 0644); 451 454 module_param(max_cstate, int, 0444); 452 - #ifdef DEBUG 453 - module_param(substates, int, 0444); 454 - #endif 455 455 456 456 MODULE_AUTHOR("Len Brown <len.brown@intel.com>"); 457 457 MODULE_DESCRIPTION("Cpuidle driver for Intel Hardware v" INTEL_IDLE_VERSION);