From: Joerg Roedel Date: Fri, 12 Jun 2015 12:25:53 +0000 (+0200) Subject: iommu/vt-d: Disable IRQ remapping in intel_prepare_irq_remapping X-Git-Tag: firefly_0821_release~176^2~1511^2~4^4~4 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c676f5876bc088ace35ece98042a3be6d8329530;p=firefly-linux-kernel-4.4.55.git 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 Tested-by: Baoquan He Signed-off-by: Joerg Roedel --- diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 46d17e19a461..f1711836486f 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. */