lpfc 8.3.29: FC Discovery state machine fixes
Subsystems (2)
PATCH 4/7 lpfc 8.3.29: FC Discovery state machine fixes
FC Discovery state machine fixes.
- Fix bug with driver returning the inactive ndlp (125743)
- Fix discovery problem when in pt2pt by copying old ndlp state before state change (126887)
- Fix ndlp nodelist not empty wait timeout during driver unloading (127052)
Signed-off-by Alex Iannicelli <[email protected]>
Signed-off-by James Smart <[email protected]>
---
lpfc_els.c | 2 +- lpfc_hbadisc.c | 4 ++++ lpfc_init.c | 9 ++++++++- 3 files changed, 13 insertions(+), 2 deletions(-)
drivers/scsi/lpfc/lpfc_els.c +1 -1
@@ -1526,7 +1526,6 @@ lpfc_plogi_confirm_nport(struct lpfc_hbamemcpy (&ndlp->active_rrqs.xri_bitmap, &rrq.xri_bitmap,sizeof (ndlp->active_rrqs.xri_bitmap)); -lpfc_nlp_set_state (vport, ndlp,NLP_STE_NPR_NODE );/* Since we are swapping the ndlp passed in with the new one * and the did has already been swapped, copy over the * state and names.
@@ -1536,6 +1535,7 @@ lpfc_plogi_confirm_nport(struct lpfc_hbamemcpy (&new_ndlp->nlp_nodename, &ndlp->nlp_nodename,sizeof (struct lpfc_name )); new_ndlp->nlp_state = ndlp->nlp_state; +lpfc_nlp_set_state (vport, ndlp,NLP_STE_NPR_NODE );/* Fix up the rport accordingly */ rport = ndlp->rport;if (rport) {
drivers/scsi/lpfc/lpfc_hbadisc.c +4 -0
@@ -5332,6 +5332,10 @@ lpfc_filter_by_rpi(struct lpfc_nodelist {uint16_t *rpi = param; +/* check for active node */ +if (!NLP_CHK_NODE_ACT (ndlp)) +return 0 ; +return ndlp->nlp_rpi == *rpi; }
drivers/scsi/lpfc/lpfc_init.c +8 -1
@@ -2341,13 +2341,20 @@ lpfc_cleanup(struct lpfc_vport *vport)continue ; } +/* take care of nodes in unused state before the state +* machine taking action. +*/ +if (ndlp->nlp_state ==NLP_STE_UNUSED_NODE ) { +lpfc_nlp_put (ndlp); +continue ; + } +if (ndlp->nlp_type &NLP_FABRIC )lpfc_disc_state_machine (vport, ndlp,NULL ,NLP_EVT_DEVICE_RECOVERY );lpfc_disc_state_machine (vport, ndlp,NULL ,NLP_EVT_DEVICE_RM ); - }/* At this point, ALL ndlp's should be gone