diff options
| author | Joerg Roedel <jroedel@suse.de> | 2015-06-12 14:25:53 +0200 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-06-16 10:59:35 +0200 |
| commit | c676f5876bc088ace35ece98042a3be6d8329530 (patch) | |
| tree | beb6be642bad0bc28dec87992351611819004096 /drivers/iommu/intel_irq_remapping.c | |
| parent | 9e4e49dfde3bfac48d431893863ac3b9d3f3774a (diff) | |
| download | linux-stable-c676f5876bc088ace35ece98042a3be6d8329530.tar.gz linux-stable-c676f5876bc088ace35ece98042a3be6d8329530.tar.bz2 linux-stable-c676f5876bc088ace35ece98042a3be6d8329530.zip | |
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 <zhen-hual@hp.com>
Tested-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu/intel_irq_remapping.c')
| -rw-r--r-- | drivers/iommu/intel_irq_remapping.c | 6 |
1 files changed, 3 insertions, 3 deletions
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. */ |