FAILED: patch "[PATCH] bnx2x: Invalidate fastpath HSI version for VFs" failed to apply to 5.10-stable tree

PATCH [email protected] 2 participants 5 messages Jan 24, 2022 – Jan 27, 2022

Subsystems (3)

Network drivers Stable branch Broadcom BNX2X 10 gigabit Ethernet driver

lore

Share & tools

lore

[email protected]

author maintainer

2022-01-24 14:11 UTC #0 lore raw

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 <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 802d4d207e75d7208ff75adb712b556c1e91cf1c Mon Sep 17 00:00:00 2001
From: Manish Chopra <[email protected]>
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 <[email protected]>

Signed-off-by Prabhakar Kushwaha <[email protected]>

Signed-off-by Alok Prasad <[email protected]>

Signed-off-by Ariel Elior <[email protected]>

Signed-off-by David S. Miller <[email protected]>

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +11 -2

index 74a8931ce1d1..11d15cd03600 100644
@@ -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);

Manish Chopra

maintainer

2022-01-25 09:37 UTC #1 lore raw

Quoted 72 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Monday, January 24, 2022 7:41 PM
To: Manish Chopra <[email protected]>; Ariel Elior <[email protected]>; [email protected]; Alok Prasad <[email protected]>; Prabhakar Kushwaha <[email protected]>
Cc: [email protected]
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 <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 802d4d207e75d7208ff75adb712b556c1e91cf1c Mon Sep 17 00:00:00 2001
From: Manish Chopra <[email protected]>
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 <[email protected]>
Signed-off-by Prabhakar Kushwaha <[email protected]>
Signed-off-by Alok Prasad <[email protected]>
Signed-off-by Ariel Elior <[email protected]>
Signed-off-by David S. Miller <[email protected]>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +11 -2
index 74a8931ce1d1..11d15cd03600 100644
@@ -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);
 

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c static void bnx2x_vf_igu_reset(struct bnx2x *bp, struct bnx2x_virtf *vf) · line 775

Quoted 2 lines

drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +0 -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 <[email protected]>
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 <[email protected]>

Signed-off-by Prabhakar Kushwaha <[email protected]>

Signed-off-by Alok Prasad <[email protected]>

Signed-off-by Ariel Elior <[email protected]>

Signed-off-by David S. Miller <[email protected]>

Thanks,
Manish

[email protected]

author maintainer

2022-01-25 10:34 UTC #2 lore raw

Quoted 97 lines · Manish Chopra

Quoted 72 lines
-----Original Message-----
From: [email protected] <[email protected]>
Sent: Monday, January 24, 2022 7:41 PM
To: Manish Chopra <[email protected]>; Ariel Elior <[email protected]>; [email protected]; Alok Prasad <[email protected]>; Prabhakar Kushwaha <[email protected]>
Cc: [email protected]
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 <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 802d4d207e75d7208ff75adb712b556c1e91cf1c Mon Sep 17 00:00:00 2001
From: Manish Chopra <[email protected]>
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 <[email protected]>
Signed-off-by Prabhakar Kushwaha <[email protected]>
Signed-off-by Alok Prasad <[email protected]>
Signed-off-by Ariel Elior <[email protected]>
Signed-off-by David S. Miller <[email protected]>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +11 -2
index 74a8931ce1d1..11d15cd03600 100644
@@ -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);
 
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c static void bnx2x_vf_igu_reset(struct bnx2x *bp, struct bnx2x_virtf *vf) · line 775
Quoted 2 lines
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +0 -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 <[email protected]>
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.

Quoted 8 lines

Signed-off-by Manish Chopra <[email protected]>
Signed-off-by Prabhakar Kushwaha <[email protected]>
Signed-off-by Alok Prasad <[email protected]>
Signed-off-by Ariel Elior <[email protected]>
Signed-off-by David S. Miller <[email protected]>
Thanks,
Manish

Ok, care to send a working backport?

Manish Chopra

maintainer

2022-01-25 19:17 UTC #3 lore raw

Quoted 119 lines

-----Original Message-----
From: [email protected] <[email protected]>
Sent: Tuesday, January 25, 2022 3:58 PM
To: Manish Chopra <[email protected]>
Cc: Ariel Elior <[email protected]>; [email protected]; Alok Prasad <[email protected]>; Prabhakar Kushwaha <[email protected]>; [email protected]
Subject: Re: [EXT] FAILED: patch "[PATCH] bnx2x: Invalidate fastpath HSI version for VFs" failed to apply to 5.10-stable tree
Quoted 20 lines · Manish Chopra
Quoted 20 lines
-----Original Message-----
From: [email protected] <[email protected]>
Sent: Monday, January 24, 2022 7:41 PM
To: Manish Chopra <[email protected]>; Ariel Elior <[email protected]>; [email protected]; Alok Prasad <[email protected]>; Prabhakar Kushwaha <[email protected]>
Cc: [email protected]
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 <[email protected]>.
Quoted 8 lines
Quoted 8 lines
thanks,
greg k-h
------------------ original commit in Linus's tree
------------------
From 802d4d207e75d7208ff75adb712b556c1e91cf1c Mon Sep 17
00:00:00
Quoted 46 lines
Quoted 46 lines
2001
From: Manish Chopra <[email protected]>
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 <[email protected]>
Signed-off-by Prabhakar Kushwaha <[email protected]>
Signed-off-by Alok Prasad <[email protected]>
Signed-off-by Ariel Elior <[email protected]>
Signed-off-by David S. Miller <[email protected]>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +11 -2
index 74a8931ce1d1..11d15cd03600 100644
@@ -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);
 
Quoted 6 lines
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c static void bnx2x_vf_igu_reset(struct bnx2x *bp, struct bnx2x_virtf *vf) · line 775
Quoted 2 lines
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +0 -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.
Quoted 25 lines
commit b7a49f73059fe6147b6b78e8f674ce0d21237432
Author: Manish Chopra <[email protected]>
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 <[email protected]>
Signed-off-by Prabhakar Kushwaha <[email protected]>
Signed-off-by Alok Prasad <[email protected]>
Signed-off-by Ariel Elior <[email protected]>
Signed-off-by David S. Miller <[email protected]>

Quoted 4 lines

Quoted 2 lines
Thanks,
Manish
Ok, care to send a working backport?

Hi Greg,

I have sent relevant backport for each of the kernel. By the way I have got two questions here -

1. when doing backporting over stable/linux.git (let's say backport for 5.10-stable kernel)
should we backport on particular kernel branch (origin/linux-5.10.y) or we should backport based on resetting master branch on a git tag (git reset --hard v5.10) ?

2. if the same backport works for multiple stable kernels - do we need to send the backport separately for each kernel ? OR we can send it single backport mentioning all the kernels in the subject like below ?

    [PATCH stable 5.10, 5.15, 5.16] ?

Thanks,
Manish

[email protected]

author maintainer

2022-01-27 14:54 UTC #4 lore raw

Quoted 122 lines · Manish Chopra

Quoted 122 lines
-----Original Message-----
From: [email protected] <[email protected]>
Sent: Tuesday, January 25, 2022 3:58 PM
To: Manish Chopra <[email protected]>
Cc: Ariel Elior <[email protected]>; [email protected]; Alok Prasad <[email protected]>; Prabhakar Kushwaha <[email protected]>; [email protected]
Subject: Re: [EXT] FAILED: patch "[PATCH] bnx2x: Invalidate fastpath HSI version for VFs" failed to apply to 5.10-stable tree
Quoted 20 lines · Manish Chopra
Quoted 20 lines
-----Original Message-----
From: [email protected] <[email protected]>
Sent: Monday, January 24, 2022 7:41 PM
To: Manish Chopra <[email protected]>; Ariel Elior <[email protected]>; [email protected]; Alok Prasad <[email protected]>; Prabhakar Kushwaha <[email protected]>
Cc: [email protected]
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 <[email protected]>.
Quoted 8 lines
Quoted 8 lines
thanks,
greg k-h
------------------ original commit in Linus's tree
------------------
From 802d4d207e75d7208ff75adb712b556c1e91cf1c Mon Sep 17
00:00:00
Quoted 46 lines
Quoted 46 lines
2001
From: Manish Chopra <[email protected]>
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 <[email protected]>
Signed-off-by Prabhakar Kushwaha <[email protected]>
Signed-off-by Alok Prasad <[email protected]>
Signed-off-by Ariel Elior <[email protected]>
Signed-off-by David S. Miller <[email protected]>
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +11 -2
index 74a8931ce1d1..11d15cd03600 100644
@@ -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);
 
Quoted 6 lines
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c static void bnx2x_vf_igu_reset(struct bnx2x *bp, struct bnx2x_virtf *vf) · line 775
Quoted 2 lines
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +0 -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.
Quoted 27 lines
commit b7a49f73059fe6147b6b78e8f674ce0d21237432
Author: Manish Chopra <[email protected]>
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 <[email protected]>
Signed-off-by Prabhakar Kushwaha <[email protected]>
Signed-off-by Alok Prasad <[email protected]>
Signed-off-by Ariel Elior <[email protected]>
Signed-off-by David S. Miller <[email protected]>
Thanks,
Manish

Quoted 8 lines

Quoted 1 line
Ok, care to send a working backport?
Hi Greg,
I have sent relevant backport for each of the kernel. By the way I have got two questions here -
1. when doing backporting over stable/linux.git (let's say backport for 5.10-stable kernel)
should we backport on particular kernel branch (origin/linux-5.10.y) or we should backport based on resetting master branch on a git tag (git reset --hard v5.10) ?

You should do it on the linux-5.10.y branch. 5.10.0 is very old by now and you might have conflicts.

Quoted 2 lines

2. if the same backport works for multiple stable kernels - do we need to send the backport separately for each kernel ? OR we can send it single backport mentioning all the kernels in the subject like below ?
    [PATCH stable 5.10, 5.15, 5.16] ?

A subject line like that is fine.

thanks,

greg k-h