perf/arm-cmn: Fix REQ2/SNP2 mixup

commit 11b0f576e0cbde6a12258f2af6753b17b8df342b upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/perf/arm-cmn.c b/drivers/perf/arm-cmn.c
index 4445cae427b2d1e0ff26d6b8f64da319b5d8ac1f..a884835f6830b724798546d2c8e48bbe08471d39 100644 (file)
--- a/drivers/perf/arm-cmn.c
+++ b/drivers/perf/arm-cmn.c
@@ -675,8 +675,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;
        }
 
@@ -794,8 +794,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))
 
 
 static struct attribute *arm_cmn_event_attrs[] = {