[PATCH v3 06/26] coresight: etm4x: Handle access to TRCSSPCICRn

[Suzuki K Poulose]

TRCSSPCICR<n> is present only if all of the following are true:
        TRCIDR4.NUMSSCC > n.
        TRCIDR4.NUMPC > 0b0000 .
        TRCSSCSR<n>.PC == 0b1

Signed-off-by: Suzuki K Poulose <suzuki.poul...@arm.com>
---
 drivers/hwtracing/coresight/coresight-etm4x-core.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c 
b/drivers/hwtracing/coresight/coresight-etm4x-core.c
index d78a37b6592c..0310eac9dc16 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -175,8 +175,9 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)
                               drvdata->base + TRCSSCCRn(i));
                writel_relaxed(config->ss_status[i],
                               drvdata->base + TRCSSCSRn(i));
-               writel_relaxed(config->ss_pe_cmp[i],
-                              drvdata->base + TRCSSPCICRn(i));
+               if (drvdata->nr_pe)
+                       writel_relaxed(config->ss_pe_cmp[i],
+                                      drvdata->base + TRCSSPCICRn(i));
        }
        for (i = 0; i < drvdata->nr_addr_cmp; i++) {
                writeq_relaxed(config->addr_val[i],
@@ -1228,7 +1229,8 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata)
        for (i = 0; i < drvdata->nr_ss_cmp; i++) {
                state->trcssccr[i] = readl(drvdata->base + TRCSSCCRn(i));
                state->trcsscsr[i] = readl(drvdata->base + TRCSSCSRn(i));
-               state->trcsspcicr[i] = readl(drvdata->base + TRCSSPCICRn(i));
+               if (drvdata->nr_pe)
+                       state->trcsspcicr[i] = readl(drvdata->base + 
TRCSSPCICRn(i));
        }
 
        for (i = 0; i < drvdata->nr_addr_cmp * 2; i++) {
@@ -1344,8 +1346,9 @@ static void etm4_cpu_restore(struct etmv4_drvdata 
*drvdata)
                               drvdata->base + TRCSSCCRn(i));
                writel_relaxed(state->trcsscsr[i],
                               drvdata->base + TRCSSCSRn(i));
-               writel_relaxed(state->trcsspcicr[i],
-                              drvdata->base + TRCSSPCICRn(i));
+               if (drvdata->nr_pe)
+                       writel_relaxed(state->trcsspcicr[i],
+                                      drvdata->base + TRCSSPCICRn(i));
        }
 
        for (i = 0; i < drvdata->nr_addr_cmp * 2; i++) {
-- 
2.24.1