Commit 2bb2c5e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 microcode loader updates from Ingo Molnar:
 "There are two main changes in this tree:

   - AMD microcode early loading fixes
   - some microcode loader source files reorganization"

* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, microcode: Move to a proper location
  x86, microcode, AMD: Fix early ucode loading
  x86, microcode: Share native MSR accessing variants
  x86, ramdisk: Export relocated ramdisk VA
parents 4500cf60 9c079129

arch/x86/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -1065,10 +1065,6 @@ config MICROCODE_OLD_INTERFACE 
	def_bool y

	depends on MICROCODE



config MICROCODE_INTEL_LIB

	def_bool y

	depends on MICROCODE_INTEL



config MICROCODE_INTEL_EARLY

	def_bool n

arch/x86/include/asm/microcode.h

+15 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MICROCODE_H

#define _ASM_X86_MICROCODE_H



#define native_rdmsr(msr, val1, val2)			\

do {							\

	u64 __val = native_read_msr((msr));		\

	(void)((val1) = (u32)__val);			\

	(void)((val2) = (u32)(__val >> 32));		\

} while (0)



#define native_wrmsr(msr, low, high)			\

	native_write_msr(msr, low, high)



#define native_wrmsrl(msr, val)				\

	native_write_msr((msr),				\

			 (u32)((u64)(val)),		\

			 (u32)((u64)(val) >> 32))



struct cpu_signature {

	unsigned int sig;

	unsigned int pf;

arch/x86/include/asm/microcode_amd.h

+3 −4
Original line number Diff line number Diff line
@@ -61,11 +61,10 @@ extern int __apply_microcode_amd(struct microcode_amd *mc_amd); 
extern int apply_microcode_amd(int cpu);

extern enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size);



#define PATCH_MAX_SIZE PAGE_SIZE

extern u8 amd_ucode_patch[PATCH_MAX_SIZE];



#ifdef CONFIG_MICROCODE_AMD_EARLY

#ifdef CONFIG_X86_32

#define MPB_MAX_SIZE PAGE_SIZE

extern u8 amd_bsp_mpb[MPB_MAX_SIZE];

#endif

extern void __init load_ucode_amd_bsp(void);

extern void load_ucode_amd_ap(void);

extern int __init save_microcode_in_initrd_amd(void);

arch/x86/include/asm/setup.h

+2 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 


#include <uapi/asm/setup.h>





#define COMMAND_LINE_SIZE 2048



#include <linux/linkage.h>
@@ -29,6 +28,8 @@ 
#include <asm/bootparam.h>

#include <asm/x86_init.h>



extern u64 relocated_ramdisk;



/* Interrupt control for vSMPowered x86_64 systems */

#ifdef CONFIG_X86_64

void vsmp_init(void);

arch/x86/kernel/Makefile

+0 −9
Original line number Diff line number Diff line
@@ -92,15 +92,6 @@ obj-$(CONFIG_PARAVIRT_CLOCK) += pvclock.o 


obj-$(CONFIG_PCSPKR_PLATFORM)	+= pcspeaker.o



obj-$(CONFIG_MICROCODE_EARLY)		+= microcode_core_early.o

obj-$(CONFIG_MICROCODE_INTEL_EARLY)	+= microcode_intel_early.o

obj-$(CONFIG_MICROCODE_INTEL_LIB)	+= microcode_intel_lib.o

microcode-y				:= microcode_core.o

microcode-$(CONFIG_MICROCODE_INTEL)	+= microcode_intel.o

microcode-$(CONFIG_MICROCODE_AMD)	+= microcode_amd.o

obj-$(CONFIG_MICROCODE_AMD_EARLY)	+= microcode_amd_early.o

obj-$(CONFIG_MICROCODE)			+= microcode.o



obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o



obj-$(CONFIG_SWIOTLB)			+= pci-swiotlb.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE