Commit 6b6256e6 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

iommu/irq_remapping: Consolidate irq domain lookup 



Now that the iommu implementations handle the X86_*_GET_PARENT_DOMAIN
types, consolidate the two getter functions.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarJoerg Roedel <jroedel@suse.de>
Link: https://lore.kernel.org/r/20200826112331.741909337@linutronix.de
parent 192a99f4

arch/x86/include/asm/irq_remapping.h

+0 −8
Original line number Diff line number Diff line
@@ -44,8 +44,6 @@ extern int irq_remapping_reenable(int); 
extern int irq_remap_enable_fault_handling(void);

extern void panic_if_irq_remap(const char *msg);



extern struct irq_domain *

irq_remapping_get_ir_irq_domain(struct irq_alloc_info *info);

extern struct irq_domain *

irq_remapping_get_irq_domain(struct irq_alloc_info *info);
@@ -73,12 +71,6 @@ static inline void panic_if_irq_remap(const char *msg) 
{

}



static inline struct irq_domain *

irq_remapping_get_ir_irq_domain(struct irq_alloc_info *info)

{

	return NULL;

}



static inline struct irq_domain *

irq_remapping_get_irq_domain(struct irq_alloc_info *info)

{

arch/x86/kernel/apic/io_apic.c

+1 −1
Original line number Diff line number Diff line
@@ -2298,7 +2298,7 @@ static int mp_irqdomain_create(int ioapic) 
	init_irq_alloc_info(&info, NULL);

	info.type = X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT;

	info.ioapic_id = mpc_ioapic_id(ioapic);

	parent = irq_remapping_get_ir_irq_domain(&info);

	parent = irq_remapping_get_irq_domain(&info);

	if (!parent)

		parent = x86_vector_domain;

	else

arch/x86/kernel/apic/msi.c

+1 −1
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ struct irq_domain *hpet_create_irq_domain(int hpet_id) 
	init_irq_alloc_info(&info, NULL);

	info.type = X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT;

	info.hpet_id = hpet_id;

	parent = irq_remapping_get_ir_irq_domain(&info);

	parent = irq_remapping_get_irq_domain(&info);

	if (parent == NULL)

		parent = x86_vector_domain;

	else

drivers/iommu/amd/iommu.c

+0 −1
Original line number Diff line number Diff line
@@ -3575,7 +3575,6 @@ struct irq_remap_ops amd_iommu_irq_ops = { 
	.disable		= amd_iommu_disable,

	.reenable		= amd_iommu_reenable,

	.enable_faulting	= amd_iommu_enable_faulting,

	.get_ir_irq_domain	= get_irq_domain,

	.get_irq_domain		= get_irq_domain,

};

drivers/iommu/hyperv-iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ static int __init hyperv_enable_irq_remapping(void) 
	return IRQ_REMAP_X2APIC_MODE;

}



static struct irq_domain *hyperv_get_ir_irq_domain(struct irq_alloc_info *info)

static struct irq_domain *hyperv_get_irq_domain(struct irq_alloc_info *info)

{

	if (info->type == X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT)

		return ioapic_ir_domain;
@@ -193,7 +193,7 @@ static struct irq_domain *hyperv_get_ir_irq_domain(struct irq_alloc_info *info) 
struct irq_remap_ops hyperv_irq_remap_ops = {

	.prepare		= hyperv_prepare_irq_remapping,

	.enable			= hyperv_enable_irq_remapping,

	.get_ir_irq_domain	= hyperv_get_ir_irq_domain,

	.get_irq_domain		= hyperv_get_irq_domain,

};



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE