qla2xxx: Bug fixes for the driver
Subsystems (2)
cover qla2xxx: Bug fixes for the driver
Hi Martin,
This series has few bug fixes for the driver.
Please apply this series to 5.4/scsi-queue at your earliest convenience.
Thanks,
Himanshu
Himanshu Madhani (3):
qla2xxx: Fix message indicating vectors used by driver
qla2xxx: Fix driver reload for ISP82xx
qla2xxx: Update driver version to 10.01.00.19-k
Quinn Tran (3):
qla2xxx: Fix flash read for Qlogic ISPs
qla2xxx: Fix stuck login session
qla2xxx: Fix stale session
drivers/scsi/qla2xxx/qla_gs.c | 5 +++-- drivers/scsi/qla2xxx/qla_init.c | 27 +++++++++++++-------------- drivers/scsi/qla2xxx/qla_isr.c | 6 ++---- drivers/scsi/qla2xxx/qla_mbx.c | 16 ++-------------- drivers/scsi/qla2xxx/qla_nx.c | 4 +++- drivers/scsi/qla2xxx/qla_sup.c | 8 ++++---- drivers/scsi/qla2xxx/qla_version.h | 2 +- 7 files changed, 28 insertions(+), 40 deletions(-)
Signature · 1 line
2.12.0
PATCH 1/6 qla2xxx: Fix message indicating vectors used by driver
This patch updates log message which indicates number of vectors used by driver instead of displaying failure to get maximum requested vectors. Driver will always request maximum vectors during initialization. In the event driver is not able to get maximum requested vectors, it will adjust the allocated vectors. This is normal and does not imply failure in driver.
--- drivers/scsi/qla2xxx/qla_isr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_isr.c +2 -4
@@ -3466,10 +3466,8 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) ha->msix_count, ret); goto msix_out; }else if (ret < ha->msix_count) { -ql_log (ql_log_warn, vha,0x00c6 , -"MSI-X: Failed to enable support " -"with %d vectors, using %d vectors.\n" , - ha->msix_count, ret); +ql_log (ql_log_info, vha,0x00c6 , +"MSI-X: Using %d vectors\n" , ret); ha->msix_count = ret;/* Recalculate queue values */ if (ha->mqiobase && (ql2xmqsupport || ql2xnvmeenable)) {
Signature · 1 line
2.12.0
Re: [PATCH 1/6] qla2xxx: Fix message indicating vectors used by driver
Quoted 20 lines · Himanshu Madhani
This patch updates log message which indicates number of vectors used by driver instead of displaying failure to get maximum requested vectors. Driver will always request maximum vectors during initialization. In the event driver is not able to get maximum requested vectors, it will adjust the allocated vectors. This is normal and does not imply failure in driver.
Signed-off-by Himanshu Madhani <[email protected]>--- drivers/scsi/qla2xxx/qla_isr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/scsi/qla2xxx/qla_isr.c +0
-0@@ -3466,10 +3466,8 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) ha->msix_count, ret); goto msix_out;
drivers/scsi/qla2xxx/qla_isr.c qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) · line 3473
Quoted 10 lines
drivers/scsi/qla2xxx/qla_isr.c +2
-4}else if (ret < ha->msix_count) { -ql_log (ql_log_warn, vha,0x00c6 , -"MSI-X: Failed to enable support " -"with %d vectors, using %d vectors.\n" , - ha->msix_count, ret); +ql_log (ql_log_info, vha,0x00c6 , +"MSI-X: Using %d vectors\n" , ret); ha->msix_count = ret;/* Recalculate queue values */ if (ha->mqiobase && (ql2xmqsupport || ql2xnvmeenable)) {
Re: [PATCH 1/6] qla2xxx: Fix message indicating vectors used by driver
In reply to Himanshu MadhaniQuoted 21 lines · Himanshu Madhani
This patch updates log message which indicates number of vectors used by driver instead of displaying failure to get maximum requested vectors. Driver will always request maximum vectors during initialization. In the event driver is not able to get maximum requested vectors, it will adjust the allocated vectors. This is normal and does not imply failure in driver.
Signed-off-by Himanshu Madhani <[email protected]>--- drivers/scsi/qla2xxx/qla_isr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)drivers/scsi/qla2xxx/qla_isr.c +0
-0@@ -3466,10 +3466,8 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) ha->msix_count, ret); goto msix_out;
drivers/scsi/qla2xxx/qla_isr.c qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) · line 3473
Quoted 10 lines
drivers/scsi/qla2xxx/qla_isr.c +2
-4}else if (ret < ha->msix_count) { -ql_log (ql_log_warn, vha,0x00c6 , -"MSI-X: Failed to enable support " -"with %d vectors, using %d vectors.\n" , - ha->msix_count, ret); +ql_log (ql_log_info, vha,0x00c6 , +"MSI-X: Using %d vectors\n" , ret); ha->msix_count = ret;/* Recalculate queue values */ if (ha->mqiobase && (ql2xmqsupport || ql2xnvmeenable)) {
PATCH 2/6 qla2xxx: Fix flash read for Qlogic ISPs
In reply to Himanshu MadhaniFrom: Quinn Tran <[email protected]>
Use adapter specific callback to read flash instead of ISP adapter specific.
--- drivers/scsi/qla2xxx/qla_init.c | 4 ++-- drivers/scsi/qla2xxx/qla_nx.c | 1 + drivers/scsi/qla2xxx/qla_sup.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +2 -2
@@ -8229,7 +8229,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) active_regions.aux.vpd_nvram ==QLA27XX_PRIMARY_IMAGE ? "primary" : "secondary"); } -qla24xx_read_flash_data (vha, ha->vpd, faddr, ha->vpd_size >>2 ); + ha->isp_ops->read_optrom (vha, ha->vpd, faddr <<2 , ha->vpd_size);/* Get NVRAM data into cache and calculate checksum. */ faddr = ha->flt_region_nvram;
@@ -8241,7 +8241,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)"Loading %s nvram image.\n" , active_regions.aux.vpd_nvram ==QLA27XX_PRIMARY_IMAGE ? "primary" : "secondary"); -qla24xx_read_flash_data (vha, ha->nvram, faddr, ha->nvram_size >>2 ); + ha->isp_ops->read_optrom (vha, ha->nvram, faddr <<2 , ha->nvram_size); dptr = (uint32_t *)nv;for (cnt =0 , chksum =0 ; cnt < ha->nvram_size >>2 ; cnt++, dptr++)
drivers/scsi/qla2xxx/qla_nx.c +1 -0
@@ -2288,6 +2288,7 @@ qla82xx_disable_intrs(struct qla_hw_data *ha)scsi_qla_host_t *vha =pci_get_drvdata (ha->pdev);qla82xx_mbx_intr_disable (vha); +spin_lock_irq (&ha->hardware_lock);if (IS_QLA8044 (ha))qla8044_wr_reg (ha,LEG_INTR_MASK_OFFSET ,1 );
drivers/scsi/qla2xxx/qla_sup.c +4 -4
@@ -682,8 +682,8 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr) ha->flt_region_flt = flt_addr; wptr = (uint16_t *)ha->flt; -qla24xx_read_flash_data (vha, (void *)flt, flt_addr, - (sizeof (struct qla_flt_header ) +FLT_REGIONS_SIZE ) >>2 ); + ha->isp_ops->read_optrom (vha, (void *)flt, flt_addr <<2 , + (sizeof (struct qla_flt_header ) +FLT_REGIONS_SIZE ));if (le16_to_cpu (*wptr) ==0xffff ) goto no_flash_data;
@@ -950,11 +950,11 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)struct req_que *req = ha->req_q_map[0 ];uint16_t cnt, chksum;uint16_t *wptr = (void *)req->ring; -struct qla_fdt_layout *fdt = (void *)req->ring; +struct qla_fdt_layout *fdt = (struct qla_fdt_layout *)req->ring;uint8_t man_id, flash_id;uint16_t mid =0 , fid =0 ; -qla24xx_read_flash_data (vha, (void *)fdt, ha->flt_region_fdt, + ha->isp_ops->read_optrom (vha, fdt, ha->flt_region_fdt <<2 ,OPTROM_BURST_DWORDS );if (le16_to_cpu (*wptr) ==0xffff ) goto no_flash_data;
Signature · 1 line
2.12.0
Re: [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs
Quoted 66 lines · Himanshu Madhani
From: Quinn Tran <[email protected]>
Use adapter specific callback to read flash instead of ISP adapter specific.
Signed-off-by Quinn Tran <[email protected]>Signed-off-by Himanshu Madhani <[email protected]>--- drivers/scsi/qla2xxx/qla_init.c | 4 ++-- drivers/scsi/qla2xxx/qla_nx.c | 1 + drivers/scsi/qla2xxx/qla_sup.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-)drivers/scsi/qla2xxx/qla_init.c +2
-2@@ -8229,7 +8229,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha) active_regions.aux.vpd_nvram ==QLA27XX_PRIMARY_IMAGE ? "primary" : "secondary"); } -qla24xx_read_flash_data (vha, ha->vpd, faddr, ha->vpd_size >>2 ); + ha->isp_ops->read_optrom (vha, ha->vpd, faddr <<2 , ha->vpd_size);/* Get NVRAM data into cache and calculate checksum. */ faddr = ha->flt_region_nvram;@@ -8241,7 +8241,7 @@ qla81xx_nvram_config(scsi_qla_host_t *vha)"Loading %s nvram image.\n" , active_regions.aux.vpd_nvram ==QLA27XX_PRIMARY_IMAGE ? "primary" : "secondary"); -qla24xx_read_flash_data (vha, ha->nvram, faddr, ha->nvram_size >>2 ); + ha->isp_ops->read_optrom (vha, ha->nvram, faddr <<2 , ha->nvram_size); dptr = (uint32_t *)nv;for (cnt =0 , chksum =0 ; cnt < ha->nvram_size >>2 ; cnt++, dptr++)drivers/scsi/qla2xxx/qla_nx.c +1
-0@@ -2288,6 +2288,7 @@ qla82xx_disable_intrs(struct qla_hw_data *ha)scsi_qla_host_t *vha =pci_get_drvdata (ha->pdev);qla82xx_mbx_intr_disable (vha); +spin_lock_irq (&ha->hardware_lock);if (IS_QLA8044 (ha))qla8044_wr_reg (ha,LEG_INTR_MASK_OFFSET ,1 );drivers/scsi/qla2xxx/qla_sup.c +2
-2@@ -682,8 +682,8 @@ qla2xxx_get_flt_info(scsi_qla_host_t *vha, uint32_t flt_addr) ha->flt_region_flt = flt_addr; wptr = (uint16_t *)ha->flt; -qla24xx_read_flash_data (vha, (void *)flt, flt_addr, - (sizeof (struct qla_flt_header ) +FLT_REGIONS_SIZE ) >>2 ); + ha->isp_ops->read_optrom (vha, (void *)flt, flt_addr <<2 , + (sizeof (struct qla_flt_header ) +FLT_REGIONS_SIZE ));if (le16_to_cpu (*wptr) ==0xffff ) goto no_flash_data;@@ -950,11 +950,11 @@ qla2xxx_get_fdt_info(scsi_qla_host_t *vha)struct req_que *req = ha->req_q_map[0 ];uint16_t cnt, chksum;uint16_t *wptr = (void *)req->ring;
drivers/scsi/qla2xxx/qla_sup.c qla2xxx_get_fdt_info(scsi_qla_host_t *vha) · line 960
Quoted 10 lines
drivers/scsi/qla2xxx/qla_sup.c +2
-2-struct qla_fdt_layout *fdt = (void *)req->ring; +struct qla_fdt_layout *fdt = (struct qla_fdt_layout *)req->ring;uint8_t man_id, flash_id;uint16_t mid =0 , fid =0 ; -qla24xx_read_flash_data (vha, (void *)fdt, ha->flt_region_fdt, + ha->isp_ops->read_optrom (vha, fdt, ha->flt_region_fdt <<2 ,OPTROM_BURST_DWORDS );if (le16_to_cpu (*wptr) ==0xffff ) goto no_flash_data;
Re: [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs
In reply to Himanshu MadhaniQuoted 5 lines · Himanshu Madhani
From: Quinn Tran <[email protected]>
Use adapter specific callback to read flash instead of ISP adapter specific.
Quoted 8 lines
Signed-off-by Quinn Tran <[email protected]>Signed-off-by Himanshu Madhani <[email protected]>--- drivers/scsi/qla2xxx/qla_init.c | 4 ++-- drivers/scsi/qla2xxx/qla_nx.c | 1 + drivers/scsi/qla2xxx/qla_sup.c | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-)
I believe this patch should be tagged with
I just bisected the FW initialization problems on my 8200 series CNA to that commit, and I can confirm that this patch fixes it.
Re: [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs
Hi Martin,
Quoted 6 lines
I believe this patch should be tagged with
Fixes 5fa8774c7f38 (scsi: qla2xxx: Add 28xx flash primary/secondary status/image mechanism)I just bisected the FW initialization problems on my 8200 series CNA to that commit, and I can confirm that this patch fixes it.
I am not going to rebase this late in the cycle. Himanshu or Quinn will need to send a request to stable@ after Linus pulls 5.4/scsi-queue.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering
Re: [EXT] Re: [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs
Hi Martin,
On 9/13/19, 5:37 PM, "Martin K. Petersen" <[email protected]> wrote:
External Email
----------------------------------------------------------------------
Hi Martin,
> I believe this patch should be tagged with
>
> Fixes: 5fa8774c7f38 (scsi: qla2xxx: Add 28xx flash primary/secondary status/image mechanism) >
> I just bisected the FW initialization problems on my 8200 series CNA
> to that commit, and I can confirm that this patch fixes it.
I am not going to rebase this late in the cycle. Himanshu or Quinn will need to send a request to stable@ after Linus pulls 5.4/scsi-queue.
Sure. Will do.
Thanks Martin W for pointing out missing tag.
-- Himanshu
--
Martin K. Petersen Oracle Linux Engineering
PATCH 3/6 qla2xxx: Fix driver reload for ISP82xx
In reply to Himanshu MadhaniHINT_MBX_INT_PENDING is not guaranteed to be cleared by firmware. Remove check that prevent driver load with ISP82XX.
--- drivers/scsi/qla2xxx/qla_mbx.c | 16 ++-------------- drivers/scsi/qla2xxx/qla_nx.c | 3 ++- 2 files changed, 4 insertions(+), 15 deletions(-)
drivers/scsi/qla2xxx/qla_mbx.c +2 -14
@@ -253,21 +253,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)if ((!abort_active && io_lock_on) ||IS_NOPOLLING_TYPE (ha)) {set_bit (MBX_INTR_WAIT , &ha->mbx_cmd_flags); -if (IS_P3P_TYPE (ha)) { -if (RD_REG_DWORD (®->isp82.hint) & -HINT_MBX_INT_PENDING ) { - ha->flags.mbox_busy =0 ; -spin_unlock_irqrestore (&ha->hardware_lock, - flags); - -atomic_dec (&ha->num_pend_mbx_stage2); -ql_dbg (ql_dbg_mbx, vha,0x1010 , -"Pending mailbox timeout, exiting.\n" ); - rval =QLA_FUNCTION_TIMEOUT ; - goto premature_exit; - } +if (IS_P3P_TYPE (ha))WRT_REG_DWORD (®->isp82.hint,HINT_MBX_INT_PENDING ); - }else if (IS_FWI2_CAPABLE (ha)) +else if (IS_FWI2_CAPABLE (ha))WRT_REG_DWORD (®->isp24.hccr,HCCRX_SET_HOST_INT );else WRT_REG_WORD (®->isp.hccr,HCCR_SET_HOST_INT );
drivers/scsi/qla2xxx/qla_nx.c +2 -1
@@ -2287,7 +2287,8 @@ qla82xx_disable_intrs(struct qla_hw_data *ha) {scsi_qla_host_t *vha =pci_get_drvdata (ha->pdev); -qla82xx_mbx_intr_disable (vha); +if (ha->interrupts_on) +qla82xx_mbx_intr_disable (vha);spin_lock_irq (&ha->hardware_lock);if (IS_QLA8044 (ha))
Signature · 1 line
2.12.0
Re: [PATCH 3/6] qla2xxx: Fix driver reload for ISP82xx
Quoted 43 lines · Himanshu Madhani
HINT_MBX_INT_PENDINGis not guaranteed to be cleared by firmware. Remove check that prevent driver load with ISP82XX.Signed-off-by Quinn Tran <[email protected]>Signed-off-by Himanshu Madhani <[email protected]>--- drivers/scsi/qla2xxx/qla_mbx.c | 16 ++-------------- drivers/scsi/qla2xxx/qla_nx.c | 3 ++- 2 files changed, 4 insertions(+), 15 deletions(-)drivers/scsi/qla2xxx/qla_mbx.c +2
-14@@ -253,21 +253,9 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)if ((!abort_active && io_lock_on) ||IS_NOPOLLING_TYPE (ha)) {set_bit (MBX_INTR_WAIT , &ha->mbx_cmd_flags); -if (IS_P3P_TYPE (ha)) { -if (RD_REG_DWORD (®->isp82.hint) & -HINT_MBX_INT_PENDING ) { - ha->flags.mbox_busy =0 ; -spin_unlock_irqrestore (&ha->hardware_lock, - flags); - -atomic_dec (&ha->num_pend_mbx_stage2); -ql_dbg (ql_dbg_mbx, vha,0x1010 , -"Pending mailbox timeout, exiting.\n" ); - rval =QLA_FUNCTION_TIMEOUT ; - goto premature_exit; - } +if (IS_P3P_TYPE (ha))WRT_REG_DWORD (®->isp82.hint,HINT_MBX_INT_PENDING ); - }else if (IS_FWI2_CAPABLE (ha)) +else if (IS_FWI2_CAPABLE (ha))WRT_REG_DWORD (®->isp24.hccr,HCCRX_SET_HOST_INT );else WRT_REG_WORD (®->isp.hccr,HCCR_SET_HOST_INT );drivers/scsi/qla2xxx/qla_nx.c +0
-0
drivers/scsi/qla2xxx/qla_nx.c qla82xx_disable_intrs(struct qla_hw_data *ha) · line 2294
Quoted 9 lines
drivers/scsi/qla2xxx/qla_nx.c +2
-1@@ -2287,7 +2287,8 @@ qla82xx_disable_intrs(struct qla_hw_data *ha) {scsi_qla_host_t *vha =pci_get_drvdata (ha->pdev); -qla82xx_mbx_intr_disable (vha); +if (ha->interrupts_on) +qla82xx_mbx_intr_disable (vha);spin_lock_irq (&ha->hardware_lock);if (IS_QLA8044 (ha))
PATCH 4/6 qla2xxx: Fix stuck login session
In reply to Himanshu MadhaniFrom: Quinn Tran <[email protected]>
Login session was stucked on cable pull. When FW is in the middle PRLI PENDING + driver is in Initiator mode, driver fail to check back with FW to see if the PRLI has completed. This patch would re-check with FW again to make sure PRLI would complete before pushing forward with relogin.
--- drivers/scsi/qla2xxx/qla_init.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +11 -12
@@ -808,6 +808,15 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, fcport->fw_login_state = current_login_state; fcport->d_id = id;switch (current_login_state) { +case DSC_LS_PRLI_PEND : +/* +* In the middle of PRLI. Let it finish. +* Allow relogin code to recheck state again +* with GNL. Push disc_state back to DELETED +* so GNL can go out again +*/ + fcport->disc_state =DSC_DELETED ; +break ;case DSC_LS_PRLI_COMP :if ((e->prli_svc_param_word_3[0 ] &BIT_4 ) ==0 ) fcport->port_type =FCT_INITIATOR ;
@@ -1474,7 +1483,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)u64 wwn;u16 sec; - ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0x20d8, + ql_dbg(ql_dbg_disc, vha, 0x20d8, "%s %8phC DS %d LS %d P %d fl %x confl %p rscn %d|%d login %d lid %d scan %d\n", __func__, fcport->port_name, fcport->disc_state, fcport->fw_login_state, fcport->login_pause, fcport->flags,
@@ -1485,6 +1494,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)return 0 ;if ((fcport->loop_id !=FC_NO_LOOP_ID ) && +qla_dual_mode_enabled (vha) && ((fcport->fw_login_state ==DSC_LS_PLOGI_PEND ) || (fcport->fw_login_state ==DSC_LS_PRLI_PEND )))return 0 ;
@@ -1674,17 +1684,6 @@ void qla24xx_handle_relogin_event(scsi_qla_host_t *vha, fcport->last_login_gen, fcport->login_gen, fcport->flags); -if ((fcport->fw_login_state ==DSC_LS_PLOGI_PEND ) || - (fcport->fw_login_state ==DSC_LS_PRLI_PEND )) -return ; - -if (fcport->fw_login_state ==DSC_LS_PLOGI_COMP ) { -if (time_before_eq (jiffies, fcport->plogi_nack_done_deadline)) { -set_bit (RELOGIN_NEEDED , &vha->dpc_flags); -return ; - } - } -if (fcport->last_rscn_gen != fcport->rscn_gen) {ql_dbg (ql_dbg_disc, vha,0x20e9 ,"%s %d %8phC post gnl\n" , __func__, __LINE__, fcport->port_name);
Signature · 1 line
2.12.0
Re: [PATCH 4/6] qla2xxx: Fix stuck login session
Quoted 59 lines · Himanshu Madhani
From: Quinn Tran <[email protected]>
Login session was stucked on cable pull. When FW is in the middle PRLI PENDING + driver is in Initiator mode, driver fail to check back with FW to see if the PRLI has completed. This patch would re-check with FW again to make sure PRLI would complete before pushing forward with relogin.
Signed-off-by Quinn Tran <[email protected]>Signed-off-by Himanshu Madhani <[email protected]>--- drivers/scsi/qla2xxx/qla_init.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)drivers/scsi/qla2xxx/qla_init.c +11
-5@@ -808,6 +808,15 @@ static void qla24xx_handle_gnl_done_event(scsi_qla_host_t *vha, fcport->fw_login_state = current_login_state; fcport->d_id = id;switch (current_login_state) { +case DSC_LS_PRLI_PEND : +/* +* In the middle of PRLI. Let it finish. +* Allow relogin code to recheck state again +* with GNL. Push disc_state back to DELETED +* so GNL can go out again +*/ + fcport->disc_state =DSC_DELETED ; +break ;case DSC_LS_PRLI_COMP :if ((e->prli_svc_param_word_3[0 ] &BIT_4 ) ==0 ) fcport->port_type =FCT_INITIATOR ;@@ -1474,7 +1483,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)u64 wwn;u16 sec; - ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0x20d8, + ql_dbg(ql_dbg_disc, vha, 0x20d8, "%s %8phC DS %d LS %d P %d fl %x confl %p rscn %d|%d login %d lid %d scan %d\n", __func__, fcport->port_name, fcport->disc_state, fcport->fw_login_state, fcport->login_pause, fcport->flags,@@ -1485,6 +1494,7 @@ int qla24xx_fcport_handle_login(struct scsi_qla_host *vha, fc_port_t *fcport)return 0 ;if ((fcport->loop_id !=FC_NO_LOOP_ID ) && +qla_dual_mode_enabled (vha) && ((fcport->fw_login_state ==DSC_LS_PLOGI_PEND ) || (fcport->fw_login_state ==DSC_LS_PRLI_PEND )))return 0 ;@@ -1674,17 +1684,6 @@ void qla24xx_handle_relogin_event(scsi_qla_host_t *vha, fcport->last_login_gen, fcport->login_gen, fcport->flags); -if ((fcport->fw_login_state ==DSC_LS_PLOGI_PEND ) || - (fcport->fw_login_state ==DSC_LS_PRLI_PEND )) -return ; -
drivers/scsi/qla2xxx/qla_init.c void qla24xx_handle_relogin_event(scsi_qla_host_t *vha, · line 1689
Quoted 10 lines
drivers/scsi/qla2xxx/qla_init.c +0
-7-if (fcport->fw_login_state ==DSC_LS_PLOGI_COMP ) { -if (time_before_eq (jiffies, fcport->plogi_nack_done_deadline)) { -set_bit (RELOGIN_NEEDED , &vha->dpc_flags); -return ; - } - } -if (fcport->last_rscn_gen != fcport->rscn_gen) {ql_dbg (ql_dbg_disc, vha,0x20e9 ,"%s %d %8phC post gnl\n" , __func__, __LINE__, fcport->port_name);
PATCH 5/6 qla2xxx: Fix stale session
In reply to Himanshu MadhaniFrom: Quinn Tran <[email protected]>
On fast cable pull, where driver is unable to detect device has disappeared and came back based on switch info, qla2xxx would not re-login while remote port has already invalidate the session. This cause IO timeout. This patch would relogin to remote device for RSCN affected port.
--- drivers/scsi/qla2xxx/qla_gs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_gs.c +3 -2
@@ -3628,7 +3628,6 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)list_for_each_entry (fcport, &vha->vp_fcports, list) {if (memcmp (rp->port_name, fcport->port_name,WWN_SIZE ))continue ; - fcport->scan_needed =0 ; fcport->scan_state =QLA_FCPORT_FOUND ; found = true;/*
@@ -3637,10 +3636,12 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)if ((fcport->flags &FCF_FABRIC_DEVICE ) ==0 ) {qla2x00_clear_loop_id (fcport); fcport->flags |=FCF_FABRIC_DEVICE ; - }else if (fcport->d_id.b24 != rp->id.b24) { + }else if (fcport->d_id.b24 != rp->id.b24 || + fcport->scan_needed) {qlt_schedule_sess_for_deletion (fcport); } fcport->d_id.b24 = rp->id.b24; + fcport->scan_needed =0 ;break ; }
Signature · 1 line
2.12.0
Re: [PATCH 5/6] qla2xxx: Fix stale session
Quoted 30 lines · Himanshu Madhani
From: Quinn Tran <[email protected]>
On fast cable pull, where driver is unable to detect device has disappeared and came back based on switch info, qla2xxx would not re-login while remote port has already invalidate the session. This cause IO timeout. This patch would relogin to remote device for RSCN affected port.
Signed-off-by Quinn Tran <[email protected]>Signed-off-by Himanshu Madhani <[email protected]>--- drivers/scsi/qla2xxx/qla_gs.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/scsi/qla2xxx/qla_gs.c +0
-1@@ -3628,7 +3628,6 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)list_for_each_entry (fcport, &vha->vp_fcports, list) {if (memcmp (rp->port_name, fcport->port_name,WWN_SIZE ))continue ; - fcport->scan_needed =0 ; fcport->scan_state =QLA_FCPORT_FOUND ; found = true;/* @@ -3637,10 +3636,12 @@ void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp)if ((fcport->flags &FCF_FABRIC_DEVICE ) ==0 ) {qla2x00_clear_loop_id (fcport); fcport->flags |=FCF_FABRIC_DEVICE ;
drivers/scsi/qla2xxx/qla_gs.c void qla24xx_async_gnnft_done(scsi_qla_host_t *vha, srb_t *sp) · line 3647
Quoted 10 lines
drivers/scsi/qla2xxx/qla_gs.c +3
-1- }else if (fcport->d_id.b24 != rp->id.b24) { + }else if (fcport->d_id.b24 != rp->id.b24 || + fcport->scan_needed) {qlt_schedule_sess_for_deletion (fcport); } fcport->d_id.b24 = rp->id.b24; + fcport->scan_needed =0 ;break ; }
PATCH 6/6 qla2xxx: Update driver version to 10.01.00.19-k
In reply to Himanshu Madhani--- drivers/scsi/qla2xxx/qla_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_version.h +1 -1
@@ -7,7 +7,7 @@/* * Driver version */ -#define QLA2XXX_VERSION "10.01.00.18-k" +#define QLA2XXX_VERSION "10.01.00.19-k"#define QLA_DRIVER_MAJOR_VER 10#define QLA_DRIVER_MINOR_VER 1
Signature · 1 line
2.12.0
Re: [PATCH 6/6] qla2xxx: Update driver version to 10.01.00.19-k
Quoted 10 lines · Himanshu Madhani
Signed-off-by Himanshu Madhani <[email protected]>--- drivers/scsi/qla2xxx/qla_version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/scsi/qla2xxx/qla_version.h +0
-0
drivers/scsi/qla2xxx/qla_version.h line 13
Quoted 8 lines
drivers/scsi/qla2xxx/qla_version.h +1
-1@@ -7,7 +7,7 @@/* * Driver version */ -#define QLA2XXX_VERSION "10.01.00.18-k" +#define QLA2XXX_VERSION "10.01.00.19-k"#define QLA_DRIVER_MAJOR_VER 10#define QLA_DRIVER_MINOR_VER 1
Martin K. Petersen
AppliedHimanshu,
Quoted 1 line
This series has few bug fixes for the driver.
Applied to 5.4/scsi-queue, thanks!
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering