Merge branch 'rebase/dom0/swiotlb-new' into rebase/master

* rebase/dom0/swiotlb-new:
  Enable Xen-SWIOTLB to be part of bootup process.
  Add in Xen-SWIOTLB hypercalls and lookup functions for PFN<->MFNs addresses.
  Make the xen-iommu work only on PV guests.
  Provide two functions:xen_swiotlb_[init|init_alloc] and remove dupliate __setup function.
  Add Xen-SWIOTLB back.
  Remove references to the old Xen-SWIOTLB code.
  Remove the old implementation of the Xen-SWIOTLB pass-through mechanism.

Conflicts:
	arch/x86/xen/Makefile

diff --cc arch/x86/kernel/pci-dma.c
Simple merge

diff --cc arch/x86/kernel/pci-swiotlb.c
index efe3691945216e68ed6c1696bfe411e6e832d099,9640e17c69c41270194f70ce61a92b615231ac9c..e8a35016115f92369663ef7c695cd5c41f45eec7
--- 1/arch/x86/kernel/pci-swiotlb.c
--- 2/arch/x86/kernel/pci-swiotlb.c
+++ b/arch/x86/kernel/pci-swiotlb.c
@@@ -48,13 -46,9 +46,10 @@@ void __init pci_swiotlb_init(void
  {
        /* don't initialize swiotlb if iommu=off (no_iommu=1) */
  #ifdef CONFIG_X86_64
 -      if (!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN)
 +      if ((!iommu_detected && !no_iommu && max_pfn > MAX_DMA32_PFN) ||
 +              iommu_pass_through)
               swiotlb = 1;
  #endif
-       if (xen_wants_swiotlb())
-               swiotlb = 1;
- 
        if (swiotlb_force)
                swiotlb = 1;
        if (swiotlb) {

diff --cc arch/x86/xen/Makefile
index 25addaaa217bdd521753454dc479db08e808e5d9,ccf0dd194459512ade018c0c9877da388332381e..4a9ee230366b87c5e4307714a4e6bfc615b6f913
--- 1/arch/x86/xen/Makefile
--- 2/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@@ -17,7 -12,4 +17,7 @@@ obj-y         := enlighten.o setup.o multicall
  obj-$(CONFIG_SMP)             += smp.o
  obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
  obj-$(CONFIG_XEN_DEBUG_FS)    += debugfs.o
- obj-$(CONFIG_PCI_XEN)         += pci-swiotlb.o
 +obj-$(CONFIG_XEN_DOM0)                += vga.o
 +obj-$(CONFIG_XEN_DOM0)                += apic.o
 +obj-$(CONFIG_XEN_DOM0_PCI)    += pci.o
+ obj-$(CONFIG_PCI_XEN)         += pci-swiotlb.o