Skip to content

Commit 668c430

Browse files
rmurphy-armlag-google
authored andcommitted
UPSTREAM: perf/arm-cmn: Hide XP PUB events for CMN-600
CMN-600 doesn't have XP events for the PUB channel, but we missed the appropriate check to avoid exposing them. Bug: 254441685 Fixes: 60d1504070c2 ("perf/arm-cmn: Support new IP features") Signed-off-by: Robin Murphy <robin.murphy@arm.com> Link: https://lore.kernel.org/r/4c108d39a0513def63acccf09ab52b328f242aeb.1645727871.git.robin.murphy@arm.com Signed-off-by: Will Deacon <will@kernel.org> (cherry picked from commit 205295c7e1abba9c1db1f9fe075f22f71351887f) Signed-off-by: Lee Jones <joneslee@google.com> Change-Id: I04bbedaed680204d2d8590c2f77aded18e896f53
1 parent 5761541 commit 668c430

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/perf/arm-cmn.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -595,6 +595,9 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
595595
if ((intf & 4) && !(cmn->ports_used & BIT(intf & 3)))
596596
return 0;
597597

598+
if (chan == 4 && cmn->model == CMN600)
599+
return 0;
600+
598601
if ((chan == 5 && cmn->rsp_vc_num < 2) ||
599602
(chan == 6 && cmn->dat_vc_num < 2))
600603
return 0;

0 commit comments

Comments
 (0)