diff options
| author |   Jiang Liu <jiang.liu@linux.intel.com> | 2014-11-09 22:48:01 +0800 |
|---|---|---|
| committer |   Joerg Roedel <jroedel@suse.de> | 2014-11-18 11:18:36 +0100 |
| commit | 51acce33c4df6ee23b5ad4c2e6c239e0d6f25771 (patch) | |
| tree | b2862ac19da7f683be590e49d94e3c57eae89ca0 /drivers/iommu | |
| parent | iommu/vt-d: Enhance intel_irq_remapping driver to support DMAR unit hotplug (diff) | |
| download | linux-dev-51acce33c4df6ee23b5ad4c2e6c239e0d6f25771.tar.xz linux-dev-51acce33c4df6ee23b5ad4c2e6c239e0d6f25771.zip | |
iommu/vt-d: Enhance error recovery in function intel_enable_irq_remapping()
Enhance error recovery in function intel_enable_irq_remapping()
by tearing down all created data structures.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Reviewed-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/intel_irq_remapping.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 7af0b56dc2d1..27541d440849 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -702,9 +702,11 @@ static int __init intel_enable_irq_remapping(void) return eim ? IRQ_REMAP_X2APIC_MODE : IRQ_REMAP_XAPIC_MODE; error: - /* - * handle error condition gracefully here! - */ + for_each_iommu(iommu, drhd) + if (ecap_ir_support(iommu->ecap)) { + iommu_disable_irq_remapping(iommu); + intel_teardown_irq_remapping(iommu); + } if (x2apic_present) pr_warn("Failed to enable irq remapping. You are vulnerable to irq-injection attacks.\n"); |