lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xen: events: return irq from xen_allocate_pirq_msi

Browse Source 
consistent with other similar functions.

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:29 +00:00
committed by Konrad Rzeszutek Wilk
parent bb5d079aef
commit 4b41df7f6e
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,8 +100,8 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
pirq = MSI_ADDR_EXT_DEST_ID(msg.address_hi) | pirq = MSI_ADDR_EXT_DEST_ID(msg.address_hi) |
((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) ? irq = xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ?
"msi-x" : "msi", &irq, &pirq, 0); "msi-x" : "msi", &pirq, 0);
if (irq < 0) if (irq < 0)
goto error; goto error;
ret = set_irq_msi(irq, msidesc); ret = set_irq_msi(irq, msidesc);
@@ -111,8 +111,8 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
" pirq=%d\n", irq, pirq); " pirq=%d\n", irq, pirq);
return 0; return 0;
} }
xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ? irq = xen_allocate_pirq_msi((type == PCI_CAP_ID_MSIX) ?
"msi-x" : "msi", &irq, &pirq, 1); "msi-x" : "msi", &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);
@@ -157,10 +157,10 @@ 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) {
xen_allocate_pirq_msi( irq = 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], 0); &v[i], 0);
if (irq < 0) { if (irq < 0) {
ret = -1; ret = -1;
goto free; goto free;

19
drivers/xen/events.c
View File

@@ -664,31 +664,34 @@ static int find_unbound_pirq(int type)
return -1; return -1;
} }
void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc_pirq) int xen_allocate_pirq_msi(char *name, int *pirq, int alloc_pirq)
{ {
int irq;
spin_lock(&irq_mapping_update_lock); spin_lock(&irq_mapping_update_lock);
*irq = xen_allocate_irq_dynamic(); irq = xen_allocate_irq_dynamic();
if (*irq == -1) if (irq == -1)
goto out; goto out;
if (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);
*irq = -1; irq = -1;
goto out; goto out;
} }
} }
set_irq_chip_and_handler_name(*irq, &xen_pirq_chip, set_irq_chip_and_handler_name(irq, &xen_pirq_chip,
handle_level_irq, name); handle_level_irq, name);
irq_info[*irq] = mk_pirq_info(0, *pirq, 0, 0); irq_info[irq] = mk_pirq_info(0, *pirq, 0, 0);
pirq_to_irq[*pirq] = *irq; pirq_to_irq[*pirq] = irq;
out: out:
spin_unlock(&irq_mapping_update_lock); spin_unlock(&irq_mapping_update_lock);
return irq;
} }
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)

2
include/xen/events.h
View File

@@ -75,7 +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
void xen_allocate_pirq_msi(char *name, int *irq, int *pirq, int alloc_pirq); int xen_allocate_pirq_msi(char *name, int *pirq, int alloc_pirq);
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