Commit 71eef7d1 authored by Ian Campbell's avatar Ian Campbell Committed by Konrad Rzeszutek Wilk
Browse files

xen: events: remove dom0 specific xen_create_msi_irq 



The function name does not distinguish it from xen_allocate_pirq_msi
(which operates on domU and pvhvm domains rather than dom0).

Hoist domain 0 specific functionality up into the only caller leaving
functionality common to all guest types in xen_bind_pirq_msi_to_irq.

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent ca1d8fe9

arch/x86/pci/xen.c

+40 −5
Original line number Diff line number Diff line
@@ -185,15 +185,50 @@ static void xen_teardown_msi_irq(unsigned int irq) 
#ifdef CONFIG_XEN_DOM0

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

{

	int irq;

	int ret = 0;

	struct msi_desc *msidesc;



	list_for_each_entry(msidesc, &dev->msi_list, list) {

		irq = xen_create_msi_irq(dev, msidesc, type);

		if (irq < 0)

			return -1;

		struct physdev_map_pirq map_irq;



		memset(&map_irq, 0, sizeof(map_irq));

		map_irq.domid = DOMID_SELF;

		map_irq.type = MAP_PIRQ_TYPE_MSI;

		map_irq.index = -1;

		map_irq.pirq = -1;

		map_irq.bus = dev->bus->number;

		map_irq.devfn = dev->devfn;



		if (type == PCI_CAP_ID_MSIX) {

			int pos;

			u32 table_offset, bir;



			pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);



			pci_read_config_dword(dev, pos + PCI_MSIX_TABLE,

					      &table_offset);

			bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);



			map_irq.table_base = pci_resource_start(dev, bir);

			map_irq.entry_nr = msidesc->msi_attrib.entry_nr;

		}

	return 0;



		ret = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);

		if (ret) {

			dev_warn(&dev->dev, "xen map irq failed %d\n", ret);

			goto out;

		}



		ret = xen_bind_pirq_msi_to_irq(dev, msidesc,

					       map_irq.pirq, map_irq.index,

					       (type == PCI_CAP_ID_MSIX) ?

					       "msi-x" : "msi");

		if (ret < 0)

			goto out;

	}

	ret = 0;

out:

	return ret;

}

#endif

#endif

drivers/xen/events.c

+0 −41
Original line number Diff line number Diff line
@@ -644,9 +644,6 @@ out: 
}



#ifdef CONFIG_PCI_MSI

#include <linux/msi.h>

#include "../pci/msi.h"



int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc)

{

	int rc;
@@ -688,44 +685,6 @@ error_irq: 
	xen_free_irq(irq);

	return -1;

}



int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type)

{

	struct physdev_map_pirq map_irq;

	int rc;

	int pos;

	u32 table_offset, bir;



	memset(&map_irq, 0, sizeof(map_irq));

	map_irq.domid = DOMID_SELF;

	map_irq.type = MAP_PIRQ_TYPE_MSI;

	map_irq.index = -1;

	map_irq.pirq = -1;

	map_irq.bus = dev->bus->number;

	map_irq.devfn = dev->devfn;



	if (type == PCI_CAP_ID_MSIX) {

		pos = pci_find_capability(dev, PCI_CAP_ID_MSIX);



		pci_read_config_dword(dev, msix_table_offset_reg(pos),

					&table_offset);

		bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);



		map_irq.table_base = pci_resource_start(dev, bir);

		map_irq.entry_nr = msidesc->msi_attrib.entry_nr;

	}



	rc = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);

	if (rc) {

		dev_warn(&dev->dev, "xen map irq failed %d\n", rc);

		return -1;

	}



	return xen_bind_pirq_msi_to_irq(dev, msidesc,

					map_irq.pirq, map_irq.index,

					(type == PCI_CAP_ID_MSIX) ?

					"msi-x" : "msi");

}

#endif



int xen_destroy_irq(int irq)

include/xen/events.h

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ int xen_map_pirq_gsi(unsigned pirq, unsigned gsi, int shareable, char *name); 
int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc);

int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,

			     int pirq, int vector, const char *name);

int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type);

#endif



/* De-allocates the above mentioned physical interrupt. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE