scsi: fnic: fix msix interrupt allocation
Subsystems (2)
PATCH 1/1 scsi: fnic: fix msix interrupt allocation
pci_alloc_irq_vectors() returns number of vectors allocated. Fix the check for error condition.
Fixes cca678dfbad49 ("scsi: fnic: switch to pci_alloc_irq_vectors")
Acked-by Satish Kharat <[email protected]>
Signed-off-by Govindarajulu Varadarajan <[email protected]>
--- drivers/scsi/fnic/fnic_isr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/fnic/fnic_isr.c +2 -2
@@ -254,7 +254,7 @@ int fnic_set_intr_mode(struct fnic *fnic)int vecs = n + m + o +1 ;if (pci_alloc_irq_vectors (fnic->pdev, vecs, vecs, -PCI_IRQ_MSIX ) <0 ) { +PCI_IRQ_MSIX ) == vecs) { fnic->rq_count = n; fnic->raw_wq_count = m; fnic->wq_copy_count = o;
@@ -280,7 +280,7 @@ int fnic_set_intr_mode(struct fnic *fnic) fnic->wq_copy_count >=1 && fnic->cq_count >=3 && fnic->intr_count >=1 && - pci_alloc_irq_vectors(fnic->pdev, 1, 1, PCI_IRQ_MSI) < 0) { + pci_alloc_irq_vectors(fnic->pdev, 1, 1, PCI_IRQ_MSI) == 1) { fnic->rq_count = 1; fnic->raw_wq_count =1 ; fnic->wq_copy_count =1 ;
Signature · 1 line
2.21.0
Hi Martin, would you have a quick look at this one when you get a moment? Bugging you for selfish reasons as I'm trying to get this included in the next RHEL release. Thanks for any info.
Quoted 36 lines · Govindarajulu Varadarajan
pci_alloc_irq_vectors()returns number of vectors allocated. Fix the check for error condition.Fixes cca678dfbad49 ("scsi: fnic: switch to pci_alloc_irq_vectors")Acked-by Satish Kharat <[email protected]>Signed-off-by Govindarajulu Varadarajan <[email protected]>--- drivers/scsi/fnic/fnic_isr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/scsi/fnic/fnic_isr.c +2
-3@@ -254,7 +254,7 @@ int fnic_set_intr_mode(struct fnic *fnic)int vecs = n + m + o +1 ;if (pci_alloc_irq_vectors (fnic->pdev, vecs, vecs, -PCI_IRQ_MSIX ) <0 ) { +PCI_IRQ_MSIX ) == vecs) { fnic->rq_count = n; fnic->raw_wq_count = m; fnic->wq_copy_count = o;@@ -280,7 +280,7 @@ int fnic_set_intr_mode(struct fnic *fnic) fnic->wq_copy_count >=1 && fnic->cq_count >=3 && fnic->intr_count >=1 && - pci_alloc_irq_vectors(fnic->pdev, 1, 1, PCI_IRQ_MSI) < 0) { + pci_alloc_irq_vectors(fnic->pdev, 1, 1, PCI_IRQ_MSI) == 1) { fnic->rq_count = 1; fnic->raw_wq_count =1 ; fnic->wq_copy_count =1 ; --2.21.0
Martin K. Petersen
AppliedGovindarajulu,
Quoted 2 lines
pci_alloc_irq_vectors()returns number of vectors allocated. Fix the check for error condition.
Applied to 5.4/scsi-queue, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering