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

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

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



Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
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 5637f2df

arch/x86/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -102,6 +102,9 @@ config ZONE_DMA 
config SBUS

	bool



config NEED_DMA_MAP_STATE

       def_bool (X86_64 || DMAR || DMA_API_DEBUG)



config GENERIC_ISA_DMA

	def_bool y

arch/x86/include/asm/pci.h

+2 −28
Original line number Diff line number Diff line
@@ -97,34 +97,6 @@ extern void pci_iommu_alloc(void); 


#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)



#if defined(CONFIG_X86_64) || defined(CONFIG_DMAR) || defined(CONFIG_DMA_API_DEBUG)



#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



#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)       dma_addr_t ADDR_NAME[0];

#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0];

#define pci_unmap_addr(PTR, ADDR_NAME)  sizeof((PTR)->ADDR_NAME)

#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \

	        do { break; } while (pci_unmap_addr(PTR, ADDR_NAME))

#define pci_unmap_len(PTR, LEN_NAME)            sizeof((PTR)->LEN_NAME)

#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \

	        do { break; } while (pci_unmap_len(PTR, LEN_NAME))



#endif



#endif  /* __KERNEL__ */



#ifdef CONFIG_X86_64
@@ -136,6 +108,8 @@ void dma32_reserve_bootmem(void); 
/* implement the pci_ DMA API in terms of the generic device dma_ one */

#include <asm-generic/pci-dma-compat.h>



#include <linux/pci-dma.h>



/* generic pci stuff */

#include <asm-generic/pci.h>

#define PCIBIOS_MAX_MEM_32 0xffffffff