perf/arm-cmn: Fix REQ2/SNP2 mixup

Somehow the encodings for REQ2/SNP2 channels in XP events
got mixed up... Unmix them.

CC: stable@vger.kernel.org
Fixes: 23760a014417 ("perf/arm-cmn: Add CMN-700 support")
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/087023e9737ac93d7ec7a841da904758c254cb01.1746717400.git.robin.murphy@arm.com
Signed-off-by: Will Deacon <will@kernel.org>

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index 92720592fee9aaad03bb0b2bf0daa5c3390bfa2f..83f4ef9852555a4f17dac789d994b4e87f9bb74c 100644 (file)
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -727,8 +727,8 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
 
                if ((chan == 5 && cmn->rsp_vc_num < 2) ||
                    (chan == 6 && cmn->dat_vc_num < 2) ||
-                   (chan == 7 && cmn->snp_vc_num < 2) ||
-                   (chan == 8 && cmn->req_vc_num < 2))
+                   (chan == 7 && cmn->req_vc_num < 2) ||
+                   (chan == 8 && cmn->snp_vc_num < 2))
                        return 0;
        }
 
@@ -882,8 +882,8 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
        _CMN_EVENT_XP(pub_##_name, (_event) | (4 << 5)),        \
        _CMN_EVENT_XP(rsp2_##_name, (_event) | (5 << 5)),       \
        _CMN_EVENT_XP(dat2_##_name, (_event) | (6 << 5)),       \
-       _CMN_EVENT_XP(snp2_##_name, (_event) | (7 << 5)),       \
-       _CMN_EVENT_XP(req2_##_name, (_event) | (8 << 5))
+       _CMN_EVENT_XP(req2_##_name, (_event) | (7 << 5)),       \
+       _CMN_EVENT_XP(snp2_##_name, (_event) | (8 << 5))
 
 #define CMN_EVENT_XP_DAT(_name, _event)                                \
        _CMN_EVENT_XP_PORT(dat_##_name, (_event) | (3 << 5)),   \