[SCSI] qla2xxx: Correct various NPIV issues.

* Consolidate vport-count processing.
* Correct vp_idx restrictions during RSCN processing.
* Push topology verification check to qla2x00_do_dpc_all_vps().
* Don't skip vport full-login-lip/lip-reset mailbox handling.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 14 insertions, 16 deletions

diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c
index a748a95efb10..42b799abba57 100644
--- a/drivers/scsi/qla2xxx/qla_mid.c
+++ b/drivers/scsi/qla2xxx/qla_mid.c
@@ -42,7 +42,6 @@ qla24xx_allocate_vp_id(scsi_qla_host_t *vha)
 
         set_bit(vp_id, ha->vp_idx_map);
         ha->num_vhosts++;
-        ha->cur_vport_count++;
         vha->vp_idx = vp_id;
         list_add_tail(&vha->list, &ha->vp_list);
         mutex_unlock(&ha->vport_lock);
@@ -58,7 +57,6 @@ qla24xx_deallocate_vp_id(scsi_qla_host_t *vha)
         mutex_lock(&ha->vport_lock);
         vp_id = vha->vp_idx;
         ha->num_vhosts--;
-        ha->cur_vport_count--;
         clear_bit(vp_id, ha->vp_idx_map);
         list_del(&vha->list);
         mutex_unlock(&ha->vport_lock);
@@ -235,7 +233,11 @@ qla2x00_vp_abort_isp(scsi_qla_host_t *vha)
                         atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME);
         }
 
-        /* To exclusively reset vport, we need to log it out first.*/
+        /*
+         * To exclusively reset vport, we need to log it out first.  Note: this
+         * control_vp can fail if ISP reset is already issued, this is
+         * expected, as the vp would be already logged out due to ISP reset.
+         */
         if (!test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags))
                 qla24xx_control_vp(vha, VCE_COMMAND_DISABLE_VPS_LOGO_ALL);
 
@@ -247,23 +249,11 @@ qla2x00_vp_abort_isp(scsi_qla_host_t *vha)
 static int
 qla2x00_do_dpc_vp(scsi_qla_host_t *vha)
 {
-        struct qla_hw_data *ha = vha->hw;
-        scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
-
-        if (!(ha->current_topology & ISP_CFG_F))
-                return 0;
-
         qla2x00_do_work(vha);
 
         if (test_and_clear_bit(VP_IDX_ACQUIRED, &vha->vp_flags)) {
                 /* VP acquired. complete port configuration */
-                if (atomic_read(&base_vha->loop_state) == LOOP_READY) {
-                        qla24xx_configure_vp(vha);
-                } else {
-                        set_bit(VP_IDX_ACQUIRED, &vha->vp_flags);
-                        set_bit(VP_DPC_NEEDED, &base_vha->dpc_flags);
-                }
-
+                qla24xx_configure_vp(vha);
                 return 0;
         }
 
@@ -314,6 +304,9 @@ qla2x00_do_dpc_all_vps(scsi_qla_host_t *vha)
 
         clear_bit(VP_DPC_NEEDED, &vha->dpc_flags);
 
+        if (!(ha->current_topology & ISP_CFG_F))
+                return;
+
         list_for_each_entry_safe(vp, tvp, &ha->vp_list, list) {
                 if (vp->vp_idx)
                         ret = qla2x00_do_dpc_vp(vp);
@@ -418,6 +411,11 @@ qla24xx_create_vhost(struct fc_vport *fc_vport)
 
         vha->flags.init_done = 1;
 
+        mutex_lock(&ha->vport_lock);
+        set_bit(vha->vp_idx, ha->vp_idx_map);
+        ha->cur_vport_count++;
+        mutex_unlock(&ha->vport_lock);
+
         return vha;
 
 create_vhost_failed: