PCI/MSI: forward MSIx vector enable error code in pci_alloc_irq_vectors_affinity
PATCH 2/15 PCI/MSI: forward MSIx vector enable error code in pci_alloc_irq_vectors_affinity
When debugging an issue where I was asking the PCI machinery to enable a set of MSIx vectors, without falling back on MSI, I ran across a behaviour which seems odd. The pci_alloc_irq_vectors_affinity will always return -ENOSPC on failure, when allocating MSIx vectors only, whereas with MSI fallback it will forward any error returned by __pci_enable_msi_range. This is a confusing behaviour, so have the pci_alloc_irq_vectors_affinity forward the error code from __pci_enable_msix_range when appropriate.
Signed-off-by Piotr Stankiewicz <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
--- drivers/pci/msi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/pci/msi.c +2 -2
@@ -1231,8 +1231,8 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs, } } -if (msix_vecs == -ENOSPC ) -return -ENOSPC ; +if (msix_vecs == -ENOSPC || (flags &PCI_IRQ_MSI_TYPES ) ==PCI_IRQ_MSIX ) +return msix_vecs;return msi_vecs; }EXPORT_SYMBOL (pci_alloc_irq_vectors_affinity);
Signature · 1 line
2.17.2