Commit faaeff98 authored by Kan Liang's avatar Kan Liang Committed by Ingo Molnar
Browse files

perf/x86/intel: Add more Icelake CPUIDs 



Add new model number for Icelake desktop and server to perf.

The data source encoding for Icelake server is the same as Skylake
server.

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: qiuxu.zhuo@intel.com
Cc: rui.zhang@intel.com
Cc: tony.luck@intel.com
Link: https://lkml.kernel.org/r/20190603134122.13853-2-kan.liang@linux.intel.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 2a538fda

arch/x86/events/intel/core.c

+9 −4
Original line number Diff line number Diff line
@@ -4485,6 +4485,7 @@ __init int intel_pmu_init(void) 
	struct event_constraint *c;

	unsigned int unused;

	struct extra_reg *er;

	bool pmem = false;

	int version, i;

	char *name;
@@ -4936,9 +4937,10 @@ __init int intel_pmu_init(void) 
		name = "knights-landing";

		break;



	case INTEL_FAM6_SKYLAKE_X:

		pmem = true;

	case INTEL_FAM6_SKYLAKE_MOBILE:

	case INTEL_FAM6_SKYLAKE_DESKTOP:

	case INTEL_FAM6_SKYLAKE_X:

	case INTEL_FAM6_KABYLAKE_MOBILE:

	case INTEL_FAM6_KABYLAKE_DESKTOP:

		x86_add_quirk(intel_pebs_isolation_quirk);
@@ -4970,8 +4972,7 @@ __init int intel_pmu_init(void) 
		td_attr  = hsw_events_attrs;

		mem_attr = hsw_mem_events_attrs;

		tsx_attr = hsw_tsx_events_attrs;

		intel_pmu_pebs_data_source_skl(

			boot_cpu_data.x86_model == INTEL_FAM6_SKYLAKE_X);

		intel_pmu_pebs_data_source_skl(pmem);



		if (boot_cpu_has(X86_FEATURE_TSX_FORCE_ABORT)) {

			x86_pmu.flags |= PMU_FL_TFA;
@@ -4985,7 +4986,11 @@ __init int intel_pmu_init(void) 
		name = "skylake";

		break;



	case INTEL_FAM6_ICELAKE_X:

	case INTEL_FAM6_ICELAKE_XEON_D:

		pmem = true;

	case INTEL_FAM6_ICELAKE_MOBILE:

	case INTEL_FAM6_ICELAKE_DESKTOP:

		x86_pmu.late_ack = true;

		memcpy(hw_cache_event_ids, skl_hw_cache_event_ids, sizeof(hw_cache_event_ids));

		memcpy(hw_cache_extra_regs, skl_hw_cache_extra_regs, sizeof(hw_cache_extra_regs));
@@ -5009,7 +5014,7 @@ __init int intel_pmu_init(void) 
		tsx_attr = icl_tsx_events_attrs;

		x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xca, .umask=0x02);

		x86_pmu.lbr_pt_coexist = true;

		intel_pmu_pebs_data_source_skl(false);

		intel_pmu_pebs_data_source_skl(pmem);

		pr_cont("Icelake events, ");

		name = "icelake";

		break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE