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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 914A2C433EF for ; Tue, 25 Jan 2022 10:34:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346406AbiAYKeV (ORCPT ); Tue, 25 Jan 2022 05:34:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1355526AbiAYK2c (ORCPT ); Tue, 25 Jan 2022 05:28:32 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB3F8C06173B for ; Tue, 25 Jan 2022 02:28:31 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8911FB81626 for ; Tue, 25 Jan 2022 10:28:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF9ECC340E0; Tue, 25 Jan 2022 10:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1643106509; bh=ZEbCd+sw6frwSCyZQklwwM1+bEP64BUXjb2laHtT/z8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=sCq6OU+nvB4TRTbP2emViDSyvoBENrnFRl2g96SyIpKAn4UI5iNwLGSFE4TPCEF7A 7SGLXWU4YsL5/Aryy57rTxJpKk6UinoZ3eQeAlC2UetXrkNwchADdsm5CUC+log3cx fG0a6rlAGdo2YlBv0oJsYzSCzgSu2hiHYRwajBe0= Date: Tue, 25 Jan 2022 11:28:26 +0100 From: "gregkh@linuxfoundation.org" To: Manish Chopra Cc: Ariel Elior , "davem@davemloft.net" , Alok Prasad , Prabhakar Kushwaha , "stable@vger.kernel.org" Subject: Re: [EXT] FAILED: patch "[PATCH] bnx2x: Invalidate fastpath HSI version for VFs" failed to apply to 5.10-stable tree Message-ID: References: <164303346429105@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Tue, Jan 25, 2022 at 09:30:53AM +0000, Manish Chopra wrote: > > -----Original Message----- > > From: gregkh@linuxfoundation.org > > Sent: Monday, January 24, 2022 7:41 PM > > To: Manish Chopra ; Ariel Elior > > ; davem@davemloft.net; Alok Prasad > > ; Prabhakar Kushwaha > > Cc: stable@vger.kernel.org > > Subject: [EXT] FAILED: patch "[PATCH] bnx2x: Invalidate fastpath HSI version > > for VFs" failed to apply to 5.10-stable tree > > > > External Email > > > > ---------------------------------------------------------------------- > > > > The patch below does not apply to the 5.10-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 802d4d207e75d7208ff75adb712b556c1e91cf1c Mon Sep 17 00:00:00 > > 2001 > > From: Manish Chopra > > Date: Fri, 17 Dec 2021 08:55:52 -0800 > > Subject: [PATCH] bnx2x: Invalidate fastpath HSI version for VFs > > > > Commit 0a6890b9b4df ("bnx2x: Utilize FW 7.13.15.0.") added validation for > > fastpath HSI versions for different client init which was not meant for SR-IOV > > VF clients, which resulted in firmware asserts when running VF clients with > > different fastpath HSI version. > > > > This patch along with the new firmware support in patch #1 fixes this behavior > > in order to not validate fastpath HSI version for the VFs. > > > > Fixes: 0a6890b9b4df ("bnx2x: Utilize FW 7.13.15.0.") > > Signed-off-by: Manish Chopra > > Signed-off-by: Prabhakar Kushwaha > > Signed-off-by: Alok Prasad > > Signed-off-by: Ariel Elior > > Signed-off-by: David S. Miller > > > > diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c > > b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c > > index 74a8931ce1d1..11d15cd03600 100644 > > --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c > > +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c > > @@ -758,9 +758,18 @@ static void bnx2x_vf_igu_reset(struct bnx2x *bp, > > struct bnx2x_virtf *vf) > > > > void bnx2x_vf_enable_access(struct bnx2x *bp, u8 abs_vfid) { > > + u16 abs_fid; > > + > > + abs_fid = FW_VF_HANDLE(abs_vfid); > > + > > /* set the VF-PF association in the FW */ > > - storm_memset_vf_to_pf(bp, FW_VF_HANDLE(abs_vfid), > > BP_FUNC(bp)); > > - storm_memset_func_en(bp, FW_VF_HANDLE(abs_vfid), 1); > > + storm_memset_vf_to_pf(bp, abs_fid, BP_FUNC(bp)); > > + storm_memset_func_en(bp, abs_fid, 1); > > + > > + /* Invalidate fp_hsi version for vfs */ > > + if (bp->fw_cap & FW_CAP_INVALIDATE_VF_FP_HSI) > > + REG_WR8(bp, BAR_XSTRORM_INTMEM + > > + > > XSTORM_ETH_FUNCTION_INFO_FP_HSI_VALID_E2_OFFSET(abs_fid), 0); > > > > /* clear vf errors*/ > > bnx2x_vf_semi_clear_err(bp, abs_vfid); > > Hello Greg, > > Although this patch fixes the actual issue but the patch is dependent on below patch as those were part of same series, due to this it fails to apply probably. > > commit b7a49f73059fe6147b6b78e8f674ce0d21237432 > Author: Manish Chopra > Date: Fri Dec 17 08:55:51 2021 -0800 > > bnx2x: Utilize firmware 7.13.21.0 > > This new firmware addresses few important issues and enhancements > as mentioned below - > > - Support direct invalidation of FP HSI Ver per function ID, required for > invalidating FP HSI Ver prior to each VF start, as there is no VF start > - BRB hardware block parity error detection support for the driver > - Fix the FCOE underrun flow > - Fix PSOD during FCoE BFS over the NIC ports after preboot driver > - Maintains backward compatibility > > This patch incorporates this new firmware 7.13.21.0 in bnx2x driver. > > Signed-off-by: Manish Chopra > Signed-off-by: Prabhakar Kushwaha > Signed-off-by: Alok Prasad > Signed-off-by: Ariel Elior > Signed-off-by: David S. Miller > > Thanks, > Manish Ok, care to send a working backport?