Skip to content

Commit

Permalink
[SCSI] qla2xxx: Consistently access the physical HA port.
Browse files Browse the repository at this point in the history
There were several places where referencing ha structure of
virtual ports for resources. Among those refereces, certain
fields are get up-to-dated only on ha structure of physical port.

Signed-off-by: Seokmann Ju <seokmann.ju@qlogic.com>
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
  • Loading branch information
Seokmann Ju authored and James Bottomley committed Apr 7, 2008
1 parent 73f0f0f commit d4486fd
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/scsi/qla2xxx/qla_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -2453,7 +2453,8 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)

if (fcport->loop_id == FC_NO_LOOP_ID) {
fcport->loop_id = next_loopid;
rval = qla2x00_find_new_loop_id(ha, fcport);
rval = qla2x00_find_new_loop_id(
to_qla_parent(ha), fcport);
if (rval != QLA_SUCCESS) {
/* Ran out of IDs to use */
break;
Expand All @@ -2478,7 +2479,8 @@ qla2x00_configure_fabric(scsi_qla_host_t *ha)

/* Find a new loop ID to use. */
fcport->loop_id = next_loopid;
rval = qla2x00_find_new_loop_id(ha, fcport);
rval = qla2x00_find_new_loop_id(to_qla_parent(ha),
fcport);
if (rval != QLA_SUCCESS) {
/* Ran out of IDs to use */
break;
Expand Down Expand Up @@ -4044,16 +4046,16 @@ qla24xx_configure_vhba(scsi_qla_host_t *ha)
if (!ha->parent)
return -EINVAL;

rval = qla2x00_fw_ready(ha);
rval = qla2x00_fw_ready(ha->parent);
if (rval == QLA_SUCCESS) {
clear_bit(RESET_MARKER_NEEDED, &ha->dpc_flags);
qla2x00_marker(ha, 0, 0, MK_SYNC_ALL);
qla2x00_marker(ha->parent, 0, 0, MK_SYNC_ALL);
}

ha->flags.management_server_logged_in = 0;

/* Login to SNS first */
qla24xx_login_fabric(ha, NPH_SNS, 0xff, 0xff, 0xfc,
qla24xx_login_fabric(ha->parent, NPH_SNS, 0xff, 0xff, 0xfc,
mb, BIT_1);
if (mb[0] != MBS_COMMAND_COMPLETE) {
DEBUG15(qla_printk(KERN_INFO, ha,
Expand All @@ -4067,7 +4069,7 @@ qla24xx_configure_vhba(scsi_qla_host_t *ha)
atomic_set(&ha->loop_state, LOOP_UP);
set_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags);
set_bit(LOCAL_LOOP_UPDATE, &ha->dpc_flags);
rval = qla2x00_loop_resync(ha);
rval = qla2x00_loop_resync(ha->parent);

return rval;
}
Expand Down

0 comments on commit d4486fd

Please sign in to comment.