Attachment 584047 Details for Bug 815998 – 0001-pci-dma-x86-use-include-linux-pci-dma.h.patch

0001-pci-dma-x86-use-include-linux-pci-dma.h.patch

0001-pci-dma-x86-use-include-linux-pci-dma.h.patch (text/plain), 2.95 KB, created by Stanislaw Gruszka on 2012-05-12 16:40:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stanislaw Gruszka

Created: 2012-05-12 16:40:27 UTC

Size: 2.95 KB

patch

obsolete

>From 27b88d5545fdc071fad19f7651f23a0c243f4c08 Mon Sep 17 00:00:00 2001
>From: Stanislaw Gruszka <sgruszka@redhat.com>
>Date: Sat, 12 May 2012 09:34:53 +0200
>Subject: [RHEL6.3 PATCH] pci-dma: x86: use include/linux/pci-dma.h
>
>Backport of:
>
>commit 3bc4e4590de89c2dfcfb1000344cd072574c9ad4
>Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
>Date:   Wed Mar 10 15:23:22 2010 -0800
>
>    pci-dma: x86: use include/linux/pci-dma.h
>
>    Signed-off-by: FUJITA 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: Andrew Morton <akpm@linux-foundation.org>
>    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.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 0c7182c..5eb2958 100644
>--- a/arch/x86/Kconfig
>+++ b/arch/x86/Kconfig
>@@ -99,6 +99,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.7.1
>

Actions: View

Attachments on bug 815998: 580046 | 580047 | 581432 | 581642 | 581650 | 584047