diff options
| author | Jiang Liu <jiang.liu@linux.intel.com> | 2014-01-06 10:18:14 +0400 |
|---|---|---|
| committer | Joerg Roedel <joro@8bytes.org> | 2014-01-09 15:43:30 +0400 |
| commit | b977e73a837963ad73d24db4ca7b71040791868c (patch) | |
| tree | 3469d37f1ca030ff60635a56697d3410e9a479b6 | |
| parent | 9544c003e85f6ac6b0b617e15266fe2e81caa42a (diff) | |
| download | linux-b977e73a837963ad73d24db4ca7b71040791868c.tar.xz | |
iommu/vt-d, trivial: check suitable flag in function detect_intel_iommu()
Flag irq_remapping_enabled is only set by intel_enable_irq_remapping(),
which is called after detect_intel_iommu(). So moving pr_info() from
detect_intel_iommu() to intel_enable_irq_remapping(), which also
slightly simplifies implementation.
Reviewed-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Joerg Roedel <joro@8bytes.org>
| -rw-r--r-- | drivers/iommu/dmar.c | 8 | ||||
| -rw-r--r-- | drivers/iommu/intel_irq_remapping.c | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 28d93b68ff02..e4c3ea022428 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c @@ -556,14 +556,6 @@ int __init detect_intel_iommu(void) if (ret) ret = check_zero_address(); { - struct acpi_table_dmar *dmar; - - dmar = (struct acpi_table_dmar *) dmar_tbl; - - if (ret && irq_remapping_enabled && cpu_has_x2apic && - dmar->flags & 0x1) - pr_info("Queued invalidation will be enabled to support x2apic and Intr-remapping.\n"); - if (ret && !no_iommu && !iommu_detected && !dmar_disabled) { iommu_detected = 1; /* Make sure ACS will be enabled */ diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c index 3aa9b5c347e4..b9256a4f946d 100644 --- a/drivers/iommu/intel_irq_remapping.c +++ b/drivers/iommu/intel_irq_remapping.c @@ -561,6 +561,8 @@ static int __init intel_enable_irq_remapping(void) } if (x2apic_present) { + pr_info("Queued invalidation will be enabled to support x2apic and Intr-remapping.\n"); + eim = !dmar_x2apic_optout(); if (!eim) printk(KERN_WARNING |