perf/x86/intel: Add more Icelake CPUIDs

[ Upstream commit faaeff98666c24376cebd0b106504d05a36881d1 ]

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: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter 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: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c
index a5436cee20b1283623fa56db2348efd29fdcdd14..b6cae65aa7ef32071f08340a01cb513121a6b178 100644 (file)
--- a/arch/x86/events/intel/core.c
+++ b/arch/x86/events/intel/core.c
@@ -4439,6 +4439,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;
 
@@ -4890,9 +4891,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);
@@ -4925,8 +4927,7 @@ __init int intel_pmu_init(void)
                x86_pmu.cpu_events = 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;
@@ -4940,7 +4941,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));
@@ -4963,7 +4968,7 @@ __init int intel_pmu_init(void)
                x86_pmu.cpu_events = get_icl_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;