Commit ed381fca authored by David Woodhouse's avatar David Woodhouse Committed by Thomas Gleixner
Browse files

x86: Kill all traces of irq_remapping_get_irq_domain() 



All users are converted to use the fwspec based parent domain lookup.

Signed-off-by: default avatarDavid Woodhouse <dwmw@amazon.co.uk>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20201024213535.443185-30-dwmw2@infradead.org
parent b643128b

arch/x86/include/asm/hw_irq.h

+0 −2
Original line number Diff line number Diff line
@@ -40,8 +40,6 @@ enum irq_alloc_type { 
	X86_IRQ_ALLOC_TYPE_PCI_MSIX,

	X86_IRQ_ALLOC_TYPE_DMAR,

	X86_IRQ_ALLOC_TYPE_UV,

	X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT,

	X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT,

};



struct ioapic_alloc_info {

arch/x86/include/asm/irq_remapping.h

+0 −9
Original line number Diff line number Diff line
@@ -44,9 +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_irq_domain(struct irq_alloc_info *info);



/* Create PCI MSI/MSIx irqdomain, use @parent as the parent irqdomain. */

extern struct irq_domain *

arch_create_remap_msi_irq_domain(struct irq_domain *par, const char *n, int id);
@@ -71,11 +68,5 @@ static inline void panic_if_irq_remap(const char *msg) 
{

}



static inline struct irq_domain *

irq_remapping_get_irq_domain(struct irq_alloc_info *info)

{

	return NULL;

}



#endif /* CONFIG_IRQ_REMAP */

#endif /* __X86_IRQ_REMAPPING_H */

drivers/iommu/amd/iommu.c

+0 −34
Original line number Diff line number Diff line
@@ -3601,10 +3601,8 @@ static int get_devid(struct irq_alloc_info *info) 
{

	switch (info->type) {

	case X86_IRQ_ALLOC_TYPE_IOAPIC:

	case X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT:

		return get_ioapic_devid(info->devid);

	case X86_IRQ_ALLOC_TYPE_HPET:

	case X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT:

		return get_hpet_devid(info->devid);

	case X86_IRQ_ALLOC_TYPE_PCI_MSI:

	case X86_IRQ_ALLOC_TYPE_PCI_MSIX:
@@ -3615,44 +3613,12 @@ static int get_devid(struct irq_alloc_info *info) 
	}

}



static struct irq_domain *get_irq_domain_for_devid(struct irq_alloc_info *info,

						   int devid)

{

	struct amd_iommu *iommu = amd_iommu_rlookup_table[devid];



	if (!iommu)

		return NULL;



	switch (info->type) {

	case X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT:

	case X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT:

		return iommu->ir_domain;

	default:

		WARN_ON_ONCE(1);

		return NULL;

	}

}



static struct irq_domain *get_irq_domain(struct irq_alloc_info *info)

{

	int devid;



	if (!info)

		return NULL;



	devid = get_devid(info);

	if (devid < 0)

		return NULL;

	return get_irq_domain_for_devid(info, devid);

}



struct irq_remap_ops amd_iommu_irq_ops = {

	.prepare		= amd_iommu_prepare,

	.enable			= amd_iommu_enable,

	.disable		= amd_iommu_disable,

	.reenable		= amd_iommu_reenable,

	.enable_faulting	= amd_iommu_enable_faulting,

	.get_irq_domain		= get_irq_domain,

};



static void fill_msi_msg(struct msi_msg *msg, u32 index)

drivers/iommu/hyperv-iommu.c

+0 −9
Original line number Diff line number Diff line
@@ -160,18 +160,9 @@ static int __init hyperv_enable_irq_remapping(void) 
	return IRQ_REMAP_X2APIC_MODE;

}



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;

	else

		return NULL;

}



struct irq_remap_ops hyperv_irq_remap_ops = {

	.prepare		= hyperv_prepare_irq_remapping,

	.enable			= hyperv_enable_irq_remapping,

	.get_irq_domain		= hyperv_get_irq_domain,

};



#endif

drivers/iommu/intel/irq_remapping.c

+0 −17
Original line number Diff line number Diff line
@@ -1127,29 +1127,12 @@ static void prepare_irte(struct irte *irte, int vector, unsigned int dest) 
	irte->redir_hint = 1;

}



static struct irq_domain *intel_get_irq_domain(struct irq_alloc_info *info)

{

	if (!info)

		return NULL;



	switch (info->type) {

	case X86_IRQ_ALLOC_TYPE_IOAPIC_GET_PARENT:

		return map_ioapic_to_ir(info->devid);

	case X86_IRQ_ALLOC_TYPE_HPET_GET_PARENT:

		return map_hpet_to_ir(info->devid);

	default:

		WARN_ON_ONCE(1);

		return NULL;

	}

}



struct irq_remap_ops intel_irq_remap_ops = {

	.prepare		= intel_prepare_irq_remapping,

	.enable			= intel_enable_irq_remapping,

	.disable		= disable_irq_remapping,

	.reenable		= reenable_irq_remapping,

	.enable_faulting	= enable_drhd_fault_handling,

	.get_irq_domain		= intel_get_irq_domain,

};



static void intel_ir_reconfigure_irte(struct irq_data *irqd, bool force)