On 2013/11/29 16:50, Jiang Liu wrote:
> Flag irq_remapping_enabled is only set by intel_enable_irq_remapping(),
> which is called after detect_intel_iommu(). So we should check flag
> disable_irq_remap instead of irq_remapping_enabled in function
> detect_intel_iommu().
>
> Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxxxxxxx>
> ---
> drivers/iommu/dmar.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
> index f3043a2..77a066b 100644
> --- a/drivers/iommu/dmar.c
> +++ b/drivers/iommu/dmar.c
> @@ -561,7 +561,7 @@ int __init detect_intel_iommu(void)
>
> dmar = (struct acpi_table_dmar *) dmar_tbl;
>
> - if (ret && irq_remapping_enabled && cpu_has_x2apic &&
> + if (ret && !disable_irq_remap && cpu_has_x2apic &&
> dmar->flags & 0x1)
> pr_info("Queued invalidation will be enabled to support x2apic and Intr-remapping.\n");
>
>
Reviewed-by: Yijing Wang <wangyijing@xxxxxxxxxx>
--
Thanks!
Yijing
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
