diff options
| author | Robin Murphy | 2017-06-05 22:15:09 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-06-09 11:45:24 +0200 |
| commit | a3959c50b02f57df4c4e4f14f632220f1c0b1f79 (patch) | |
| tree | e7a30538730e28a5ca185dc1be97a2f1b7fb4925 /drivers/hwtracing | |
| parent | coresight: etb10: Fix a typo in a comment line (diff) | |
| download | kernel-qcow2-linux-a3959c50b02f57df4c4e4f14f632220f1c0b1f79.tar.gz kernel-qcow2-linux-a3959c50b02f57df4c4e4f14f632220f1c0b1f79.tar.xz kernel-qcow2-linux-a3959c50b02f57df4c4e4f14f632220f1c0b1f79.zip | |
coresight: tmc: Configure DMA mask appropriately
Before making any DMA API calls, the ETR driver should really be setting
its masks to ensure that DMA is possible. Especially since it can
address more than the 32-bit default mask set by the AMBA bus code.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Tested-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>
Diffstat (limited to 'drivers/hwtracing')
| -rw-r--r-- | drivers/hwtracing/coresight/coresight-tmc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/hwtracing/coresight/coresight-tmc.c b/drivers/hwtracing/coresight/coresight-tmc.c index d8517d2a968c..864488793f09 100644 --- a/drivers/hwtracing/coresight/coresight-tmc.c +++ b/drivers/hwtracing/coresight/coresight-tmc.c @@ -362,6 +362,13 @@ static int tmc_probe(struct amba_device *adev, const struct amba_id *id) desc.type = CORESIGHT_DEV_TYPE_SINK; desc.subtype.sink_subtype = CORESIGHT_DEV_SUBTYPE_SINK_BUFFER; desc.ops = &tmc_etr_cs_ops; + /* + * ETR configuration uses a 40-bit AXI master in place of + * the embedded SRAM of ETB/ETF. + */ + ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(40)); + if (ret) + goto out; } else { desc.type = CORESIGHT_DEV_TYPE_LINKSINK; desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_FIFO; |