The patch titled
intel_iommu: default to off
has been removed from the -mm tree. Its filename was
intel_iommu-default-to-off.patch
This patch was dropped because an updated version will be merged
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: intel_iommu: default to off
From: Kyle McMartin <kyle@xxxxxxxxxx>
Due to reports of data corruption due to aborted DMA when using the intel
iommu code, disable it by default and provide a command line parameter
"intel_iommu=on" to turn it back on again.
Signed-off-by: Kyle McMartin <kyle@xxxxxxxxxx>
Cc: Mark McLoughlin <markmc@xxxxxxxxxx>
Cc: Suresh Siddha <suresh.b.siddha@xxxxxxxxx>
Cc: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Cc: <stable@xxxxxxxxxx> [2.6.28.x]
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/pci/intel-iommu.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff -puN drivers/pci/intel-iommu.c~intel_iommu-default-to-off drivers/pci/intel-iommu.c
--- a/drivers/pci/intel-iommu.c~intel_iommu-default-to-off
+++ a/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
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
_
Patches currently in -mm which might be from kyle@xxxxxxxxxx are
intel_iommu-default-to-off.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
