Skip to contentSkip to conversation

scsi: qla2xxx: Fix qla2x00_request_irqs() for MSI

PATCH Applied Huacai Chen 3 participants 3 messages Nov 21, 2019 – Nov 27, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: qla2xxx: Fix qla2x00_request_irqs() for MSI

Commit 4fa183455988adaa ("scsi: qla2xxx: Utilize pci_alloc_irq_vectors /pci_free_irq_vectors calls.") use pci_alloc_irq_vectors() to replace pci_enable_msi() but it didn't handle the return value correctly. This bug make qla2x00 always fail to setup MSI if MSI-X fail, so fix it.

BTW, improve the log message of return value in qla2x00_request_irqs() to avoid confusing.

Fixes 4fa183455988adaa ("scsi: qla2xxx: Utilize pci_alloc_irq_vectors/pci_free_irq_vectors calls.")
Cc Michael Hernandez <[email protected]>
---
 drivers/scsi/qla2xxx/qla_isr.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/qla2xxx/qla_isr.c +3 -3
index 4c26630..c0568c6 100644
@@ -3626,7 +3626,7 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
 skip_msix:
 
 	ql_log(ql_log_info, vha, 0x0037,
-	    "Falling back-to MSI mode -%d.\n", ret);
+	    "Falling back-to MSI mode -- ret=%d.\n", ret);
 
 	if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) &&
 	    !IS_QLA8001(ha) && !IS_P3P_TYPE(ha) && !IS_QLAFX00(ha) &&
@@ -3634,13 +3634,13 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
 		goto skip_msi;
 
 	ret = pci_alloc_irq_vectors(ha->pdev, 1, 1, PCI_IRQ_MSI);
-	if (!ret) {
+	if (ret > 0) {
 		ql_dbg(ql_dbg_init, vha, 0x0038,
 		    "MSI: Enabled.\n");
 		ha->flags.msi_enabled = 1;
 	} else
 		ql_log(ql_log_warn, vha, 0x0039,
-		    "Falling back-to INTa mode -- %d.\n", ret);
+		    "Falling back-to INTa mode -- ret=%d.\n", ret);
 skip_msi:
 
 	/* Skip INTx on ISP82xx. */
Signature · 1 line
2.7.0
Acked-by on v1 1/1
#1 lore raw

On 11/20/19, 11:37 PM, "Huacai Chen" <[email protected] on behalf of [email protected]> wrote:

    External Email
    
    ----------------------------------------------------------------------
    Commit 4fa183455988adaa ("scsi: qla2xxx: Utilize pci_alloc_irq_vectors
    /pci_free_irq_vectors calls.") use pci_alloc_irq_vectors() to replace
    pci_enable_msi() but it didn't handle the return value correctly. This
    bug make qla2x00 always fail to setup MSI if MSI-X fail, so fix it.
    
    BTW, improve the log message of return value in qla2x00_request_irqs()
    to avoid confusing.
    
    Fixes: 4fa183455988adaa ("scsi: qla2xxx: Utilize pci_alloc_irq_vectors/pci_free_irq_vectors calls.")
    Cc: Michael Hernandez <[email protected]>
    Signed-off-by: Huacai Chen <[email protected]>
    ---
     drivers/scsi/qla2xxx/qla_isr.c | 6 +++---
     1 file changed, 3 insertions(+), 3 deletions(-)
    
    diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
    index 4c26630..c0568c6 100644
    --- a/drivers/scsi/qla2xxx/qla_isr.c
    +++ b/drivers/scsi/qla2xxx/qla_isr.c
    @@ -3626,7 +3626,7 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
     skip_msix:
     
     	ql_log(ql_log_info, vha, 0x0037,
    -	    "Falling back-to MSI mode -%d.\n", ret);
    +	    "Falling back-to MSI mode -- ret=%d.\n", ret);
     
     	if (!IS_QLA24XX(ha) && !IS_QLA2532(ha) && !IS_QLA8432(ha) &&
     	    !IS_QLA8001(ha) && !IS_P3P_TYPE(ha) && !IS_QLAFX00(ha) &&
    @@ -3634,13 +3634,13 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp)
     		goto skip_msi;
     
     	ret = pci_alloc_irq_vectors(ha->pdev, 1, 1, PCI_IRQ_MSI);
    -	if (!ret) {
    +	if (ret > 0) {
     		ql_dbg(ql_dbg_init, vha, 0x0038,
     		    "MSI: Enabled.\n");
     		ha->flags.msi_enabled = 1;
     	} else
     		ql_log(ql_log_warn, vha, 0x0039,
    -		    "Falling back-to INTa mode -- %d.\n", ret);
    +		    "Falling back-to INTa mode -- ret=%d.\n", ret);
     skip_msi:
     
     	/* Skip INTx on ISP82xx. */
    -- 
    2.7.0

Looks Good.

#2 lore raw
In reply to Huacai Chen

Huacai,

Quoted 4 lines

Commit 4fa183455988adaa ("scsi: qla2xxx: Utilize pci_alloc_irq_vectors /pci_free_irq_vectors calls.") use pci_alloc_irq_vectors() to replace pci_enable_msi() but it didn't handle the return value correctly. This bug make qla2x00 always fail to setup MSI if MSI-X fail, so fix it.

Applied to 5.5/scsi-queue, thanks!

Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering