perf/arm-cmn: Ensure port and device id bits are set properly

[ Upstream commit dfdf714fed559c09021df1d2a4bb64c0ad5f53bc ]

The portid_bits and deviceid_bits were set only for XP type nodes in
the arm_cmn_discover() and it confused other nodes to find XP nodes.
Copy the both bits from the XP nodes directly when it sets up a new
node.

Fixes: e79634b53e39 ("perf/arm-cmn: Refactor node ID handling. Again.")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/20241121001334.331334-1-namhyung@kernel.org
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index 0b3ce77136456a4b82dcae952ec91cbc41764cd0..7bd1733d79770319039c75c10ef64c67079599d2 100644 (file)
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -2075,8 +2075,6 @@ static int arm_cmn_init_dtcs(struct arm_cmn *cmn)
                        continue;
 
                xp = arm_cmn_node_to_xp(cmn, dn);
-               dn->portid_bits = xp->portid_bits;
-               dn->deviceid_bits = xp->deviceid_bits;
                dn->dtc = xp->dtc;
                dn->dtm = xp->dtm;
                if (cmn->multi_dtm)
@@ -2307,6 +2305,8 @@ static int arm_cmn_discover(struct arm_cmn *cmn, unsigned int rgn_offset)
                        }
 
                        arm_cmn_init_node_info(cmn, reg & CMN_CHILD_NODE_ADDR, dn);
+                       dn->portid_bits = xp->portid_bits;
+                       dn->deviceid_bits = xp->deviceid_bits;
 
                        switch (dn->type) {
                        case CMN_TYPE_DTC: