From aeac7c38e473ec1934899458672c80f5ed388536 Mon Sep 17 00:00:00 2001 From: Stefano Stabellini Date: Wed, 30 Oct 2013 04:25:44 +0000 Subject: [PATCH] Revert "arm: make SWIOTLB available" This reverts commit 06e6295bcecefea9dc29fc84b5fd6848061365a0. --- arch/arm/Kconfig | 6 ----- arch/arm/include/asm/dma-mapping.h | 37 ------------------------------ 2 files changed, 43 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 01f7013c85c7..9c80ef2cee7d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1872,12 +1872,6 @@ config CC_STACKPROTECTOR neutralized via a kernel panic. This feature requires gcc version 4.2 or above. -config SWIOTLB - def_bool y - -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 f5945d4e4e9f..271e983e0fec 100644 --- a/arch/arm/include/asm/dma-mapping.h +++ b/arch/arm/include/asm/dma-mapping.h @@ -10,7 +10,6 @@ #include #include -#include #include #include @@ -98,42 +97,6 @@ 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, __phys_to_pfn(paddr)) + 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 __pfn_to_phys(dma_to_pfn(dev, dev_addr)) + offset; -} - -static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size) -{ - u64 limit, mask; - - if (dev->dma_mask) - mask = *dev->dma_mask; - else - mask = dev->coherent_dma_mask; - - if (mask == 0) - return 0; - - limit = (mask + 1) & ~mask; - if (limit && size > limit) - return 0; - - if ((addr | (addr + size - 1)) & ~mask) - return 0; - - return 1; -} - -static inline void dma_mark_clean(void *addr, size_t size) { } - /* * DMA errors are defined by all-bits-set in the DMA address. */ -- 2.39.5