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

Commit bfd36050 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull perf fixes from Ingo Molnar:
 "Two small fixlets"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Add Haswell ULT model number used in Macbook Air and other systems
  perf/x86: Fix intel QPI uncore event definitions
parents b88a2595 0499bd86

arch/x86/kernel/cpu/perf_event_intel.c

+1 −0
Original line number Diff line number Diff line
@@ -2270,6 +2270,7 @@ __init int intel_pmu_init(void) 
	case 70:

	case 71:

	case 63:

	case 69:

		x86_pmu.late_ack = true;

		memcpy(hw_cache_event_ids, snb_hw_cache_event_ids, sizeof(hw_cache_event_ids));

		memcpy(hw_cache_extra_regs, snb_hw_cache_extra_regs, sizeof(hw_cache_extra_regs));

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+2 −2
Original line number Diff line number Diff line
@@ -314,8 +314,8 @@ static struct uncore_event_desc snbep_uncore_imc_events[] = { 
static struct uncore_event_desc snbep_uncore_qpi_events[] = {

	INTEL_UNCORE_EVENT_DESC(clockticks,       "event=0x14"),

	INTEL_UNCORE_EVENT_DESC(txl_flits_active, "event=0x00,umask=0x06"),

	INTEL_UNCORE_EVENT_DESC(drs_data,         "event=0x02,umask=0x08"),

	INTEL_UNCORE_EVENT_DESC(ncb_data,         "event=0x03,umask=0x04"),

	INTEL_UNCORE_EVENT_DESC(drs_data,         "event=0x102,umask=0x08"),

	INTEL_UNCORE_EVENT_DESC(ncb_data,         "event=0x103,umask=0x04"),

	{ /* end: all zeroes */ },

};