perf/arm-cmn: Fix HN-F class_occup_id events
authorRobin Murphy <robin.murphy@arm.com>
Thu, 23 Nov 2023 11:58:13 +0000 (11:58 +0000)
committerWill Deacon <will@kernel.org>
Tue, 5 Dec 2023 12:17:02 +0000 (12:17 +0000)
A subtle copy-paste error managed to slip through the reorganisation
of these patches in development, and not only give some HN-F events
the wrong type, but use that wrong type before the subsequent patch
defined it. Too late to fix history, but we can at least fix the bug.

Fixes: b1b7dc38e482 ("perf/arm-cmn: Refactor HN-F event selector macros")
Reported-by: Jing Zhang <renyu.zj@linux.alibaba.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/5a22439de84ff188ef76674798052448eb03a3e1.1700740693.git.robin.murphy@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
drivers/perf/arm-cmn.c

index 014010d035882375e9c0381ebce08a80af48ddd5..86d970e74129c0268068f7c45c0f22558914ece3 100644 (file)
@@ -811,7 +811,7 @@ static umode_t arm_cmn_event_attr_is_visible(struct kobject *kobj,
 #define CMN_EVENT_HNF_OCC(_model, _name, _event)                       \
        CMN_EVENT_HN_OCC(_model, hnf_##_name, CMN_TYPE_HNF, _event)
 #define CMN_EVENT_HNF_CLS(_model, _name, _event)                       \
-       CMN_EVENT_HN_CLS(_model, hnf_##_name, CMN_TYPE_HNS, _event)
+       CMN_EVENT_HN_CLS(_model, hnf_##_name, CMN_TYPE_HNF, _event)
 #define CMN_EVENT_HNF_SNT(_model, _name, _event)                       \
        CMN_EVENT_HN_SNT(_model, hnf_##_name, CMN_TYPE_HNF, _event)