Commit 26f0cf91 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen 

* 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  x86: Detect whether we should use Xen SWIOTLB.
  pci-swiotlb-xen: Add glue code to setup dma_ops utilizing xen_swiotlb_* functions.
  swiotlb-xen: SWIOTLB library for Xen PV guest with PCI passthrough.
  xen/mmu: inhibit vmap aliases rather than trying to clear them out
  vmap: add flag to allow lazy unmap to be disabled at runtime
  xen: Add xen_create_contiguous_region
  xen: Rename the balloon lock
  xen: Allow unprivileged Xen domains to create iomap pages
  xen: use _PAGE_IOMAP in ioremap to do machine mappings

Fix up trivial conflicts (adding both xen swiotlb and xen pci platform
driver setup close to each other) in drivers/xen/{Kconfig,Makefile} and
include/xen/xen-ops.h
parents d862b13b fe96eb40

arch/x86/include/asm/xen/page.h

+2 −6
Original line number Diff line number Diff line
@@ -112,13 +112,9 @@ static inline xpaddr_t machine_to_phys(xmaddr_t machine) 
 */

static inline unsigned long mfn_to_local_pfn(unsigned long mfn)

{

	extern unsigned long max_mapnr;

	unsigned long pfn = mfn_to_pfn(mfn);

	if ((pfn < max_mapnr)

	    && !xen_feature(XENFEAT_auto_translated_physmap)

	    && (get_phys_to_machine(pfn) != mfn))

		return max_mapnr; /* force !pfn_valid() */

	/* XXX fixme; not true with sparsemem */

	if (get_phys_to_machine(pfn) != mfn)

		return -1; /* force !pfn_valid() */

	return pfn;

}

arch/x86/include/asm/xen/swiotlb-xen.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_SWIOTLB_XEN_H

#define _ASM_X86_SWIOTLB_XEN_H



#ifdef CONFIG_SWIOTLB_XEN

extern int xen_swiotlb;

extern int __init pci_xen_swiotlb_detect(void);

extern void __init pci_xen_swiotlb_init(void);

#else

#define xen_swiotlb (0)

static inline int __init pci_xen_swiotlb_detect(void) { return 0; }

static inline void __init pci_xen_swiotlb_init(void) { }

#endif



#endif /* _ASM_X86_SWIOTLB_XEN_H */

arch/x86/kernel/pci-dma.c

+5 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <asm/calgary.h>

#include <asm/amd_iommu.h>

#include <asm/x86_init.h>

#include <asm/xen/swiotlb-xen.h>



static int forbid_dac __read_mostly;
@@ -132,7 +133,7 @@ void __init pci_iommu_alloc(void) 
	/* free the range so iommu could get some range less than 4G */

	dma32_free_bootmem();



	if (pci_swiotlb_detect())

	if (pci_xen_swiotlb_detect() || pci_swiotlb_detect())

		goto out;



	gart_iommu_hole_init();
@@ -144,6 +145,8 @@ void __init pci_iommu_alloc(void) 
	/* needs to be called after gart_iommu_hole_init */

	amd_iommu_detect();

out:

	pci_xen_swiotlb_init();



	pci_swiotlb_init();

}
@@ -296,7 +299,7 @@ static int __init pci_iommu_init(void) 
#endif

	x86_init.iommu.iommu_init();



	if (swiotlb) {

	if (swiotlb || xen_swiotlb) {

		printk(KERN_INFO "PCI-DMA: "

		       "Using software bounce buffering for IO (SWIOTLB)\n");

		swiotlb_print_info();

arch/x86/xen/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -18,3 +18,4 @@ obj-$(CONFIG_SMP) += smp.o 
obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o

obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o



obj-$(CONFIG_SWIOTLB_XEN)	+= pci-swiotlb-xen.o

arch/x86/xen/enlighten.c

+4 −0
Original line number Diff line number Diff line
@@ -1172,6 +1172,10 @@ asmlinkage void __init xen_start_kernel(void) 


	pgd = (pgd_t *)xen_start_info->pt_base;



	if (!xen_initial_domain())

		__supported_pte_mask &= ~(_PAGE_PWT | _PAGE_PCD);



	__supported_pte_mask |= _PAGE_IOMAP;

	/* Don't do the full vcpu_info placement stuff until we have a

	   possible map and a non-dummy shared_info. */

	per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];

CRA Git | Maintained and supported by SUSTech CRA and CCSE