x86/microcode: Do the family check first
Subsystems (2)
Borislav Petkov
maintainerPATCH 1/1 x86/microcode: Do the family check first
From: Borislav Petkov <[email protected]>
On CPUs like AMD's Geode, for example, we shouldn't even try to load microcode because they do not support the modern microcode loading interface.
However, we do the family check *after* the other checks whether the loader has been disabled on the command line or whether we're running in a guest.
So move the family checks first in order to exit early if we're being loaded on an unsupported family.
--- arch/x86/kernel/cpu/microcode/core.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
arch/x86/kernel/cpu/microcode/core.c +18 -9
@@ -122,9 +122,6 @@ static bool __init check_loader_disabled_bsp(void)bool *res = &dis_ucode_ldr;#endif -if (!have_cpuid_p ()) -return *res; -/* * CPUID(1).ECX[31]: reserved for hypervisor use. This is still not * completely accurate as xen pv guests don't see that CPUID bit set but
@@ -166,24 +163,36 @@ bool get_builtin_firmware(struct cpio_data *cd, const char *name)void __init load_ucode_bsp (void ) {unsigned int cpuid_1_eax; +bool intel = true; -if (check_loader_disabled_bsp ()) +if (!have_cpuid_p ())return ; cpuid_1_eax =native_cpuid_eax (1 );switch (x86_cpuid_vendor ()) {case X86_VENDOR_INTEL : -if (x86_family (cpuid_1_eax) >=6 ) -load_ucode_intel_bsp (); +if (x86_family (cpuid_1_eax) <6 ) +return ;break ; +case X86_VENDOR_AMD : -if (x86_family (cpuid_1_eax) >=0x10 ) -load_ucode_amd_bsp (cpuid_1_eax); +if (x86_family (cpuid_1_eax) <0x10 ) +return ; + intel = false;break ; +default : -break ; +return ; } + +if (check_loader_disabled_bsp ()) +return ; + +if (intel) +load_ucode_intel_bsp (); +else +load_ucode_amd_bsp (cpuid_1_eax); }static bool check_loader_disabled_ap (void )
Signature · 1 line
2.13.0
tip-bot for Borislav Petkov
merge botx86/microcode: Do the family check first
Commit-ID: 1f161f67a272cc4f29f27934dd3f74cb657eb5c4 Gitweb: https://git.kernel.org/tip/1f161f67a272cc4f29f27934dd3f74cb657eb5c4 Author: Borislav Petkov <[email protected]> AuthorDate: Thu, 12 Oct 2017 13:23:16 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 14 Oct 2017 12:55:40 +0200
x86/microcode: Do the family check first
On CPUs like AMD's Geode, for example, we shouldn't even try to load microcode because they do not support the modern microcode loading interface.
However, we do the family check *after* the other checks whether the loader has been disabled on the command line or whether we're running in a guest.
So move the family checks first in order to exit early if we're being loaded on an unsupported family.
--- arch/x86/kernel/cpu/microcode/core.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-)
arch/x86/kernel/cpu/microcode/core.c +18 -9
@@ -122,9 +122,6 @@ static bool __init check_loader_disabled_bsp(void)bool *res = &dis_ucode_ldr;#endif -if (!have_cpuid_p ()) -return *res; -/* * CPUID(1).ECX[31]: reserved for hypervisor use. This is still not * completely accurate as xen pv guests don't see that CPUID bit set but
@@ -166,24 +163,36 @@ bool get_builtin_firmware(struct cpio_data *cd, const char *name)void __init load_ucode_bsp (void ) {unsigned int cpuid_1_eax; +bool intel = true; -if (check_loader_disabled_bsp ()) +if (!have_cpuid_p ())return ; cpuid_1_eax =native_cpuid_eax (1 );switch (x86_cpuid_vendor ()) {case X86_VENDOR_INTEL : -if (x86_family (cpuid_1_eax) >=6 ) -load_ucode_intel_bsp (); +if (x86_family (cpuid_1_eax) <6 ) +return ;break ; +case X86_VENDOR_AMD : -if (x86_family (cpuid_1_eax) >=0x10 ) -load_ucode_amd_bsp (cpuid_1_eax); +if (x86_family (cpuid_1_eax) <0x10 ) +return ; + intel = false;break ; +default : -break ; +return ; } + +if (check_loader_disabled_bsp ()) +return ; + +if (intel) +load_ucode_intel_bsp (); +else +load_ucode_amd_bsp (cpuid_1_eax); }static bool check_loader_disabled_ap (void )