UPSTREAM: perf/arm-cmn: Update watchpoint format

From CMN-650 onwards, some of the fields in the watchpoint config
registers moved subtly enough to easily overlook. Watchpoint events are
still only partially supported on newer IPs - which in itself deserves
noting - but were not intended to become any *less* functional than on
CMN-600.

Bug: 254441685
Fixes: 60d15040 ("perf/arm-cmn: Support new IP features")
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/e1ce4c2f1e4f73ab1c60c3a85e4037cd62dd6352.1645727871.git.robin.murphy@arm.com


Signed-off-by: Will Deacon <will@kernel.org>
(cherry picked from commit 31fac565)
Signed-off-by: Lee Jones <joneslee@google.com>
Change-Id: I2f2b45498eb58becb2fce80a0f44a3d695dafadb