iommu: Fix build failure without INTEL_IOMMU
PATCH 1/1 iommu: Fix build failure without INTEL_IOMMU
Fix Intel IOMMU build failure in linux-next when CONFIG_INTEL_IOMMU is not enabled.
Signed-off-by Daniel J Blueman <[email protected]>
--- drivers/iommu/intel_irq_remapping.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/iommu/intel_irq_remapping.c +8 -0
@@ -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 }
Signature · 1 line
2.1.4
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
Quoted 64 lines · Daniel J Blueman
Fix Intel IOMMU build failure in linux-next when
CONFIG_INTEL_IOMMUis not enabled.Signed-off-by Daniel J Blueman <[email protected]>--- drivers/iommu/intel_irq_remapping.c | 8 ++++++++ 1 file changed, 8 insertions(+)drivers/iommu/intel_irq_remapping.c +8
-0@@ -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 }