Commit 69094c20 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-microcode-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 microcode update from Ingo Molnar:
 "Remove the microcode loader's FW_LOADER coupling"

* tag 'x86-microcode-2020-08-03' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode: Do not select FW_LOADER
parents 0a897743 c8a59a4d

arch/x86/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -1293,7 +1293,6 @@ config MICROCODE 
	bool "CPU microcode loading support"

	default y

	depends on CPU_SUP_AMD || CPU_SUP_INTEL

	select FW_LOADER

	help

	  If you say Y here, you will be able to update the microcode on

	  Intel and AMD processors. The Intel support is for the IA32 family,
@@ -1315,7 +1314,6 @@ config MICROCODE_INTEL 
	bool "Intel microcode loading support"

	depends on MICROCODE

	default MICROCODE

	select FW_LOADER

	help

	  This options enables microcode patch loading support for Intel

	  processors.
@@ -1327,7 +1325,6 @@ config MICROCODE_INTEL 
config MICROCODE_AMD

	bool "AMD microcode loading support"

	depends on MICROCODE

	select FW_LOADER

	help

	  If you select this option, microcode patch loading support for AMD

	  processors will be enabled.

arch/x86/kernel/cpu/microcode/core.c

+0 −2
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ extern struct builtin_fw __end_builtin_fw[]; 


bool get_builtin_firmware(struct cpio_data *cd, const char *name)

{

#ifdef CONFIG_FW_LOADER

	struct builtin_fw *b_fw;



	for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) {
@@ -155,7 +154,6 @@ bool get_builtin_firmware(struct cpio_data *cd, const char *name) 
			return true;

		}

	}

#endif

	return false;

}