[SCSI] qla2xxx: Fixups for ISP83xx.
Signed-off-by: Nigel Kirkland <nigel.kirkland@qlogic.com> Signed-off-by: Chad Dupuis <chad.dupuis@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
6f606d24c6
commit
f863f603bb
2 changed files with 5 additions and 5 deletions
|
@ -585,7 +585,7 @@ qla2x00_sysfs_write_reset(struct file *filp, struct kobject *kobj,
|
||||||
scsi_unblock_requests(vha->host);
|
scsi_unblock_requests(vha->host);
|
||||||
break;
|
break;
|
||||||
case 0x2025d:
|
case 0x2025d:
|
||||||
if (!IS_QLA81XX(ha))
|
if (!IS_QLA81XX(ha) || !IS_QLA8031(ha))
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
|
|
||||||
ql_log(ql_log_info, vha, 0x706f,
|
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));
|
scsi_qla_host_t *vha = shost_priv(class_to_shost(dev));
|
||||||
struct qla_hw_data *ha = vha->hw;
|
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, "\n");
|
||||||
|
|
||||||
return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
|
return snprintf(buf, PAGE_SIZE, "%d.%02d.%02d\n",
|
||||||
|
|
|
@ -544,7 +544,7 @@ qla81xx_set_internal_loopback(scsi_qla_host_t *vha, uint16_t *config,
|
||||||
int rval = 0;
|
int rval = 0;
|
||||||
struct qla_hw_data *ha = vha->hw;
|
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;
|
goto done_set_internal;
|
||||||
|
|
||||||
new_config[0] = config[0] | (ENABLE_INTERNAL_LOOPBACK << 1);
|
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];
|
uint16_t new_config[4];
|
||||||
struct qla_hw_data *ha = vha->hw;
|
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;
|
goto done_reset_internal;
|
||||||
|
|
||||||
memset(new_config, 0 , sizeof(new_config));
|
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 ||
|
if ((ha->current_topology == ISP_CFG_F ||
|
||||||
(atomic_read(&vha->loop_state) == LOOP_DOWN) ||
|
(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
|
le32_to_cpu(*(uint32_t *)req_data) == ELS_OPCODE_BYTE
|
||||||
&& req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
|
&& req_data_len == MAX_ELS_FRAME_PAYLOAD)) &&
|
||||||
elreq.options == EXTERNAL_LOOPBACK) {
|
elreq.options == EXTERNAL_LOOPBACK) {
|
||||||
|
|
Reference in a new issue