perf/x86/intel: Fix rtm_abort_event encoding on Ice Lake
authorKan Liang <kan.liang@linux.intel.com>
Wed, 25 Nov 2020 21:37:19 +0000 (13:37 -0800)
committerPeter Zijlstra <peterz@infradead.org>
Wed, 9 Dec 2020 16:08:57 +0000 (17:08 +0100)
According to the event list from icelake_core_v1.09.json, the encoding
of the RTM_RETIRED.ABORTED event on Ice Lake should be,
    "EventCode": "0xc9",
    "UMask": "0x04",
    "EventName": "RTM_RETIRED.ABORTED",

Correct the wrong encoding.

Fixes: 6017608936c1 ("perf/x86/intel: Add Icelake support")
Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lkml.kernel.org/r/20201125213720.15692-1-kan.liang@linux.intel.com
arch/x86/events/intel/core.c

index 546cc89..6c0d18f 100644 (file)
@@ -5466,7 +5466,7 @@ __init int intel_pmu_init(void)
                mem_attr = icl_events_attrs;
                td_attr = icl_td_events_attrs;
                tsx_attr = icl_tsx_events_attrs;
-               x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xca, .umask=0x02);
+               x86_pmu.rtm_abort_event = X86_CONFIG(.event=0xc9, .umask=0x04);
                x86_pmu.lbr_pt_coexist = true;
                intel_pmu_pebs_data_source_skl(pmem);
                x86_pmu.update_topdown_event = icl_update_topdown_event;