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

Commit 83346fbc 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 Ingo Molnar:
 "Misc fixes:

   - unwinder fixes
   - AMD CPU topology enumeration fixes
   - microcode loader fixes
   - x86 embedded platform fixes
   - fix for a bootup crash that may trigger when clearcpuid= is used
     with invalid values"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mpx: Use compatible types in comparison to fix sparse error
  x86/tsc: Add the Intel Denverton Processor to native_calibrate_tsc()
  x86/entry: Fix the end of the stack for newly forked tasks
  x86/unwind: Include __schedule() in stack traces
  x86/unwind: Disable KASAN checks for non-current tasks
  x86/unwind: Silence warnings for non-current tasks
  x86/microcode/intel: Use correct buffer size for saving microcode data
  x86/microcode/intel: Fix allocation size of struct ucode_patch
  x86/microcode/intel: Add a helper which gives the microcode revision
  x86/microcode: Use native CPUID to tickle out microcode revision
  x86/CPU: Add native CPUID variants returning a single datum
  x86/boot: Add missing declaration of string functions
  x86/CPU/AMD: Fix Bulldozer topology
  x86/platform/intel-mid: Rename 'spidev' to 'mrfld_spidev'
  x86/cpu: Fix typo in the comment for Anniedale
  x86/cpu: Fix bootup crashes by sanitizing the argument of the 'clearcpuid=' command-line option
parents a11ce3a4 45382862

arch/x86/boot/string.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <linux/types.h>

#include "ctype.h"

#include "string.h"



int memcmp(const void *s1, const void *s2, size_t len)

{

arch/x86/boot/string.h

+9 −0
Original line number Diff line number Diff line
@@ -18,4 +18,13 @@ int memcmp(const void *s1, const void *s2, size_t len); 
#define memset(d,c,l) __builtin_memset(d,c,l)

#define memcmp	__builtin_memcmp



extern int strcmp(const char *str1, const char *str2);

extern int strncmp(const char *cs, const char *ct, size_t count);

extern size_t strlen(const char *s);

extern char *strstr(const char *s1, const char *s2);

extern size_t strnlen(const char *s, size_t maxlen);

extern unsigned int atou(const char *s);

extern unsigned long long simple_strtoull(const char *cp, char **endp,

					  unsigned int base);



#endif /* BOOT_STRING_H */

arch/x86/entry/entry_32.S

+11 −19
Original line number Diff line number Diff line
@@ -254,23 +254,6 @@ ENTRY(__switch_to_asm) 
	jmp	__switch_to

END(__switch_to_asm)



/*

 * The unwinder expects the last frame on the stack to always be at the same

 * offset from the end of the page, which allows it to validate the stack.

 * Calling schedule_tail() directly would break that convention because its an

 * asmlinkage function so its argument has to be pushed on the stack.  This

 * wrapper creates a proper "end of stack" frame header before the call.

 */

ENTRY(schedule_tail_wrapper)

	FRAME_BEGIN



	pushl	%eax

	call	schedule_tail

	popl	%eax



	FRAME_END

	ret

ENDPROC(schedule_tail_wrapper)

/*

 * A newly forked process directly context switches into this address.

 *
@@ -279,15 +262,24 @@ ENDPROC(schedule_tail_wrapper) 
 * edi: kernel thread arg

 */

ENTRY(ret_from_fork)

	call	schedule_tail_wrapper

	FRAME_BEGIN		/* help unwinder find end of stack */



	/*

	 * schedule_tail() is asmlinkage so we have to put its 'prev' argument

	 * on the stack.

	 */

	pushl	%eax

	call	schedule_tail

	popl	%eax



	testl	%ebx, %ebx

	jnz	1f		/* kernel threads are uncommon */



2:

	/* When we fork, we trace the syscall return in the child, too. */

	movl    %esp, %eax

	leal	FRAME_OFFSET(%esp), %eax

	call    syscall_return_slowpath

	FRAME_END

	jmp     restore_all



	/* kernel thread */

arch/x86/entry/entry_64.S

+7 −4
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <asm/smap.h>

#include <asm/pgtable_types.h>

#include <asm/export.h>

#include <asm/frame.h>

#include <linux/err.h>



.code64
@@ -408,6 +409,7 @@ END(__switch_to_asm) 
 * r12: kernel thread arg

 */

ENTRY(ret_from_fork)

	FRAME_BEGIN			/* help unwinder find end of stack */

	movq	%rax, %rdi

	call	schedule_tail		/* rdi: 'prev' task parameter */
@@ -415,10 +417,11 @@ ENTRY(ret_from_fork) 
	jnz	1f			/* kernel threads are uncommon */



2:

	movq	%rsp, %rdi

	leaq	FRAME_OFFSET(%rsp),%rdi	/* pt_regs pointer */

	call	syscall_return_slowpath	/* returns with IRQs disabled */

	TRACE_IRQS_ON			/* user mode is traced as IRQS on */

	SWAPGS

	FRAME_END

	jmp	restore_regs_and_iret



1:

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#define INTEL_FAM6_ATOM_SILVERMONT2	0x4D /* Avaton/Rangely */

#define INTEL_FAM6_ATOM_AIRMONT		0x4C /* CherryTrail / Braswell */

#define INTEL_FAM6_ATOM_MERRIFIELD	0x4A /* Tangier */

#define INTEL_FAM6_ATOM_MOOREFIELD	0x5A /* Annidale */

#define INTEL_FAM6_ATOM_MOOREFIELD	0x5A /* Anniedale */

#define INTEL_FAM6_ATOM_GOLDMONT	0x5C

#define INTEL_FAM6_ATOM_DENVERTON	0x5F /* Goldmont Microserver */