]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
octeontx2-af: make PF_FUNC comparison consistent in NIX XOFF handling
authorAlok Tiwari <alok.a.tiwari@oracle.com>
Wed, 4 Mar 2026 19:39:48 +0000 (11:39 -0800)
committerJakub Kicinski <kuba@kernel.org>
Fri, 6 Mar 2026 02:31:46 +0000 (18:31 -0800)
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>
Reviewed-by: Subbaraya Sundeep <sbhatta@marvell.com>
Link: https://patch.msgid.link/20260304193950.2467391-1-alok.a.tiwari@oracle.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c

index badfa1d642527f703fcb9974f607908cf331e261..ef5b081162ebfb17be03d017258db9564b7f6444 100644 (file)
@@ -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);