Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d761f3ed 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 updates from Thomas Gleixner:

 - more work to make the microcode loader robust

 - a fix for the micro code load precedence

 - fixes for initrd loading with randomized memory

 - less printk noise on SMP machines

* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/asm, x86/microcode: Add __PAGE_OFFSET_BASE define on 32-bit
  x86/microcode/intel: Fix initrd loading with CONFIG_RANDOMIZE_MEMORY=y
  x86/microcode: Remove unused symbol exports
  x86/microcode/intel: Do not issue microcode updates messages on each CPU
  Documentation/microcode: Document some aspects for more clarity
  x86/microcode/AMD: Make amd_ucode_patch[] static
  x86/microcode/intel: Unexport save_mc_for_early()
  x86/microcode/intel: Rename load_microcode_early() to find_microcode_patch()
  x86/microcode: Propagate save_microcode_in_initrd() retval
  x86/microcode: Get rid of find_cpio_data()'s dummy offset arg
  lib/cpio: Make find_cpio_data()'s offset arg optional
  x86/microcode: Fix suspend to RAM with builtin microcode
  x86/microcode: Fix loading precedence
parents b325e04e 4a1a8e1b

Documentation/x86/early-microcode.txt

+4 −1
Original line number Diff line number Diff line
@@ -45,7 +45,10 @@ Builtin microcode 
=================



We can also load builtin microcode supplied through the regular firmware

builtin method CONFIG_FIRMWARE_IN_KERNEL. Here's an example:

builtin method CONFIG_FIRMWARE_IN_KERNEL. Only 64-bit is currently

supported.



Here's an example:



CONFIG_FIRMWARE_IN_KERNEL=y

CONFIG_EXTRA_FIRMWARE="intel-ucode/06-3a-09 amd-ucode/microcode_amd_fam15h.bin"

arch/x86/include/asm/microcode.h

+0 −26
Original line number Diff line number Diff line
@@ -133,40 +133,14 @@ static inline unsigned int x86_cpuid_family(void) 
#ifdef CONFIG_MICROCODE

extern void __init load_ucode_bsp(void);

extern void load_ucode_ap(void);

extern int __init save_microcode_in_initrd(void);

void reload_early_microcode(void);

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

#else

static inline void __init load_ucode_bsp(void)			{ }

static inline void load_ucode_ap(void)				{ }

static inline int __init save_microcode_in_initrd(void)		{ return 0; }

static inline void reload_early_microcode(void)			{ }

static inline bool

get_builtin_firmware(struct cpio_data *cd, const char *name)	{ return false; }

#endif



static inline unsigned long get_initrd_start(void)

{

#ifdef CONFIG_BLK_DEV_INITRD

	return initrd_start;

#else

	return 0;

#endif

}



static inline unsigned long get_initrd_start_addr(void)

{

#ifdef CONFIG_BLK_DEV_INITRD

#ifdef CONFIG_X86_32

	unsigned long *initrd_start_p = (unsigned long *)__pa_nodebug(&initrd_start);



	return (unsigned long)__pa_nodebug(*initrd_start_p);

#else

	return get_initrd_start();

#endif

#else /* CONFIG_BLK_DEV_INITRD */

	return 0;

#endif

}



#endif /* _ASM_X86_MICROCODE_H */

arch/x86/include/asm/microcode_amd.h

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ extern int apply_microcode_amd(int cpu); 
extern enum ucode_state load_microcode_amd(int cpu, 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

extern void __init load_ucode_amd_bsp(unsigned int family);

arch/x86/include/asm/microcode_intel.h

+0 −5
Original line number Diff line number Diff line
@@ -70,9 +70,4 @@ static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; 
static inline void reload_ucode_intel(void) {}

#endif



#ifdef CONFIG_HOTPLUG_CPU

extern int save_mc_for_early(u8 *mc);

#else

static inline int save_mc_for_early(u8 *mc) { return 0; }

#endif

#endif /* _ASM_X86_MICROCODE_INTEL_H */

arch/x86/include/asm/page_32_types.h

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ 
 * If you want more physical memory than this then see the CONFIG_HIGHMEM4G

 * and CONFIG_HIGHMEM64G options in the kernel configuration.

 */

#define __PAGE_OFFSET		_AC(CONFIG_PAGE_OFFSET, UL)

#define __PAGE_OFFSET_BASE	_AC(CONFIG_PAGE_OFFSET, UL)

#define __PAGE_OFFSET		__PAGE_OFFSET_BASE



#define __START_KERNEL_map	__PAGE_OFFSET