Commit bdb0ae6a 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 Peter Anvin:
 "This is a collection of miscellaneous fixes, the most important one is
  the fix for the Samsung laptop bricking issue (auto-blacklisting the
  samsung-laptop driver); the efi_enabled() changes you see below are
  prerequisites for that fix.

  The other issues fixed are booting on OLPC XO-1.5, an UV fix, NMI
  debugging, and requiring CAP_SYS_RAWIO for MSR references, just as
  with I/O port references."

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  samsung-laptop: Disable on EFI hardware
  efi: Make 'efi_enabled' a function to query EFI facilities
  smp: Fix SMP function call empty cpu mask race
  x86/msr: Add capabilities check
  x86/dma-debug: Bump PREALLOC_DMA_DEBUG_ENTRIES
  x86/olpc: Fix olpc-xo1-sci.c build errors
  arch/x86/platform/uv: Fix incorrect tlb flush all issue
  x86-64: Fix unwind annotations in recent NMI changes
  x86-32: Start out cr0 clean, disable paging before modifying cr3/4
parents 0fe94b9e e0094244

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2138,6 +2138,7 @@ config OLPC_XO1_RTC 
config OLPC_XO1_SCI

	bool "OLPC XO-1 SCI extras"

	depends on OLPC && OLPC_XO1_PM

	depends on INPUT=y

	select POWER_SUPPLY

	select GPIO_CS5535

	select MFD_CORE

arch/x86/include/asm/efi.h

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size, 
#endif /* CONFIG_X86_32 */



extern int add_efi_memmap;

extern unsigned long x86_efi_facility;

extern void efi_set_executable(efi_memory_desc_t *md, bool executable);

extern int efi_memblock_x86_reserve_range(void);

extern void efi_call_phys_prelog(void);

arch/x86/include/asm/uv/uv.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ extern void uv_system_init(void); 
extern const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,

						 struct mm_struct *mm,

						 unsigned long start,

						 unsigned end,

						 unsigned long end,

						 unsigned int cpu);



#else	/* X86_UV */

arch/x86/kernel/entry_64.S

+3 −4
Original line number Diff line number Diff line
@@ -1781,6 +1781,7 @@ first_nmi: 
	 * Leave room for the "copied" frame

	 */

	subq $(5*8), %rsp

	CFI_ADJUST_CFA_OFFSET 5*8



	/* Copy the stack frame to the Saved frame */

	.rept 5
@@ -1863,10 +1864,8 @@ end_repeat_nmi: 
nmi_swapgs:

	SWAPGS_UNSAFE_STACK

nmi_restore:

	RESTORE_ALL 8



	/* Pop the extra iret frame */

	addq $(5*8), %rsp

	/* Pop the extra iret frame at once */

	RESTORE_ALL 6*8



	/* Clear the NMI executing stack variable */

	movq $0, 5*8(%rsp)

arch/x86/kernel/head_32.S

+7 −2
Original line number Diff line number Diff line
@@ -300,6 +300,12 @@ ENTRY(startup_32_smp) 
	leal -__PAGE_OFFSET(%ecx),%esp



default_entry:

#define CR0_STATE	(X86_CR0_PE | X86_CR0_MP | X86_CR0_ET | \

			 X86_CR0_NE | X86_CR0_WP | X86_CR0_AM | \

			 X86_CR0_PG)

	movl $(CR0_STATE & ~X86_CR0_PG),%eax

	movl %eax,%cr0



/*

 *	New page tables may be in 4Mbyte page mode and may

 *	be using the global pages.
@@ -364,8 +370,7 @@ default_entry: 
 */

	movl $pa(initial_page_table), %eax

	movl %eax,%cr3		/* set the page table pointer.. */

	movl %cr0,%eax

	orl  $X86_CR0_PG,%eax

	movl $CR0_STATE,%eax

	movl %eax,%cr0		/* ..and set paging (PG) bit */

	ljmp $__BOOT_CS,$1f	/* Clear prefetch and normalize %eip */

1:

CRA Git | Maintained and supported by SUSTech CRA and CCSE