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

Commit 35ffccdb 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 

Pul x86 microcode updates from Ingo Molnar:
 "x86 microcode loader updates from Borislav Petkov:

   - early parsing of the built-in microcode

   - cleanups

   - misc smaller fixes"

* 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/microcode: Correct CPU family related variable types
  x86/microcode: Disable builtin microcode loading on 32-bit for now
  x86/microcode/intel: Rename get_matching_sig()
  x86/microcode/intel: Simplify get_matching_sig()
  x86/microcode/intel: Simplify update_match_cpu()
  x86/microcode/intel: Rename get_matching_microcode
  x86/cpu/microcode: Zap changelog
  x86/microcode: Parse built-in microcode early
  x86/microcode/intel: Remove unused @rev arg of get_matching_sig()
  x86/microcode/intel: Get rid of revision_is_newer()
parents e2172d8f 7b179b8f

arch/x86/include/asm/microcode.h

+7 −1
Original line number Diff line number Diff line 
#ifndef _ASM_X86_MICROCODE_H

#define _ASM_X86_MICROCODE_H



#include <linux/earlycpio.h>



#define native_rdmsr(msr, val1, val2)			\

do {							\

	u64 __val = native_read_msr((msr));		\
@@ -152,6 +154,7 @@ 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) {}
@@ -160,6 +163,9 @@ 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



#endif /* _ASM_X86_MICROCODE_H */

arch/x86/include/asm/microcode_amd.h

+2 −2
Original line number Diff line number Diff line
@@ -65,12 +65,12 @@ extern enum ucode_state load_microcode_amd(int cpu, u8 family, const u8 *data, s 
extern u8 amd_ucode_patch[PATCH_MAX_SIZE];



#ifdef CONFIG_MICROCODE_AMD_EARLY

extern void __init load_ucode_amd_bsp(void);

extern void __init load_ucode_amd_bsp(unsigned int family);

extern void load_ucode_amd_ap(void);

extern int __init save_microcode_in_initrd_amd(void);

void reload_ucode_amd(void);

#else

static inline void __init load_ucode_amd_bsp(void) {}

static inline void __init load_ucode_amd_bsp(unsigned int family) {}

static inline void load_ucode_amd_ap(void) {}

static inline int __init save_microcode_in_initrd_amd(void) { return -EINVAL; }

void reload_ucode_amd(void) {}

arch/x86/include/asm/microcode_intel.h

+2 −11
Original line number Diff line number Diff line
@@ -51,20 +51,11 @@ struct extended_sigtable { 
	(((struct microcode_intel *)mc)->hdr.datasize ? \

	 ((struct microcode_intel *)mc)->hdr.datasize : DEFAULT_UCODE_DATASIZE)



#define sigmatch(s1, s2, p1, p2) \

	(((s1) == (s2)) && (((p1) & (p2)) || (((p1) == 0) && ((p2) == 0))))



#define exttable_size(et) ((et)->count * EXT_SIGNATURE_SIZE + EXT_HEADER_SIZE)



extern int get_matching_microcode(unsigned int csig, int cpf, int rev, void *mc);

extern int has_newer_microcode(void *mc, unsigned int csig, int cpf, int rev);

extern int microcode_sanity_check(void *mc, int print_err);

extern int get_matching_sig(unsigned int csig, int cpf, int rev, void *mc);



static inline int

revision_is_newer(struct microcode_header_intel *mc_header, int rev)

{

	return (mc_header->rev <= rev) ? 0 : 1;

}

extern int find_matching_signature(void *mc, unsigned int csig, int cpf);



#ifdef CONFIG_MICROCODE_INTEL_EARLY

extern void __init load_ucode_intel_bsp(void);

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

+21 −3
Original line number Diff line number Diff line
@@ -228,7 +228,23 @@ static void apply_ucode_in_initrd(void *ucode, size_t size, bool save_patch) 
	}

}



void __init load_ucode_amd_bsp(void)

static bool __init load_builtin_amd_microcode(struct cpio_data *cp,

					      unsigned int family)

{

#ifdef CONFIG_X86_64

	char fw_name[36] = "amd-ucode/microcode_amd.bin";



	if (family >= 0x15)

		snprintf(fw_name, sizeof(fw_name),

			 "amd-ucode/microcode_amd_fam%.2xh.bin", family);



	return get_builtin_firmware(cp, fw_name);

#else

	return false;

#endif

}



void __init load_ucode_amd_bsp(unsigned int family)

{

	struct cpio_data cp;

	void **data;
@@ -243,8 +259,10 @@ void __init load_ucode_amd_bsp(void) 
#endif



	cp = find_ucode_in_initrd();

	if (!cp.data)

	if (!cp.data) {

		if (!load_builtin_amd_microcode(&cp, family))

			return;

	}



	*data = cp.data;

	*size = cp.size;

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

+9 −67
Original line number Diff line number Diff line 
/*

 *	Intel CPU Microcode Update Driver for Linux

 * CPU Microcode Update Driver for Linux

 *

 * Copyright (C) 2000-2006 Tigran Aivazian <tigran@aivazian.fsnet.co.uk>

 *	      2006	Shaohua Li <shaohua.li@intel.com>

 *	      2013-2015	Borislav Petkov <bp@alien8.de>

 *

 *	This driver allows to upgrade microcode on Intel processors

 *	belonging to IA-32 family - PentiumPro, Pentium II,

 *	Pentium III, Xeon, Pentium 4, etc.

 *

 *	Reference: Section 8.11 of Volume 3a, IA-32 Intel? Architecture

 *	Software Developer's Manual

 *	Order Number 253668 or free download from:

 *

 *	http://developer.intel.com/Assets/PDF/manual/253668.pdf	

 *

 *	For more information, go to http://www.urbanmyth.org/microcode

 * This driver allows to upgrade microcode on x86 processors.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 *

 *	1.0	16 Feb 2000, Tigran Aivazian <tigran@sco.com>

 *		Initial release.

 *	1.01	18 Feb 2000, Tigran Aivazian <tigran@sco.com>

 *		Added read() support + cleanups.

 *	1.02	21 Feb 2000, Tigran Aivazian <tigran@sco.com>

 *		Added 'device trimming' support. open(O_WRONLY) zeroes

 *		and frees the saved copy of applied microcode.

 *	1.03	29 Feb 2000, Tigran Aivazian <tigran@sco.com>

 *		Made to use devfs (/dev/cpu/microcode) + cleanups.

 *	1.04	06 Jun 2000, Simon Trimmer <simon@veritas.com>

 *		Added misc device support (now uses both devfs and misc).

 *		Added MICROCODE_IOCFREE ioctl to clear memory.

 *	1.05	09 Jun 2000, Simon Trimmer <simon@veritas.com>

 *		Messages for error cases (non Intel & no suitable microcode).

 *	1.06	03 Aug 2000, Tigran Aivazian <tigran@veritas.com>

 *		Removed ->release(). Removed exclusive open and status bitmap.

 *		Added microcode_rwsem to serialize read()/write()/ioctl().

 *		Removed global kernel lock usage.

 *	1.07	07 Sep 2000, Tigran Aivazian <tigran@veritas.com>

 *		Write 0 to 0x8B msr and then cpuid before reading revision,

 *		so that it works even if there were no update done by the

 *		BIOS. Otherwise, reading from 0x8B gives junk (which happened

 *		to be 0 on my machine which is why it worked even when I

 *		disabled update by the BIOS)

 *		Thanks to Eric W. Biederman <ebiederman@lnxi.com> for the fix.

 *	1.08	11 Dec 2000, Richard Schaal <richard.schaal@intel.com> and

 *			     Tigran Aivazian <tigran@veritas.com>

 *		Intel Pentium 4 processor support and bugfixes.

 *	1.09	30 Oct 2001, Tigran Aivazian <tigran@veritas.com>

 *		Bugfix for HT (Hyper-Threading) enabled processors

 *		whereby processor resources are shared by all logical processors

 *		in a single CPU package.

 *	1.10	28 Feb 2002 Asit K Mallick <asit.k.mallick@intel.com> and

 *		Tigran Aivazian <tigran@veritas.com>,

 *		Serialize updates as required on HT processors due to

 *		speculative nature of implementation.

 *	1.11	22 Mar 2002 Tigran Aivazian <tigran@veritas.com>

 *		Fix the panic when writing zero-length microcode chunk.

 *	1.12	29 Sep 2003 Nitin Kamble <nitin.a.kamble@intel.com>,

 *		Jun Nakajima <jun.nakajima@intel.com>

 *		Support for the microcode updates in the new format.

 *	1.13	10 Oct 2003 Tigran Aivazian <tigran@veritas.com>

 *		Removed ->read() method and obsoleted MICROCODE_IOCFREE ioctl

 *		because we no longer hold a copy of applied microcode

 *		in kernel memory.

 *	1.14	25 Jun 2004 Tigran Aivazian <tigran@veritas.com>

 *		Fix sigmatch() macro to handle old CPUs with pf == 0.

 *		Thanks to Stuart Swales for pointing out this bug.

 */



#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt