Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752780AbbFDIMW (ORCPT ); Thu, 4 Jun 2015 04:12:22 -0400 Received: from mga03.intel.com ([134.134.136.65]:25875 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751817AbbFDIMK (ORCPT ); Thu, 4 Jun 2015 04:12:10 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,551,1427785200"; d="scan'208";a="581897520" Message-ID: <55700857.4000105@linux.intel.com> Date: Thu, 04 Jun 2015 16:12:07 +0800 From: Jiang Liu Organization: Intel User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Daniel J Blueman CC: Thomas Gleixner , Fenghua Yu , Steffen Persvold , LKML Subject: Re: [PATCH -next] iommu: Fix build failure without INTEL_IOMMU References: <1433405233-28180-1-git-send-email-daniel@numascale.com> In-Reply-To: <1433405233-28180-1-git-send-email-daniel@numascale.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2565 Lines: 76 Hi Daniel, Seems there's already a patch to fix this issue posted by Joerg http://www.spinics.net/lists/kernel/msg2004510.html Thanks! Gerry On 2015/6/4 16:07, Daniel J Blueman wrote: > Fix Intel IOMMU build failure in linux-next when CONFIG_INTEL_IOMMU is not enabled. > > Signed-off-by: Daniel J Blueman > --- > drivers/iommu/intel_irq_remapping.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/iommu/intel_irq_remapping.c b/drivers/iommu/intel_irq_remapping.c > index 24f7a35..ec337e7 100644 > --- a/drivers/iommu/intel_irq_remapping.c > +++ b/drivers/iommu/intel_irq_remapping.c > @@ -146,8 +146,10 @@ static int modify_irte(struct irq_2_iommu *irq_iommu, > set_64bit(&irte->low, irte_modified->low); > set_64bit(&irte->high, irte_modified->high); > > +#ifdef CONFIG_INTEL_IOMMU > if (iommu->pre_enabled_ir) > __iommu_update_old_irte(iommu, index); > +#endif > > __iommu_flush_cache(iommu, irte, sizeof(*irte)); > > @@ -210,8 +212,10 @@ static int clear_entries(struct irq_2_iommu *irq_iommu) > bitmap_release_region(iommu->ir_table->bitmap, index, > irq_iommu->irte_mask); > > +#ifdef CONFIG_INTEL_IOMMU > if (iommu->pre_enabled_ir) > __iommu_update_old_irte(iommu, -1); > +#endif > > return qi_flush_iec(iommu, index, irq_iommu->irte_mask); > } > @@ -650,6 +654,7 @@ static int __init intel_enable_irq_remapping(void) > * Setup Interrupt-remapping for all the DRHD's now. > */ > for_each_iommu(iommu, drhd) { > +#ifdef CONFIG_INTEL_IOMMU > if (iommu->pre_enabled_ir) { > unsigned long long q; > > @@ -660,6 +665,7 @@ static int __init intel_enable_irq_remapping(void) > INTR_REMAP_TABLE_ENTRIES*sizeof(struct irte)); > __iommu_load_old_irte(iommu); > } else > +#endif > iommu_set_irq_remapping(iommu, eim); > > setup = true; > @@ -1374,6 +1380,7 @@ static int __iommu_update_old_irte(struct intel_iommu *iommu, int index) > > static void iommu_check_pre_ir_status(struct intel_iommu *iommu) > { > +#ifdef CONFIG_INTEL_IOMMU > u32 sts; > > sts = readl(iommu->reg + DMAR_GSTS_REG); > @@ -1381,4 +1388,5 @@ static void iommu_check_pre_ir_status(struct intel_iommu *iommu) > pr_info("IR is enabled prior to OS.\n"); > iommu->pre_enabled_ir = 1; > } > +#endif > } > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/