Re: [PATCH] x86/microcode: Use native_cpuid() in load_ucode_amd_bsp()

Path	csiph.com!1.us.feeder.erje.net!feeder.erje.net!2.eu.feeder.erje.net!news2.arglkargh.de!news.mixmin.net!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From	Borislav Petkov <bp@alien8.de>
Newsgroups	linux.kernel
Subject	Re: [PATCH] x86/microcode: Use native_cpuid() in load_ucode_amd_bsp()
Date	Fri, 16 Dec 2016 17:40:01 +0100
Message-ID	<sP3I5-65D-3@gated-at.bofh.it> (permalink)
References	<sP3yq-61M-29@gated-at.bofh.it>
X-Original-To	Boris Ostrovsky <boris.ostrovsky@oracle.com>
MIME-Version	1.0
Content-Type	text/plain; charset=utf-8
Content-Disposition	inline
User-Agent	NeoMutt/20161014 (1.7.1)
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	46
Organization	linux.* mail to news gateway
X-Original-Cc	x86@kernel.org, linux-kernel@vger.kernel.org, jgross@suse.com, xen-devel@lists.xenproject.org
X-Original-Date	Fri, 16 Dec 2016 17:37:25 +0100
X-Original-Message-ID	<20161216163725.uxrvtsq3qvzwwrs5@pd.tnic>
X-Original-References	<1481906392-3847-1-git-send-email-boris.ostrovsky@oracle.com>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1543575

Show key headers only | View raw

On Fri, Dec 16, 2016 at 11:39:52AM -0500, Boris Ostrovsky wrote:
> When CONFIG_PARAVIRT is selected, cpuid() becomes a call. Since
> for 32-bit kernels load_ucode_amd_bsp() is executed before paging
> is enabled the call cannot be completed (as kernel virtual addresses
> are not reachable yet).
> 
> Use native_cpuid() instead which is an asm wrapper for CPUID instruction.
> 
> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> ---
>  arch/x86/kernel/cpu/microcode/amd.c |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c
> index 6f353bd..e2d941f 100644
> --- a/arch/x86/kernel/cpu/microcode/amd.c
> +++ b/arch/x86/kernel/cpu/microcode/amd.c
> @@ -297,6 +297,7 @@ void __init load_ucode_amd_bsp(unsigned int family)
>  	struct cpio_data cp;
>  	const char *path;
>  	bool use_pa;
> +	u32 eax, ebx, ecx, edx;
>  
>  	if (IS_ENABLED(CONFIG_X86_32)) {
>  		uci	= (struct ucode_cpu_info *)__pa_nodebug(ucode_cpu_info);
> @@ -315,7 +316,10 @@ void __init load_ucode_amd_bsp(unsigned int family)
>  		return;
>  
>  	/* Get BSP's CPUID.EAX(1), needed in load_microcode_amd() */
> -	uci->cpu_sig.sig = cpuid_eax(1);
> +	eax = 0x00000001;
> +	ecx = 0;
> +	native_cpuid(&eax, &ebx, &ecx, &edx);
> +	uci->cpu_sig.sig = eax;
>  
>  	apply_microcode_early_amd(cp.data, cp.size, true);
>  }
> -- 

Applied, thanks.

-- 
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] x86/microcode: Use native_cpuid() in load_ucode_amd_bsp() Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2016-12-16 17:30 +0100
  Re: [PATCH] x86/microcode: Use native_cpuid() in load_ucode_amd_bsp() Borislav Petkov <bp@alien8.de> - 2016-12-16 17:40 +0100

csiph-web