diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 19:28:10 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-02 19:28:10 -0400 |
commit | fdd78889aad2ec85b2f5a8ed232215dca7a22a3b (patch) | |
tree | d99e66e9afe26bebf89204d15443c42b9345bc21 /arch/x86/Kconfig | |
parent | d652df0b2f0b9c2e655be0d6f90989fae0a511b4 (diff) | |
parent | 9608d33b8210c993af4430d661a6474946480c9b (diff) |
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
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 14 |
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 | |||
1058 | depends on MICROCODE_INTEL | 1058 | depends on MICROCODE_INTEL |
1059 | 1059 | ||
1060 | config MICROCODE_INTEL_EARLY | 1060 | config MICROCODE_INTEL_EARLY |
1061 | def_bool n | ||
1062 | |||
1063 | config MICROCODE_AMD_EARLY | ||
1064 | def_bool n | ||
1065 | |||
1066 | config MICROCODE_EARLY | ||
1061 | bool "Early load microcode" | 1067 | bool "Early load microcode" |
1062 | depends on MICROCODE_INTEL && BLK_DEV_INITRD | 1068 | depends on MICROCODE=y && BLK_DEV_INITRD |
1069 | select MICROCODE_INTEL_EARLY if MICROCODE_INTEL | ||
1070 | select MICROCODE_AMD_EARLY if MICROCODE_AMD | ||
1063 | default y | 1071 | default y |
1064 | help | 1072 | help |
1065 | This option provides functionality to read additional microcode data | 1073 | This option provides functionality to read additional microcode data |
@@ -1067,10 +1075,6 @@ config MICROCODE_INTEL_EARLY | |||
1067 | microcode to CPU's as early as possible. No functional change if no | 1075 | microcode to CPU's as early as possible. No functional change if no |
1068 | microcode data is glued to the initrd, therefore it's safe to say Y. | 1076 | microcode data is glued to the initrd, therefore it's safe to say Y. |
1069 | 1077 | ||
1070 | config MICROCODE_EARLY | ||
1071 | def_bool y | ||
1072 | depends on MICROCODE_INTEL_EARLY | ||
1073 | |||
1074 | config X86_MSR | 1078 | config X86_MSR |
1075 | tristate "/dev/cpu/*/msr - Model-specific register support" | 1079 | tristate "/dev/cpu/*/msr - Model-specific register support" |
1076 | ---help--- | 1080 | ---help--- |