From: vikas.chaudhary@qlogic.com
To: jbottomley@parallels.com, michaelc@cs.wisc.edu
Cc: linux-scsi@vger.kernel.org, ravi.anand@qlogic.com,
lalit.chandivade@qlogic.com, vikas.chaudhary@qlogic.com
Subject: [PATCH 06/11] qla4xxx: Proper detection of firmware abort error code for ISP82xx
Date: Mon, 13 Feb 2012 18:30:45 +0530 [thread overview]
Message-ID: <1329138050-1042-7-git-send-email-vikas.chaudhary@qlogic.com> (raw)
In-Reply-To: <1329138050-1042-1-git-send-email-vikas.chaudhary@qlogic.com>
From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
drivers/scsi/qla4xxx/ql4_def.h | 2 --
drivers/scsi/qla4xxx/ql4_nx.h | 1 +
drivers/scsi/qla4xxx/ql4_os.c | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
index bfe6854..ec48dc3 100644
--- a/drivers/scsi/qla4xxx/ql4_def.h
+++ b/drivers/scsi/qla4xxx/ql4_def.h
@@ -150,8 +150,6 @@
#define QL4_SESS_RECOVERY_TMO 120 /* iSCSI session */
/* recovery timeout */
-#define MSB(x) ((uint8_t)((uint16_t)(x) >> 8))
-#define LSW(x) ((uint16_t)(x))
#define LSDW(x) ((u32)((u64)(x)))
#define MSDW(x) ((u32)((((u64)(x)) >> 16) >> 16))
diff --git a/drivers/scsi/qla4xxx/ql4_nx.h b/drivers/scsi/qla4xxx/ql4_nx.h
index dc45ac9..dc7500e 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.h
+++ b/drivers/scsi/qla4xxx/ql4_nx.h
@@ -623,6 +623,7 @@ struct crb_addr_pair {
#define ADDR_ERROR ((unsigned long) 0xffffffff)
#define MAX_CTL_CHECK 1000
+#define QLA82XX_FWERROR_CODE(code) ((code >> 8) & 0x1fffff)
/***************************************************************************
* PCI related defines.
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 3339cc1..2cd2077 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -2165,7 +2165,7 @@ void qla4_8xxx_watchdog(struct scsi_qla_host *ha)
halt_status = qla4_8xxx_rd_32(ha,
QLA82XX_PEG_HALT_STATUS1);
- if (LSW(MSB(halt_status)) == 0x67)
+ if (QLA82XX_FWERROR_CODE(halt_status) == 0x67)
ql4_printk(KERN_ERR, ha, "%s:"
" Firmware aborted with"
" error code 0x00006700."
--
1.7.8.247.g10f4e
next prev parent reply other threads:[~2012-02-13 13:09 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-13 13:00 [PATCH 00/11] qla4xxx: Update for scsi-misc vikas.chaudhary
2012-02-13 13:00 ` [PATCH 01/11] qla4xxx: Remove unused code vikas.chaudhary
2012-02-13 13:00 ` [PATCH 02/11] qla4xxx: Fix un-necessary delay on invalid DDB vikas.chaudhary
2012-02-13 13:00 ` [PATCH 03/11] qla4xxx: Fix verify boot idx correctly vikas.chaudhary
2012-02-13 13:00 ` [PATCH 04/11] qla4xxx: Modified debug log messages for boot info vikas.chaudhary
2012-02-13 13:00 ` [PATCH 05/11] qla4xxx: Remove un-necessary print statment vikas.chaudhary
2012-02-13 13:00 ` vikas.chaudhary [this message]
2012-02-13 13:00 ` [PATCH 07/11] scsi_transport_iscsi: added support for host event vikas.chaudhary
2012-02-13 13:00 ` [PATCH 09/11] iscsi_transport: Added Ping support vikas.chaudhary
2012-02-21 21:55 ` Or Gerlitz
2012-02-21 22:33 ` Mike Christie
2012-02-21 22:39 ` Or Gerlitz
2012-02-21 22:54 ` Ravi Anand
2012-02-21 22:58 ` Mike Christie
2012-02-13 13:00 ` [PATCH 10/11] qla4xxx: Added ping support vikas.chaudhary
2012-03-06 2:49 ` Mike Christie
2012-03-06 12:26 ` Vikas Chaudhary
2012-02-13 13:00 ` [PATCH 11/11] qla4xxx: Update driver version to 5.02.00-k14 vikas.chaudhary
2012-02-15 7:00 ` [PATCH 00/11] qla4xxx: Update for scsi-misc Mike Christie
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=1329138050-1042-7-git-send-email-vikas.chaudhary@qlogic.com \
--to=vikas.chaudhary@qlogic.com \
--cc=jbottomley@parallels.com \
--cc=lalit.chandivade@qlogic.com \
--cc=linux-scsi@vger.kernel.org \
--cc=michaelc@cs.wisc.edu \
--cc=ravi.anand@qlogic.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).