[PATCH 15/19] iommu/vt-d: Disable IRQ remapping in intel_prepare_irq_remapping

[Joerg Roedel]

From: Joerg Roedel <jroedel@xxxxxxx>

Move it to this function for now, so that the copy routines
for irq remapping take no effect yet.

Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
---
 drivers/iommu/intel_irq_remapping.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 46d17e1..f1711836 100644
--- a/drivers/iommu/intel_irq_remapping.c
+++ b/drivers/iommu/intel_irq_remapping.c
@@ -654,6 +654,9 @@ static int __init intel_prepare_irq_remapping(void)
 			pr_info("%s does not support EIM\n", iommu->name);
 			eim = 0;
 		}
+
+		/* Disable IRQ remapping if it is already enabled */
+		iommu_disable_irq_remapping(iommu);
 	}
 
 	eim_mode = eim;
@@ -682,9 +685,6 @@ static int __init intel_enable_irq_remapping(void)
 	struct intel_iommu *iommu;
 	bool setup = false;
 
-	for_each_iommu(iommu, drhd)
-		iommu_disable_irq_remapping(iommu);
-
 	/*
 	 * Setup Interrupt-remapping for all the DRHD's now.
 	 */
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/