Signed-off-by: Stefano Stabellini <redacted>
CC: will.deacon at arm.com
CC: linux at arm.linux.org.uk
---
arch/arm/Kconfig                   |    7 +++++++
arch/arm/include/asm/dma-mapping.h |   24 ++++++++++++++++++++++++
2 files changed, 31 insertions(+), 0 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ba412e0..05125ab 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig

@@ -1832,6 +1832,13 @@ config CC_STACKPROTECTOR

	  neutralized via a kernel panic.
	  This feature requires gcc version 4.2 or above.

+config SWIOTLB
+	def_bool y
+	select NEED_SG_DMA_LENGTH
+
+config IOMMU_HELPER
+	def_bool SWIOTLB
+

config XEN_DOM0
	def_bool y
	depends on XEN

diff --git a/arch/arm/include/asm/dma-mapping.h

b/arch/arm/include/asm/dma-mapping.h
index 5b579b9..ad89e0f 100644

--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h

@@ -86,6 +86,30 @@ static inline dma_addr_t virt_to_dma(struct device

*dev, void *addr)
}
#endif

+static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t
paddr)
+{
+	unsigned int offset = paddr & ~PAGE_MASK;
+	return pfn_to_dma(dev, paddr >> PAGE_SHIFT) + offset;
+}
+
+static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t
dev_addr)
+{
+	unsigned int offset = dev_addr & ~PAGE_MASK;
+	return (dma_to_pfn(dev, dev_addr) << PAGE_SHIFT) + offset;
+}
+
+static inline bool dma_capable(struct device *dev, dma_addr_t addr,
size_t size)
+{
+	if (!dev->dma_mask)
+		return 0;
+
+	return addr + size - 1 <= *dev->dma_mask;
+}
+
+static inline void dma_mark_clean(void *addr, size_t size)
+{
+}
+
/*
 * DMA errors are defined by all-bits-set in the DMA address.
 */