perf/arm-cmn: Move overlapping wp_combine field
authorIlkka Koskinen <ilkka@os.amperecomputing.com>
Wed, 1 Mar 2023 17:55:40 +0000 (09:55 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 May 2023 14:03:11 +0000 (23:03 +0900)
commit7ff92db0dd6f91e7c4dbbed21aae74bd5fc5123e
tree7f42648ad8d74dfdf0a5a8e765da706e5191dc16
parent198ca89deaedfb511f3b74a2f3c03424e992746e
perf/arm-cmn: Move overlapping wp_combine field

[ Upstream commit f87e9114b5e590c2c6658ca21d7b714ca240bdd0 ]

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: 23760a014417 ("perf/arm-cmn: Add CMN-700 support")
Signed-off-by: Ilkka Koskinen <ilkka@os.amperecomputing.com>
Link: https://lore.kernel.org/r/20230301175540.19891-1-ilkka@os.amperecomputing.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/perf/arm-cmn.c