Skip to content

Commit b1afb79

Browse files
author
CKI KWF Bot
committed
Merge: perf/x86/intel: Add PMU support for Clearwater Forest
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1140 JIRA: https://issues.redhat.com/browse/RHEL-45092 JIRA: https://issues.redhat.com/browse/RHEL-47453 Adds Clearwater Forest PMU support. 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: CKI GitLab Kmaint Pipeline Bot <26919896-cki-kmaint-pipeline-bot@users.noreply.gitlab.com>
2 parents 9793008 + c4d87b0 commit b1afb79

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

arch/x86/events/intel/core.c

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2224,6 +2224,18 @@ static struct extra_reg intel_cmt_extra_regs[] __read_mostly = {
22242224
EVENT_EXTRA_END
22252225
};
22262226

2227+
EVENT_ATTR_STR(topdown-fe-bound, td_fe_bound_skt, "event=0x9c,umask=0x01");
2228+
EVENT_ATTR_STR(topdown-retiring, td_retiring_skt, "event=0xc2,umask=0x02");
2229+
EVENT_ATTR_STR(topdown-be-bound, td_be_bound_skt, "event=0xa4,umask=0x02");
2230+
2231+
static struct attribute *skt_events_attrs[] = {
2232+
EVENT_PTR(td_fe_bound_skt),
2233+
EVENT_PTR(td_retiring_skt),
2234+
EVENT_PTR(td_bad_spec_cmt),
2235+
EVENT_PTR(td_be_bound_skt),
2236+
NULL,
2237+
};
2238+
22272239
#define KNL_OT_L2_HITE BIT_ULL(19) /* Other Tile L2 Hit */
22282240
#define KNL_OT_L2_HITF BIT_ULL(20) /* Other Tile L2 Hit */
22292241
#define KNL_MCDRAM_LOCAL BIT_ULL(21)
@@ -6884,6 +6896,18 @@ __init int intel_pmu_init(void)
68846896
name = "crestmont";
68856897
break;
68866898

6899+
case INTEL_ATOM_DARKMONT_X:
6900+
intel_pmu_init_skt(NULL);
6901+
intel_pmu_pebs_data_source_cmt();
6902+
x86_pmu.pebs_latency_data = cmt_latency_data;
6903+
x86_pmu.get_event_constraints = cmt_get_event_constraints;
6904+
td_attr = skt_events_attrs;
6905+
mem_attr = grt_mem_attrs;
6906+
extra_attr = cmt_format_attr;
6907+
pr_cont("Darkmont events, ");
6908+
name = "darkmont";
6909+
break;
6910+
68876911
case INTEL_WESTMERE:
68886912
case INTEL_WESTMERE_EP:
68896913
case INTEL_WESTMERE_EX:

0 commit comments

Comments
 (0)