Skip to content

Commit c251dbb

Browse files
committed
Merge: perf/x86/intel: Enable Clearwater Forest and Panther Lake PMU support
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/7069 JIRA: https://issues.redhat.com/browse/RHEL-47454 JIRA: https://issues.redhat.com/browse/RHEL-47452 JIRA: https://issues.redhat.com/browse/RHEL-45093 JIRA: https://issues.redhat.com/browse/RHEL-47406 PMU enablement for two Intel microarchitectures that we haven't enabled in RHEL-9 yet. Signed-off-by: Michael Petlan <mpetlan@redhat.com> Approved-by: David Arcari <darcari@redhat.com> Approved-by: Lenny Szubowicz <lszubowi@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Augusto Caringi <acaringi@redhat.com>
2 parents b4dfef9 + 950a1ae commit c251dbb

File tree

1 file changed

+33
-2
lines changed

1 file changed

+33
-2
lines changed

arch/x86/events/intel/core.c

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2219,6 +2219,18 @@ static struct extra_reg intel_cmt_extra_regs[] __read_mostly = {
22192219
EVENT_EXTRA_END
22202220
};
22212221

2222+
EVENT_ATTR_STR(topdown-fe-bound, td_fe_bound_skt, "event=0x9c,umask=0x01");
2223+
EVENT_ATTR_STR(topdown-retiring, td_retiring_skt, "event=0xc2,umask=0x02");
2224+
EVENT_ATTR_STR(topdown-be-bound, td_be_bound_skt, "event=0xa4,umask=0x02");
2225+
2226+
static struct attribute *skt_events_attrs[] = {
2227+
EVENT_PTR(td_fe_bound_skt),
2228+
EVENT_PTR(td_retiring_skt),
2229+
EVENT_PTR(td_bad_spec_cmt),
2230+
EVENT_PTR(td_be_bound_skt),
2231+
NULL,
2232+
};
2233+
22222234
#define KNL_OT_L2_HITE BIT_ULL(19) /* Other Tile L2 Hit */
22232235
#define KNL_OT_L2_HITF BIT_ULL(20) /* Other Tile L2 Hit */
22242236
#define KNL_MCDRAM_LOCAL BIT_ULL(21)
@@ -6789,6 +6801,18 @@ __init int intel_pmu_init(void)
67896801
name = "crestmont";
67906802
break;
67916803

6804+
case INTEL_ATOM_DARKMONT_X:
6805+
intel_pmu_init_skt(NULL);
6806+
intel_pmu_pebs_data_source_cmt();
6807+
x86_pmu.pebs_latency_data = cmt_latency_data;
6808+
x86_pmu.get_event_constraints = cmt_get_event_constraints;
6809+
td_attr = skt_events_attrs;
6810+
mem_attr = grt_mem_attrs;
6811+
extra_attr = cmt_format_attr;
6812+
pr_cont("Darkmont events, ");
6813+
name = "darkmont";
6814+
break;
6815+
67926816
case INTEL_WESTMERE:
67936817
case INTEL_WESTMERE_EP:
67946818
case INTEL_WESTMERE_EX:
@@ -7219,8 +7243,17 @@ __init int intel_pmu_init(void)
72197243
name = "meteorlake_hybrid";
72207244
break;
72217245

7246+
case INTEL_PANTHERLAKE_L:
7247+
pr_cont("Pantherlake Hybrid events, ");
7248+
name = "pantherlake_hybrid";
7249+
goto lnl_common;
7250+
72227251
case INTEL_LUNARLAKE_M:
72237252
case INTEL_ARROWLAKE:
7253+
pr_cont("Lunarlake Hybrid events, ");
7254+
name = "lunarlake_hybrid";
7255+
7256+
lnl_common:
72247257
intel_pmu_init_hybrid(hybrid_big_small);
72257258

72267259
x86_pmu.pebs_latency_data = lnl_latency_data;
@@ -7242,8 +7275,6 @@ __init int intel_pmu_init(void)
72427275
intel_pmu_init_skt(&pmu->pmu);
72437276

72447277
intel_pmu_pebs_data_source_lnl();
7245-
pr_cont("Lunarlake Hybrid events, ");
7246-
name = "lunarlake_hybrid";
72477278
break;
72487279

72497280
case INTEL_ARROWLAKE_H:

0 commit comments

Comments
 (0)