Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-18 10:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

xen-pcifront: Sanity check the MSI/MSI-X values

Browse Source 
Check the returned vector values for any values that are
odd or plain incorrect (say vector value zero), and if so
print a warning. Also fixup the return values.

This patch was precipiated by the Xen PCIBack returning the
incorrect values due to how it was retrieving PIRQ values.
This has been fixed in the xen-pciback by
"xen/pciback: Utilize 'xen_pirq_from_irq' to get PIRQ value"
patch.

Reviewed-by: Ian Campbell <Ian.Campbell@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Konrad Rzeszutek Wilk 2011-02-16 13:43:22 -05:00
parent db2e2e6ee9
commit 1d4610527b
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/pci/xen-pcifront.c
View File

@ -277,18 +277,24 @@ static int pci_frontend_enable_msix(struct pci_dev *dev,
if (likely(!err)) { if (likely(!err)) {
if (likely(!op.value)) { if (likely(!op.value)) {
/* we get the result */ /* we get the result */
for (i = 0; i < nvec; i++) for (i = 0; i < nvec; i++) {
if (op.msix_entries[i].vector <= 0) {
dev_warn(&dev->dev, "MSI-X entry %d is invalid: %d!\n",
i, op.msix_entries[i].vector);
err = -EINVAL;
*(*vector+i) = -1;
continue;
}
*(*vector+i) = op.msix_entries[i].vector; *(*vector+i) = op.msix_entries[i].vector;
return 0; }
} else { } else {
printk(KERN_DEBUG "enable msix get value %x\n", printk(KERN_DEBUG "enable msix get value %x\n",
op.value); op.value);
return op.value;
} }
} else { } else {
dev_err(&dev->dev, "enable msix get err %x\n", err); dev_err(&dev->dev, "enable msix get err %x\n", err);
return err;
} }
return err;
} }
static void pci_frontend_disable_msix(struct pci_dev *dev) static void pci_frontend_disable_msix(struct pci_dev *dev)
@ -325,6 +331,12 @@ static int pci_frontend_enable_msi(struct pci_dev *dev, int **vector)
err = do_pci_op(pdev, &op); err = do_pci_op(pdev, &op);
if (likely(!err)) { if (likely(!err)) {
*(*vector) = op.value; *(*vector) = op.value;
if (op.value <= 0) {
dev_warn(&dev->dev, "MSI entry is invalid: %d!\n",
op.value);
err = -EINVAL;
*(*vector) = -1;
}
} else { } else {
dev_err(&dev->dev, "pci frontend enable msi failed for dev " dev_err(&dev->dev, "pci frontend enable msi failed for dev "
"%x:%x\n", op.bus, op.devfn); "%x:%x\n", op.bus, op.devfn);