Skip to content

Commit dec02de

Browse files
jbeulichkonradwilk
authored andcommitted
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: Jan Beulich <jbeulich@suse.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
1 parent 96f28bc commit dec02de

3 files changed

Lines changed: 8 additions & 14 deletions

File tree

arch/x86/pci/xen.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
177177
goto error;
178178
i = 0;
179179
list_for_each_entry(msidesc, &dev->msi_list, list) {
180-
irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i], 0,
180+
irq = xen_bind_pirq_msi_to_irq(dev, msidesc, v[i],
181181
(type == PCI_CAP_ID_MSIX) ?
182182
"pcifront-msi-x" :
183183
"pcifront-msi",
@@ -244,7 +244,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
244244
dev_dbg(&dev->dev,
245245
"xen: msi already bound to pirq=%d\n", pirq);
246246
}
247-
irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq, 0,
247+
irq = xen_bind_pirq_msi_to_irq(dev, msidesc, pirq,
248248
(type == PCI_CAP_ID_MSIX) ?
249249
"msi-x" : "msi",
250250
DOMID_SELF);
@@ -326,7 +326,7 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
326326
}
327327

328328
ret = xen_bind_pirq_msi_to_irq(dev, msidesc,
329-
map_irq.pirq, map_irq.index,
329+
map_irq.pirq,
330330
(type == PCI_CAP_ID_MSIX) ?
331331
"msi-x" : "msi",
332332
domid);

drivers/xen/events.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ enum xen_irq_type {
8585
* event channel - irq->event channel mapping
8686
* cpu - cpu this event channel is bound to
8787
* index - type-specific information:
88-
* PIRQ - vector, with MSB being "needs EIO", or physical IRQ of the HVM
89-
* guest, or GSI (real passthrough IRQ) of the device.
88+
* PIRQ - physical IRQ, GSI, flags, and owner domain
9089
* VIRQ - virq number
9190
* IPI - IPI vector
9291
* EVTCHN -
@@ -105,7 +104,6 @@ struct irq_info {
105104
struct {
106105
unsigned short pirq;
107106
unsigned short gsi;
108-
unsigned char vector;
109107
unsigned char flags;
110108
uint16_t domid;
111109
} pirq;
@@ -211,7 +209,6 @@ static void xen_irq_info_pirq_init(unsigned irq,
211209
unsigned short evtchn,
212210
unsigned short pirq,
213211
unsigned short gsi,
214-
unsigned short vector,
215212
uint16_t domid,
216213
unsigned char flags)
217214
{
@@ -221,7 +218,6 @@ static void xen_irq_info_pirq_init(unsigned irq,
221218

222219
info->u.pirq.pirq = pirq;
223220
info->u.pirq.gsi = gsi;
224-
info->u.pirq.vector = vector;
225221
info->u.pirq.domid = domid;
226222
info->u.pirq.flags = flags;
227223
}
@@ -714,7 +710,7 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
714710
goto out;
715711
}
716712

717-
xen_irq_info_pirq_init(irq, 0, pirq, gsi, irq_op.vector, DOMID_SELF,
713+
xen_irq_info_pirq_init(irq, 0, pirq, gsi, DOMID_SELF,
718714
shareable ? PIRQ_SHAREABLE : 0);
719715

720716
pirq_query_unmask(irq);
@@ -762,8 +758,7 @@ int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc)
762758
}
763759

764760
int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
765-
int pirq, int vector, const char *name,
766-
domid_t domid)
761+
int pirq, const char *name, domid_t domid)
767762
{
768763
int irq, ret;
769764

@@ -776,7 +771,7 @@ int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
776771
irq_set_chip_and_handler_name(irq, &xen_pirq_chip, handle_edge_irq,
777772
name);
778773

779-
xen_irq_info_pirq_init(irq, 0, pirq, 0, vector, domid, 0);
774+
xen_irq_info_pirq_init(irq, 0, pirq, 0, domid, 0);
780775
ret = irq_set_msi_desc(irq, msidesc);
781776
if (ret < 0)
782777
goto error_irq;

include/xen/events.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,7 @@ int xen_bind_pirq_gsi_to_irq(unsigned gsi,
9090
int xen_allocate_pirq_msi(struct pci_dev *dev, struct msi_desc *msidesc);
9191
/* Bind an PSI pirq to an irq. */
9292
int xen_bind_pirq_msi_to_irq(struct pci_dev *dev, struct msi_desc *msidesc,
93-
int pirq, int vector, const char *name,
94-
domid_t domid);
93+
int pirq, const char *name, domid_t domid);
9594
#endif
9695

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

0 commit comments

Comments
 (0)