coresight: etmv4: Fix resource selector constant

[ Upstream commit cb8bba907a4ff4ba42f1d245cb506d55829674b8 ]

ETMv4 max resource selector constant incorrectly set to 16. Updated to the
correct 32 value, and adjustments made to limited code using it.

Signed-off-by: Mike Leach <mike.leach@linaro.org>
Fixes: 2e1cdfe184b52 ("coresight-etm4x: Adding CoreSight ETM4x driver")
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20200716175746.3338735-10-mathieu.poirier@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/hwtracing/coresight/coresight-etm4x.h b/drivers/hwtracing/coresight/coresight-etm4x.h
index 4a695bf90582ecc8af4f29045b40a38e29280567..b0d633daf7162b248fc1cf52cea4811a2810b828 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x.h
+++ b/drivers/hwtracing/coresight/coresight-etm4x.h
@@ -133,7 +133,7 @@
 #define ETMv4_MAX_CTXID_CMP            8
 #define ETM_MAX_VMID_CMP               8
 #define ETM_MAX_PE_CMP                 8
-#define ETM_MAX_RES_SEL                        16
+#define ETM_MAX_RES_SEL                        32
 #define ETM_MAX_SS_CMP                 8
 
 #define ETM_ARCH_V4                    0x40
@@ -325,7 +325,7 @@ struct etmv4_save_state {
        u32     trccntctlr[ETMv4_MAX_CNTR];
        u32     trccntvr[ETMv4_MAX_CNTR];
 
-       u32     trcrsctlr[ETM_MAX_RES_SEL * 2];
+       u32     trcrsctlr[ETM_MAX_RES_SEL];
 
        u32     trcssccr[ETM_MAX_SS_CMP];
        u32     trcsscsr[ETM_MAX_SS_CMP];