[PATCH 11/15] arm: dma-mapping: Invoke dma offset func if needed

[Jim Quinlan]

Just like dma_pfn_offset, another offset is added to
the dma/phys translation if there happen to be multiple
regions that have different mapping offsets.

Signed-off-by: Jim Quinlan <james.quin...@broadcom.com>
---
 arch/arm/include/asm/dma-mapping.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/arch/arm/include/asm/dma-mapping.h 
b/arch/arm/include/asm/dma-mapping.h
index bdd80ddbca34..f0c0a1fa9ac0 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -35,8 +35,14 @@ static inline const struct dma_map_ops 
*get_arch_dma_ops(struct bus_type *bus)
 #ifndef __arch_pfn_to_dma
 static inline dma_addr_t pfn_to_dma(struct device *dev, unsigned long pfn)
 {
-       if (dev)
+       if (dev) {
+#ifdef CONFIG_DMA_PFN_OFFSET_MAP
+               if (unlikely(dev->dma_offset_map))
+                       pfn -= dma_pfn_offset_frm_phys_addr(
+                               dev->dma_offset_map, PFN_PHYS(pfn));
+#endif
                pfn -= dev->dma_pfn_offset;
+       }
        return (dma_addr_t)__pfn_to_bus(pfn);
 }
 
@@ -44,9 +50,14 @@ static inline unsigned long dma_to_pfn(struct device *dev, 
dma_addr_t addr)
 {
        unsigned long pfn = __bus_to_pfn(addr);
 
-       if (dev)
+       if (dev) {
+#ifdef CONFIG_DMA_PFN_OFFSET_MAP
+               if (unlikely(dev->dma_offset_map))
+                       pfn += dma_pfn_offset_frm_dma_addr(
+                               dev->dma_offset_map, addr);
+#endif
                pfn += dev->dma_pfn_offset;
-
+       }
        return pfn;
 }
 
-- 
2.17.1