coresight tmc etr: Setup AXI cache encoding for read transfers

If the ETR supports split cache encoding (i.e, separate bits for
read and write transfers) unlike the older version (where read
and write transfers use the same encoding in AXICTL[2-5]).
This feature is not advertised and has to be described by the
static mask associated with the device id.

Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
index 880b53527599ddbd387c9b80ea25865b4e7b43e2..40ddcf11ae4c1650b7785a504e81122ba967c008 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
+++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
@@ -39,6 +39,12 @@ static void tmc_etr_enable_hw(struct tmc_drvdata *drvdata)
        axictl &= ~TMC_AXICTL_CLEAR_MASK;
        axictl |= (TMC_AXICTL_PROT_CTL_B1 | TMC_AXICTL_WR_BURST_16);
        axictl |= TMC_AXICTL_AXCACHE_OS;
+
+       if (tmc_etr_has_cap(drvdata, TMC_ETR_AXI_ARCACHE)) {
+               axictl &= ~TMC_AXICTL_ARCACHE_MASK;
+               axictl |= TMC_AXICTL_ARCACHE_OS;
+       }
+
        writel_relaxed(axictl, drvdata->base + TMC_AXICTL);
        tmc_write_dba(drvdata, drvdata->paddr);
 

diff --git a/drivers/hwtracing/coresight/coresight-tmc.h b/drivers/hwtracing/coresight/coresight-tmc.h
index 07c0bf1d92691b5d9d443478cd46bc5588631f5f..f39caa6a45c30694f13b6d802f80beb4dc0ef334 100644 (file)
--- a/drivers/hwtracing/coresight/coresight-tmc.h
+++ b/drivers/hwtracing/coresight/coresight-tmc.h
@@ -59,13 +59,18 @@
  *
  * TMC AXICTL format for SoC-400
  *     Bits [0-1]      : ProtCtrlBit0-1
- *     Bits [2-5]      : CacheCtrlBits 0-3 (AxCACHE)
+ *     Bits [2-5]      : CacheCtrlBits 0-3 (AXCACHE)
  *     Bit  6          : Reserved
  *     Bit  7          : ScatterGatherMode
  *     Bits [8-11]     : WrBurstLen
  *     Bits [12-31]    : Reserved.
+ * TMC AXICTL format for SoC-600, as above except:
+ *     Bits [2-5]      : AXI WCACHE
+ *     Bits [16-19]    : AXI RCACHE
+ *     Bits [20-31]    : Reserved
  */
 #define TMC_AXICTL_CLEAR_MASK 0xfbf
+#define TMC_AXICTL_ARCACHE_MASK (0xf << 16)
 
 #define TMC_AXICTL_PROT_CTL_B0 BIT(0)
 #define TMC_AXICTL_PROT_CTL_B1 BIT(1)
@@ -73,6 +78,7 @@
 #define TMC_AXICTL_WR_BURST_16 0xF00
 /* Write-back Read and Write-allocate */
 #define TMC_AXICTL_AXCACHE_OS  (0xf << 2)
+#define TMC_AXICTL_ARCACHE_OS  (0xf << 16)
 
 /* TMC_FFCR - 0x304 */
 #define TMC_FFCR_FLUSHMAN_BIT  6
@@ -111,6 +117,8 @@ enum tmc_mem_intf_width {
 
 /* TMC ETR Capability bit definitions */
 #define TMC_ETR_SG                     (0x1U << 0)
+/* ETR has separate read/write cache encodings */
+#define TMC_ETR_AXI_ARCACHE            (0x1U << 1)
 
 /**
  * struct tmc_drvdata - specifics associated to an TMC component