leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iommu: dmar: Provide arch specific irq allocation

Browse Source 
ia64 and x86 share this driver. x86 is moving to a different irq
allocation and ia64 keeps its private irq_create/destroy stuff.

Use macros to redirect to one or the other. Yes, macros to avoid
include hell.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Grant Likely <grant.likely@linaro.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Acked-by: Joerg Roedel <joro@8bytes.org>
Cc: x86@kernel.org
Cc: linux-ia64@vger.kernel.org
Cc: iommu@lists.linux-foundation.org
Link: http://lkml.kernel.org/r/20140507154336.372289825@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2014-05-07 15:44:11 +00:00
parent aa5125a455
commit a553b142b8
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/ia64/include/asm/irq_remapping.h
View File

@ -1,4 +1,6 @@
#ifndef __IA64_INTR_REMAPPING_H #ifndef __IA64_INTR_REMAPPING_H
#define __IA64_INTR_REMAPPING_H #define __IA64_INTR_REMAPPING_H
#define irq_remapping_enabled 0 #define irq_remapping_enabled 0
#define dmar_alloc_hwirq create_irq
#define dmar_free_hwirq destroy_irq
#endif #endif

3
arch/x86/include/asm/irq_remapping.h
View File

@ -103,4 +103,7 @@ static inline bool setup_remapped_irq(int irq,
} }
#endif /* CONFIG_IRQ_REMAP */ #endif /* CONFIG_IRQ_REMAP */
#define dmar_alloc_hwirq() irq_alloc_hwirq(-1)
#define dmar_free_hwirq irq_free_hwirq
#endif /* __X86_IRQ_REMAPPING_H */ #endif /* __X86_IRQ_REMAPPING_H */

6
drivers/iommu/dmar.c
View File

@ -994,7 +994,7 @@ static void free_iommu(struct intel_iommu *iommu)
if (iommu->irq) { if (iommu->irq) {
free_irq(iommu->irq, iommu); free_irq(iommu->irq, iommu);
irq_set_handler_data(iommu->irq, NULL); irq_set_handler_data(iommu->irq, NULL);
destroy_irq(iommu->irq); dmar_free_hwirq(iommu->irq);
} }
if (iommu->qi) { if (iommu->qi) {
@ -1550,7 +1550,7 @@ int dmar_set_interrupt(struct intel_iommu *iommu)
if (iommu->irq) if (iommu->irq)
return 0; return 0;
irq = create_irq(); irq = dmar_alloc_hwirq();
if (irq <= 0) { if (irq <= 0) {
pr_err("IOMMU: no free vectors\n"); pr_err("IOMMU: no free vectors\n");
return -EINVAL; return -EINVAL;
@ -1563,7 +1563,7 @@ int dmar_set_interrupt(struct intel_iommu *iommu)
if (ret) { if (ret) {
irq_set_handler_data(irq, NULL); irq_set_handler_data(irq, NULL);
iommu->irq = 0; iommu->irq = 0;
destroy_irq(irq); dmar_free_hwirq(irq);
return ret; return ret;
} }