dma-mapping: remove the default map_resource implementation

Instead provide a proper implementation in the direct mapping code, and
also wire it up for arm and powerpc, leaving an error return for all the
IOMMU or virtual mapping instances for which we'd have to wire up an
actual implementation

Signed-off-by: Christoph Hellwig <hch@lst.de>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
index f6ded992c183..9842085e6774 100644
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
@@ -208,6 +208,8 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page,
                 unsigned long attrs);
 int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
                 enum dma_data_direction dir, unsigned long attrs);
+dma_addr_t dma_direct_map_resource(struct device *dev, phys_addr_t paddr,
+                size_t size, enum dma_data_direction dir, unsigned long attrs);
 
 #if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE) || \
     defined(CONFIG_SWIOTLB)
@@ -346,19 +348,19 @@ static inline dma_addr_t dma_map_resource(struct device *dev,
                                           unsigned long attrs)
 {
         const struct dma_map_ops *ops = get_dma_ops(dev);
-        dma_addr_t addr;
+        dma_addr_t addr = DMA_MAPPING_ERROR;
 
         BUG_ON(!valid_dma_direction(dir));
 
         /* Don't allow RAM to be mapped */
         BUG_ON(pfn_valid(PHYS_PFN(phys_addr)));
 
-        addr = phys_addr;
-        if (ops && ops->map_resource)
+        if (dma_is_direct(ops))
+                addr = dma_direct_map_resource(dev, phys_addr, size, dir, attrs);
+        else if (ops->map_resource)
                 addr = ops->map_resource(dev, phys_addr, size, dir, attrs);
 
         debug_dma_map_resource(dev, phys_addr, size, dir, addr);
-
         return addr;
 }
 
@@ -369,7 +371,7 @@ static inline void dma_unmap_resource(struct device *dev, dma_addr_t addr,
         const struct dma_map_ops *ops = get_dma_ops(dev);
 
         BUG_ON(!valid_dma_direction(dir));
-        if (ops && ops->unmap_resource)
+        if (!dma_is_direct(ops) && ops->unmap_resource)
                 ops->unmap_resource(dev, addr, size, dir, attrs);
         debug_dma_unmap_resource(dev, addr, size, dir);
 }