FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-03-07 12:12:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xen: events: drop XEN_ALLOC_IRQ flag to xen_allocate_pirq_msi

Browse Source 
All callers pass this flag so it is pointless.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Ian Campbell 2011-02-18 16:43:28 +00:00 committed by Konrad Rzeszutek Wilk
parent ae1635b05f
commit bb5d079aef
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/pci/xen.c
View File

@ -101,7 +101,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
((msg.address_lo >> MSI_ADDR_DEST_ID_SHIFT) & 0xff); ((msg.address_lo >> MSI_ADDR_DEST_ID_SHIFT) & 0xff);
if (xen_irq_from_pirq(pirq) >= 0 && msg.data == XEN_PIRQ_MSI_DATA) { if (xen_irq_from_pirq(pirq) >= 0 && msg.data == XEN_PIRQ_MSI_DATA) {
xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ? xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ?
"msi-x" : "msi", &irq, &pirq, XEN_ALLOC_IRQ); "msi-x" : "msi", &irq, &pirq, 0);
if (irq < 0) if (irq < 0)
goto error; goto error;
ret = set_irq_msi(irq, msidesc); ret = set_irq_msi(irq, msidesc);
@ -112,7 +112,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
return 0; return 0;
} }
xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ? xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ?
"msi-x" : "msi", &irq, &pirq, (XEN_ALLOC_IRQ | XEN_ALLOC_PIRQ)); "msi-x" : "msi", &irq, &pirq, 1);
if (irq < 0 || pirq < 0) if (irq < 0 || pirq < 0)
goto error; goto error;
printk(KERN_DEBUG "xen: msi --> irq=%d, pirq=%d\n", irq, pirq); printk(KERN_DEBUG "xen: msi --> irq=%d, pirq=%d\n", irq, pirq);
@ -160,7 +160,7 @@ static int xen_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
xen_allocate_pirq_msi( xen_allocate_pirq_msi(
(type == PCI_CAP_ID_MSIX) ? (type == PCI_CAP_ID_MSIX) ?
"pcifront-msi-x" : "pcifront-msi", "pcifront-msi-x" : "pcifront-msi",
&irq, &v[i], XEN_ALLOC_IRQ); &irq, &v[i], 0);
if (irq < 0) { if (irq < 0) {
ret = -1; ret = -1;
goto free; goto free;

6
drivers/xen/events.c
View File

@ -664,17 +664,15 @@ static int find_unbound_pirq(int type)
return -1; return -1;
} }
void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc) void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc_pirq)
{ {
spin_lock(&irq_mapping_update_lock); spin_lock(&irq_mapping_update_lock);
if (alloc & XEN_ALLOC_IRQ) {
*irq = xen_allocate_irq_dynamic(); *irq = xen_allocate_irq_dynamic();
if (*irq == -1) if (*irq == -1)
goto out; goto out;
}
if (alloc & XEN_ALLOC_PIRQ) { if (alloc_pirq) {
*pirq = find_unbound_pirq(MAP_PIRQ_TYPE_MSI); *pirq = find_unbound_pirq(MAP_PIRQ_TYPE_MSI);
if (*pirq == -1) { if (*pirq == -1) {
xen_free_irq(*irq); xen_free_irq(*irq);

5
include/xen/events.h
View File

@ -75,10 +75,7 @@ int xen_allocate_pirq(unsigned gsi, int shareable, char *name);
int xen_map_pirq_gsi(unsigned pirq, unsigned gsi, int shareable, char *name); int xen_map_pirq_gsi(unsigned pirq, unsigned gsi, int shareable, char *name);
#ifdef CONFIG_PCI_MSI #ifdef CONFIG_PCI_MSI
/* Allocate an irq and a pirq to be used with MSIs. */ void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc_pirq);
#define XEN_ALLOC_PIRQ (1 << 0)
#define XEN_ALLOC_IRQ (1 << 1)
void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc_mask);
int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type); int xen_create_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int type);
#endif #endif