Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0690cbd2 authored by Joerg Roedel's avatar Joerg Roedel
Browse files

powerpc/iommu: Rename iommu_[un]map_sg functions 



The IOMMU-API gained support for a new iommu_map_sg
function. This causes compile failures on powerpc because
the function name is already globally used there.
This patch renames adds a ppc_ prefix to these functions to
solve the compile problem.

Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent d7da6bdc

arch/powerpc/include/asm/iommu.h

+10 −7
Original line number Diff line number Diff line
@@ -137,12 +137,15 @@ static inline void set_iommu_table_base_and_group(struct device *dev, 
	iommu_add_device(dev);

}



extern int iommu_map_sg(struct device *dev, struct iommu_table *tbl,

extern int ppc_iommu_map_sg(struct device *dev, struct iommu_table *tbl,

			    struct scatterlist *sglist, int nelems,

			unsigned long mask, enum dma_data_direction direction,

			    unsigned long mask,

			    enum dma_data_direction direction,

			    struct dma_attrs *attrs);

extern void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,

			   int nelems, enum dma_data_direction direction,

extern void ppc_iommu_unmap_sg(struct iommu_table *tbl,

			       struct scatterlist *sglist,

			       int nelems,

			       enum dma_data_direction direction,

			       struct dma_attrs *attrs);



extern void *iommu_alloc_coherent(struct device *dev, struct iommu_table *tbl,

arch/powerpc/kernel/dma-iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static int dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist, 
			    int nelems, enum dma_data_direction direction,

			    struct dma_attrs *attrs)

{

	return iommu_map_sg(dev, get_iommu_table_base(dev), sglist, nelems,

	return ppc_iommu_map_sg(dev, get_iommu_table_base(dev), sglist, nelems,

				device_to_mask(dev), direction, attrs);

}
@@ -68,8 +68,8 @@ static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist, 
		int nelems, enum dma_data_direction direction,

		struct dma_attrs *attrs)

{

	iommu_unmap_sg(get_iommu_table_base(dev), sglist, nelems, direction,

		       attrs);

	ppc_iommu_unmap_sg(get_iommu_table_base(dev), sglist, nelems,

			   direction, attrs);

}



/* We support DMA to/from any memory page via the iommu */

arch/powerpc/kernel/iommu.c

+8 −8
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, 
		ppc_md.tce_flush(tbl);

}



int iommu_map_sg(struct device *dev, struct iommu_table *tbl,

int ppc_iommu_map_sg(struct device *dev, struct iommu_table *tbl,

		     struct scatterlist *sglist, int nelems,

		     unsigned long mask, enum dma_data_direction direction,

		     struct dma_attrs *attrs)
@@ -539,7 +539,7 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl, 


	DBG("mapped %d elements:\n", outcount);



	/* For the sake of iommu_unmap_sg, we clear out the length in the

	/* For the sake of ppc_iommu_unmap_sg, we clear out the length in the

	 * next entry of the sglist if we didn't fill the list completely

	 */

	if (outcount < incount) {
@@ -572,7 +572,7 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl, 
}





void iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,

void ppc_iommu_unmap_sg(struct iommu_table *tbl, struct scatterlist *sglist,

			int nelems, enum dma_data_direction direction,

			struct dma_attrs *attrs)

{

arch/powerpc/platforms/cell/iommu.c

+5 −4
Original line number Diff line number Diff line
@@ -621,8 +621,9 @@ static int dma_fixed_map_sg(struct device *dev, struct scatterlist *sg, 
	if (iommu_fixed_is_weak == dma_get_attr(DMA_ATTR_WEAK_ORDERING, attrs))

		return dma_direct_ops.map_sg(dev, sg, nents, direction, attrs);

	else

		return iommu_map_sg(dev, cell_get_iommu_table(dev), sg, nents,

				    device_to_mask(dev), direction, attrs);

		return ppc_iommu_map_sg(dev, cell_get_iommu_table(dev), sg,

					nents, device_to_mask(dev),

					direction, attrs);

}



static void dma_fixed_unmap_sg(struct device *dev, struct scatterlist *sg,
@@ -632,8 +633,8 @@ static void dma_fixed_unmap_sg(struct device *dev, struct scatterlist *sg, 
	if (iommu_fixed_is_weak == dma_get_attr(DMA_ATTR_WEAK_ORDERING, attrs))

		dma_direct_ops.unmap_sg(dev, sg, nents, direction, attrs);

	else

		iommu_unmap_sg(cell_get_iommu_table(dev), sg, nents, direction,

			       attrs);

		ppc_iommu_unmap_sg(cell_get_iommu_table(dev), sg, nents,

				   direction, attrs);

}



static int dma_fixed_dma_supported(struct device *dev, u64 mask)