iommu/vt-d, trivial: check suitable flag in function detect_intel_iommu() (b977e73a) · Commits · 戴 / test

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>

drivers/iommu/dmar.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -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 */

drivers/iommu/intel_irq_remapping.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

Admin message