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

Commit 24b888d8 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 updates for x86:

   - Fix an unintended sign extension issue in the fault handling code

   - Rename the new resource control config switch so it's less
     confusing

   - Avoid setting up EFI info in kexec when the EFI runtime is
     disabled.

   - Fix the microcode version check in the AMD microcode loader so it
     only loads higher version numbers and never downgrades

   - Set EFER.LME in the 32bit trampoline before returning to long mode
     to handle older AMD/KVM behaviour properly.

   - Add Darren and Andy as x86/platform reviewers"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/resctrl: Avoid confusion over the new X86_RESCTRL config
  x86/kexec: Don't setup EFI info if EFI runtime is not enabled
  x86/microcode/amd: Don't falsely trick the late loading mechanism
  MAINTAINERS: Add Andy and Darren as arch/x86/platform/ reviewers
  x86/fault: Fix sign-extend unintended sign extension
  x86/boot/compressed/64: Set EFER.LME=1 in 32-bit trampoline before returning to long mode
  x86/cpu: Add Atom Tremont (Jacobsville)
parents cc6810e3 e6d42931

Documentation/x86/resctrl_ui.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ Fenghua Yu <fenghua.yu@intel.com> 
Tony Luck <tony.luck@intel.com>

Vikas Shivappa <vikas.shivappa@intel.com>



This feature is enabled by the CONFIG_X86_RESCTRL and the x86 /proc/cpuinfo

This feature is enabled by the CONFIG_X86_CPU_RESCTRL and the x86 /proc/cpuinfo

flag bits:

RDT (Resource Director Technology) Allocation - "rdt_a"

CAT (Cache Allocation Technology) - "cat_l3", "cat_l2"

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -16641,6 +16641,15 @@ S: Maintained 
F:	drivers/platform/x86/

F:	drivers/platform/olpc/



X86 PLATFORM DRIVERS - ARCH

R:	Darren Hart <dvhart@infradead.org>

R:	Andy Shevchenko <andy@infradead.org>

L:	platform-driver-x86@vger.kernel.org

L:	x86@kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core

S:	Maintained

F:	arch/x86/platform



X86 VDSO

M:	Andy Lutomirski <luto@kernel.org>

L:	linux-kernel@vger.kernel.org

arch/x86/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -446,12 +446,12 @@ config RETPOLINE 
	  branches. Requires a compiler with -mindirect-branch=thunk-extern

	  support for full protection. The kernel may run slower.



config X86_RESCTRL

	bool "Resource Control support"

config X86_CPU_RESCTRL

	bool "x86 CPU resource control support"

	depends on X86 && (CPU_SUP_INTEL || CPU_SUP_AMD)

	select KERNFS

	help

	  Enable Resource Control support.

	  Enable x86 CPU resource control support.



	  Provide support for the allocation and monitoring of system resources

	  usage by the CPU.

arch/x86/boot/compressed/head_64.S

+8 −0
Original line number Diff line number Diff line
@@ -600,6 +600,14 @@ ENTRY(trampoline_32bit_src) 
	leal	TRAMPOLINE_32BIT_PGTABLE_OFFSET(%ecx), %eax

	movl	%eax, %cr3

3:

	/* Set EFER.LME=1 as a precaution in case hypervsior pulls the rug */

	pushl	%ecx

	movl	$MSR_EFER, %ecx

	rdmsr

	btsl	$_EFER_LME, %eax

	wrmsr

	popl	%ecx



	/* Enable PAE and LA57 (if required) paging modes */

	movl	$X86_CR4_PAE, %eax

	cmpl	$0, %edx

arch/x86/boot/compressed/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#define TRAMPOLINE_32BIT_PGTABLE_OFFSET	0



#define TRAMPOLINE_32BIT_CODE_OFFSET	PAGE_SIZE

#define TRAMPOLINE_32BIT_CODE_SIZE	0x60

#define TRAMPOLINE_32BIT_CODE_SIZE	0x70



#define TRAMPOLINE_32BIT_STACK_END	TRAMPOLINE_32BIT_SIZE