From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Jun 2009 04:38:22 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/iommu-2.6.31
X-Git-Tag: v2.6.31-rc1~45
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=687d680985b1438360a9ba470ece8b57cd205c3b;p=profile%2Fivi%2Fkernel-x86-ivi.git

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}
---

687d680985b1438360a9ba470ece8b57cd205c3b
diff --cc drivers/pci/intel-iommu.c
index cd38916,c3cdfc9..178853a
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@@ -1972,30 -2072,23 +2076,15 @@@ static int __init init_dmars(void
  		}
  	}
  
 -#ifdef CONFIG_INTR_REMAP
 -	if (!intr_remapping_enabled) {
 -		ret = enable_intr_remapping(0);
 -		if (ret)
 -			printk(KERN_ERR
 -			       "IOMMU: enable interrupt remapping failed\n");
 -	}
 -#endif
  	/*
- 	 * For each rmrr
- 	 *   for each dev attached to rmrr
- 	 *   do
- 	 *     locate drhd for dev, alloc domain for dev
- 	 *     allocate free domain
- 	 *     allocate page table entries for rmrr
- 	 *     if context not allocated for bus
- 	 *           allocate and init context
- 	 *           set present in root table for this bus
- 	 *     init context with domain, translation etc
- 	 *    endfor
- 	 * endfor
+ 	 * If pass through is set and enabled, context entries of all pci
+ 	 * devices are intialized by pass through translation type.
  	 */
- 	for_each_rmrr_units(rmrr) {
- 		for (i = 0; i < rmrr->devices_cnt; i++) {
- 			pdev = rmrr->devices[i];
- 			/* some BIOS lists non-exist devices in DMAR table */
- 			if (!pdev)
- 				continue;
- 			ret = iommu_prepare_rmrr_dev(rmrr, pdev);
- 			if (ret)
- 				printk(KERN_ERR
- 				 "IOMMU: mapping reserved region failed\n");
+ 	if (iommu_pass_through) {
+ 		ret = init_context_pass_through();
+ 		if (ret) {
+ 			printk(KERN_ERR "IOMMU: Pass through init failed.\n");
+ 			iommu_pass_through = 0;
  		}
  	}