Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b4c9156 authored by Boris Ostrovsky's avatar Boris Ostrovsky Committed by Thomas Gleixner
Browse files

x86/microcode/AMD: Use native_cpuid() in load_ucode_amd_bsp() 



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 the CPUID
instruction.

Signed-off-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Jürgen Gross <jgross@suse.com>
Link: http://lkml.kernel.org/r/1481906392-3847-1-git-send-email-boris.ostrovsky@oracle.com
Link: http://lkml.kernel.org/r/20161218164414.9649-5-bp@alien8.de


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent a15a7535

arch/x86/kernel/cpu/microcode/amd.c

+5 −1
Original line number Diff line number Diff line
@@ -301,6 +301,7 @@ static bool get_builtin_microcode(struct cpio_data *cp, unsigned int family) 
void __init load_ucode_amd_bsp(unsigned int family)

{

	struct ucode_cpu_info *uci;

	u32 eax, ebx, ecx, edx;

	struct cpio_data cp;

	const char *path;

	bool use_pa;
@@ -322,7 +323,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 = 1;

	ecx = 0;

	native_cpuid(&eax, &ebx, &ecx, &edx);

	uci->cpu_sig.sig = eax;



	apply_microcode_early_amd(cp.data, cp.size, true, NULL);

}