Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 3 Jul 2018 10:12:03 -0400
From:   Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
To:     Tom Lendacky <thomas.lendacky@amd.com>
Cc:     x86@kernel.org, linux-kernel@vger.kernel.org,
        Ingo Molnar <mingo@redhat.com>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Borislav Petkov <bpetkov@suse.de>,
        David Woodhouse <dwmw@amazon.co.uk>
Subject: Re: [PATCH 1/2] x86/bugs: Update when to check for the LS_CFG SSBD
 mitigation
Message-ID: <20180703141203.GJ8404@char.us.oracle.com>
References: <20180702213543.29202.79104.stgit@tlendack-t1.amdoffice.net>
 <20180702213553.29202.21089.stgit@tlendack-t1.amdoffice.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20180702213553.29202.21089.stgit@tlendack-t1.amdoffice.net>
User-Agent: Mutt/1.8.3 (2017-05-23)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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 <thomas.lendacky@amd.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

> ---
>  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) {
>