From: "Ewan D. Milne" <emilne@redhat.com>
To: Himanshu Madhani <hmadhani@marvell.com>,
James.Bottomley@HansenPartnership.com,
martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org
Subject: Re: [PATCH 3/6] qla2xxx: Fix driver reload for ISP82xx
Date: Tue, 03 Sep 2019 10:49:30 -0400 [thread overview]
Message-ID: <a41e1293ee3c50d21e1700cfeeca4329e7551a01.camel@redhat.com> (raw)
In-Reply-To: <20190830222402.23688-4-hmadhani@marvell.com>
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>
next prev parent reply other threads:[~2019-09-03 14:49 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
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-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
2019-09-03 14:48 ` Ewan D. Milne
2019-09-13 20:36 ` Martin Wilck
2019-09-13 22:37 ` Martin K. Petersen
2019-09-16 16:19 ` [EXT] " Himanshu Madhani
2019-08-30 22:23 ` [PATCH 3/6] qla2xxx: Fix driver reload for ISP82xx Himanshu Madhani
2019-09-03 14:49 ` Ewan D. Milne [this message]
2019-08-30 22:24 ` [PATCH 4/6] qla2xxx: Fix stuck login session Himanshu Madhani
2019-09-03 14:50 ` Ewan D. Milne
2019-08-30 22:24 ` [PATCH 5/6] qla2xxx: Fix stale session 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-03 14:52 ` Ewan D. Milne
2019-09-07 19:39 ` [PATCH 0/6] qla2xxx: Bug fixes for the driver Martin K. Petersen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a41e1293ee3c50d21e1700cfeeca4329e7551a01.camel@redhat.com \
--to=emilne@redhat.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=hmadhani@marvell.com \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).