| Message ID | 20241121001334.331334-1-namhyung@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] perf/arm-cmn: Ensure port and device id bits are set properly | expand |
On 2024-11-21 12:13 am, Namhyung Kim wrote: > 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. Reviewed-by: Robin Murphy <robin.murphy@arm.com> > Fixes: e79634b53e39 ("perf/arm-cmn: Refactor node ID handling. Again.") > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > --- > drivers/perf/arm-cmn.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c > index 49bd811c6fd6efdd..b20fa600e510c54f 100644 > --- a/drivers/perf/arm-cmn.c > +++ b/drivers/perf/arm-cmn.c > @@ -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: > > base-commit: 43fb83c17ba2d63dfb798f0be7453ed55ca3f9c2
diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c index 49bd811c6fd6efdd..b20fa600e510c54f 100644 --- a/drivers/perf/arm-cmn.c +++ b/drivers/perf/arm-cmn.c @@ -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:
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> --- drivers/perf/arm-cmn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 43fb83c17ba2d63dfb798f0be7453ed55ca3f9c2