From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752726Ab3LBBr1 (ORCPT ); Sun, 1 Dec 2013 20:47:27 -0500 Received: from szxga01-in.huawei.com ([119.145.14.64]:61406 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752488Ab3LBBrY (ORCPT ); Sun, 1 Dec 2013 20:47:24 -0500 Message-ID: <529BE5EF.7040706@huawei.com> Date: Mon, 2 Dec 2013 09:44:15 +0800 From: Yijing Wang User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: Jiang Liu , Yinghai Lu , Joerg Roedel , David Woodhouse , "Dan Williams" , Vinod Koul , Ashok Raj CC: , , , Subject: Re: [Patch Part1 V2 07/17] iommu/vt-d, trivial: check suitable flag in function detect_intel_iommu() References: <1385715030-20553-1-git-send-email-jiang.liu@linux.intel.com> <1385715030-20553-8-git-send-email-jiang.liu@linux.intel.com> In-Reply-To: <1385715030-20553-8-git-send-email-jiang.liu@linux.intel.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.135.76.69] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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 -- Thanks! Yijing