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

Commit 0989e1f9 authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds
Browse files

frv: 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 frv 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: David Howells <dhowells@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3fe111fc

arch/frv/mb93090-mb00/pci-dma-nommu.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -119,14 +119,16 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, 




EXPORT_SYMBOL(dma_map_single);

EXPORT_SYMBOL(dma_map_single);





int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,

int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,

	       enum dma_data_direction direction)

	       enum dma_data_direction direction)

{

{

	int i;

	int i;

	struct scatterlist *sg;





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

	for_each_sg(sglist, sg, nents, i) {

		frv_cache_wback_inv(sg_dma_address(&sg[i]),

		frv_cache_wback_inv(sg_dma_address(sg),

				    sg_dma_address(&sg[i]) + sg_dma_len(&sg[i]));

				    sg_dma_address(sg) + sg_dma_len(sg));

	}





	BUG_ON(direction == DMA_NONE);

	BUG_ON(direction == DMA_NONE);

arch/frv/mb93090-mb00/pci-dma.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -50,19 +50,20 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size, 




EXPORT_SYMBOL(dma_map_single);

EXPORT_SYMBOL(dma_map_single);





int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,

int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,

	       enum dma_data_direction direction)

	       enum dma_data_direction direction)

{

{

	unsigned long dampr2;

	unsigned long dampr2;

	void *vaddr;

	void *vaddr;

	int i;

	int i;

	struct scatterlist *sg;





	BUG_ON(direction == DMA_NONE);

	BUG_ON(direction == DMA_NONE);





	dampr2 = __get_DAMPR(2);

	dampr2 = __get_DAMPR(2);





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

	for_each_sg(sglist, sg, nents, i) {

		vaddr = kmap_atomic_primary(sg_page(&sg[i]));

		vaddr = kmap_atomic_primary(sg_page(sg));





		frv_dcache_writeback((unsigned long) vaddr,

		frv_dcache_writeback((unsigned long) vaddr,

				     (unsigned long) vaddr + PAGE_SIZE);

				     (unsigned long) vaddr + PAGE_SIZE);