dma/ia64: update ia64 machvecs, swiotlb.c
PATCH v6 2/3 dma/ia64: update ia64 machvecs, swiotlb.c
Change all ia64 machvecs to use the new dma_*map*_attrs() interfaces. Implement the old dma_*map_*() interfaces in terms of the corresponding new interfaces. For ia64/sn, make use of one dma attribute, DMA_ATTR_WRITE_BARRIER. Introduce swiotlb_*map*_attrs() functions.
Signed-off-by Arthur Kepner <[email protected]>
---
arch/ia64/hp/common/hwsw_iommu.c | 61 ++++++++++++----------- arch/ia64/hp/common/sba_iommu.c | 64 ++++++++++++++---------- arch/ia64/sn/pci/pci_dma.c | 81 ++++++++++++++++++++++--------- include/asm-ia64/dma-mapping.h | 28 +++++++++- include/asm-ia64/machvec.h | 50 +++++++++++-------- include/asm-ia64/machvec_hpzx1.h | 16 +++--- include/asm-ia64/machvec_hpzx1_swiotlb.h | 16 +++--- include/asm-ia64/machvec_sn2.h | 16 +++--- lib/swiotlb.c | 50 ++++++++++++++++--- 9 files changed, 249 insertions(+), 133 deletions(-)
arch/ia64/hp/common/hwsw_iommu.c +32 -29
@@ -20,10 +20,10 @@extern int swiotlb_late_init_with_default_size (size_t size);extern ia64_mv_dma_alloc_coherent swiotlb_alloc_coherent;extern ia64_mv_dma_free_coherent swiotlb_free_coherent; -extern ia64_mv_dma_map_single swiotlb_map_single; -extern ia64_mv_dma_unmap_single swiotlb_unmap_single; -extern ia64_mv_dma_map_sg swiotlb_map_sg; -extern ia64_mv_dma_unmap_sg swiotlb_unmap_sg; +extern ia64_mv_dma_map_single_attrs swiotlb_map_single_attrs; +extern ia64_mv_dma_unmap_single_attrs swiotlb_unmap_single_attrs; +extern ia64_mv_dma_map_sg_attrs swiotlb_map_sg_attrs; +extern ia64_mv_dma_unmap_sg_attrs swiotlb_unmap_sg_attrs;extern ia64_mv_dma_supported swiotlb_dma_supported;extern ia64_mv_dma_mapping_error swiotlb_dma_mapping_error;
@@ -31,19 +31,19 @@ extern ia64_mv_dma_mapping_error swiotlb_dma_mapping_error;extern ia64_mv_dma_alloc_coherent sba_alloc_coherent;extern ia64_mv_dma_free_coherent sba_free_coherent; -extern ia64_mv_dma_map_single sba_map_single; -extern ia64_mv_dma_unmap_single sba_unmap_single; -extern ia64_mv_dma_map_sg sba_map_sg; -extern ia64_mv_dma_unmap_sg sba_unmap_sg; +extern ia64_mv_dma_map_single_attrs sba_map_single_attrs; +extern ia64_mv_dma_unmap_single_attrs sba_unmap_single_attrs; +extern ia64_mv_dma_map_sg_attrs sba_map_sg_attrs; +extern ia64_mv_dma_unmap_sg_attrs sba_unmap_sg_attrs;extern ia64_mv_dma_supported sba_dma_supported;extern ia64_mv_dma_mapping_error sba_dma_mapping_error;#define hwiommu_alloc_coherent sba_alloc_coherent#define hwiommu_free_coherent sba_free_coherent -#define hwiommu_map_single sba_map_single -#define hwiommu_unmap_single sba_unmap_single -#define hwiommu_map_sg sba_map_sg -#define hwiommu_unmap_sg sba_unmap_sg +#define hwiommu_map_single_attrs sba_map_single_attrs +#define hwiommu_unmap_single_attrs sba_unmap_single_attrs +#define hwiommu_map_sg_attrs sba_map_sg_attrs +#define hwiommu_unmap_sg_attrs sba_unmap_sg_attrs#define hwiommu_dma_supported sba_dma_supported#define hwiommu_dma_mapping_error sba_dma_mapping_error#define hwiommu_sync_single_for_cpu machvec_dma_sync_single
@@ -98,41 +98,48 @@ hwsw_free_coherent (struct device *dev, size_t size, void *vaddr, dma_addr_t dma }dma_addr_t -hwsw_map_single (struct device *dev,void *addr,size_t size,int dir) +hwsw_map_single_attrs (struct device *dev,void *addr,size_t size,int dir, +struct dma_attrs *attrs) {if (use_swiotlb (dev)) -return swiotlb_map_single (dev, addr, size, dir); +return swiotlb_map_single_attrs (dev, addr, size, dir, attrs);else -return hwiommu_map_single (dev, addr, size, dir); +return hwiommu_map_single_attrs (dev, addr, size, dir, attrs); } +EXPORT_SYMBOL (hwsw_map_single_attrs);void -hwsw_unmap_single (struct device *dev,dma_addr_t iova,size_t size,int dir) +hwsw_unmap_single_attrs (struct device *dev,dma_addr_t iova,size_t size, +int dir,struct dma_attrs *attrs) {if (use_swiotlb (dev)) -return swiotlb_unmap_single (dev, iova, size, dir); +return swiotlb_unmap_single_attrs (dev, iova, size, dir, attrs);else -return hwiommu_unmap_single (dev, iova, size, dir); +return hwiommu_unmap_single_attrs (dev, iova, size, dir, attrs); } - +EXPORT_SYMBOL (hwsw_unmap_single_attrs);int -hwsw_map_sg (struct device *dev,struct scatterlist *sglist,int nents,int dir) +hwsw_map_sg_attrs (struct device *dev,struct scatterlist *sglist,int nents, +int dir,struct dma_attrs *attrs) {if (use_swiotlb (dev)) -return swiotlb_map_sg (dev, sglist, nents, dir); +return swiotlb_map_sg_attrs (dev, sglist, nents, dir, attrs);else -return hwiommu_map_sg (dev, sglist, nents, dir); +return hwiommu_map_sg_attrs (dev, sglist, nents, dir, attrs); } +EXPORT_SYMBOL (hwsw_map_sg_attrs);void -hwsw_unmap_sg (struct device *dev,struct scatterlist *sglist,int nents,int dir) +hwsw_unmap_sg_attrs (struct device *dev,struct scatterlist *sglist,int nents, +int dir,struct dma_attrs *attrs) {if (use_swiotlb (dev)) -return swiotlb_unmap_sg (dev, sglist, nents, dir); +return swiotlb_unmap_sg_attrs (dev, sglist, nents, dir, attrs);else -return hwiommu_unmap_sg (dev, sglist, nents, dir); +return hwiommu_unmap_sg_attrs (dev, sglist, nents, dir, attrs); } +EXPORT_SYMBOL (hwsw_unmap_sg_attrs);void hwsw_sync_single_for_cpu (struct device *dev,dma_addr_t addr,size_t size,int dir)
@@ -185,10 +192,6 @@ hwsw_dma_mapping_error (dma_addr_t dma_addr) }EXPORT_SYMBOL (hwsw_dma_mapping_error); -EXPORT_SYMBOL (hwsw_map_single); -EXPORT_SYMBOL (hwsw_unmap_single); -EXPORT_SYMBOL (hwsw_map_sg); -EXPORT_SYMBOL (hwsw_unmap_sg);EXPORT_SYMBOL (hwsw_dma_supported);EXPORT_SYMBOL (hwsw_alloc_coherent);EXPORT_SYMBOL (hwsw_free_coherent);
arch/ia64/hp/common/sba_iommu.c +37 -27
209 lines not on this page · raw message
arch/ia64/sn/pci/pci_dma.c +60 -21
188 lines not on this page · raw message
include/asm-ia64/dma-mapping.h +24 -4
@@ -23,10 +23,30 @@ dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr, {dma_free_coherent (dev, size, cpu_addr, dma_handle); } -#define dma_map_single platform_dma_map_single -#define dma_map_sg platform_dma_map_sg -#define dma_unmap_single platform_dma_unmap_single -#define dma_unmap_sg platform_dma_unmap_sg +#define dma_map_single_attrs platform_dma_map_single_attrs +static inline dma_addr_t dma_map_single (struct device *dev,void *cpu_addr, +size_t size,int dir) +{ +return dma_map_single_attrs (dev, cpu_addr, size, dir,NULL ); +} +#define dma_map_sg_attrs platform_dma_map_sg_attrs +static inline int dma_map_sg (struct device *dev,struct scatterlist *sgl, +int nents,int dir) +{ +return dma_map_sg_attrs (dev, sgl, nents, dir,NULL ); +} +#define dma_unmap_single_attrs platform_dma_unmap_single_attrs +static inline void dma_unmap_single (struct device *dev,dma_addr_t cpu_addr, +size_t size,int dir) +{ +return dma_unmap_single_attrs (dev, cpu_addr, size, dir,NULL ); +} +#define dma_unmap_sg_attrs platform_dma_unmap_sg_attrs +static inline void dma_unmap_sg (struct device *dev,struct scatterlist *sgl, +int nents,int dir) +{ +return dma_unmap_sg_attrs (dev, sgl, nents, dir,NULL ); +}#define dma_sync_single_for_cpu platform_dma_sync_single_for_cpu#define dma_sync_sg_for_cpu platform_dma_sync_sg_for_cpu#define dma_sync_single_for_device platform_dma_sync_single_for_device
include/asm-ia64/machvec.h +30 -20
98 lines not on this page · raw message
include/asm-ia64/machvec_hpzx1.h +8 -8
@@ -4,10 +4,10 @@extern ia64_mv_setup_t dig_setup;extern ia64_mv_dma_alloc_coherent sba_alloc_coherent;extern ia64_mv_dma_free_coherent sba_free_coherent; -extern ia64_mv_dma_map_single sba_map_single; -extern ia64_mv_dma_unmap_single sba_unmap_single; -extern ia64_mv_dma_map_sg sba_map_sg; -extern ia64_mv_dma_unmap_sg sba_unmap_sg; +extern ia64_mv_dma_map_single_attrs sba_map_single_attrs; +extern ia64_mv_dma_unmap_single_attrs sba_unmap_single_attrs; +extern ia64_mv_dma_map_sg_attrs sba_map_sg_attrs; +extern ia64_mv_dma_unmap_sg_attrs sba_unmap_sg_attrs;extern ia64_mv_dma_supported sba_dma_supported;extern ia64_mv_dma_mapping_error sba_dma_mapping_error;
@@ -23,10 +23,10 @@ extern ia64_mv_dma_mapping_error sba_dma_mapping_error;#define platform_dma_init machvec_noop#define platform_dma_alloc_coherent sba_alloc_coherent#define platform_dma_free_coherent sba_free_coherent -#define platform_dma_map_single sba_map_single -#define platform_dma_unmap_single sba_unmap_single -#define platform_dma_map_sg sba_map_sg -#define platform_dma_unmap_sg sba_unmap_sg +#define platform_dma_map_single_attrs sba_map_single_attrs +#define platform_dma_unmap_single_attrs sba_unmap_single_attrs +#define platform_dma_map_sg_attrs sba_map_sg_attrs +#define platform_dma_unmap_sg_attrs sba_unmap_sg_attrs#define platform_dma_sync_single_for_cpu machvec_dma_sync_single#define platform_dma_sync_sg_for_cpu machvec_dma_sync_sg#define platform_dma_sync_single_for_device machvec_dma_sync_single
include/asm-ia64/machvec_hpzx1_swiotlb.h +8 -8
@@ -4,10 +4,10 @@extern ia64_mv_setup_t dig_setup;extern ia64_mv_dma_alloc_coherent hwsw_alloc_coherent;extern ia64_mv_dma_free_coherent hwsw_free_coherent; -extern ia64_mv_dma_map_single hwsw_map_single; -extern ia64_mv_dma_unmap_single hwsw_unmap_single; -extern ia64_mv_dma_map_sg hwsw_map_sg; -extern ia64_mv_dma_unmap_sg hwsw_unmap_sg; +extern ia64_mv_dma_map_single_attrs hwsw_map_single_attrs; +extern ia64_mv_dma_unmap_single_attrs hwsw_unmap_single_attrs; +extern ia64_mv_dma_map_sg_attrs hwsw_map_sg_attrs; +extern ia64_mv_dma_unmap_sg_attrs hwsw_unmap_sg_attrs;extern ia64_mv_dma_supported hwsw_dma_supported;extern ia64_mv_dma_mapping_error hwsw_dma_mapping_error;extern ia64_mv_dma_sync_single_for_cpu hwsw_sync_single_for_cpu;
@@ -28,10 +28,10 @@ extern ia64_mv_dma_sync_sg_for_device hwsw_sync_sg_for_device;#define platform_dma_init machvec_noop#define platform_dma_alloc_coherent hwsw_alloc_coherent#define platform_dma_free_coherent hwsw_free_coherent -#define platform_dma_map_single hwsw_map_single -#define platform_dma_unmap_single hwsw_unmap_single -#define platform_dma_map_sg hwsw_map_sg -#define platform_dma_unmap_sg hwsw_unmap_sg +#define platform_dma_map_single_attrs hwsw_map_single_attrs +#define platform_dma_unmap_single_attrs hwsw_unmap_single_attrs +#define platform_dma_map_sg_attrs hwsw_map_sg_attrs +#define platform_dma_unmap_sg_attrs hwsw_unmap_sg_attrs#define platform_dma_supported hwsw_dma_supported#define platform_dma_mapping_error hwsw_dma_mapping_error#define platform_dma_sync_single_for_cpu hwsw_sync_single_for_cpu
include/asm-ia64/machvec_sn2.h +8 -8
@@ -57,10 +57,10 @@ extern ia64_mv_readl_t __sn_readl_relaxed;extern ia64_mv_readq_t __sn_readq_relaxed;extern ia64_mv_dma_alloc_coherent sn_dma_alloc_coherent;extern ia64_mv_dma_free_coherent sn_dma_free_coherent; -extern ia64_mv_dma_map_single sn_dma_map_single; -extern ia64_mv_dma_unmap_single sn_dma_unmap_single; -extern ia64_mv_dma_map_sg sn_dma_map_sg; -extern ia64_mv_dma_unmap_sg sn_dma_unmap_sg; +extern ia64_mv_dma_map_single_attrs sn_dma_map_single_attrs; +extern ia64_mv_dma_unmap_single_attrs sn_dma_unmap_single_attrs; +extern ia64_mv_dma_map_sg_attrs sn_dma_map_sg_attrs; +extern ia64_mv_dma_unmap_sg_attrs sn_dma_unmap_sg_attrs;extern ia64_mv_dma_sync_single_for_cpu sn_dma_sync_single_for_cpu;extern ia64_mv_dma_sync_sg_for_cpu sn_dma_sync_sg_for_cpu;extern ia64_mv_dma_sync_single_for_device sn_dma_sync_single_for_device;
@@ -113,10 +113,10 @@ extern ia64_mv_pci_fixup_bus_t sn_pci_fixup_bus;#define platform_dma_init machvec_noop#define platform_dma_alloc_coherent sn_dma_alloc_coherent#define platform_dma_free_coherent sn_dma_free_coherent -#define platform_dma_map_single sn_dma_map_single -#define platform_dma_unmap_single sn_dma_unmap_single -#define platform_dma_map_sg sn_dma_map_sg -#define platform_dma_unmap_sg sn_dma_unmap_sg +#define platform_dma_map_single_attrs sn_dma_map_single_attrs +#define platform_dma_unmap_single_attrs sn_dma_unmap_single_attrs +#define platform_dma_map_sg_attrs sn_dma_map_sg_attrs +#define platform_dma_unmap_sg_attrs sn_dma_unmap_sg_attrs#define platform_dma_sync_single_for_cpu sn_dma_sync_single_for_cpu#define platform_dma_sync_sg_for_cpu sn_dma_sync_sg_for_cpu#define platform_dma_sync_single_for_device sn_dma_sync_single_for_device
lib/swiotlb.c +42 -8
111 lines not on this page · raw message