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

Commit 146c3d32 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 fixes from Thomas Gleixner:
 "A few fixes for x86:

   - Fix a boot regression caused by the recent bootparam sanitizing
     change, which escaped the attention of all people who reviewed that
     code.

   - Address a boot problem on machines with broken E820 tables caused
     by an underflow which ended up placing the trampoline start at
     physical address 0.

   - Handle machines which do not advertise a legacy timer of any form,
     but need calibration of the local APIC timer gracefully by making
     the calibration routine independent from the tick interrupt. Marked
     for stable as well as there seems to be quite some new laptops
     rolled out which expose this.

   - Clear the RDRAND CPUID bit on AMD family 15h and 16h CPUs which are
     affected by broken firmware which does not initialize RDRAND
     correctly after resume. Add a command line parameter to override
     this for machine which either do not use suspend/resume or have a
     fixed BIOS. Unfortunately there is no way to detect this on boot,
     so the only safe decision is to turn it off by default.

   - Prevent RFLAGS from being clobbers in CALL_NOSPEC on 32bit which
     caused fast KVM instruction emulation to break.

   - Explain the Intel CPU model naming convention so that the repeating
     discussions come to an end"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/retpoline: Don't clobber RFLAGS during CALL_NOSPEC on i386
  x86/boot: Fix boot regression caused by bootparam sanitizing
  x86/CPU/AMD: Clear RDRAND CPUID bit on AMD family 15h/16h
  x86/boot/compressed/64: Fix boot on machines with broken E820 table
  x86/apic: Handle missing global clockevent gracefully
  x86/cpu: Explain Intel model naming convention
parents 5a13fc3d b63f20a7

Documentation/admin-guide/kernel-parameters.txt

+7 −0
Original line number Diff line number Diff line
@@ -4090,6 +4090,13 @@ 
			Run specified binary instead of /init from the ramdisk,

			used for early userspace startup. See initrd.



	rdrand=		[X86]

			force - Override the decision by the kernel to hide the

				advertisement of RDRAND support (this affects

				certain AMD processors because of buggy BIOS

				support, specifically around the suspend/resume

				path).



	rdt=		[HW,X86,RDT]

			Turn on/off individual RDT features. List is:

			cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp,

arch/x86/boot/compressed/pgtable_64.c

+10 −3
Original line number Diff line number Diff line
@@ -72,6 +72,8 @@ static unsigned long find_trampoline_placement(void) 


	/* Find the first usable memory region under bios_start. */

	for (i = boot_params->e820_entries - 1; i >= 0; i--) {

		unsigned long new;



		entry = &boot_params->e820_table[i];



		/* Skip all entries above bios_start. */
@@ -84,15 +86,20 @@ static unsigned long find_trampoline_placement(void) 


		/* Adjust bios_start to the end of the entry if needed. */

		if (bios_start > entry->addr + entry->size)

			bios_start = entry->addr + entry->size;

			new = entry->addr + entry->size;



		/* Keep bios_start page-aligned. */

		bios_start = round_down(bios_start, PAGE_SIZE);

		new = round_down(new, PAGE_SIZE);



		/* Skip the entry if it's too small. */

		if (bios_start - TRAMPOLINE_32BIT_SIZE < entry->addr)

		if (new - TRAMPOLINE_32BIT_SIZE < entry->addr)

			continue;



		/* Protect against underflow. */

		if (new - TRAMPOLINE_32BIT_SIZE > bios_start)

			break;



		bios_start = new;

		break;

	}

arch/x86/include/asm/bootparam_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ static void sanitize_boot_params(struct boot_params *boot_params) 
			BOOT_PARAM_PRESERVE(apm_bios_info),

			BOOT_PARAM_PRESERVE(tboot_addr),

			BOOT_PARAM_PRESERVE(ist_info),

			BOOT_PARAM_PRESERVE(acpi_rsdp_addr),

			BOOT_PARAM_PRESERVE(hd0_info),

			BOOT_PARAM_PRESERVE(hd1_info),

			BOOT_PARAM_PRESERVE(sys_desc_table),
@@ -71,6 +70,7 @@ static void sanitize_boot_params(struct boot_params *boot_params) 
			BOOT_PARAM_PRESERVE(eddbuf_entries),

			BOOT_PARAM_PRESERVE(edd_mbr_sig_buf_entries),

			BOOT_PARAM_PRESERVE(edd_mbr_sig_buffer),

			BOOT_PARAM_PRESERVE(hdr),

			BOOT_PARAM_PRESERVE(e820_table),

			BOOT_PARAM_PRESERVE(eddbuf),

		};

arch/x86/include/asm/intel-family.h

+15 −0
Original line number Diff line number Diff line
@@ -11,6 +11,21 @@ 
 * While adding a new CPUID for a new microarchitecture, add a new

 * group to keep logically sorted out in chronological order. Within

 * that group keep the CPUID for the variants sorted by model number.

 *

 * The defined symbol names have the following form:

 *	INTEL_FAM6{OPTFAMILY}_{MICROARCH}{OPTDIFF}

 * where:

 * OPTFAMILY	Describes the family of CPUs that this belongs to. Default

 *		is assumed to be "_CORE" (and should be omitted). Other values

 *		currently in use are _ATOM and _XEON_PHI

 * MICROARCH	Is the code name for the micro-architecture for this core.

 *		N.B. Not the platform name.

 * OPTDIFF	If needed, a short string to differentiate by market segment.

 *		Exact strings here will vary over time. _DESKTOP, _MOBILE, and

 *		_X (short for Xeon server) should be used when they are

 *		appropriate.

 *

 * The #define line may optionally include a comment including platform names.

 */



#define INTEL_FAM6_CORE_YONAH		0x0E

arch/x86/include/asm/msr-index.h

+1 −0
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ 
#define MSR_AMD64_PATCH_LEVEL		0x0000008b

#define MSR_AMD64_TSC_RATIO		0xc0000104

#define MSR_AMD64_NB_CFG		0xc001001f

#define MSR_AMD64_CPUID_FN_1		0xc0011004

#define MSR_AMD64_PATCH_LOADER		0xc0010020

#define MSR_AMD64_OSVW_ID_LENGTH	0xc0010140

#define MSR_AMD64_OSVW_STATUS		0xc0010141