Commit 24911acd authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Michael Ellerman
Browse files

powerpc: remove device_to_mask() 



Use the dma_get_mask() helper from dma-mapping.h instead, as they are
functionally identical.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAlexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent a278e7ea

arch/powerpc/include/asm/iommu.h

+0 −8
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE