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 <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Tested-by: Yunying Sun <yunying.sun@intel.com>
Link: https://lore.kernel.org/r/20240614134631.1092359-4-kan.liang@linux.intel.com

(cherry picked from commit 585463fee64270d4b4d80b1e433d2105ef555bec)
Signed-off-by: Michael Reed <Michael.Reed@canonical.com>
Acked-by: Thibault Ferrante <thibault.ferrante@canonical.com>
Acked-by: Mehmet Basaran <mehmet.basaran@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
This commit is contained in:
Kan Liang
2024-09-18 22:51:00 +02:00
committed by Mehmet Basaran
parent 097db0972c
commit 2e644cada9
+3
View File
@@ -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;
}