diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-01-31 08:38:17 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-01-31 08:38:17 +0100 |
commit | f26483eaedec39b09b1f2bdfc3f0d18f86764327 (patch) | |
tree | 4d5b94adb85d84517462d4883c59cbf3af5dd116 /arch/x86/kernel/cpu | |
parent | da0aa3dde05108e180eecd76534c55f43ea4b9c8 (diff) | |
parent | 24c2503255d35c269b67162c397a1a1c1e02f6ce (diff) | |
download | op-kernel-dev-f26483eaedec39b09b1f2bdfc3f0d18f86764327.zip op-kernel-dev-f26483eaedec39b09b1f2bdfc3f0d18f86764327.tar.gz |
Merge branch 'x86/urgent' into x86/microcode, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/microcode/amd.c
arch/x86/kernel/cpu/microcode/core.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu')
-rw-r--r-- | arch/x86/kernel/cpu/microcode/core.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 3b74d2f..b4a4cd3 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c @@ -46,6 +46,8 @@ static struct microcode_ops *microcode_ops; static bool dis_ucode_ldr = true; +bool initrd_gone; + LIST_HEAD(microcode_cache); /* @@ -219,11 +221,12 @@ void load_ucode_ap(void) static int __init save_microcode_in_initrd(void) { struct cpuinfo_x86 *c = &boot_cpu_data; + int ret = -EINVAL; switch (c->x86_vendor) { case X86_VENDOR_INTEL: if (c->x86 >= 6) - return save_microcode_in_initrd_intel(); + ret = save_microcode_in_initrd_intel(); break; case X86_VENDOR_AMD: if (c->x86 >= 0x10) @@ -233,7 +236,9 @@ static int __init save_microcode_in_initrd(void) break; } - return -EINVAL; + initrd_gone = true; + + return ret; } struct cpio_data find_microcode_in_initrd(const char *path, bool use_pa) @@ -276,9 +281,16 @@ struct cpio_data find_microcode_in_initrd(const char *path, bool use_pa) * has the virtual address of the beginning of the initrd. It also * possibly relocates the ramdisk. In either case, initrd_start contains * the updated address so use that instead. + * + * initrd_gone is for the hotplug case where we've thrown out initrd + * already. */ - if (!use_pa && initrd_start) - start = initrd_start; + if (!use_pa) { + if (initrd_gone) + return (struct cpio_data){ NULL, 0, "" }; + if (initrd_start) + start = initrd_start; + } return find_cpio_data(path, (void *)start, size, NULL); #else /* !CONFIG_BLK_DEV_INITRD */ |