Commit 9471eee9 authored by Dou Liyang's avatar Dou Liyang Committed by Thomas Gleixner

x86/spectre: Check CONFIG_RETPOLINE in command line parser

The spectre_v2 option 'auto' does not check whether CONFIG_RETPOLINE is
enabled. As a consequence it fails to emit the appropriate warning and sets
feature flags which have no effect at all.

Add the missing IS_ENABLED() check.

Fixes: da285121 ("x86/spectre: Add boot time option to select Spectre v2 mitigation")
Signed-off-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: ak@linux.intel.com
Cc: peterz@infradead.org
Cc: Tomohiro" <misono.tomohiro@jp.fujitsu.com>
Cc: dave.hansen@intel.com
Cc: bp@alien8.de
Cc: arjan@linux.intel.com
Cc: dwmw@amazon.co.uk
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/f5892721-7528-3647-08fb-f8d10e65ad87@cn.fujitsu.com
parent 55f49fcb
...@@ -213,10 +213,10 @@ static void __init spectre_v2_select_mitigation(void) ...@@ -213,10 +213,10 @@ static void __init spectre_v2_select_mitigation(void)
return; return;
case SPECTRE_V2_CMD_FORCE: case SPECTRE_V2_CMD_FORCE:
/* FALLTRHU */
case SPECTRE_V2_CMD_AUTO: case SPECTRE_V2_CMD_AUTO:
if (IS_ENABLED(CONFIG_RETPOLINE))
goto retpoline_auto; goto retpoline_auto;
break;
case SPECTRE_V2_CMD_RETPOLINE_AMD: case SPECTRE_V2_CMD_RETPOLINE_AMD:
if (IS_ENABLED(CONFIG_RETPOLINE)) if (IS_ENABLED(CONFIG_RETPOLINE))
goto retpoline_amd; goto retpoline_amd;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment