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

Commit 210bff6d authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

parisc: use for_each_sg() 



This replaces the plain loop over the sglist array with for_each_sg()
macro which consists of sg_next() function calls.  Since parisc doesn't
select ARCH_HAS_SG_CHAIN, it is not necessary to use for_each_sg() in
order to loop over each sg element.  But this can help find problems with
drivers that do not properly initialize their sg tables when
CONFIG_DEBUG_SG is enabled.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b519ea6d

arch/parisc/kernel/pci-dma.c

+16 −11
Original line number Diff line number Diff line
@@ -478,14 +478,16 @@ static void pa11_dma_unmap_single(struct device *dev, dma_addr_t dma_handle, siz 
static int pa11_dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)

{

	int i;

	struct scatterlist *sg;



	BUG_ON(direction == DMA_NONE);



	for (i = 0; i < nents; i++, sglist++ ) {

		unsigned long vaddr = (unsigned long)sg_virt(sglist);

		sg_dma_address(sglist) = (dma_addr_t) virt_to_phys(vaddr);

		sg_dma_len(sglist) = sglist->length;

		flush_kernel_dcache_range(vaddr, sglist->length);

	for_each_sg(sglist, sg, nents, i) {

		unsigned long vaddr = (unsigned long)sg_virt(sg);



		sg_dma_address(sg) = (dma_addr_t) virt_to_phys(vaddr);

		sg_dma_len(sg) = sg->length;

		flush_kernel_dcache_range(vaddr, sg->length);

	}

	return nents;

}
@@ -493,6 +495,7 @@ static int pa11_dma_map_sg(struct device *dev, struct scatterlist *sglist, int n 
static void pa11_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)

{

	int i;

	struct scatterlist *sg;



	BUG_ON(direction == DMA_NONE);
@@ -501,8 +504,8 @@ static void pa11_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, in 


	/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */



	for (i = 0; i < nents; i++, sglist++ )

		flush_kernel_vmap_range(sg_virt(sglist), sglist->length);

	for_each_sg(sglist, sg, nents, i)

		flush_kernel_vmap_range(sg_virt(sg), sg->length);

	return;

}
@@ -523,21 +526,23 @@ static void pa11_dma_sync_single_for_device(struct device *dev, dma_addr_t dma_h 
static void pa11_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)

{

	int i;

	struct scatterlist *sg;



	/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */



	for (i = 0; i < nents; i++, sglist++ )

		flush_kernel_vmap_range(sg_virt(sglist), sglist->length);

	for_each_sg(sglist, sg, nents, i)

		flush_kernel_vmap_range(sg_virt(sg), sg->length);

}



static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)

{

	int i;

	struct scatterlist *sg;



	/* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */



	for (i = 0; i < nents; i++, sglist++ )

		flush_kernel_vmap_range(sg_virt(sglist), sglist->length);

	for_each_sg(sglist, sg, nents, i)

		flush_kernel_vmap_range(sg_virt(sg), sg->length);

}



struct hppa_dma_ops pcxl_dma_ops = {