coresight: etm4x: Fix accesses to TRCCIDCTLR1

The TRCCIDCTLR1 is only implemented if TRCIDR4.NUMCIDC > 4.
Don't touch the register if it is not implemented.

Cc: stable@vger.kernel.org
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Mike Leach <mike.leach@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Link: https://lore.kernel.org/r/20201127175256.1092685-5-mathieu.poirier@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c
index e67365d1ce28b70ca50f2422d2dcaf063d395eea..af0ab2f44865497209c3661dfedbbd3c82aed184 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-etm4x-core.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c
@@ -187,7 +187,8 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata)
                writeq_relaxed(config->ctxid_pid[i],
                               drvdata->base + TRCCIDCVRn(i));
        writel_relaxed(config->ctxid_mask0, drvdata->base + TRCCIDCCTLR0);
-       writel_relaxed(config->ctxid_mask1, drvdata->base + TRCCIDCCTLR1);
+       if (drvdata->numcidc > 4)
+               writel_relaxed(config->ctxid_mask1, drvdata->base + TRCCIDCCTLR1);
 
        for (i = 0; i < drvdata->numvmidc; i++)
                writeq_relaxed(config->vmid_val[i],
@@ -1241,7 +1242,8 @@ static int etm4_cpu_save(struct etmv4_drvdata *drvdata)
                state->trcvmidcvr[i] = readq(drvdata->base + TRCVMIDCVRn(i));
 
        state->trccidcctlr0 = readl(drvdata->base + TRCCIDCCTLR0);
-       state->trccidcctlr1 = readl(drvdata->base + TRCCIDCCTLR1);
+       if (drvdata->numcidc > 4)
+               state->trccidcctlr1 = readl(drvdata->base + TRCCIDCCTLR1);
 
        state->trcvmidcctlr0 = readl(drvdata->base + TRCVMIDCCTLR0);
        if (drvdata->numvmidc > 4)
@@ -1352,7 +1354,8 @@ static void etm4_cpu_restore(struct etmv4_drvdata *drvdata)
                               drvdata->base + TRCVMIDCVRn(i));
 
        writel_relaxed(state->trccidcctlr0, drvdata->base + TRCCIDCCTLR0);
-       writel_relaxed(state->trccidcctlr1, drvdata->base + TRCCIDCCTLR1);
+       if (drvdata->numcidc > 4)
+               writel_relaxed(state->trccidcctlr1, drvdata->base + TRCCIDCCTLR1);
 
        writel_relaxed(state->trcvmidcctlr0, drvdata->base + TRCVMIDCCTLR0);
        if (drvdata->numvmidc > 4)