Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 microcode loading update from Ingo Molnar:
 "Two main changes that improve microcode loading on AMD CPUs:

   - Add support for all-in-one binary microcode files that concatenate
     the microcode images of multiple processor families, by Jacob Shin

   - Add early microcode loading (embedded in the initrd) support, also
     by Jacob Shin"

* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, microcode, amd: Another early loading fixup
  x86, microcode, amd: Allow multiple families' bin files appended together
  x86, microcode, amd: Make find_ucode_in_initrd() __init
  x86, microcode, amd: Fix warnings and errors on with CONFIG_MICROCODE=m
  x86, microcode, amd: Early microcode patch loading support for AMD
  x86, microcode, amd: Refactor functions to prepare for early loading
  x86, microcode: Vendor abstract out save_microcode_in_initrd()
  x86, microcode, intel: Correct typo in printk

1 files changed, 9 insertions, 5 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index c49b4dc8ffe0..34d1db1e7f40 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1058,8 +1058,16 @@ config MICROCODE_INTEL_LIB
         depends on MICROCODE_INTEL
 
 config MICROCODE_INTEL_EARLY
+        def_bool n
+
+config MICROCODE_AMD_EARLY
+        def_bool n
+
+config MICROCODE_EARLY
         bool "Early load microcode"
-        depends on MICROCODE_INTEL && BLK_DEV_INITRD
+        depends on MICROCODE=y && BLK_DEV_INITRD
+        select MICROCODE_INTEL_EARLY if MICROCODE_INTEL
+        select MICROCODE_AMD_EARLY if MICROCODE_AMD
         default y
         help
           This option provides functionality to read additional microcode data
@@ -1067,10 +1075,6 @@ config MICROCODE_INTEL_EARLY
           microcode to CPU's as early as possible. No functional change if no
           microcode data is glued to the initrd, therefore it's safe to say Y.
 
-config MICROCODE_EARLY
-        def_bool y
-        depends on MICROCODE_INTEL_EARLY
-
 config X86_MSR
         tristate "/dev/cpu/*/msr - Model-specific register support"
         ---help---