aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKeshavamurthy, Anil S <anil.s.keshavamurthy@intel.com>2007-10-21 19:41:53 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-22 11:13:18 -0400
commit7d3b03ce7bff9d39ebaee1bb8de1968c4434b883 (patch)
tree0016214c96d2475a160efdd85539242e356ce2d9 /drivers
parenteb3fa7cb51a2a35cd95eb92e65d8039c779468a5 (diff)
Intel IOMMU: Intel iommu cmdline option - forcedac
Introduce intel_iommu=forcedac commandline option. This option is helpful to verify the pci device capability of handling physical dma'able address greater than 4G. Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> Cc: Andi Kleen <ak@suse.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Muli Ben-Yehuda <muli@il.ibm.com> Cc: "Siddha, Suresh B" <suresh.b.siddha@intel.com> Cc: Arjan van de Ven <arjan@infradead.org> Cc: Ashok Raj <ashok.raj@intel.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Christoph Lameter <clameter@sgi.com> Cc: Greg KH <greg@kroah.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/intel-iommu.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 05630b44dbfc..cb24defdb6d9 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -54,6 +54,7 @@ static void domain_remove_dev_info(struct dmar_domain *domain);
54 54
55static int dmar_disabled; 55static int dmar_disabled;
56static int __initdata dmar_map_gfx = 1; 56static int __initdata dmar_map_gfx = 1;
57static int dmar_forcedac;
57 58
58#define DUMMY_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-1)) 59#define DUMMY_DEVICE_DOMAIN_INFO ((struct device_domain_info *)(-1))
59static DEFINE_SPINLOCK(device_domain_lock); 60static DEFINE_SPINLOCK(device_domain_lock);
@@ -71,6 +72,10 @@ static int __init intel_iommu_setup(char *str)
71 dmar_map_gfx = 0; 72 dmar_map_gfx = 0;
72 printk(KERN_INFO 73 printk(KERN_INFO
73 "Intel-IOMMU: disable GFX device mapping\n"); 74 "Intel-IOMMU: disable GFX device mapping\n");
75 } else if (!strncmp(str, "forcedac", 8)) {
76 printk (KERN_INFO
77 "Intel-IOMMU: Forcing DAC for PCI devices\n");
78 dmar_forcedac = 1;
74 } 79 }
75 80
76 str += strcspn(str, ","); 81 str += strcspn(str, ",");
@@ -1558,7 +1563,7 @@ static dma_addr_t __intel_map_single(struct device *dev, void *addr,
1558 1563
1559 start_addr = IOVA_START_ADDR; 1564 start_addr = IOVA_START_ADDR;
1560 1565
1561 if (pdev->dma_mask <= DMA_32BIT_MASK) { 1566 if ((pdev->dma_mask <= DMA_32BIT_MASK) || (dmar_forcedac)) {
1562 iova = iommu_alloc_iova(domain, addr, size, start_addr, 1567 iova = iommu_alloc_iova(domain, addr, size, start_addr,
1563 pdev->dma_mask); 1568 pdev->dma_mask);
1564 } else { 1569 } else {