Skip to content

Commit 05b21a5

Browse files
rmurphy-armgregkh
authored andcommitted
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: [email protected] Fixes: 23760a0 ("perf/arm-cmn: Add CMN-700 support") Signed-off-by: Robin Murphy <[email protected]> Link: https://lore.kernel.org/r/087023e9737ac93d7ec7a841da904758c254cb01.1746717400.git.robin.murphy@arm.com Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent a0ec22f commit 05b21a5

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/perf/arm-cmn.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -675,8 +675,8 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
675675

676676
if ((chan == 5 && cmn->rsp_vc_num < 2) ||
677677
(chan == 6 && cmn->dat_vc_num < 2) ||
678-
(chan == 7 && cmn->snp_vc_num < 2) ||
679-
(chan == 8 && cmn->req_vc_num < 2))
678+
(chan == 7 && cmn->req_vc_num < 2) ||
679+
(chan == 8 && cmn->snp_vc_num < 2))
680680
return 0;
681681
}
682682

@@ -794,8 +794,8 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
794794
_CMN_EVENT_XP(pub_##_name, (_event) | (4 << 5)), \
795795
_CMN_EVENT_XP(rsp2_##_name, (_event) | (5 << 5)), \
796796
_CMN_EVENT_XP(dat2_##_name, (_event) | (6 << 5)), \
797-
_CMN_EVENT_XP(snp2_##_name, (_event) | (7 << 5)), \
798-
_CMN_EVENT_XP(req2_##_name, (_event) | (8 << 5))
797+
_CMN_EVENT_XP(req2_##_name, (_event) | (7 << 5)), \
798+
_CMN_EVENT_XP(snp2_##_name, (_event) | (8 << 5))
799799

800800

801801
static struct attribute *arm_cmn_event_attrs[] = {

0 commit comments

Comments
 (0)