* [PATCH 1/6] qla2xxx: Fix message indicating vectors used by driver
2019-08-30 22:23 [PATCH 0/6] qla2xxx: Bug fixes for the driver Himanshu Madhani
@ 2019-08-30 22:23 ` Himanshu Madhani
2019-09-03 14:46 ` Ewan D. Milne
2019-09-04 22:33 ` Lee Duncan
2019-08-30 22:23 ` [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs Himanshu Madhani
` (5 subsequent siblings)
6 siblings, 2 replies; 18+ messages in thread
From: Himanshu Madhani @ 2019-08-30 22:23 UTC (permalink / raw)
To: James.Bottomley, martin.petersen; +Cc: hmadhani, linux-scsi
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 <hmadhani@marvell.com>
---
drivers/scsi/qla2xxx/qla_isr.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
index d81b5ecce24b..4c26630c1c3e 100644
--- a/drivers/scsi/qla2xxx/qla_isr.c
+++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -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)) {
--
2.12.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 1/6] qla2xxx: Fix message indicating vectors used by driver
2019-08-30 22:23 ` [PATCH 1/6] qla2xxx: Fix message indicating vectors used by driver Himanshu Madhani
@ 2019-09-03 14:46 ` Ewan D. Milne
2019-09-04 22:33 ` Lee Duncan
1 sibling, 0 replies; 18+ messages in thread
From: Ewan D. Milne @ 2019-09-03 14:46 UTC (permalink / raw)
To: Himanshu Madhani, James.Bottomley, martin.petersen; +Cc: linux-scsi
On Fri, 2019-08-30 at 15:23 -0700, Himanshu Madhani wrote:
> 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 <hmadhani@marvell.com>
> ---
> drivers/scsi/qla2xxx/qla_isr.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
> index d81b5ecce24b..4c26630c1c3e 100644
> --- a/drivers/scsi/qla2xxx/qla_isr.c
> +++ b/drivers/scsi/qla2xxx/qla_isr.c
> @@ -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)) {
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/6] qla2xxx: Fix message indicating vectors used by driver
2019-08-30 22:23 ` [PATCH 1/6] qla2xxx: Fix message indicating vectors used by driver Himanshu Madhani
2019-09-03 14:46 ` Ewan D. Milne
@ 2019-09-04 22:33 ` Lee Duncan
1 sibling, 0 replies; 18+ messages in thread
From: Lee Duncan @ 2019-09-04 22:33 UTC (permalink / raw)
To: Himanshu Madhani, James.Bottomley, martin.petersen; +Cc: linux-scsi
On 8/30/19 3:23 PM, Himanshu Madhani wrote:
> 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 <hmadhani@marvell.com>
> ---
> drivers/scsi/qla2xxx/qla_isr.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
> index d81b5ecce24b..4c26630c1c3e 100644
> --- a/drivers/scsi/qla2xxx/qla_isr.c
> +++ b/drivers/scsi/qla2xxx/qla_isr.c
> @@ -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)) {
>
Reviewed-by: Lee Duncan <lduncan@suse.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs
2019-08-30 22:23 [PATCH 0/6] qla2xxx: Bug fixes for the driver Himanshu Madhani
2019-08-30 22:23 ` [PATCH 1/6] qla2xxx: Fix message indicating vectors used by driver Himanshu Madhani
@ 2019-08-30 22:23 ` Himanshu Madhani
2019-09-03 14:48 ` Ewan D. Milne
2019-09-13 20:36 ` Martin Wilck
2019-08-30 22:23 ` [PATCH 3/6] qla2xxx: Fix driver reload for ISP82xx Himanshu Madhani
` (4 subsequent siblings)
6 siblings, 2 replies; 18+ messages in thread
From: Himanshu Madhani @ 2019-08-30 22:23 UTC (permalink / raw)
To: James.Bottomley, martin.petersen; +Cc: hmadhani, linux-scsi
From: Quinn Tran <qutran@marvell.com>
Use adapter specific callback to read flash instead of ISP
adapter specific.
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
---
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(-)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 632130b6165d..8161f08f3a4d 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -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++)
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index 65a675906188..a79f8da38abe 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -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);
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 764e1bb0f695..f2d5115b2d8d 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -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;
--
2.12.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs
2019-08-30 22:23 ` [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs Himanshu Madhani
@ 2019-09-03 14:48 ` Ewan D. Milne
2019-09-13 20:36 ` Martin Wilck
1 sibling, 0 replies; 18+ messages in thread
From: Ewan D. Milne @ 2019-09-03 14:48 UTC (permalink / raw)
To: Himanshu Madhani, James.Bottomley, martin.petersen; +Cc: linux-scsi
On Fri, 2019-08-30 at 15:23 -0700, Himanshu Madhani wrote:
> From: Quinn Tran <qutran@marvell.com>
>
> Use adapter specific callback to read flash instead of ISP
> adapter specific.
>
> Signed-off-by: Quinn Tran <qutran@marvell.com>
> Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
> ---
> 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(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
> index 632130b6165d..8161f08f3a4d 100644
> --- a/drivers/scsi/qla2xxx/qla_init.c
> +++ b/drivers/scsi/qla2xxx/qla_init.c
> @@ -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++)
> diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
> index 65a675906188..a79f8da38abe 100644
> --- a/drivers/scsi/qla2xxx/qla_nx.c
> +++ b/drivers/scsi/qla2xxx/qla_nx.c
> @@ -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);
> diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
> index 764e1bb0f695..f2d5115b2d8d 100644
> --- a/drivers/scsi/qla2xxx/qla_sup.c
> +++ b/drivers/scsi/qla2xxx/qla_sup.c
> @@ -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;
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs
2019-08-30 22:23 ` [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs Himanshu Madhani
2019-09-03 14:48 ` Ewan D. Milne
@ 2019-09-13 20:36 ` Martin Wilck
2019-09-13 22:37 ` Martin K. Petersen
1 sibling, 1 reply; 18+ messages in thread
From: Martin Wilck @ 2019-09-13 20:36 UTC (permalink / raw)
To: Himanshu Madhani, James.Bottomley, martin.petersen; +Cc: linux-scsi
On Fri, 2019-08-30 at 15:23 -0700, Himanshu Madhani wrote:
> From: Quinn Tran <qutran@marvell.com>
>
> Use adapter specific callback to read flash instead of ISP
> adapter specific.
>
> Signed-off-by: Quinn Tran <qutran@marvell.com>
> Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
> ---
> 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(-)
>
Tested-by: Martin Wilck <mwilck@suse.com>
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.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs
2019-09-13 20:36 ` Martin Wilck
@ 2019-09-13 22:37 ` Martin K. Petersen
2019-09-16 16:19 ` [EXT] " Himanshu Madhani
0 siblings, 1 reply; 18+ messages in thread
From: Martin K. Petersen @ 2019-09-13 22:37 UTC (permalink / raw)
To: Martin Wilck
Cc: Himanshu Madhani, James.Bottomley, martin.petersen, linux-scsi
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.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [EXT] Re: [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs
2019-09-13 22:37 ` Martin K. Petersen
@ 2019-09-16 16:19 ` Himanshu Madhani
0 siblings, 0 replies; 18+ messages in thread
From: Himanshu Madhani @ 2019-09-16 16:19 UTC (permalink / raw)
To: Martin K. Petersen, Martin Wilck; +Cc: James.Bottomley, linux-scsi
Hi Martin,
On 9/13/19, 5:37 PM, "Martin K. Petersen" <martin.petersen@oracle.com> 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
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 3/6] qla2xxx: Fix driver reload for ISP82xx
2019-08-30 22:23 [PATCH 0/6] qla2xxx: Bug fixes for the driver Himanshu Madhani
2019-08-30 22:23 ` [PATCH 1/6] qla2xxx: Fix message indicating vectors used by driver Himanshu Madhani
2019-08-30 22:23 ` [PATCH 2/6] qla2xxx: Fix flash read for Qlogic ISPs Himanshu Madhani
@ 2019-08-30 22:23 ` Himanshu Madhani
2019-09-03 14:49 ` Ewan D. Milne
2019-08-30 22:24 ` [PATCH 4/6] qla2xxx: Fix stuck login session Himanshu Madhani
` (3 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Himanshu Madhani @ 2019-08-30 22:23 UTC (permalink / raw)
To: James.Bottomley, martin.petersen; +Cc: hmadhani, linux-scsi
HINT_MBX_INT_PENDING is not guaranteed to be cleared by
firmware. Remove check that prevent driver load with ISP82XX.
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
---
drivers/scsi/qla2xxx/qla_mbx.c | 16 ++--------------
drivers/scsi/qla2xxx/qla_nx.c | 3 ++-
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index a82b6db2fa9d..4c858e2d0ea8 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -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);
diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
index a79f8da38abe..2b2028f2383e 100644
--- a/drivers/scsi/qla2xxx/qla_nx.c
+++ b/drivers/scsi/qla2xxx/qla_nx.c
@@ -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))
--
2.12.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 3/6] qla2xxx: Fix driver reload for ISP82xx
2019-08-30 22:23 ` [PATCH 3/6] qla2xxx: Fix driver reload for ISP82xx Himanshu Madhani
@ 2019-09-03 14:49 ` Ewan D. Milne
0 siblings, 0 replies; 18+ messages in thread
From: Ewan D. Milne @ 2019-09-03 14:49 UTC (permalink / raw)
To: Himanshu Madhani, James.Bottomley, martin.petersen; +Cc: linux-scsi
On Fri, 2019-08-30 at 15:23 -0700, Himanshu Madhani wrote:
> HINT_MBX_INT_PENDING is not guaranteed to be cleared by
> firmware. Remove check that prevent driver load with ISP82XX.
>
> Signed-off-by: Quinn Tran <qutran@marvell.com>
> Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
> ---
> drivers/scsi/qla2xxx/qla_mbx.c | 16 ++--------------
> drivers/scsi/qla2xxx/qla_nx.c | 3 ++-
> 2 files changed, 4 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
> index a82b6db2fa9d..4c858e2d0ea8 100644
> --- a/drivers/scsi/qla2xxx/qla_mbx.c
> +++ b/drivers/scsi/qla2xxx/qla_mbx.c
> @@ -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);
> diff --git a/drivers/scsi/qla2xxx/qla_nx.c b/drivers/scsi/qla2xxx/qla_nx.c
> index a79f8da38abe..2b2028f2383e 100644
> --- a/drivers/scsi/qla2xxx/qla_nx.c
> +++ b/drivers/scsi/qla2xxx/qla_nx.c
> @@ -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))
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 4/6] qla2xxx: Fix stuck login session
2019-08-30 22:23 [PATCH 0/6] qla2xxx: Bug fixes for the driver Himanshu Madhani
` (2 preceding siblings ...)
2019-08-30 22:23 ` [PATCH 3/6] qla2xxx: Fix driver reload for ISP82xx Himanshu Madhani
@ 2019-08-30 22:24 ` Himanshu Madhani
2019-09-03 14:50 ` Ewan D. Milne
2019-08-30 22:24 ` [PATCH 5/6] qla2xxx: Fix stale session Himanshu Madhani
` (2 subsequent siblings)
6 siblings, 1 reply; 18+ messages in thread
From: Himanshu Madhani @ 2019-08-30 22:24 UTC (permalink / raw)
To: James.Bottomley, martin.petersen; +Cc: hmadhani, linux-scsi
From: Quinn Tran <qutran@marvell.com>
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 <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
---
drivers/scsi/qla2xxx/qla_init.c | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 8161f08f3a4d..2bbadcf60295 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -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);
--
2.12.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 4/6] qla2xxx: Fix stuck login session
2019-08-30 22:24 ` [PATCH 4/6] qla2xxx: Fix stuck login session Himanshu Madhani
@ 2019-09-03 14:50 ` Ewan D. Milne
0 siblings, 0 replies; 18+ messages in thread
From: Ewan D. Milne @ 2019-09-03 14:50 UTC (permalink / raw)
To: Himanshu Madhani, James.Bottomley, martin.petersen; +Cc: linux-scsi
On Fri, 2019-08-30 at 15:24 -0700, Himanshu Madhani wrote:
> From: Quinn Tran <qutran@marvell.com>
>
> 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 <qutran@marvell.com>
> Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
> ---
> drivers/scsi/qla2xxx/qla_init.c | 23 +++++++++++------------
> 1 file changed, 11 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
> index 8161f08f3a4d..2bbadcf60295 100644
> --- a/drivers/scsi/qla2xxx/qla_init.c
> +++ b/drivers/scsi/qla2xxx/qla_init.c
> @@ -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);
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 5/6] qla2xxx: Fix stale session
2019-08-30 22:23 [PATCH 0/6] qla2xxx: Bug fixes for the driver Himanshu Madhani
` (3 preceding siblings ...)
2019-08-30 22:24 ` [PATCH 4/6] qla2xxx: Fix stuck login session Himanshu Madhani
@ 2019-08-30 22:24 ` Himanshu Madhani
2019-09-03 14:52 ` Ewan D. Milne
2019-08-30 22:24 ` [PATCH 6/6] qla2xxx: Update driver version to 10.01.00.19-k Himanshu Madhani
2019-09-07 19:39 ` [PATCH 0/6] qla2xxx: Bug fixes for the driver Martin K. Petersen
6 siblings, 1 reply; 18+ messages in thread
From: Himanshu Madhani @ 2019-08-30 22:24 UTC (permalink / raw)
To: James.Bottomley, martin.petersen; +Cc: hmadhani, linux-scsi
From: Quinn Tran <qutran@marvell.com>
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 <qutran@marvell.com>
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
---
drivers/scsi/qla2xxx/qla_gs.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
index 03f94eb372b6..dc0e36676313 100644
--- a/drivers/scsi/qla2xxx/qla_gs.c
+++ b/drivers/scsi/qla2xxx/qla_gs.c
@@ -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;
}
--
2.12.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 5/6] qla2xxx: Fix stale session
2019-08-30 22:24 ` [PATCH 5/6] qla2xxx: Fix stale session Himanshu Madhani
@ 2019-09-03 14:52 ` Ewan D. Milne
0 siblings, 0 replies; 18+ messages in thread
From: Ewan D. Milne @ 2019-09-03 14:52 UTC (permalink / raw)
To: Himanshu Madhani, James.Bottomley, martin.petersen; +Cc: linux-scsi
On Fri, 2019-08-30 at 15:24 -0700, Himanshu Madhani wrote:
> From: Quinn Tran <qutran@marvell.com>
>
> 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 <qutran@marvell.com>
> Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
> ---
> drivers/scsi/qla2xxx/qla_gs.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_gs.c b/drivers/scsi/qla2xxx/qla_gs.c
> index 03f94eb372b6..dc0e36676313 100644
> --- a/drivers/scsi/qla2xxx/qla_gs.c
> +++ b/drivers/scsi/qla2xxx/qla_gs.c
> @@ -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;
> }
>
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 6/6] qla2xxx: Update driver version to 10.01.00.19-k
2019-08-30 22:23 [PATCH 0/6] qla2xxx: Bug fixes for the driver Himanshu Madhani
` (4 preceding siblings ...)
2019-08-30 22:24 ` [PATCH 5/6] qla2xxx: Fix stale session Himanshu Madhani
@ 2019-08-30 22:24 ` Himanshu Madhani
2019-09-03 14:52 ` Ewan D. Milne
2019-09-07 19:39 ` [PATCH 0/6] qla2xxx: Bug fixes for the driver Martin K. Petersen
6 siblings, 1 reply; 18+ messages in thread
From: Himanshu Madhani @ 2019-08-30 22:24 UTC (permalink / raw)
To: James.Bottomley, martin.petersen; +Cc: hmadhani, linux-scsi
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
---
drivers/scsi/qla2xxx/qla_version.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
index 0833546a1b43..a8f2a953ceff 100644
--- a/drivers/scsi/qla2xxx/qla_version.h
+++ b/drivers/scsi/qla2xxx/qla_version.h
@@ -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
--
2.12.0
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 6/6] qla2xxx: Update driver version to 10.01.00.19-k
2019-08-30 22:24 ` [PATCH 6/6] qla2xxx: Update driver version to 10.01.00.19-k Himanshu Madhani
@ 2019-09-03 14:52 ` Ewan D. Milne
0 siblings, 0 replies; 18+ messages in thread
From: Ewan D. Milne @ 2019-09-03 14:52 UTC (permalink / raw)
To: Himanshu Madhani, James.Bottomley, martin.petersen; +Cc: linux-scsi
On Fri, 2019-08-30 at 15:24 -0700, Himanshu Madhani wrote:
> Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
> ---
> drivers/scsi/qla2xxx/qla_version.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h
> index 0833546a1b43..a8f2a953ceff 100644
> --- a/drivers/scsi/qla2xxx/qla_version.h
> +++ b/drivers/scsi/qla2xxx/qla_version.h
> @@ -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
Reviewed-by: Ewan D. Milne <emilne@redhat.com>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 0/6] qla2xxx: Bug fixes for the driver
2019-08-30 22:23 [PATCH 0/6] qla2xxx: Bug fixes for the driver Himanshu Madhani
` (5 preceding siblings ...)
2019-08-30 22:24 ` [PATCH 6/6] qla2xxx: Update driver version to 10.01.00.19-k Himanshu Madhani
@ 2019-09-07 19:39 ` Martin K. Petersen
6 siblings, 0 replies; 18+ messages in thread
From: Martin K. Petersen @ 2019-09-07 19:39 UTC (permalink / raw)
To: Himanshu Madhani; +Cc: James.Bottomley, martin.petersen, linux-scsi
Himanshu,
> This series has few bug fixes for the driver.
Applied to 5.4/scsi-queue, thanks!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 18+ messages in thread