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 12/22] qla2xxx: Fixups for ISP83xx.
Date: Tue, 15 May 2012 14:34:19 -0400 [thread overview]
Message-ID: <1337106869-14191-13-git-send-email-chad.dupuis@qlogic.com> (raw)
In-Reply-To: <1337106869-14191-1-git-send-email-chad.dupuis@qlogic.com>
From: Nigel Kirkland <nigel.kirkland@qlogic.com>
Signed-off-by: Nigel Kirkland <nigel.kirkland@qlogic.com>
Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com>
---
drivers/scsi/qla2xxx/qla_attr.c | 4 ++--
drivers/scsi/qla2xxx/qla_bsg.c | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
index f8d7692..5b3b594 100644
--- a/drivers/scsi/qla2xxx/qla_attr.c
+++ b/drivers/scsi/qla2xxx/qla_attr.c
@@ -585,7 +585,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
scsi_unblock_requests(vha->host);
break;
case 0x2025d:
- if (!IS_QLA81XX(ha))
+ if (!IS_QLA81XX(ha) || !IS_QLA8031(ha))
return -EPERM;
ql_log(ql_log_info, vha, 0x706f,
@@ -1153,7 +1153,7 @@ qla2x00_phy_version_show(struct device *dev, struct device_attribute *attr,
scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
struct qla_hw_data *ha = vha->hw;
- if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+ if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
return snprintf(buf, PAGE_SIZE, "\n");
return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
diff --git a/drivers/scsi/qla2xxx/qla_bsg.c b/drivers/scsi/qla2xxx/qla_bsg.c
index bc3cc6d..26d34cb 100644
--- a/drivers/scsi/qla2xxx/qla_bsg.c
+++ b/drivers/scsi/qla2xxx/qla_bsg.c
@@ -544,7 +544,7 @@ qla81xx_set_internal_loopback(scsi_qla_host_t *vha, uint16_t *config,
int rval = 0;
struct qla_hw_data *ha = vha->hw;
- if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+ if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
goto done_set_internal;
new_config[0] = config[0] | (ENABLE_INTERNAL_LOOPBACK << 1);
@@ -586,7 +586,7 @@ qla81xx_reset_internal_loopback(scsi_qla_host_t *vha, uint16_t *config,
uint16_t new_config[4];
struct qla_hw_data *ha = vha->hw;
- if (!IS_QLA81XX(ha) && !IS_QLA83XX(ha))
+ if (!IS_QLA81XX(ha) && !IS_QLA8031(ha))
goto done_reset_internal;
memset(new_config, 0 , sizeof(new_config));
@@ -711,7 +711,7 @@ qla2x00_process_loopback(struct fc_bsg_job *bsg_job)
if ((ha->current_topology == ISP_CFG_F ||
(atomic_read(&vha->loop_state) == LOOP_DOWN) ||
- ((IS_QLA81XX(ha) || IS_QLA83XX(ha)) &&
+ ((IS_QLA81XX(ha) || IS_QLA8031(ha)) &&
le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE
&& req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
elreq.options == EXTERNAL_LOOPBACK) {
--
1.7.7
next prev parent reply other threads:[~2012-05-15 18:57 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-15 18:34 [PATCH 00/22] qla2xxx: Updates for scsi "misc" branch Chad Dupuis
2012-05-15 18:34 ` [PATCH 01/22] qla2xxx: Fix typo in qla_init.c Chad Dupuis
2012-05-15 18:34 ` [PATCH 02/22] qla2xxx: Micro optimization in queuecommand handler Chad Dupuis
2012-05-15 18:34 ` [PATCH 03/22] qla2xxx: Fix typo in qla_mbx.c Chad Dupuis
2012-05-15 18:34 ` [PATCH 04/22] qla2xxx: Remove unneeded DPC wakeups from qla82xx_watchdog Chad Dupuis
2012-05-15 18:34 ` [PATCH 05/22] qla2xxx: Detect PEG errors Chad Dupuis
2012-05-15 18:34 ` [PATCH 06/22] qla2xxx: Change "Done" to "Entering" in the debug print statement in qla2x00_port_logout Chad Dupuis
2012-05-15 18:34 ` [PATCH 07/22] qla2xxx: Handle interrupt registration failures more gracefully Chad Dupuis
2012-05-15 18:34 ` [PATCH 08/22] qla2xxx: Add ql_dbg_verbose logging level Chad Dupuis
2012-05-15 18:34 ` [PATCH 09/22] qla2xxx: Stats should be different from physical and virtual ports Chad Dupuis
2012-05-15 18:34 ` [PATCH 10/22] qla2xxx: Fix typo in bus-reset handler Chad Dupuis
2012-05-15 18:34 ` [PATCH 11/22] qla2xxx: Display proper supported speeds for 16G FC adapters Chad Dupuis
2012-05-15 18:34 ` Chad Dupuis [this message]
2012-05-15 18:34 ` [PATCH 13/22] qla2xxx: Remove mirrored field vp_idx from struct fc_port Chad Dupuis
2012-05-15 18:34 ` [PATCH 14/22] qla2xxx: Optimize existing port name server query matching Chad Dupuis
2012-05-15 18:34 ` [PATCH 15/22] qla2xxx: Corrections to log messages Chad Dupuis
2012-05-15 18:34 ` [PATCH 16/22] qla2xxx: Log link up and link down messages to track link flops Chad Dupuis
2012-05-15 18:34 ` [PATCH 17/22] qla2xxx: Avoid losing any fc ports when loop id's are exhausted Chad Dupuis
2012-05-15 18:34 ` [PATCH 18/22] qla2xxx: Don't capture minidump for ISP82xx on flash update from application Chad Dupuis
2012-05-15 18:34 ` [PATCH 19/22] qla2xxx: Display proper firmware version when new minidump template is gathered for ISP82xx Chad Dupuis
2012-05-15 18:34 ` [PATCH 20/22] Revert "qla2xxx: During loopdown perform Diagnostic loopback." Chad Dupuis
2012-05-15 18:34 ` [PATCH 21/22] qla2xxx: Add LLD target-mode infrastructure for >= 24xx series Chad Dupuis
2012-05-15 18:34 ` [PATCH 22/22] tcm_qla2xxx: Add >= 24xx series fabric module for target-core Chad Dupuis
2012-05-18 23:47 ` [PATCH 00/22] qla2xxx: Updates for scsi "misc" branch Nicholas A. Bellinger
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=1337106869-14191-13-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).