From: Dick Kennedy Date: Sat, 30 Sep 2017 00:34:32 +0000 (-0700) Subject: scsi: lpfc: PLOGI failures during NPIV testing X-Git-Tag: v4.1.12-124.31.3~999 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4837b3bbc76c70eb5dfafb170f626b097fe5dbf0;p=users%2Fjedix%2Flinux-maple.git scsi: lpfc: PLOGI failures during NPIV testing Orabug: 27631736 Local Reject/Invalid RPI errors seen during discovery. Temporary RPI cleanup was occurring regardless of SLI rev. It's only necessary on SLI-4. Adjust the test for whether cleanup is necessary. Signed-off-by: Dick Kennedy Signed-off-by: James Smart Reviewed-by: Johannes Thumshirn Signed-off-by: Martin K. Petersen (cherry picked from commit e8bcf0ae4c0346fdc78ebefe0eefcaa6a6622d38) Signed-off-by: Dick dkennedy Signed-off-by: Dan Duval Reviewed-by: Jack Vogel --- diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 482d39773fef..2f389988e208 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -4814,7 +4814,8 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) lpfc_cancel_retry_delay_tmo(vport, ndlp); if ((ndlp->nlp_flag & NLP_DEFER_RM) && !(ndlp->nlp_flag & NLP_REG_LOGIN_SEND) && - !(ndlp->nlp_flag & NLP_RPI_REGISTERED)) { + !(ndlp->nlp_flag & NLP_RPI_REGISTERED) && + phba->sli_rev != LPFC_SLI_REV4) { /* For this case we need to cleanup the default rpi * allocated by the firmware. */