Commit dec02dea authored by Jan Beulich's avatar Jan Beulich Committed by Konrad Rzeszutek Wilk

xen: drop tracking of IRQ vector

For quite a few Xen versions, this wasn't the IRQ vector anymore
anyway, and it is not being used by the kernel for anything. Hence
drop the field from struct irq_info, and respective function
parameters.
Signed-off-by: default avatarJan Beulich <jbeulich@suse.com>
Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 96f28bc6
...@@ -177,7 +177,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) ...@@ -177,7 +177,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
goto error; goto error;
i = 0; i = 0;
list_for_each_entry(msidesc, &dev->msi_list, list) { list_for_each_entry(msidesc, &dev->msi_list, list) {
irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i], 0, irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i],
(type == PCI_CAP_ID_MSIX) ? (type == PCI_CAP_ID_MSIX) ?
"pcifront-msi-x" : "pcifront-msi-x" :
"pcifront-msi", "pcifront-msi",
...@@ -244,7 +244,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) ...@@ -244,7 +244,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
dev_dbg(&dev->dev, dev_dbg(&dev->dev,
"xen: msi already bound to pirq=%d\n", pirq); "xen: msi already bound to pirq=%d\n", pirq);
} }
irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq, 0, irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq,
(type == PCI_CAP_ID_MSIX) ? (type == PCI_CAP_ID_MSIX) ?
"msi-x" : "msi", "msi-x" : "msi",
DOMID_SELF); DOMID_SELF);
...@@ -326,7 +326,7 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) ...@@ -326,7 +326,7 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
} }
ret = xen_bind_pirq_msi_to_irq(dev, msidesc, ret = xen_bind_pirq_msi_to_irq(dev, msidesc,
map_irq.pirq, map_irq.index, map_irq.pirq,
(type == PCI_CAP_ID_MSIX) ? (type == PCI_CAP_ID_MSIX) ?
"msi-x" : "msi", "msi-x" : "msi",
domid); domid);
......
...@@ -85,8 +85,7 @@ enum xen_irq_type { ...@@ -85,8 +85,7 @@ enum xen_irq_type {
* event channel - irq->event channel mapping * event channel - irq->event channel mapping
* cpu - cpu this event channel is bound to * cpu - cpu this event channel is bound to
* index - type-specific information: * index - type-specific information:
* PIRQ - vector, with MSB being "needs EIO", or physical IRQ of the HVM * PIRQ - physical IRQ, GSI, flags, and owner domain
* guest, or GSI (real passthrough IRQ) of the device.
* VIRQ - virq number * VIRQ - virq number
* IPI - IPI vector * IPI - IPI vector
* EVTCHN - * EVTCHN -
...@@ -105,7 +104,6 @@ struct irq_info { ...@@ -105,7 +104,6 @@ struct irq_info {
struct { struct {
unsigned short pirq; unsigned short pirq;
unsigned short gsi; unsigned short gsi;
unsigned char vector;
unsigned char flags; unsigned char flags;
uint16_t domid; uint16_t domid;
} pirq; } pirq;
...@@ -211,7 +209,6 @@ static void xen_irq_info_pirq_init(unsigned irq, ...@@ -211,7 +209,6 @@ static void xen_irq_info_pirq_init(unsigned irq,
unsigned short evtchn, unsigned short evtchn,
unsigned short pirq, unsigned short pirq,
unsigned short gsi, unsigned short gsi,
unsigned short vector,
uint16_t domid, uint16_t domid,
unsigned char flags) unsigned char flags)
{ {
...@@ -221,7 +218,6 @@ static void xen_irq_info_pirq_init(unsigned irq, ...@@ -221,7 +218,6 @@ static void xen_irq_info_pirq_init(unsigned irq,
info->u.pirq.pirq = pirq; info->u.pirq.pirq = pirq;
info->u.pirq.gsi = gsi; info->u.pirq.gsi = gsi;
info->u.pirq.vector = vector;
info->u.pirq.domid = domid; info->u.pirq.domid = domid;
info->u.pirq.flags = flags; info->u.pirq.flags = flags;
} }
...@@ -714,7 +710,7 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi, ...@@ -714,7 +710,7 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
goto out; goto out;
} }
xen_irq_info_pirq_init(irq, 0, pirq, gsi, irq_op.vector, DOMID_SELF, xen_irq_info_pirq_init(irq, 0, pirq, gsi, DOMID_SELF,
shareable ? PIRQ_SHAREABLE : 0); shareable ? PIRQ_SHAREABLE : 0);
pirq_query_unmask(irq); pirq_query_unmask(irq);
...@@ -762,8 +758,7 @@ int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc) ...@@ -762,8 +758,7 @@ 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 xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
int pirq, int vector, const char *name, int pirq, const char *name, domid_t domid)
domid_t domid)
{ {
int irq, ret; int irq, ret;
...@@ -776,7 +771,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc, ...@@ -776,7 +771,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_edge_irq, irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_edge_irq,
name); name);
xen_irq_info_pirq_init(irq, 0, pirq, 0, vector, domid, 0); xen_irq_info_pirq_init(irq, 0, pirq, 0, domid, 0);
ret = irq_set_msi_desc(irq, msidesc); ret = irq_set_msi_desc(irq, msidesc);
if (ret < 0) if (ret < 0)
goto error_irq; goto error_irq;
......
...@@ -90,8 +90,7 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi, ...@@ -90,8 +90,7 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc); int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc);
/* Bind an PSI pirq to an irq. */ /* Bind an PSI pirq to an irq. */
int xen_bind_pirq_msi_to_irq(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 pirq, const char *name, domid_t domid);
domid_t domid);
#endif #endif
/* De-allocates the above mentioned physical interrupt. */ /* De-allocates the above mentioned physical interrupt. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment