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

Commit 368f8998 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:
 "This contains the following fixes and improvements:

   - Avoid dereferencing an unprotected VMA pointer in the fault signal
     generation code

   - Fix inline asm call constraints for GCC 4.4

   - Use existing register variable to retrieve the stack pointer
     instead of forcing the compiler to create another indirect access
     which results in excessive extra 'mov %rsp, %<dst>' instructions

   - Disable branch profiling for the memory encryption code to prevent
     an early boot crash

   - Fix a sparse warning caused by casting the __user annotation in
     __get_user_asm_u64() away

   - Fix an off by one error in the loop termination of the error patch
     in the x86 sysfs init code

   - Add missing CPU IDs to various Intel specific drivers to enable the
     functionality on recent hardware

   - More (init) constification in the numachip code"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/asm: Use register variable to get stack pointer value
  x86/mm: Disable branch profiling in mem_encrypt.c
  x86/asm: Fix inline asm call constraints for GCC 4.4
  perf/x86/intel/uncore: Correct num_boxes for IIO and IRP
  perf/x86/intel/rapl: Add missing CPU IDs
  perf/x86/msr: Add missing CPU IDs
  perf/x86/intel/cstate: Add missing CPU IDs
  x86: Don't cast away the __user in __get_user_asm_u64()
  x86/sysfs: Fix off-by-one error in loop termination
  x86/mm: Fix fault error path using unsafe vma pointer
  x86/numachip: Add const and __initconst to numachip2_clockevent
parents c42ed9f9 196bd485

arch/x86/events/intel/cstate.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -552,6 +552,7 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { 




	X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_MOBILE,  snb_cstates),

	X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_MOBILE,  snb_cstates),

	X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates),

	X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_DESKTOP, snb_cstates),

	X86_CSTATES_MODEL(INTEL_FAM6_SKYLAKE_X, snb_cstates),





	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE,  snb_cstates),

	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_MOBILE,  snb_cstates),

	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, snb_cstates),

	X86_CSTATES_MODEL(INTEL_FAM6_KABYLAKE_DESKTOP, snb_cstates),
@@ -560,6 +561,9 @@ static const struct x86_cpu_id intel_cstates_match[] __initconst = { 
	X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),

	X86_CSTATES_MODEL(INTEL_FAM6_XEON_PHI_KNM, knl_cstates),





	X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT, glm_cstates),

	X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GOLDMONT, glm_cstates),

	X86_CSTATES_MODEL(INTEL_FAM6_ATOM_DENVERTON, glm_cstates),



	X86_CSTATES_MODEL(INTEL_FAM6_ATOM_GEMINI_LAKE, glm_cstates),

	{ },

	{ },

};

};

MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);

MODULE_DEVICE_TABLE(x86cpu, intel_cstates_match);

arch/x86/events/intel/rapl.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -775,6 +775,9 @@ static const struct x86_cpu_id rapl_cpu_match[] __initconst = { 
	X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, skl_rapl_init),

	X86_RAPL_MODEL_MATCH(INTEL_FAM6_KABYLAKE_DESKTOP, skl_rapl_init),





	X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT, hsw_rapl_init),

	X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GOLDMONT, hsw_rapl_init),

	X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_DENVERTON, hsw_rapl_init),



	X86_RAPL_MODEL_MATCH(INTEL_FAM6_ATOM_GEMINI_LAKE, hsw_rapl_init),

	{},

	{},

};

};

arch/x86/events/intel/uncore_snbep.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3462,7 +3462,7 @@ static struct intel_uncore_ops skx_uncore_iio_ops = { 
static struct intel_uncore_type skx_uncore_iio = {

static struct intel_uncore_type skx_uncore_iio = {

	.name			= "iio",

	.name			= "iio",

	.num_counters		= 4,

	.num_counters		= 4,

	.num_boxes		= 5,

	.num_boxes		= 6,

	.perf_ctr_bits		= 48,

	.perf_ctr_bits		= 48,

	.event_ctl		= SKX_IIO0_MSR_PMON_CTL0,

	.event_ctl		= SKX_IIO0_MSR_PMON_CTL0,

	.perf_ctr		= SKX_IIO0_MSR_PMON_CTR0,

	.perf_ctr		= SKX_IIO0_MSR_PMON_CTR0,
@@ -3492,7 +3492,7 @@ static const struct attribute_group skx_uncore_format_group = { 
static struct intel_uncore_type skx_uncore_irp = {

static struct intel_uncore_type skx_uncore_irp = {

	.name			= "irp",

	.name			= "irp",

	.num_counters		= 2,

	.num_counters		= 2,

	.num_boxes		= 5,

	.num_boxes		= 6,

	.perf_ctr_bits		= 48,

	.perf_ctr_bits		= 48,

	.event_ctl		= SKX_IRP0_MSR_PMON_CTL0,

	.event_ctl		= SKX_IRP0_MSR_PMON_CTL0,

	.perf_ctr		= SKX_IRP0_MSR_PMON_CTR0,

	.perf_ctr		= SKX_IRP0_MSR_PMON_CTR0,

arch/x86/events/msr.c

+8 −0
Original line number Original line Diff line number Diff line
@@ -63,6 +63,14 @@ static bool test_intel(int idx) 
	case INTEL_FAM6_ATOM_SILVERMONT1:

	case INTEL_FAM6_ATOM_SILVERMONT1:

	case INTEL_FAM6_ATOM_SILVERMONT2:

	case INTEL_FAM6_ATOM_SILVERMONT2:

	case INTEL_FAM6_ATOM_AIRMONT:

	case INTEL_FAM6_ATOM_AIRMONT:



	case INTEL_FAM6_ATOM_GOLDMONT:

	case INTEL_FAM6_ATOM_DENVERTON:



	case INTEL_FAM6_ATOM_GEMINI_LAKE:



	case INTEL_FAM6_XEON_PHI_KNL:

	case INTEL_FAM6_XEON_PHI_KNM:

		if (idx == PERF_MSR_SMI)

		if (idx == PERF_MSR_SMI)

			return true;

			return true;

		break;

		break;

arch/x86/include/asm/asm.h

+5 −3
Original line number Original line Diff line number Diff line
@@ -11,10 +11,12 @@ 
# define __ASM_FORM_COMMA(x) " " #x ","

# define __ASM_FORM_COMMA(x) " " #x ","

#endif

#endif





#ifdef CONFIG_X86_32

#ifndef __x86_64__

/* 32 bit */

# define __ASM_SEL(a,b) __ASM_FORM(a)

# define __ASM_SEL(a,b) __ASM_FORM(a)

# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(a)

# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(a)

#else

#else

/* 64 bit */

# define __ASM_SEL(a,b) __ASM_FORM(b)

# define __ASM_SEL(a,b) __ASM_FORM(b)

# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(b)

# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(b)

#endif

#endif
@@ -139,8 +141,8 @@ 
 * gets set up by the containing function.  If you forget to do this, objtool

 * gets set up by the containing function.  If you forget to do this, objtool

 * may print a "call without frame pointer save/setup" warning.

 * may print a "call without frame pointer save/setup" warning.

 */

 */

register unsigned int __asm_call_sp asm("esp");

register unsigned long current_stack_pointer asm(_ASM_SP);

#define ASM_CALL_CONSTRAINT "+r" (__asm_call_sp)

#define ASM_CALL_CONSTRAINT "+r" (current_stack_pointer)

#endif

#endif





#endif /* _ASM_X86_ASM_H */
 
#endif /* _ASM_X86_ASM_H */