lkml.org 
[lkml]   [2010]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 -mm 02/14] x86: use include/linux/pci-dma.h
    Date
    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Cc: x86@kernel.org
    ---
    arch/x86/Kconfig | 3 +++
    arch/x86/include/asm/pci.h | 30 ++----------------------------
    2 files changed, 5 insertions(+), 28 deletions(-)

    diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
    index 15c1c09..46da6ce 100644
    --- a/arch/x86/Kconfig
    +++ b/arch/x86/Kconfig
    @@ -100,6 +100,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

    diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
    index ada8c20..d9bef0a 100644
    --- a/arch/x86/include/asm/pci.h
    +++ b/arch/x86/include/asm/pci.h
    @@ -90,34 +90,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
    @@ -127,6 +99,8 @@ extern void pci_iommu_alloc(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
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2010-02-10 02:43    [W:0.022 / U:62.044 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site