From patchwork Fri Sep 22 06:17:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 9965217 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 8B887602D8 for ; Fri, 22 Sep 2017 06:18:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DDB529707 for ; Fri, 22 Sep 2017 06:18:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 72EDA2970B; Fri, 22 Sep 2017 06:18:04 +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 21E5229707 for ; Fri, 22 Sep 2017 06:18:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751866AbdIVGSD (ORCPT ); Fri, 22 Sep 2017 02:18:03 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:34579 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751637AbdIVGSB (ORCPT ); Fri, 22 Sep 2017 02:18:01 -0400 Received: by mail-pg0-f68.google.com with SMTP id u18so126562pgo.1 for ; Thu, 21 Sep 2017 23:18:00 -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=JHDSbPqFNbK0U6F7+VCqCbNxPUBESQ2h8RiFZ//nSj0=; b=pqh8pUhk/YxoD9UAB3WO3fzQIsnp0k09OlhqiweRvrh4y0DfzOdV6HPvwi/OC+A89U 4RL/ZC2LAuumCPjnfpU+AM54vUS/MwUJUlNfpB3X3E7Iw08KdDASVAK3C+fnoLotC5Yp dZmZ8/PMYUTv//MCcKmMXxvQx9TszPb7+xSvBA5leB9uWacbf0mfzuMsnJJdk1WA06kk OWAA5SrCwwFEwiQ3nhiijkWKARxi0vayjtM9P4BvDXsc2RTjNGkB9bGeCx4pBXA0TChi LXXBIqIToTYs7a2nDPqJTMb2O24AC3Fpri9EDXg+gE5jhcRf8kjRyrtaQMiMRRAU9xST 626A== 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=JHDSbPqFNbK0U6F7+VCqCbNxPUBESQ2h8RiFZ//nSj0=; b=sxnLAuAzfyZ/yw4LZ47yBILfxb3eZb5erNmpkTBwjYSjIj69D240G28vFOtDsOCm/9 6qiZS1piIBItcuKP+RW/xK92JRhHT8gK/DWYcstmxxt0ww50uqfRCWAoJlOxdjsW59o3 ikUbIAVBjmhUrGLcLBzDP1OndeMiv/7UW+kB66o6C+JMh7fiuVSGorYGamWqebdMjXeJ K9oGYcnZQIJwOOcb3JZ2qiwdwmS2CVGkk1aZ0xkQ0pc1QFQzWWffqeQ/hRJi215mkUUr C+FnH5M05sPOUirRkINJ8eAda4EXmM1d+Z/Q3+Ix+VZ0x9Xd9OOlWWYePg9bE+kAgxPB oBkA== X-Gm-Message-State: AHPjjUhLX3eMu2eY1CsBI2+vJYQDzF5aphGLfQETaPpCxAEdT3kPxdWf 2FYTwAZ+HeX0k/OYz3UBNtA1bQ== X-Google-Smtp-Source: AOwi7QDArSxbzIpWXfRosNxR/hXexjlETYsLGueE15fkbkU5cmUqVwlhhTGbiZoLCl43PlesprpaoQ== X-Received: by 10.99.120.202 with SMTP id t193mr8424456pgc.419.1506061080267; Thu, 21 Sep 2017 23:18:00 -0700 (PDT) Received: from os42.localdomain (ip68-4-115-207.oc.oc.cox.net. [68.4.115.207]) by smtp.gmail.com with ESMTPSA id e87sm5911355pfl.46.2017.09.21.23.17.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Sep 2017 23:17:59 -0700 (PDT) From: James Smart To: linux-scsi@vger.kernel.org Cc: Dick Kennedy , James Smart Subject: [PATCH 05/19] lpfc: PLOGI failures during NPIV testing Date: Thu, 21 Sep 2017 23:17:27 -0700 Message-Id: <20170922061741.12347-6-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170922061741.12347-1-jsmart2021@gmail.com> References: <20170922061741.12347-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. */