|
@@ -532,17 +532,12 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void)
|
|
|
* Intel uses the SPEC CTRL MSR Bit(2) for this, while AMD may
|
|
|
* use a completely different MSR and bit dependent on family.
|
|
|
*/
|
|
|
- switch (boot_cpu_data.x86_vendor) {
|
|
|
- case X86_VENDOR_INTEL:
|
|
|
- case X86_VENDOR_AMD:
|
|
|
- if (!static_cpu_has(X86_FEATURE_MSR_SPEC_CTRL)) {
|
|
|
- x86_amd_ssb_disable();
|
|
|
- break;
|
|
|
- }
|
|
|
+ if (!static_cpu_has(X86_FEATURE_MSR_SPEC_CTRL))
|
|
|
+ x86_amd_ssb_disable();
|
|
|
+ else {
|
|
|
x86_spec_ctrl_base |= SPEC_CTRL_SSBD;
|
|
|
x86_spec_ctrl_mask |= SPEC_CTRL_SSBD;
|
|
|
wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base);
|
|
|
- break;
|
|
|
}
|
|
|
}
|
|
|
|