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

Commit f6ae31c2 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Linus Torvalds
Browse files

parisc: use asm-generic/scatterlist.h 



parisc uses iova and iova_length in scatterlist structure instead of
dma_address and dma_length.  However, the accessor are used so we can
convert parisc to use asm-generic/scatterlist.h easily.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Helge Deller <deller@gmx.de>
Cc: James E.J. Bottomley <jejb@parisc-linux.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7676679f

arch/parisc/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -98,6 +98,9 @@ config STACKTRACE_SUPPORT 
config NEED_DMA_MAP_STATE

	def_bool y



config NEED_SG_DMA_LENGTH

	def_bool y



config ISA_DMA_API

	bool

arch/parisc/include/asm/scatterlist.h

+2 −18
Original line number Diff line number Diff line
@@ -3,25 +3,9 @@ 


#include <asm/page.h>

#include <asm/types.h>



struct scatterlist {

#ifdef CONFIG_DEBUG_SG

	unsigned long sg_magic;

#endif

	unsigned long page_link;

	unsigned int offset;



	unsigned int length;



	/* an IOVA can be 64-bits on some PA-Risc platforms. */

	dma_addr_t iova;	/* I/O Virtual Address */

	__u32      iova_length; /* bytes mapped */

};



#define sg_virt_addr(sg) ((unsigned long)sg_virt(sg))

#define sg_dma_address(sg) ((sg)->iova)

#define sg_dma_len(sg)     ((sg)->iova_length)

#include <asm-generic/scatterlist.h>



#define ISA_DMA_THRESHOLD (~0UL)

#define sg_virt_addr(sg) ((unsigned long)sg_virt(sg))



#endif /* _ASM_PARISC_SCATTERLIST_H */