From 2e644cada9c284a609ece49a290a6e28aabe3fe4 Mon Sep 17 00:00:00 2001 From: Kan Liang Date: Wed, 18 Sep 2024 22:51:00 +0200 Subject: [PATCH] perf/x86/uncore: Retrieve the unit ID from the unit control RB tree BugLink: https://bugs.launchpad.net/bugs/2081079 The box_ids only save the unit ID for the first die. If a unit, e.g., a CXL unit, doesn't exist in the first die. The unit ID cannot be retrieved. The unit control RB tree also stores the unit ID information. Retrieve the unit ID from the unit control RB tree Signed-off-by: Kan Liang Signed-off-by: Peter Zijlstra (Intel) Tested-by: Yunying Sun Link: https://lore.kernel.org/r/20240614134631.1092359-4-kan.liang@linux.intel.com (cherry picked from commit 585463fee64270d4b4d80b1e433d2105ef555bec) Signed-off-by: Michael Reed Acked-by: Thibault Ferrante Acked-by: Mehmet Basaran Signed-off-by: Stefan Bader --- arch/x86/events/intel/uncore.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c index 117357057de3..bc662dfd8662 100644 --- a/arch/x86/events/intel/uncore.c +++ b/arch/x86/events/intel/uncore.c @@ -862,6 +862,9 @@ static const struct attribute_group uncore_pmu_attr_group = { static inline int uncore_get_box_id(struct intel_uncore_type *type, struct intel_uncore_pmu *pmu) { + if (type->boxes) + return intel_uncore_find_discovery_unit_id(type->boxes, -1, pmu->pmu_idx); + return type->box_ids ? type->box_ids[pmu->pmu_idx] : pmu->pmu_idx; }