From: Alok Tiwari Date: Wed, 4 Mar 2026 19:39:48 +0000 (-0800) Subject: octeontx2-af: make PF_FUNC comparison consistent in NIX XOFF handling X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58a4c3e8006504bf18e0ddd2dcba6f414bed7680;p=thirdparty%2Fkernel%2Flinux.git octeontx2-af: make PF_FUNC comparison consistent in NIX XOFF handling 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 Reviewed-by: Subbaraya Sundeep Link: https://patch.msgid.link/20260304193950.2467391-1-alok.a.tiwari@oracle.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c index badfa1d642527..ef5b081162ebf 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);