| Message ID | 4c108d39a0513def63acccf09ab52b328f242aeb.1645727871.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] perf/arm-cmn: Hide XP PUB events for CMN-600 | expand |
On Thu, 24 Feb 2022 18:41:21 +0000, Robin Murphy wrote: > CMN-600 doesn't have XP events for the PUB channel, but we missed > the appropriate check to avoid exposing them. > > Applied to will (for-next/perf), thanks! [1/2] perf/arm-cmn: Hide XP PUB events for CMN-600 https://git.kernel.org/will/c/205295c7e1ab [2/2] perf/arm-cmn: Update watchpoint format https://git.kernel.org/will/c/31fac5657739 Cheers,
diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c index 93fd2bcfaf05..ba039a2532ad 100644 --- a/drivers/perf/arm-cmn.c +++ b/drivers/perf/arm-cmn.c @@ -595,6 +595,9 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj, if ((intf & 4) && !(cmn->ports_used & BIT(intf & 3))) return 0; + if (chan == 4 && cmn->model == CMN600) + return 0; + if ((chan == 5 && cmn->rsp_vc_num < 2) || (chan == 6 && cmn->dat_vc_num < 2)) return 0;
CMN-600 doesn't have XP events for the PUB channel, but we missed the appropriate check to avoid exposing them. Fixes: 60d1504070c2 ("perf/arm-cmn: Support new IP features") Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- drivers/perf/arm-cmn.c | 3 +++ 1 file changed, 3 insertions(+)