From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C440FC2BA19 for ; Thu, 16 Apr 2020 01:46:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A0CB72064A for ; Thu, 16 Apr 2020 01:46:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587001568; bh=c2xKREQm3PT1NX7twv3UUcLaqZaQQxBsgyJLNMklD68=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=RHAe3uhGkrymCD9BPdpO1qCnER36x1tsZMouecq49gK67ys6F3GKgW7REQJcqAIIU 6be1WvOn3yTEcr6F42Rqr2oiAG/AQ5kjeGuQWHSZ3suPFYnIP5UIYekX+81Gjn6euI ZaDO+VY11JNMZMXG/9TV5Icv1O1TMYygcFq+v0+s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729692AbgDPBqF (ORCPT ); Wed, 15 Apr 2020 21:46:05 -0400 Received: from mail.kernel.org ([198.145.29.99]:54404 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726201AbgDPBqC (ORCPT ); Wed, 15 Apr 2020 21:46:02 -0400 Received: from localhost (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 84F032064A; Thu, 16 Apr 2020 01:46:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587001561; bh=c2xKREQm3PT1NX7twv3UUcLaqZaQQxBsgyJLNMklD68=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=QimMJZUbMiHyk+oWPoojkiOFrLqWTUqiDAETybM2ZkHKfzhoy+tuMYRBvl3oo12dM eZT1Oi+xBB2YifH9V1NMhJBKYklxyu/8C4rurDmPW8c7Zrj2jBiLaAvKxpgHSFbTMR kt0OsPnbSPPJ8U+UVXbkWVPf5ugf4PBHWAXva0RA= Date: Wed, 15 Apr 2020 21:46:00 -0400 From: Sasha Levin To: gregkh@linuxfoundation.org Cc: jsmart2021@gmail.com, dick.kennedy@broadcom.com, martin.petersen@oracle.com, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] scsi: lpfc: Fix broken Credit Recovery after driver load" failed to apply to 5.4-stable tree Message-ID: <20200416014600.GU1068@sasha-vm> References: <1586949527184166@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <1586949527184166@kroah.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Wed, Apr 15, 2020 at 01:18:47PM +0200, gregkh@linuxfoundation.org wrote: > >The patch below does not apply to the 5.4-stable tree. >If someone wants it applied there, or to any other stable or longterm >tree, then please email the backport, including the original git commit >id to . > >thanks, > >greg k-h > >------------------ original commit in Linus's tree ------------------ > >>From 835214f5d5f516a38069bc077c879c7da00d6108 Mon Sep 17 00:00:00 2001 >From: James Smart >Date: Mon, 27 Jan 2020 16:23:03 -0800 >Subject: [PATCH] scsi: lpfc: Fix broken Credit Recovery after driver load > >When driver is set to enable bb credit recovery, the switch displayed the >setting as inactive. If the link bounces, it switches to Active. > >During link up processing, the driver currently does a MBX_READ_SPARAM >followed by a MBX_CONFIG_LINK. These mbox commands are queued to be >executed, one at a time and the completion is processed by the worker >thread. Since the MBX_READ_SPARAM is done BEFORE the MBX_CONFIG_LINK, the >BB_SC_N bit is never set the the returned values. BB Credit recovery status >only gets set after the driver requests the feature in CONFIG_LINK, which >is done after the link up. Thus the ordering of READ_SPARAM needs to follow >the CONFIG_LINK. > >Fix by reordering so that READ_SPARAM is done after CONFIG_LINK. Added a >HBA_DEFER_FLOGI flag so that any FLOGI handling waits until after the >READ_SPARAM is done so that the proper BB credit value is set in the FLOGI >payload. > >Fixes: 6bfb16208298 ("scsi: lpfc: Fix configuration of BB credit recovery in service parameters") >Cc: # v5.4+ >Link: https://lore.kernel.org/r/20200128002312.16346-4-jsmart2021@gmail.com >Signed-off-by: Dick Kennedy >Signed-off-by: James Smart >Signed-off-by: Martin K. Petersen I've grabbed these additional fixes to address the conflict: 6bfb16208298 ("scsi: lpfc: Fix configuration of BB credit recovery in service parameters") e3ba04c9bad1 ("scsi: lpfc: Fix Fabric hostname registration if system hostname changes") 93a4d6f40198 ("scsi: lpfc: Add registration for CPU Offline/Online events") -- Thanks, Sasha