Skip to content

Commit

Permalink
powerpc: use asm-generic/scatterlist.h
Browse files Browse the repository at this point in the history
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
FUJITA Tomonori authored and Linus Torvalds committed May 27, 2010
1 parent 4a14d84 commit e32205e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 28 deletions.
3 changes: 3 additions & 0 deletions arch/powerpc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,9 @@ config ZONE_DMA
config NEED_DMA_MAP_STATE
def_bool (PPC64 || NOT_COHERENT_CACHE)

config NEED_SG_DMA_LENGTH
def_bool y

config GENERIC_ISA_DMA
bool
depends on PPC64 || POWER4 || 6xx && !CPM2
Expand Down
29 changes: 1 addition & 28 deletions arch/powerpc/include/asm/scatterlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,38 +9,11 @@
* 2 of the License, or (at your option) any later version.
*/

#ifdef __KERNEL__
#include <linux/types.h>
#include <asm/dma.h>

struct scatterlist {
#ifdef CONFIG_DEBUG_SG
unsigned long sg_magic;
#endif
unsigned long page_link;
unsigned int offset;
unsigned int length;

/* For TCE or SWIOTLB support */
dma_addr_t dma_address;
u32 dma_length;
};

/*
* These macros should be used after a dma_map_sg call has been done
* to get bus addresses of each of the SG entries and their lengths.
* You should only work with the number of sg entries pci_map_sg
* returns, or alternatively stop on the first sg_dma_len(sg) which
* is 0.
*/
#define sg_dma_address(sg) ((sg)->dma_address)
#define sg_dma_len(sg) ((sg)->dma_length)
#include <asm-generic/scatterlist.h>

#ifdef __powerpc64__
#define ISA_DMA_THRESHOLD (~0UL)
#endif

#define ARCH_HAS_SG_CHAIN

#endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_SCATTERLIST_H */

0 comments on commit e32205e

Please sign in to comment.