rpms/kernel/devel linux-2.6-defaults-intel_iommu-off.patch, NONE, 1.1 kernel.spec, 1.1225, 1.1226

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10772

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-defaults-intel_iommu-off.patch 
Log Message:
* Fri Jan 23 2009 Kyle McMartin <kyle at redhat.com>
- disable intel_iommu by default (enable with "intel_iommu=on")


linux-2.6-defaults-intel_iommu-off.patch:

--- NEW FILE linux-2.6-defaults-intel_iommu-off.patch ---
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index 3dfecb2..05f94fc 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -268,7 +268,7 @@ static long list_size;
 
 static void domain_remove_dev_info(struct dmar_domain *domain);
 
-int dmar_disabled;
+int dmar_disabled = 1;
 static int __initdata dmar_map_gfx = 1;
 static int dmar_forcedac;
 static int intel_iommu_strict;
@@ -284,9 +284,12 @@ static int __init intel_iommu_setup(char *str)
 	if (!str)
 		return -EINVAL;
 	while (*str) {
-		if (!strncmp(str, "off", 3)) {
+		if (!strncmp(str, "on", 2)) {
+			dmar_disabled = 0;
+			printk(KERN_INFO "Intel-IOMMU: enabled\n");
+		} else if (!strncmp(str, "off", 3)) {
 			dmar_disabled = 1;
-			printk(KERN_INFO"Intel-IOMMU: disabled\n");
+			printk(KERN_INFO "Intel-IOMMU: disabled\n");
 		} else if (!strncmp(str, "igfx_off", 8)) {
 			dmar_map_gfx = 0;
 			printk(KERN_INFO


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1225
retrieving revision 1.1226
diff -u -r1.1225 -r1.1226
--- kernel.spec	22 Jan 2009 06:26:05 -0000	1.1225
+++ kernel.spec	23 Jan 2009 18:48:42 -0000	1.1226
@@ -662,6 +662,7 @@
 
 Patch9000: use-per_cpu-module-references.patch
 Patch9001: revert-fix-modules_install-via-nfs.patch
+Patch9002: linux-2.6-defaults-intel_iommu-off.patch
 
 %endif
 
@@ -1165,6 +1166,10 @@
 ApplyPatch revert-fix-modules_install-via-nfs.patch
 
 ApplyPatch use-per_cpu-module-references.patch
+
+# turn off intel_iommu by default
+#  bugs: #481356, #479996
+ApplyPatch linux-2.6-defaults-intel_iommu-off.patch
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1740,6 +1745,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Fri Jan 23 2009 Kyle McMartin <kyle at redhat.com>
+- disable intel_iommu by default (enable with "intel_iommu=on")
+
 * Thu Jan 22 2009 Dave Airlie <airlied at redhat.com>
 - rebase drm patches - nouveau TODO