diff options
| author | Will Deacon <will.deacon@arm.com> | 2014-08-27 15:49:10 +0100 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2014-12-01 16:50:32 +0000 |
| commit | a3a60f81ee6f8fa65a57fa186b395bcd1f1bb097 (patch) | |
| tree | fb9f47c0b0f9065916242bfa76864d5b72825b8f /drivers/of/platform.c | |
| parent | 1cd076bf67793942ed921b766f7d461de2ebc0a2 (diff) | |
| download | linux-stable-a3a60f81ee6f8fa65a57fa186b395bcd1f1bb097.tar.gz linux-stable-a3a60f81ee6f8fa65a57fa186b395bcd1f1bb097.tar.bz2 linux-stable-a3a60f81ee6f8fa65a57fa186b395bcd1f1bb097.zip | |
dma-mapping: replace set_arch_dma_coherent_ops with arch_setup_dma_ops
set_arch_dma_coherent_ops is called from of_dma_configure in order to
swizzle the architectural dma-mapping functions over to a cache-coherent
implementation. This is currently implemented only for ARM.
In anticipation of re-using this mechanism for IOMMU-backed dma-mapping
ops too, this patch replaces the function with a broader
arch_setup_dma_ops callback which will be extended in future.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Tested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/of/platform.c')
| -rw-r--r-- | drivers/of/platform.c | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 3b64d0bf5bba..ff1f4e9afccb 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -164,6 +164,8 @@ static void of_dma_configure(struct device *dev) { u64 dma_addr, paddr, size; int ret; + bool coherent; + unsigned long offset; /* * Set default dma-mask to 32 bit. Drivers are expected to setup @@ -178,28 +180,21 @@ static void of_dma_configure(struct device *dev) if (!dev->dma_mask) dev->dma_mask = &dev->coherent_dma_mask; - /* - * if dma-coherent property exist, call arch hook to setup - * dma coherent operations. - */ - if (of_dma_is_coherent(dev->of_node)) { - set_arch_dma_coherent_ops(dev); - dev_dbg(dev, "device is dma coherent\n"); - } - - /* - * if dma-ranges property doesn't exist - just return else - * setup the dma offset - */ ret = of_dma_get_range(dev->of_node, &dma_addr, &paddr, &size); if (ret < 0) { - dev_dbg(dev, "no dma range information to setup\n"); - return; + dma_addr = offset = 0; + size = dev->coherent_dma_mask; + } else { + offset = PFN_DOWN(paddr - dma_addr); + dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", dev->dma_pfn_offset); } + dev->dma_pfn_offset = offset; + + coherent = of_dma_is_coherent(dev->of_node); + dev_dbg(dev, "device is%sdma coherent\n", + coherent ? " " : " not "); - /* DMA ranges found. Calculate and set dma_pfn_offset */ - dev->dma_pfn_offset = PFN_DOWN(paddr - dma_addr); - dev_dbg(dev, "dma_pfn_offset(%#08lx)\n", dev->dma_pfn_offset); + arch_setup_dma_ops(dev, coherent); } /** |