[SCSI] bfa: Fix to avoid vport delete hang on request queue full scenario.

Fixed the LPS (Logical Port Services) state machine to send a
FDISC/FLOGI to the FW from the request queue wait state, when
there is space available again on the request queue.
Made changes to free the vport on LOGO/cleanup complete instead
of free'ing it from vport_delete_handler in the module unload scenario.

Signed-off-by: Krishna Gudipati <kgudipat@brocade.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
index d4f951fe753eecb1fbccade0e96e5adde904b986..5d2a1307e5cea333a73356a56ff4a054af5009d2 100644 (file)
--- a/drivers/scsi/bfa/bfa_fcs_lport.c
+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
@@ -5717,6 +5717,8 @@ bfa_fcs_vport_free(struct bfa_fcs_vport_s *vport)
 
        if (vport_drv->comp_del)
                complete(vport_drv->comp_del);
+       else
+               kfree(vport_drv);
 
        bfa_lps_delete(vport->lps);
 }

diff --git a/drivers/scsi/bfa/bfa_svc.c b/drivers/scsi/bfa/bfa_svc.c
index 3abe2bebfe1f276a70ec855ddf1b16b9fabb2184..6583b2d94f6426bb6777e4d8bf76334734d1f47c 100644 (file)
--- a/drivers/scsi/bfa/bfa_svc.c
+++ b/drivers/scsi/bfa/bfa_svc.c
@@ -1280,6 +1280,7 @@ bfa_lps_sm_loginwait(struct bfa_lps_s *lps, enum bfa_lps_event event)
        switch (event) {
        case BFA_LPS_SM_RESUME:
                bfa_sm_set_state(lps, bfa_lps_sm_login);
+               bfa_lps_send_login(lps);
                break;
 
        case BFA_LPS_SM_OFFLINE:
@@ -1578,7 +1579,7 @@ bfa_lps_login_rsp(struct bfa_s *bfa, struct bfi_lps_login_rsp_s *rsp)
                break;
 
        case BFA_STATUS_VPORT_MAX:
-               if (!rsp->ext_status)
+               if (rsp->ext_status)
                        bfa_lps_no_res(lps, rsp->ext_status);
                break;
 

diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c
index 06310b8e562d19ccc49d5932d7b41d3429290ac5..7b1ecd2b3ffe8b382689429c6e91d01ae04e45a1 100644 (file)
--- a/drivers/scsi/bfa/bfad_attr.c
+++ b/drivers/scsi/bfa/bfad_attr.c
@@ -494,8 +494,11 @@ bfad_im_vport_delete(struct fc_vport *fc_vport)
        unsigned long flags;
        struct completion fcomp;
 
-       if (im_port->flags & BFAD_PORT_DELETE)
-               goto free_scsi_host;
+       if (im_port->flags & BFAD_PORT_DELETE) {
+               bfad_scsi_host_free(bfad, im_port);
+               list_del(&vport->list_entry);
+               return 0;
+       }
 
        port = im_port->port;
 
@@ -526,7 +529,6 @@ bfad_im_vport_delete(struct fc_vport *fc_vport)
 
        wait_for_completion(vport->comp_del);
 
-free_scsi_host:
        bfad_scsi_host_free(bfad, im_port);
        list_del(&vport->list_entry);
        kfree(vport);