From patchwork Sat Sep 30 00:34:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 9978869 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 1BC736037F for ; Sat, 30 Sep 2017 00:35:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0DFC1298D4 for ; Sat, 30 Sep 2017 00:35:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 01D74298D6; Sat, 30 Sep 2017 00:35:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AFFBA298D4 for ; Sat, 30 Sep 2017 00:35:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752621AbdI3AfG (ORCPT ); Fri, 29 Sep 2017 20:35:06 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:33262 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752605AbdI3AfB (ORCPT ); Fri, 29 Sep 2017 20:35:01 -0400 Received: by mail-qk0-f193.google.com with SMTP id b82so392119qkc.0 for ; Fri, 29 Sep 2017 17:35:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=72z9McABC0+NZoJ2GxcPUQDt218tva1B87i5QfhHrS0=; b=tK32E6JUEkTn8yE4u+Fx7rhwzNY49FHlcKaqpKGn62J5QSEnPfBn6QE/+ipff9enN/ pETmorlQqwC6kJUyH34DD+u2g5zENRBTg/LXLrgJIAOAvrbJGZfJhR1Vu5Z3M4X/oCd9 zXvl5wvIlzepkc4I/WbSsWOCRGEAn40QesEbYG1soar8LgfZnq8d+Xi1Kwte3ARC5N/P Lc8a3ki4QMWXL4ZBSM1tY18EbQg+6hd7apu7bzmpNm9mfpriJNlmyQ3T90+1IuOoFM/y +1fl34k9FyOpyzzqiuu8gcZrqU12FmIxGIGyevqpLPGSs/oLESiSybbbgpGR9OiWtuAL NPPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=72z9McABC0+NZoJ2GxcPUQDt218tva1B87i5QfhHrS0=; b=XaKfQDV7asSKngcWoQDBC4GCXi2FWDhVwk2PazxMojNYT+1sRPjYrylcpzdtRR4cSN zl60p0xUIj4OrGJ4O4m46M3v7QwEl20miQ9kcsLr3U8Sffg4IJWtaosGsXKNe8ZjbJAy 7pW9bPU9sNYTOPgVBSF7rAv62AKjqMQyVEND0FRMCkbtI966LeRd83MeCzT12EwGpdAd bXQ1EUHM3V+iNxCChtqaCWXMIupAlqpErSa3ILcl/evOMhIJmWYHAClXL3+uFJissz0q 42n4s+sNccxYRvrRoCuiqRyYnHnfTwOqudYzf51FTEwecTnnQhCURk9T09chjWM5HAQk uYxw== X-Gm-Message-State: AMCzsaUJxZ11d0m0rA9nYK16nfprL0tiYbwNF6oscRnmidBAhlf2nMGU nIJdCLdBOiOtrnnnZa2/LZOf/g== X-Google-Smtp-Source: AOwi7QBDutuiCjj7Gp8p9p1YLZIa4kCH4mzNRPgDol4uyJRVEDB3PesOY4pBKXlT58ViZ5k6KvEmCA== X-Received: by 10.55.212.93 with SMTP id l90mr5775396qki.30.1506731700875; Fri, 29 Sep 2017 17:35:00 -0700 (PDT) Received: from pallmd1.broadcom.com ([192.19.255.250]) by smtp.gmail.com with ESMTPSA id u32sm3596918qte.25.2017.09.29.17.35.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 29 Sep 2017 17:35:00 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: Dick Kennedy , James Smart Subject: [PATCH v2 06/21] lpfc: PLOGI failures during NPIV testing Date: Fri, 29 Sep 2017 17:34:32 -0700 Message-Id: <20170930003447.10747-7-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170930003447.10747-1-jsmart2021@gmail.com> References: <20170930003447.10747-1-jsmart2021@gmail.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Dick Kennedy 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 --- drivers/scsi/lpfc/lpfc_hbadisc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 499df9d17339..d9a03beb76a4 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -4983,7 +4983,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. */