Commit dfdf714f authored Nov 20, 2024 by Namhyung Kim Committed by Catalin Marinas Nov 25, 2024

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



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: e79634b5 ("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>

parent 02a55f27

drivers/perf/arm-cmn.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2178,8 +2178,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)
		@@ -2420,6 +2418,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: