Commit d761f3ed authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -45,7 +45,10 @@ Builtin microcode ...@@ -45,7 +45,10 @@ Builtin microcode
================= =================
We can also load builtin microcode supplied through the regular firmware 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_FIRMWARE_IN_KERNEL=y
CONFIG_EXTRA_FIRMWARE="intel-ucode/06-3a-09 amd-ucode/microcode_amd_fam15h.bin" CONFIG_EXTRA_FIRMWARE="intel-ucode/06-3a-09 amd-ucode/microcode_amd_fam15h.bin"
......
...@@ -133,40 +133,14 @@ static inline unsigned int x86_cpuid_family(void) ...@@ -133,40 +133,14 @@ static inline unsigned int x86_cpuid_family(void)
#ifdef CONFIG_MICROCODE #ifdef CONFIG_MICROCODE
extern void __init load_ucode_bsp(void); extern void __init load_ucode_bsp(void);
extern void load_ucode_ap(void); extern void load_ucode_ap(void);
extern int __init save_microcode_in_initrd(void);
void reload_early_microcode(void); void reload_early_microcode(void);
extern bool get_builtin_firmware(struct cpio_data *cd, const char *name); extern bool get_builtin_firmware(struct cpio_data *cd, const char *name);
#else #else
static inline void __init load_ucode_bsp(void) { } static inline void __init load_ucode_bsp(void) { }
static inline void load_ucode_ap(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 void reload_early_microcode(void) { }
static inline bool static inline bool
get_builtin_firmware(struct cpio_data *cd, const char *name) { return false; } get_builtin_firmware(struct cpio_data *cd, const char *name) { return false; }
#endif #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 */ #endif /* _ASM_X86_MICROCODE_H */
...@@ -62,7 +62,6 @@ extern int apply_microcode_amd(int cpu); ...@@ -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); extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, size_t size);
#define PATCH_MAX_SIZE PAGE_SIZE #define PATCH_MAX_SIZE PAGE_SIZE
extern u8 amd_ucode_patch[PATCH_MAX_SIZE];
#ifdef CONFIG_MICROCODE_AMD #ifdef CONFIG_MICROCODE_AMD
extern void __init load_ucode_amd_bsp(unsigned int family); extern void __init load_ucode_amd_bsp(unsigned int family);
......
...@@ -70,9 +70,4 @@ static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL; ...@@ -70,9 +70,4 @@ static inline int __init save_microcode_in_initrd_intel(void) { return -EINVAL;
static inline void reload_ucode_intel(void) {} static inline void reload_ucode_intel(void) {}
#endif #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 */ #endif /* _ASM_X86_MICROCODE_INTEL_H */
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
* If you want more physical memory than this then see the CONFIG_HIGHMEM4G * If you want more physical memory than this then see the CONFIG_HIGHMEM4G
* and CONFIG_HIGHMEM64G options in the kernel configuration. * 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 #define __START_KERNEL_map __PAGE_OFFSET
......
...@@ -56,24 +56,24 @@ static u8 *container; ...@@ -56,24 +56,24 @@ static u8 *container;
static size_t container_size; static size_t container_size;
static u32 ucode_new_rev; static u32 ucode_new_rev;
u8 amd_ucode_patch[PATCH_MAX_SIZE]; static u8 amd_ucode_patch[PATCH_MAX_SIZE];
static u16 this_equiv_id; static u16 this_equiv_id;
static struct cpio_data ucode_cpio; static struct cpio_data ucode_cpio;
/*
* Microcode patch container file is prepended to the initrd in cpio format.
* See Documentation/x86/early-microcode.txt
*/
static __initdata char ucode_path[] = "kernel/x86/microcode/AuthenticAMD.bin";
static struct cpio_data __init find_ucode_in_initrd(void) static struct cpio_data __init find_ucode_in_initrd(void)
{ {
long offset = 0; #ifdef CONFIG_BLK_DEV_INITRD
char *path; char *path;
void *start; void *start;
size_t size; size_t size;
/*
* Microcode patch container file is prepended to the initrd in cpio
* format. See Documentation/x86/early-microcode.txt
*/
static __initdata char ucode_path[] = "kernel/x86/microcode/AuthenticAMD.bin";
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
struct boot_params *p; struct boot_params *p;
...@@ -89,9 +89,12 @@ static struct cpio_data __init find_ucode_in_initrd(void) ...@@ -89,9 +89,12 @@ static struct cpio_data __init find_ucode_in_initrd(void)
path = ucode_path; path = ucode_path;
start = (void *)(boot_params.hdr.ramdisk_image + PAGE_OFFSET); start = (void *)(boot_params.hdr.ramdisk_image + PAGE_OFFSET);
size = boot_params.hdr.ramdisk_size; size = boot_params.hdr.ramdisk_size;
#endif #endif /* !CONFIG_X86_32 */
return find_cpio_data(path, start, size, &offset); return find_cpio_data(path, start, size, NULL);
#else
return (struct cpio_data){ NULL, 0, "" };
#endif
} }
static size_t compute_container_size(u8 *data, u32 total_size) static size_t compute_container_size(u8 *data, u32 total_size)
...@@ -289,11 +292,11 @@ void __init load_ucode_amd_bsp(unsigned int family) ...@@ -289,11 +292,11 @@ void __init load_ucode_amd_bsp(unsigned int family)
size = &ucode_cpio.size; size = &ucode_cpio.size;
#endif #endif
cp = find_ucode_in_initrd();
if (!cp.data) {
if (!load_builtin_amd_microcode(&cp, family)) if (!load_builtin_amd_microcode(&cp, family))
cp = find_ucode_in_initrd();
if (!(cp.data && cp.size))
return; return;
}
*data = cp.data; *data = cp.data;
*size = cp.size; *size = cp.size;
......
...@@ -60,7 +60,6 @@ static bool dis_ucode_ldr; ...@@ -60,7 +60,6 @@ static bool dis_ucode_ldr;
static DEFINE_MUTEX(microcode_mutex); static DEFINE_MUTEX(microcode_mutex);
struct ucode_cpu_info ucode_cpu_info[NR_CPUS]; struct ucode_cpu_info ucode_cpu_info[NR_CPUS];
EXPORT_SYMBOL_GPL(ucode_cpu_info);
/* /*
* Operations that are run on a target cpu: * Operations that are run on a target cpu:
...@@ -175,24 +174,24 @@ void load_ucode_ap(void) ...@@ -175,24 +174,24 @@ void load_ucode_ap(void)
} }
} }
int __init save_microcode_in_initrd(void) static int __init save_microcode_in_initrd(void)
{ {
struct cpuinfo_x86 *c = &boot_cpu_data; struct cpuinfo_x86 *c = &boot_cpu_data;
switch (c->x86_vendor) { switch (c->x86_vendor) {
case X86_VENDOR_INTEL: case X86_VENDOR_INTEL:
if (c->x86 >= 6) if (c->x86 >= 6)
save_microcode_in_initrd_intel(); return save_microcode_in_initrd_intel();
break; break;
case X86_VENDOR_AMD: case X86_VENDOR_AMD:
if (c->x86 >= 0x10) if (c->x86 >= 0x10)
save_microcode_in_initrd_amd(); return save_microcode_in_initrd_amd();
break; break;
default: default:
break; break;
} }
return 0; return -EINVAL;
} }
void reload_early_microcode(void) void reload_early_microcode(void)
...@@ -691,4 +690,5 @@ int __init microcode_init(void) ...@@ -691,4 +690,5 @@ int __init microcode_init(void)
return error; return error;
} }
fs_initcall(save_microcode_in_initrd);
late_initcall(microcode_init); late_initcall(microcode_init);
This diff is collapsed.
...@@ -141,7 +141,6 @@ int microcode_sanity_check(void *mc, int print_err) ...@@ -141,7 +141,6 @@ int microcode_sanity_check(void *mc, int print_err)
} }
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(microcode_sanity_check);
/* /*
* Returns 1 if update has been found, 0 otherwise. * Returns 1 if update has been found, 0 otherwise.
...@@ -183,4 +182,3 @@ int has_newer_microcode(void *mc, unsigned int csig, int cpf, int new_rev) ...@@ -183,4 +182,3 @@ int has_newer_microcode(void *mc, unsigned int csig, int cpf, int new_rev)
return find_matching_signature(mc, csig, cpf); return find_matching_signature(mc, csig, cpf);
} }
EXPORT_SYMBOL_GPL(has_newer_microcode);
...@@ -699,13 +699,6 @@ void free_initmem(void) ...@@ -699,13 +699,6 @@ void free_initmem(void)
#ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD
void __init free_initrd_mem(unsigned long start, unsigned long end) void __init free_initrd_mem(unsigned long start, unsigned long end)
{ {
/*
* Remember, initrd memory may contain microcode or other useful things.
* Before we lose initrd mem, we need to find a place to hold them
* now that normal virtual memory is enabled.
*/
save_microcode_in_initrd();
/* /*
* end could be not aligned, and We can not align that, * end could be not aligned, and We can not align that,
* decompresser could be confused by aligned initrd_end * decompresser could be confused by aligned initrd_end
......
...@@ -125,7 +125,10 @@ struct cpio_data find_cpio_data(const char *path, void *data, ...@@ -125,7 +125,10 @@ struct cpio_data find_cpio_data(const char *path, void *data,
if ((ch[C_MODE] & 0170000) == 0100000 && if ((ch[C_MODE] & 0170000) == 0100000 &&
ch[C_NAMESIZE] >= mypathsize && ch[C_NAMESIZE] >= mypathsize &&
!memcmp(p, path, mypathsize)) { !memcmp(p, path, mypathsize)) {
if (nextoff)
*nextoff = (long)nptr - (long)data; *nextoff = (long)nptr - (long)data;
if (ch[C_NAMESIZE] - mypathsize >= MAX_CPIO_FILE_NAME) { if (ch[C_NAMESIZE] - mypathsize >= MAX_CPIO_FILE_NAME) {
pr_warn( pr_warn(
"File %s exceeding MAX_CPIO_FILE_NAME [%d]\n", "File %s exceeding MAX_CPIO_FILE_NAME [%d]\n",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment