Skip to content

Commit

Permalink
iommu/vt-d: Don't disable IR when it was previously enabled
Browse files Browse the repository at this point in the history
Keep it enabled in kdump kernel to guarantee interrupt
delivery.

Tested-by: ZhenHua Li <zhen-hual@hp.com>
Tested-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
  • Loading branch information
Joerg Roedel committed Jun 16, 2015
1 parent 7c3c987 commit 571dbbd
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/iommu/intel_irq_remapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -742,9 +742,6 @@ 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;
Expand Down Expand Up @@ -777,7 +774,8 @@ static int __init intel_enable_irq_remapping(void)
* Setup Interrupt-remapping for all the DRHD's now.
*/
for_each_iommu(iommu, drhd) {
iommu_enable_irq_remapping(iommu);
if (!ir_pre_enabled(iommu))
iommu_enable_irq_remapping(iommu);
setup = true;
}

Expand Down

0 comments on commit 571dbbd

Please sign in to comment.