Commit 9006c133 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/msi: Use generic MSI domain ops 



pci_msi_get_hwirq() and pci_msi_set_desc are not longer special. Enable the
generic MSI domain ops in the core and PCI MSI code unconditionally and get
rid of the x86 specific implementations in the X86 MSI code and in the
hyperv PCI driver.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200826112332.564274859@linutronix.de
parent 3b9c1d37

arch/x86/include/asm/msi.h

+0 −2
Original line number Diff line number Diff line
@@ -9,6 +9,4 @@ typedef struct irq_alloc_info msi_alloc_info_t; 
int pci_msi_prepare(struct irq_domain *domain, struct device *dev, int nvec,

		    msi_alloc_info_t *arg);



void pci_msi_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc);



#endif /* _ASM_X86_MSI_H */

arch/x86/kernel/apic/msi.c

+1 −29
Original line number Diff line number Diff line
@@ -203,12 +203,6 @@ void native_teardown_msi_irq(unsigned int irq) 
	irq_domain_free_irqs(irq, 1);

}



static irq_hw_number_t pci_msi_get_hwirq(struct msi_domain_info *info,

					 msi_alloc_info_t *arg)

{

	return arg->hwirq;

}



int pci_msi_prepare(struct irq_domain *domain, struct device *dev, int nvec,

		    msi_alloc_info_t *arg)

{
@@ -227,17 +221,8 @@ int pci_msi_prepare(struct irq_domain *domain, struct device *dev, int nvec, 
}

EXPORT_SYMBOL_GPL(pci_msi_prepare);



void pci_msi_set_desc(msi_alloc_info_t *arg, struct msi_desc *desc)

{

	arg->desc = desc;

	arg->hwirq = pci_msi_domain_calc_hwirq(desc);

}

EXPORT_SYMBOL_GPL(pci_msi_set_desc);



static struct msi_domain_ops pci_msi_domain_ops = {

	.get_hwirq	= pci_msi_get_hwirq,

	.msi_prepare	= pci_msi_prepare,

	.set_desc	= pci_msi_set_desc,

};



static struct msi_domain_info pci_msi_domain_info = {
@@ -322,12 +307,6 @@ static struct irq_chip dmar_msi_controller = { 
	.flags			= IRQCHIP_SKIP_SET_WAKE,

};



static irq_hw_number_t dmar_msi_get_hwirq(struct msi_domain_info *info,

					  msi_alloc_info_t *arg)

{

	return arg->hwirq;

}



static int dmar_msi_init(struct irq_domain *domain,

			 struct msi_domain_info *info, unsigned int virq,

			 irq_hw_number_t hwirq, msi_alloc_info_t *arg)
@@ -339,7 +318,6 @@ static int dmar_msi_init(struct irq_domain *domain, 
}



static struct msi_domain_ops dmar_msi_domain_ops = {

	.get_hwirq	= dmar_msi_get_hwirq,

	.msi_init	= dmar_msi_init,

};
@@ -381,6 +359,7 @@ int dmar_alloc_hwirq(int id, int node, void *arg) 
	init_irq_alloc_info(&info, NULL);

	info.type = X86_IRQ_ALLOC_TYPE_DMAR;

	info.devid = id;

	info.hwirq = id;

	info.data = arg;



	return irq_domain_alloc_irqs(domain, 1, node, &info);
@@ -419,12 +398,6 @@ static struct irq_chip hpet_msi_controller __ro_after_init = { 
	.flags = IRQCHIP_SKIP_SET_WAKE,

};



static irq_hw_number_t hpet_msi_get_hwirq(struct msi_domain_info *info,

					  msi_alloc_info_t *arg)

{

	return arg->hwirq;

}



static int hpet_msi_init(struct irq_domain *domain,

			 struct msi_domain_info *info, unsigned int virq,

			 irq_hw_number_t hwirq, msi_alloc_info_t *arg)
@@ -443,7 +416,6 @@ static void hpet_msi_free(struct irq_domain *domain, 
}



static struct msi_domain_ops hpet_msi_domain_ops = {

	.get_hwirq	= hpet_msi_get_hwirq,

	.msi_init	= hpet_msi_init,

	.msi_free	= hpet_msi_free,

};

drivers/pci/controller/pci-hyperv.c

+0 −8
Original line number Diff line number Diff line
@@ -1531,16 +1531,8 @@ static struct irq_chip hv_msi_irq_chip = { 
	.irq_unmask		= hv_irq_unmask,

};



static irq_hw_number_t hv_msi_domain_ops_get_hwirq(struct msi_domain_info *info,

						   msi_alloc_info_t *arg)

{

	return arg->hwirq;

}



static struct msi_domain_ops hv_msi_ops = {

	.get_hwirq	= hv_msi_domain_ops_get_hwirq,

	.msi_prepare	= pci_msi_prepare,

	.set_desc	= pci_msi_set_desc,

	.msi_free	= hv_msi_free,

};

drivers/pci/msi.c

+1 −5
Original line number Diff line number Diff line
@@ -1350,7 +1350,7 @@ void pci_msi_domain_write_msg(struct irq_data *irq_data, struct msi_msg *msg) 
 *

 * The ID number is only used within the irqdomain.

 */

irq_hw_number_t pci_msi_domain_calc_hwirq(struct msi_desc *desc)

static irq_hw_number_t pci_msi_domain_calc_hwirq(struct msi_desc *desc)

{

	struct pci_dev *dev = msi_desc_to_pci_dev(desc);
@@ -1401,16 +1401,12 @@ static int pci_msi_domain_handle_error(struct irq_domain *domain, 
	return error;

}



#ifdef GENERIC_MSI_DOMAIN_OPS

static void pci_msi_domain_set_desc(msi_alloc_info_t *arg,

				    struct msi_desc *desc)

{

	arg->desc = desc;

	arg->hwirq = pci_msi_domain_calc_hwirq(desc);

}

#else

#define pci_msi_domain_set_desc		NULL

#endif



static struct msi_domain_ops pci_msi_domain_ops_default = {

	.set_desc	= pci_msi_domain_set_desc,

include/linux/msi.h

+0 −1
Original line number Diff line number Diff line
@@ -369,7 +369,6 @@ void pci_msi_domain_write_msg(struct irq_data *irq_data, struct msi_msg *msg); 
struct irq_domain *pci_msi_create_irq_domain(struct fwnode_handle *fwnode,

					     struct msi_domain_info *info,

					     struct irq_domain *parent);

irq_hw_number_t pci_msi_domain_calc_hwirq(struct msi_desc *desc);

int pci_msi_domain_check_cap(struct irq_domain *domain,

			     struct msi_domain_info *info, struct device *dev);

u32 pci_msi_domain_get_msi_rid(struct irq_domain *domain, struct pci_dev *pdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE