Commit f87e9114 authored by Ilkka Koskinen's avatar Ilkka Koskinen Committed by Will Deacon
Browse files

perf/arm-cmn: Move overlapping wp_combine field 



As eventid field was expanded to support new mesh versions, it started to
overlap with wp_combine field. Move wp_combine to fix the issue.

Fixes: 23760a01 ("perf/arm-cmn: Add CMN-700 support")
Signed-off-by: default avatarIlkka Koskinen <ilkka@os.amperecomputing.com>
Link: https://lore.kernel.org/r/20230301175540.19891-1-ilkka@os.amperecomputing.com


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 3b16f626

drivers/perf/arm-cmn.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ 
#define CMN_EVENT_BYNODEID(event)	FIELD_GET(CMN_CONFIG_BYNODEID, (event)->attr.config)

#define CMN_EVENT_NODEID(event)		FIELD_GET(CMN_CONFIG_NODEID, (event)->attr.config)



#define CMN_CONFIG_WP_COMBINE		GENMASK_ULL(27, 24)

#define CMN_CONFIG_WP_COMBINE		GENMASK_ULL(30, 27)

#define CMN_CONFIG_WP_DEV_SEL		GENMASK_ULL(50, 48)

#define CMN_CONFIG_WP_CHN_SEL		GENMASK_ULL(55, 51)

/* Note that we don't yet support the tertiary match group on newer IPs */