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

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

pci-dma: powerpc: use include/linux/pci-dma.h 



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 74a0bd66

arch/powerpc/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -672,6 +672,9 @@ config ZONE_DMA 
	bool

	default y



config NEED_DMA_MAP_STATE

	def_bool (PPC64 || NOT_COHERENT_CACHE)



config GENERIC_ISA_DMA

	bool

	depends on PPC64 || POWER4 || 6xx && !CPM2

arch/powerpc/include/asm/pci.h

+1 −31
Original line number Diff line number Diff line
@@ -141,37 +141,7 @@ extern int pci_mmap_legacy_page_range(struct pci_bus *bus, 


#define HAVE_PCI_LEGACY	1



#if defined(CONFIG_PPC64) || defined(CONFIG_NOT_COHERENT_CACHE)

/*

 * For 64-bit kernels, pci_unmap_{single,page} is not a nop.

 * For 32-bit non-coherent kernels, pci_dma_sync_single_for_cpu() and

 * so on are not nops.

 * and thus...

 */

#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	\

	dma_addr_t ADDR_NAME;

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)		\

	__u32 LEN_NAME;

#define pci_unmap_addr(PTR, ADDR_NAME)			\

	((PTR)->ADDR_NAME)

#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)		\

	(((PTR)->ADDR_NAME) = (VAL))

#define pci_unmap_len(PTR, LEN_NAME)			\

	((PTR)->LEN_NAME)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL)		\

	(((PTR)->LEN_NAME) = (VAL))



#else /* 32-bit && coherent */



/* pci_unmap_{page,single} is a nop so... */

#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME)

#define pci_unmap_addr(PTR, ADDR_NAME)		(0)

#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL)	do { } while (0)

#define pci_unmap_len(PTR, LEN_NAME)		(0)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL)	do { } while (0)



#endif /* CONFIG_PPC64 || CONFIG_NOT_COHERENT_CACHE */

#include <linux/pci-dma.h>



#ifdef CONFIG_PPC64