Commit c676f587 authored by Joerg Roedel's avatar Joerg Roedel

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: default avatarZhenHua Li <zhen-hual@hp.com>
Tested-by: default avatarBaoquan He <bhe@redhat.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 9e4e49df
...@@ -654,6 +654,9 @@ static int __init intel_prepare_irq_remapping(void) ...@@ -654,6 +654,9 @@ static int __init intel_prepare_irq_remapping(void)
pr_info("%s does not support EIM\n", iommu->name); pr_info("%s does not support EIM\n", iommu->name);
eim = 0; eim = 0;
} }
/* Disable IRQ remapping if it is already enabled */
iommu_disable_irq_remapping(iommu);
} }
eim_mode = eim; eim_mode = eim;
...@@ -682,9 +685,6 @@ static int __init intel_enable_irq_remapping(void) ...@@ -682,9 +685,6 @@ static int __init intel_enable_irq_remapping(void)
struct intel_iommu *iommu; struct intel_iommu *iommu;
bool setup = false; bool setup = false;
for_each_iommu(iommu, drhd)
iommu_disable_irq_remapping(iommu);
/* /*
* Setup Interrupt-remapping for all the DRHD's now. * Setup Interrupt-remapping for all the DRHD's now.
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment