[Xen-devel] [PATCH 1/2] Revert "xen/swiotlb: make sure GART iommu doesn't initialize if we want Xen swiotlb"

[Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>]

This reverts commit d26d4ca29d2a13c8ccb94a1fe2d154b2c46de9e0.
---
 arch/x86/kernel/pci-dma.c  |    4 ++--
 arch/x86/xen/pci-swiotlb.c |    8 --------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index 1101a9f..6b76948 100644
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -122,8 +122,6 @@ void __init pci_iommu_alloc(void)
         * The order of these functions is important for
         * fall-back/fail-over reasons
         */
-       xen_swiotlb_init();
-
        gart_iommu_hole_init();
 
        detect_calgary();
@@ -132,6 +130,8 @@ void __init pci_iommu_alloc(void)
 
        amd_iommu_detect();
 
+       xen_swiotlb_init();
+
        pci_swiotlb_init();
 }
 
diff --git a/arch/x86/xen/pci-swiotlb.c b/arch/x86/xen/pci-swiotlb.c
index 00f2260..5e2c856 100644
--- a/arch/x86/xen/pci-swiotlb.c
+++ b/arch/x86/xen/pci-swiotlb.c
@@ -43,10 +43,6 @@
 #include <xen/page.h>
 #include <xen/xen-ops.h>
 
-
-#include <linux/pci.h>
-#include <asm/gart.h>
-
 #define OFFSET(val,align) ((unsigned long)     \
                           ( (val) & ( (align) - 1)))
 
@@ -989,9 +985,5 @@ void __init xen_swiotlb_init(void)
                xen_swiotlb_init_with_default_size(64 * (1<<20));       /* 
default to 64MB */
                dma_ops = &xen_swiotlb_dma_ops;
                iommu_detected = 1;
-#ifdef CONFIG_GART_IOMMU
-               gart_iommu_aperture_disabled = 1;
-#endif
-
        }
 }
-- 
1.6.2.5


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel