Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 687d6809 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.infradead.org/~dwmw2/iommu-2.6.31 

* git://git.infradead.org/~dwmw2/iommu-2.6.31:
  intel-iommu: Fix one last ia64 build problem in Pass Through Support
  VT-d: support the device IOTLB
  VT-d: cleanup iommu_flush_iotlb_psi and flush_unmaps
  VT-d: add device IOTLB invalidation support
  VT-d: parse ATSR in DMA Remapping Reporting Structure
  PCI: handle Virtual Function ATS enabling
  PCI: support the ATS capability
  intel-iommu: dmar_set_interrupt return error value
  intel-iommu: Tidy up iommu->gcmd handling
  intel-iommu: Fix tiny theoretical race in write-buffer flush.
  intel-iommu: Clean up handling of "caching mode" vs. IOTLB flushing.
  intel-iommu: Clean up handling of "caching mode" vs. context flushing.
  VT-d: fix invalid domain id for KVM context flush
  Fix !CONFIG_DMAR build failure introduced by Intel IOMMU Pass Through Support
  Intel IOMMU Pass Through Support

Fix up trivial conflicts in drivers/pci/{intel-iommu.c,intr_remapping.c}
parents 10534140 008fe148

Documentation/kernel-parameters.txt

+1 −0
Original line number Diff line number Diff line
@@ -1006,6 +1006,7 @@ and is between 256 and 4096 characters. It is defined in the file 
		nomerge

		forcesac

		soft

		pt	[x86, IA64]



	io7=		[HW] IO7 for Marvel based alpha systems

			See comment before marvel_specify_io7 in

arch/ia64/include/asm/iommu.h

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ extern void pci_iommu_shutdown(void); 
extern void no_iommu_init(void);

extern int force_iommu, no_iommu;

extern int iommu_detected;

#ifdef	CONFIG_DMAR

extern int iommu_pass_through;

#else

#define iommu_pass_through	(0)

#endif

extern void iommu_dma_init(void);

extern void machvec_init(const char *name);

arch/ia64/kernel/pci-dma.c

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ int force_iommu __read_mostly = 1; 
int force_iommu __read_mostly;

#endif



int iommu_pass_through;



/* Dummy device used for NULL arguments (normally ISA). Better would

   be probably a smaller DMA mask, but this is bug-to-bug compatible

   to i386. */

arch/ia64/kernel/pci-swiotlb.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ void __init swiotlb_dma_init(void) 


void __init pci_swiotlb_init(void)

{

	if (!iommu_detected) {

	if (!iommu_detected || iommu_pass_through) {

#ifdef CONFIG_IA64_GENERIC

		swiotlb = 1;

		printk(KERN_INFO "PCI-DMA: Re-initialize machine vector.\n");

arch/x86/include/asm/iommu.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ extern void no_iommu_init(void); 
extern struct dma_map_ops nommu_dma_ops;

extern int force_iommu, no_iommu;

extern int iommu_detected;

extern int iommu_pass_through;



/* 10 seconds */

#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)