Commit 874a2013 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/irq: Make most MSI ops XEN private 



Nothing except XEN uses the setup/teardown ops. Hide them there.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20200826112334.198633344@linutronix.de
parent 7ca435cf

arch/x86/include/asm/x86_init.h

+0 −2
Original line number Diff line number Diff line
@@ -276,8 +276,6 @@ struct x86_platform_ops { 
struct pci_dev;



struct x86_msi_ops {

	int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);

	void (*teardown_msi_irqs)(struct pci_dev *dev);

	void (*restore_msi_irqs)(struct pci_dev *dev);

};

arch/x86/pci/xen.c

+14 −7
Original line number Diff line number Diff line
@@ -157,6 +157,13 @@ static int acpi_register_gsi_xen(struct device *dev, u32 gsi, 
struct xen_pci_frontend_ops *xen_pci_frontend;

EXPORT_SYMBOL_GPL(xen_pci_frontend);



struct xen_msi_ops {

	int (*setup_msi_irqs)(struct pci_dev *dev, int nvec, int type);

	void (*teardown_msi_irqs)(struct pci_dev *dev);

};



static struct xen_msi_ops xen_msi_ops __ro_after_init;



static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)

{

	int irq, ret, i;
@@ -415,7 +422,7 @@ static int xen_msi_domain_alloc_irqs(struct irq_domain *domain, 
	else

		type = PCI_CAP_ID_MSI;



	return x86_msi.setup_msi_irqs(to_pci_dev(dev), nvec, type);

	return xen_msi_ops.setup_msi_irqs(to_pci_dev(dev), nvec, type);

}



static void xen_msi_domain_free_irqs(struct irq_domain *domain,
@@ -424,7 +431,7 @@ static void xen_msi_domain_free_irqs(struct irq_domain *domain, 
	if (WARN_ON_ONCE(!dev_is_pci(dev)))

		return;



	x86_msi.teardown_msi_irqs(to_pci_dev(dev));

	xen_msi_ops.teardown_msi_irqs(to_pci_dev(dev));

}



static struct msi_domain_ops xen_pci_msi_domain_ops = {
@@ -463,16 +470,16 @@ static __init void xen_setup_pci_msi(void) 
{

	if (xen_pv_domain()) {

		if (xen_initial_domain()) {

			x86_msi.setup_msi_irqs = xen_initdom_setup_msi_irqs;

			xen_msi_ops.setup_msi_irqs = xen_initdom_setup_msi_irqs;

			x86_msi.restore_msi_irqs = xen_initdom_restore_msi_irqs;

		} else {

			x86_msi.setup_msi_irqs = xen_setup_msi_irqs;

			xen_msi_ops.setup_msi_irqs = xen_setup_msi_irqs;

		}

		x86_msi.teardown_msi_irqs = xen_pv_teardown_msi_irqs;

		xen_msi_ops.teardown_msi_irqs = xen_pv_teardown_msi_irqs;

		pci_msi_ignore_mask = 1;

	} else if (xen_hvm_domain()) {

		x86_msi.setup_msi_irqs = xen_hvm_setup_msi_irqs;

		x86_msi.teardown_msi_irqs = xen_teardown_msi_irqs;

		xen_msi_ops.setup_msi_irqs = xen_hvm_setup_msi_irqs;

		xen_msi_ops.teardown_msi_irqs = xen_teardown_msi_irqs;

	} else {

		WARN_ON_ONCE(1);

		return;