[PATCH net-next] octeontx2-af: make PF_FUNC comparison consistent in NIX XOFF handling

[PATCH net-next] octeontx2-af: make PF_FUNC comparison consistent in NIX XOFF handling

[Alok Tiwari]

nix_smq_flush_enadis_xoff() compares PF_FUNC values with the FUNC bits
masked off, but one operand applied the mask before extracting PF_FUNC
via TXSCH_MAP_FUNC().

Apply RVU_PFVF_FUNC_MASK after TXSCH_MAP_FUNC() for the TL2 scheduler
queue operand, matching the existing handling of the other operand and
making the comparison consistent and clearer.

No functional change intended.

Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>
---
 drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
index 98dd68137a09..32f1b1676a1e 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
@@ -2391,8 +2391,8 @@ static void nix_smq_flush_enadis_xoff(struct rvu *rvu, int blkaddr,
 			continue;
 		/* skip if PF_FUNC doesn't match */
 		if ((TXSCH_MAP_FUNC(txsch->pfvf_map[tl2]) & ~RVU_PFVF_FUNC_MASK) !=
-		    (TXSCH_MAP_FUNC(txsch->pfvf_map[tl2_schq] &
-				    ~RVU_PFVF_FUNC_MASK)))
+		    (TXSCH_MAP_FUNC(txsch->pfvf_map[tl2_schq]) &
+				    ~RVU_PFVF_FUNC_MASK))
 			continue;
 		/* enable/disable XOFF */
 		regoff = NIX_AF_TL2X_SW_XOFF(tl2);
-- 
2.50.1

Re: [PATCH net-next] octeontx2-af: make PF_FUNC comparison consistent in NIX XOFF handling

[Subbaraya Sundeep]

On 2026-03-05 at 01:09:48, Alok Tiwari (alok.a.tiwari@oracle.com) wrote:
> nix_smq_flush_enadis_xoff() compares PF_FUNC values with the FUNC bits
> masked off, but one operand applied the mask before extracting PF_FUNC
> via TXSCH_MAP_FUNC().
> 
> Apply RVU_PFVF_FUNC_MASK after TXSCH_MAP_FUNC() for the TL2 scheduler
> queue operand, matching the existing handling of the other operand and
> making the comparison consistent and clearer.
> 
> No functional change intended.
> 
Yes no impact on functionality.

> Signed-off-by: Alok Tiwari <alok.a.tiwari@oracle.com>

Reviewed-by: Subbaraya Sundeep <sbhatta@marvell.com>

Thanks,
Sundeep

> ---
>  drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
> index 98dd68137a09..32f1b1676a1e 100644
> --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
> +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c
> @@ -2391,8 +2391,8 @@ static void nix_smq_flush_enadis_xoff(struct rvu *rvu, int blkaddr,
>  			continue;
>  		/* skip if PF_FUNC doesn't match */
>  		if ((TXSCH_MAP_FUNC(txsch->pfvf_map[tl2]) & ~RVU_PFVF_FUNC_MASK) !=
> -		    (TXSCH_MAP_FUNC(txsch->pfvf_map[tl2_schq] &
> -				    ~RVU_PFVF_FUNC_MASK)))
> +		    (TXSCH_MAP_FUNC(txsch->pfvf_map[tl2_schq]) &
> +				    ~RVU_PFVF_FUNC_MASK))
>  			continue;
>  		/* enable/disable XOFF */
>  		regoff = NIX_AF_TL2X_SW_XOFF(tl2);
> -- 
> 2.50.1
> 

Re: [PATCH net-next] octeontx2-af: make PF_FUNC comparison consistent in NIX XOFF handling

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Wed,  4 Mar 2026 11:39:48 -0800 you wrote:
> nix_smq_flush_enadis_xoff() compares PF_FUNC values with the FUNC bits
> masked off, but one operand applied the mask before extracting PF_FUNC
> via TXSCH_MAP_FUNC().
> 
> Apply RVU_PFVF_FUNC_MASK after TXSCH_MAP_FUNC() for the TL2 scheduler
> queue operand, matching the existing handling of the other operand and
> making the comparison consistent and clearer.
> 
> [...]

Here is the summary with links:
  - [net-next] octeontx2-af: make PF_FUNC comparison consistent in NIX XOFF handling
    https://git.kernel.org/netdev/net-next/c/58a4c3e80065

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html