On Mon, Jul 02, 2018 at 04:35:53PM -0500, Tom Lendacky wrote:
> If either the X86_FEATURE_AMD_SSBD or X86_FEATURE_VIRT_SSBD features are
> present, then there is no need to perform the check for the LS_CFG SSBD
> mitigation support.
>
> Signed-off-by: Tom Lendacky <[email protected]>
Reviewed-by: Konrad Rzeszutek Wilk <[email protected]>
> ---
> arch/x86/kernel/cpu/amd.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
> index 082d787..38915fb 100644
> --- a/arch/x86/kernel/cpu/amd.c
> +++ b/arch/x86/kernel/cpu/amd.c
> @@ -543,7 +543,9 @@ static void bsp_init_amd(struct cpuinfo_x86 *c)
> nodes_per_socket = ((value >> 3) & 7) + 1;
> }
>
> - if (c->x86 >= 0x15 && c->x86 <= 0x17) {
> + if (!boot_cpu_has(X86_FEATURE_AMD_SSBD) &&
> + !boot_cpu_has(X86_FEATURE_VIRT_SSBD) &&
> + c->x86 >= 0x15 && c->x86 <= 0x17) {
> unsigned int bit;
>
> switch (c->x86) {
>
