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

Commit c8692362 authored by Mark Nelson's avatar Mark Nelson Committed by Benjamin Herrenschmidt
Browse files

powerpc/dma: Add struct iommu_table argument to iommu_map_sg() 



Make iommu_map_sg take a struct iommu_table. It did so before commit
740c3ce6 (iommu sg merging: ppc: make
iommu respect the segment size limits).

This stops the function looking in the archdata.dma_data for the iommu
table because in the future it will be called with a device that has
no table there.

This also has the nice side effect of making iommu_map_sg() match the
other map functions.

Signed-off-by: default avatarMark Nelson <markn@au1.ibm.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent fabb6570

arch/powerpc/kernel/dma_64.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static void dma_iommu_unmap_single(struct device *dev, dma_addr_t dma_handle, 
static int dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist,

			    int nelems, enum dma_data_direction direction)

{

	return iommu_map_sg(dev, sglist, nelems,

	return iommu_map_sg(dev, dev->archdata.dma_data, sglist, nelems,

			    device_to_mask(dev), direction);

}

arch/powerpc/kernel/iommu.c

+3 −4
Original line number Diff line number Diff line
@@ -267,11 +267,10 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, 
	spin_unlock_irqrestore(&(tbl->it_lock), flags);

}



int iommu_map_sg(struct device *dev, struct scatterlist *sglist,

		 int nelems, unsigned long mask,

		 enum dma_data_direction direction)

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

		 struct scatterlist *sglist, int nelems,

		 unsigned long mask, enum dma_data_direction direction)

{

	struct iommu_table *tbl = dev->archdata.dma_data;

	dma_addr_t dma_next = 0, dma_addr;

	unsigned long flags;

	struct scatterlist *s, *outs, *segstart;

include/asm-powerpc/iommu.h

+3 −3
Original line number Diff line number Diff line
@@ -79,9 +79,9 @@ extern void iommu_free_table(struct iommu_table *tbl, const char *node_name); 
extern struct iommu_table *iommu_init_table(struct iommu_table * tbl,

					    int nid);



extern int iommu_map_sg(struct device *dev, struct scatterlist *sglist,

			int nelems, unsigned long mask,

			enum dma_data_direction direction);

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

			struct scatterlist *sglist, int nelems,

			unsigned long mask, enum dma_data_direction direction);

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

			   int nelems, enum dma_data_direction direction);