powerpc: remove device_to_mask
PATCH 1/1 powerpc: remove device_to_mask
Use the dma_get_mask helper from dma-mapping.h instead.
Signed-off-by Christoph Hellwig <[email protected]>
--- arch/powerpc/include/asm/iommu.h | 8 -------- arch/powerpc/kernel/dma-iommu.c | 4 ++-- arch/powerpc/platforms/pseries/vio.c | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-)
arch/powerpc/include/asm/iommu.h +0 -8
@@ -327,13 +327,5 @@ extern bool iommu_fixed_is_weak;extern const struct dma_map_ops dma_iommu_ops; -static inline unsigned long device_to_mask (struct device *dev) -{ -if (dev->dma_mask && *dev->dma_mask) -return *dev->dma_mask; -/* Assume devices without mask can take 32 bit addresses */ -return 0xfffffffful ; -} -#endif /* __KERNEL__ */ #endif /* _ASM_IOMMU_H */
arch/powerpc/kernel/dma-iommu.c +2 -2
@@ -71,7 +71,7 @@ static dma_addr_t dma_iommu_map_page(struct device *dev, struct page *page,return dma_direct_map_page (dev, page, offset, size, direction, attrs);return iommu_map_page (dev,get_iommu_table_base (dev), page, offset, - size,device_to_mask (dev), direction, attrs); + size,dma_get_mask (dev), direction, attrs); }
@@ -92,7 +92,7 @@ static int dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist,if (dma_iommu_map_bypass (dev, attrs))return dma_direct_map_sg (dev, sglist, nelems, direction, attrs);return ppc_iommu_map_sg (dev,get_iommu_table_base (dev), sglist, nelems, -device_to_mask (dev), direction, attrs); +dma_get_mask (dev), direction, attrs); } static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist,
arch/powerpc/platforms/pseries/vio.c +2 -2
@@ -524,7 +524,7 @@ static dma_addr_t vio_dma_iommu_map_page(struct device *dev, struct page *page,if (vio_cmo_alloc (viodev,roundup (size,IOMMU_PAGE_SIZE (tbl)))) goto out_fail; - ret =iommu_map_page (dev, tbl, page, offset, size,device_to_mask (dev), + ret =iommu_map_page (dev, tbl, page, offset, size,dma_get_mask (dev), direction, attrs);if (unlikely (ret ==DMA_MAPPING_ERROR )) goto out_deallocate;
@@ -564,7 +564,7 @@ static int vio_dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist,if (vio_cmo_alloc (viodev, alloc_size)) goto out_fail; - ret =ppc_iommu_map_sg (dev, tbl, sglist, nelems,device_to_mask (dev), + ret =ppc_iommu_map_sg (dev, tbl, sglist, nelems,dma_get_mask (dev), direction, attrs);if (unlikely (!ret)) goto out_deallocate;
Signature · 1 line
2.20.1
Quoted 3 lines · Christoph Hellwig
Use the
dma_get_maskhelper fromdma-mapping.hinstead.Signed-off-by Christoph Hellwig <[email protected]>
Reviewed-by Alexey Kardashevskiy <[email protected]>
Quoted 69 lines
--- arch/powerpc/include/asm/iommu.h | 8 -------- arch/powerpc/kernel/dma-iommu.c | 4 ++-- arch/powerpc/platforms/pseries/vio.c | 4 ++-- 3 files changed, 4 insertions(+), 12 deletions(-)arch/powerpc/include/asm/iommu.h +0
-8@@ -327,13 +327,5 @@ extern bool iommu_fixed_is_weak;extern const struct dma_map_ops dma_iommu_ops; -static inline unsigned long device_to_mask (struct device *dev) -{ -if (dev->dma_mask && *dev->dma_mask) -return *dev->dma_mask; -/* Assume devices without mask can take 32 bit addresses */ -return 0xfffffffful ; -} -#endif /* __KERNEL__ */ #endif /* _ASM_IOMMU_H */ arch/powerpc/kernel/dma-iommu.c +2
-2@@ -71,7 +71,7 @@ static dma_addr_t dma_iommu_map_page(struct device *dev, struct page *page,return dma_direct_map_page (dev, page, offset, size, direction, attrs);return iommu_map_page (dev,get_iommu_table_base (dev), page, offset, - size,device_to_mask (dev), direction, attrs); + size,dma_get_mask (dev), direction, attrs); }@@ -92,7 +92,7 @@ static int dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist,if (dma_iommu_map_bypass (dev, attrs))return dma_direct_map_sg (dev, sglist, nelems, direction, attrs);return ppc_iommu_map_sg (dev,get_iommu_table_base (dev), sglist, nelems, -device_to_mask (dev), direction, attrs); +dma_get_mask (dev), direction, attrs); } static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist,arch/powerpc/platforms/pseries/vio.c +2
-2@@ -524,7 +524,7 @@ static dma_addr_t vio_dma_iommu_map_page(struct device *dev, struct page *page,if (vio_cmo_alloc (viodev,roundup (size,IOMMU_PAGE_SIZE (tbl)))) goto out_fail; - ret =iommu_map_page (dev, tbl, page, offset, size,device_to_mask (dev), + ret =iommu_map_page (dev, tbl, page, offset, size,dma_get_mask (dev), direction, attrs);if (unlikely (ret ==DMA_MAPPING_ERROR )) goto out_deallocate;@@ -564,7 +564,7 @@ static int vio_dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist,if (vio_cmo_alloc (viodev, alloc_size)) goto out_fail; - ret =ppc_iommu_map_sg (dev, tbl, sglist, nelems,device_to_mask (dev), + ret =ppc_iommu_map_sg (dev, tbl, sglist, nelems,dma_get_mask (dev), direction, attrs);if (unlikely (!ret)) goto out_deallocate;
Signature · 1 line
Alexey
Michael Ellerman
reviewerQuoted 6 lines · Alexey Kardashevskiy
Quoted 3 lines · Christoph Hellwig
Use the
dma_get_maskhelper fromdma-mapping.hinstead.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Alexey Kardashevskiy <[email protected]>
I'll add to the change log "because they are functionally identical."
cheers
Michael Ellerman
AppliedQuoted 4 lines · Christoph Hellwig
Use the
dma_get_maskhelper fromdma-mapping.hinstead.Signed-off-by Christoph Hellwig <[email protected]>Reviewed-by Alexey Kardashevskiy <[email protected]>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/24911acd64cee411c9e626d3d0ca0733805b009b
cheers