From: Chad Dupuis <chad.dupuis@qlogic.com>
To: jbottomley@parallels.com
Cc: giridhar.malavali@qlogic.com, chad.dupuis@qlogic.com,
andrew.vasquez@qlogic.com, linux-scsi@vger.kernel.org
Subject: [PATCH 08/11] qla2xxx: Complete mailbox command timedout to avoid initialization failures during next reset cycle.
Date: Thu, 9 Feb 2012 11:14:10 -0800 [thread overview]
Message-ID: <1328814853-21764-9-git-send-email-chad.dupuis@qlogic.com> (raw)
In-Reply-To: <1328814853-21764-1-git-send-email-chad.dupuis@qlogic.com>
From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Complete the mailbox command timed out before initiating another abort cycle
to recover so that mailbox commands issued during next reset cycle don't fail
due to pending mailbox access timeout.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
---
drivers/scsi/qla2xxx/qla_mbx.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 8635722..08f1d01 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -342,6 +342,8 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
set_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
clear_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);
+ /* Allow next mbx cmd to come in. */
+ complete(&ha->mbx_cmd_comp);
if (ha->isp_ops->abort_isp(vha)) {
/* Failed. retry later. */
set_bit(ISP_ABORT_NEEDED,
@@ -350,6 +352,7 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp)
clear_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags);
ql_dbg(ql_dbg_mbx, base_vha, 0x101f,
"Finished abort_isp.\n");
+ goto mbx_done;
}
}
}
@@ -358,6 +361,7 @@ premature_exit:
/* Allow next mbx cmd to come in. */
complete(&ha->mbx_cmd_comp);
+mbx_done:
if (rval) {
ql_dbg(ql_dbg_mbx, base_vha, 0x1020,
"**** Failed mbx[0]=%x, mb[1]=%x, mb[2]=%x, cmd=%x ****.\n",
--
1.6.0.2
next prev parent reply other threads:[~2012-02-09 19:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-09 19:14 [PATCH 00/11] qla2xxx: Patches for 3.3-rc Chad Dupuis
2012-02-09 19:14 ` [PATCH 01/11] qla2xxx: Propagate up abort failures Chad Dupuis
2012-02-09 19:14 ` [PATCH 02/11] qla2xxx: Add check for null fcport references in qla2xxx_queuecommand Chad Dupuis
2012-02-09 19:14 ` [PATCH 03/11] qla2xxx: Add an "is reset active" helper Chad Dupuis
2012-02-09 19:14 ` [PATCH 04/11] qla2xxx: Clear options-flags while issuing stop-firmware mbx command Chad Dupuis
2012-02-09 19:14 ` [PATCH 05/11] qla2xxx: Remove errant clearing of MBX_INTERRUPT flag during CT-IOCB processing Chad Dupuis
2012-02-09 19:14 ` [PATCH 06/11] qla2xxx: Correct out of bounds read of ISP2200 mailbox registers Chad Dupuis
2012-02-09 19:14 ` [PATCH 07/11] qla2xxx: Remove check for null fcport from host reset handler Chad Dupuis
2012-02-09 19:14 ` Chad Dupuis [this message]
2012-02-09 19:14 ` [PATCH 09/11] qla2xxx: Remove resetting memory during device initialization for ISP82xx Chad Dupuis
2012-02-09 19:14 ` [PATCH 10/11] qla2xxx: Proper detection of firmware abort error code " Chad Dupuis
2012-02-09 19:14 ` [PATCH 11/11] qla2xxx: Update version number to 8.03.07.13-k Chad Dupuis
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=1328814853-21764-9-git-send-email-chad.dupuis@qlogic.com \
--to=chad.dupuis@qlogic.com \
--cc=andrew.vasquez@qlogic.com \
--cc=giridhar.malavali@qlogic.com \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
/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).