diff options
| author | Wyes Karny <wyes.karny@amd.com> | 2022-06-06 23:33:34 +0530 |
|---|---|---|
| committer | Dave Hansen <dave.hansen@linux.intel.com> | 2022-06-08 12:58:58 -0700 |
| commit | 8bcedb4ce04750e1ccc9a6b6433387f6a9166a56 (patch) | |
| tree | 21dcb5a551fa90b1722779a4e44c2c03b66417c1 /arch/x86/kernel/process.c | |
| parent | 2147c438fde135d6c145a96e373d9348e7076f7f (diff) | |
| download | linux-stable-8bcedb4ce04750e1ccc9a6b6433387f6a9166a56.tar.gz linux-stable-8bcedb4ce04750e1ccc9a6b6433387f6a9166a56.tar.bz2 linux-stable-8bcedb4ce04750e1ccc9a6b6433387f6a9166a56.zip | |
x86: Handle idle=nomwait cmdline properly for x86_idle
When kernel is booted with idle=nomwait do not use MWAIT as the
default idle state.
If the user boots the kernel with idle=nomwait, it is a clear
direction to not use mwait as the default idle state.
However, the current code does not take this into consideration
while selecting the default idle state on x86.
Fix it by checking for the idle=nomwait boot option in
prefer_mwait_c1_over_halt().
Also update the documentation around idle=nomwait appropriately.
[ dhansen: tweak commit message ]
Signed-off-by: Wyes Karny <wyes.karny@amd.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Tested-by: Zhang Rui <rui.zhang@intel.com>
Link: https://lkml.kernel.org/r/fdc2dc2d0a1bc21c2f53d989ea2d2ee3ccbc0dbe.1654538381.git-series.wyes.karny@amd.com
Diffstat (limited to 'arch/x86/kernel/process.c')
| -rw-r--r-- | arch/x86/kernel/process.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index b370767f5b19..dca2e5e2fae2 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -824,6 +824,10 @@ static void amd_e400_idle(void) */ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c) { + /* User has disallowed the use of MWAIT. Fallback to HALT */ + if (boot_option_idle_override == IDLE_NOMWAIT) + return 0; + if (c->x86_vendor != X86_VENDOR_INTEL) return 0; @@ -932,9 +936,8 @@ static int __init idle_setup(char *str) } else if (!strcmp(str, "nomwait")) { /* * If the boot option of "idle=nomwait" is added, - * it means that mwait will be disabled for CPU C2/C3 - * states. In such case it won't touch the variable - * of boot_option_idle_override. + * it means that mwait will be disabled for CPU C1/C2/C3 + * states. */ boot_option_idle_override = IDLE_NOMWAIT; } else |