x86/microcode changes for v3.16
Subsystems (2)
Linus,
Please pull the latest x86-microcode-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-microcode-for-linus
# HEAD: 65cef1311d5d212fd3d48a43678536dc878ca288 x86, microcode: Add a disable chicken bit
A microcode-debugging boot flag plus related refactoring.
Thanks,
Ingo
------------------>
Borislav Petkov (2):
x86, boot: Carve out early cmdline parsing function x86, microcode: Add a disable chicken bit
arch/x86/include/asm/cmdline.h | 6 +++ arch/x86/include/asm/microcode.h | 1 + arch/x86/kernel/cpu/microcode/core.c | 6 +++ arch/x86/kernel/cpu/microcode/core_early.c | 37 +++++++++++++ arch/x86/lib/Makefile | 2 +- arch/x86/lib/cmdline.c | 84 ++++++++++++++++++++++++++++++ 6 files changed, 135 insertions(+), 1 deletion(-) create mode 100644 arch/x86/include/asm/cmdline.h create mode 100644 arch/x86/lib/cmdline.c
arch/x86/include/asm/cmdline.h new file +6 -0
@@ -0,0 +1,6 @@ +#ifndef _ASM_X86_CMDLINE_H +#define _ASM_X86_CMDLINE_H + +int cmdline_find_option_bool (const char *cmdline_ptr,const char *option); + +#endif /* _ASM_X86_CMDLINE_H */
arch/x86/include/asm/microcode.h +1 -0
@@ -25,6 +25,7 @@ struct cpu_signature {struct device ;enum ucode_state {UCODE_ERROR ,UCODE_OK ,UCODE_NFOUND }; +extern bool dis_ucode_ldr;struct microcode_ops { enum ucode_state (*request_microcode_user) (int cpu,
arch/x86/kernel/cpu/microcode/core.c +6 -0
@@ -97,6 +97,9 @@ MODULE_LICENSE("GPL");static struct microcode_ops *microcode_ops; +bool dis_ucode_ldr; +module_param (dis_ucode_ldr, bool,0 ); +/* * Synchronization. *
@@ -546,6 +549,9 @@ static int __init microcode_init(void)struct cpuinfo_x86 *c = &cpu_data (0 );int error; +if (dis_ucode_ldr) +return 0 ; +if (c->x86_vendor ==X86_VENDOR_INTEL ) microcode_ops =init_intel_microcode ();else if (c->x86_vendor ==X86_VENDOR_AMD )
arch/x86/kernel/cpu/microcode/core_early.c +37 -0
@@ -17,9 +17,11 @@* 2 of the License, or (at your option) any later version. */ #include <linux/module.h> +#include <asm/microcode.h> #include <asm/microcode_intel.h> #include <asm/microcode_amd.h> #include <asm/processor.h> +#include <asm/cmdline.h> #define QCHAR (a, b, c, d) ((a) + ((b) << 8) + ((c) << 16) + ((d) << 24))#define CPUID_INTEL1 QCHAR('G', 'e', 'n', 'u')
@@ -72,10 +74,33 @@ static int x86_family(void)return x86; } +static bool __init check_loader_disabled_bsp (void ) +{ +#ifdef CONFIG_X86_32 +const char *cmdline = (const char *)__pa_nodebug (boot_command_line); +const char *opt ="dis_ucode_ldr" ; +const char *option = (const char *)__pa_nodebug (opt); +bool *res = (bool *)__pa_nodebug (&dis_ucode_ldr); + +#else /* CONFIG_X86_64 */ +const char *cmdline = boot_command_line; +const char *option ="dis_ucode_ldr" ; +bool *res = &dis_ucode_ldr; +#endif + +if (cmdline_find_option_bool (cmdline, option)) + *res = true; + +return *res; +} +void __init load_ucode_bsp (void ) {int vendor, x86; +if (check_loader_disabled_bsp ()) +return ; +if (!have_cpuid_p ())return ;
@@ -96,10 +121,22 @@ void __init load_ucode_bsp(void) } } +static bool check_loader_disabled_ap (void ) +{ +#ifdef CONFIG_X86_32 +return __pa_nodebug (dis_ucode_ldr); +#else +return dis_ucode_ldr; +#endif +} +void load_ucode_ap (void ) {int vendor, x86; +if (check_loader_disabled_ap ()) +return ; +if (!have_cpuid_p ())return ;
arch/x86/lib/Makefile +1 -1
@@ -16,7 +16,7 @@ clean-files := inat-tables.c obj-$(CONFIG_SMP) += msr-smp.o cache-smp.o -lib-y := delay.o misc.o +lib-y := delay.o misc.o cmdline.o lib-y += thunk_$(BITS).o lib-y += usercopy_$(BITS).o usercopy.o getuser.o putuser.o lib-y += memcpy_$(BITS).o
arch/x86/lib/cmdline.c new file +84 -0
84 lines not on this page · raw message