Re: [PATCH v3 14/18] coresight tmc etr: Cleanup AXICTL register handling

From: Mathieu Poirier
Date: Mon Jul 17 2017 - 13:07:11 EST


On Fri, Jul 14, 2017 at 02:04:19PM +0100, Suzuki K Poulose wrote:
> This patch cleans up how we setup the AXICTL register on
> TMC ETR. At the moment we don't set the CacheCtrl bits, which
> drives the arcache and awcache bits on AXI bus specifying the
> cacheablitiy. Set this to Write-back Read and Write-allocate.
>
> Cc: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
> Signed-off-by: Suzuki K Poulose <suzuki.poulose@xxxxxxx>
> ---
> drivers/hwtracing/coresight/coresight-tmc-etr.c | 10 +++-------
> drivers/hwtracing/coresight/coresight-tmc.h | 17 ++++++++++++++++-
> 2 files changed, 19 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/hwtracing/coresight/coresight-tmc-etr.c b/drivers/hwtracing/coresight/coresight-tmc-etr.c
> index ff11b92..4aa5d36 100644
> --- a/drivers/hwtracing/coresight/coresight-tmc-etr.c
> +++ b/drivers/hwtracing/coresight/coresight-tmc-etr.c
> @@ -36,13 +36,9 @@ static void tmc_etr_enable_hw(struct tmc_drvdata *drvdata)
> writel_relaxed(TMC_MODE_CIRCULAR_BUFFER, drvdata->base + TMC_MODE);
>
> axictl = readl_relaxed(drvdata->base + TMC_AXICTL);
> - axictl |= TMC_AXICTL_WR_BURST_16;
> - writel_relaxed(axictl, drvdata->base + TMC_AXICTL);
> - axictl &= ~TMC_AXICTL_SCT_GAT_MODE;
> - writel_relaxed(axictl, drvdata->base + TMC_AXICTL);
> - axictl = (axictl &
> - ~(TMC_AXICTL_PROT_CTL_B0 | TMC_AXICTL_PROT_CTL_B1)) |
> - TMC_AXICTL_PROT_CTL_B1;
> + axictl &= ~TMC_AXICTL_CLEAR_MASK;
> + axictl |= (TMC_AXICTL_PROT_CTL_B1 | TMC_AXICTL_WR_BURST_16);
> + axictl |= TMC_AXICTL_AxCACHE_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 a0668f6..5d6d7e5 100644
> --- a/drivers/hwtracing/coresight/coresight-tmc.h
> +++ b/drivers/hwtracing/coresight/coresight-tmc.h
> @@ -55,11 +55,26 @@
> #define TMC_STS_TMCREADY_BIT 2
> #define TMC_STS_FULL BIT(0)
> #define TMC_STS_TRIGGERED BIT(1)
> -/* TMC_AXICTL - 0x110 */
> +/*
> + * TMC_AXICTL - 0x110
> + *
> + * TMC AXICTL format for SoC-400
> + * Bits [0-1] : ProtCtrlBit0-1
> + * Bits [2-5] : CacheCtrlBits 0-3 (AxCACHE)
> + * Bit 6 : Reserved
> + * Bit 7 : ScatterGatherMode
> + * Bits [8-11] : WrBurstLen
> + * Bits [12-31] : Reserved.
> + */
> +#define TMC_AXICTL_CLEAR_MASK 0xfbf
> +
> #define TMC_AXICTL_PROT_CTL_B0 BIT(0)
> #define TMC_AXICTL_PROT_CTL_B1 BIT(1)
> #define TMC_AXICTL_SCT_GAT_MODE BIT(7)
> #define TMC_AXICTL_WR_BURST_16 0xF00
> +/* Write-back Read and Write-allocate */
> +#define TMC_AXICTL_AxCACHE_OS (0xf << 2)

Please use a capital 'x' here.

Also this patch is giving me a few checkpatch.pl warnings.

> +
> /* TMC_FFCR - 0x304 */
> #define TMC_FFCR_FLUSHMAN_BIT 6
> #define TMC_FFCR_EN_FMT BIT(0)
> --
> 2.7.5
>