iommu/vt-d: Disable IRQ remapping in intel_prepare_irq_remapping

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

Tested-by: ZhenHua Li <[email protected]>
Tested-by: Baoquan He <[email protected]>
Signed-off-by: Joerg Roedel <[email protected]>

diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c
index 46d17e19a4612c2e1db8204c75a5cb17c69093e7..f1711836486f0fd00e002b48c599a2df9ef93d7d 100644 (file)
--- 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.
         */