Enable Xen-SWIOTLB to be part of bootup process.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
index e486c4030538f275209b1c9d8b08dfb8c3ee60a1..eca588b433a8a949be959fdeb56d57c07ce0bed4 100644 (file)
--- a/arch/x86/kernel/pci-dma.c
+++ b/arch/x86/kernel/pci-dma.c
@@ -11,6 +11,7 @@
 #include <asm/calgary.h>
 #include <asm/amd_iommu.h>
 #include <asm/xen/iommu.h>
+#include <asm/xen/swiotlb.h>
 
 static int forbid_dac __read_mostly;
 
@@ -127,6 +128,8 @@ void __init pci_iommu_alloc(void)
 
        amd_iommu_detect();
 
+       xen_swiotlb_init_alloc();
+
        pci_swiotlb_init();
 }
 
@@ -278,6 +281,8 @@ static int __init pci_iommu_init(void)
 
        xen_iommu_init();
 
+       xen_swiotlb_init();
+
        calgary_iommu_init();
 
        intel_iommu_init();