On Tue, Jan 25, 2022 at 09:30:53AM +0000, Manish Chopra wrote:
> > -----Original Message-----
> > From: gregkh@xxxxxxxxxxxxxxxxxxx <gregkh@xxxxxxxxxxxxxxxxxxx>
> > Sent: Monday, January 24, 2022 7:41 PM
> > To: Manish Chopra <manishc@xxxxxxxxxxx>; Ariel Elior
> > <aelior@xxxxxxxxxxx>; davem@xxxxxxxxxxxxx; Alok Prasad
> > <palok@xxxxxxxxxxx>; Prabhakar Kushwaha <pkushwaha@xxxxxxxxxxx>
> > Cc: stable@xxxxxxxxxxxxxxx
> > 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
> > <stable@xxxxxxxxxxxxxxx>.
> >
> > thanks,
> >
> > greg k-h
> >
> > ------------------ original commit in Linus's tree ------------------
> >
> > From 802d4d207e75d7208ff75adb712b556c1e91cf1c Mon Sep 17 00:00:00
> > 2001
> > From: Manish Chopra <manishc@xxxxxxxxxxx>
> > 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 <manishc@xxxxxxxxxxx>
> > Signed-off-by: Prabhakar Kushwaha <pkushwaha@xxxxxxxxxxx>
> > Signed-off-by: Alok Prasad <palok@xxxxxxxxxxx>
> > Signed-off-by: Ariel Elior <aelior@xxxxxxxxxxx>
> > Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> >
> > 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 <manishc@xxxxxxxxxxx>
> 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 <manishc@xxxxxxxxxxx>
> Signed-off-by: Prabhakar Kushwaha <pkushwaha@xxxxxxxxxxx>
> Signed-off-by: Alok Prasad <palok@xxxxxxxxxxx>
> Signed-off-by: Ariel Elior <aelior@xxxxxxxxxxx>
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
>
> Thanks,
> Manish
Ok, care to send a working backport?
