diff options
author | Jiang Liu <jiang.liu@linux.intel.com> | 2014-01-06 01:18:14 -0500 |
---|---|---|
committer | Joerg Roedel <joro@8bytes.org> | 2014-01-09 06:43:30 -0500 |
commit | b977e73a837963ad73d24db4ca7b71040791868c (patch) | |
tree | 3469d37f1ca030ff60635a56697d3410e9a479b6 /drivers/iommu/dmar.c | |
parent | 9544c003e85f6ac6b0b617e15266fe2e81caa42a (diff) |
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>
Diffstat (limited to 'drivers/iommu/dmar.c')
-rw-r--r-- | drivers/iommu/dmar.c | 8 |
1 files changed, 0 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) | |||
556 | if (ret) | 556 | if (ret) |
557 | ret = check_zero_address(); | 557 | ret = check_zero_address(); |
558 | { | 558 | { |
559 | struct acpi_table_dmar *dmar; | ||
560 | |||
561 | dmar = (struct acpi_table_dmar *) dmar_tbl; | ||
562 | |||
563 | if (ret && irq_remapping_enabled && cpu_has_x2apic && | ||
564 | dmar->flags & 0x1) | ||
565 | pr_info("Queued invalidation will be enabled to support x2apic and Intr-remapping.\n"); | ||
566 | |||
567 | if (ret && !no_iommu && !iommu_detected && !dmar_disabled) { | 559 | if (ret && !no_iommu && !iommu_detected && !dmar_disabled) { |
568 | iommu_detected = 1; | 560 | iommu_detected = 1; |
569 | /* Make sure ACS will be enabled */ | 561 | /* Make sure ACS will be enabled */ |