From: Satha Rao The scheduler queue number packed above the 16-bit register offset was masked to 10 bits ([25:16]). Queue indices of 1024 and above were truncated, so configuration and readback used the wrong TX scheduler queue. The queue number is 11 bits ([26:16]). The SMQ field of the CN20K SQ context is 11 bits wide, so queue indices of 1024 and above first became reachable with the CN20K NIX contexts. Widen TXSCHQ_IDX_MASK to 11 bits and NIX_TX_SCHQ_MASK through bit 26. Compile tested only; not tested on real hardware. Fixes: b5dcdde074d5 ("octeontx2-af: Add cn20k NIX block contexts") Signed-off-by: Satha Rao Signed-off-by: Vadluri Mukunda --- v2: - Fixes tag now points to an upstream commit - Use full name in Signed-off-by - Add test status to the commit message v1: https://lore.kernel.org/netdev/20261026062316.754904-1-vmukunda@marvell.com/ drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 2 +- drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h index cece197d1074..1b62f9d7f00a 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h +++ b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h @@ -1164,7 +1164,7 @@ struct nix_txschq_config { u8 lvl; /* SMQ/MDQ/TL4/TL3/TL2/TL1 */ u8 read; #define TXSCHQ_IDX_SHIFT 16 -#define TXSCHQ_IDX_MASK (BIT_ULL(10) - 1) +#define TXSCHQ_IDX_MASK (BIT_ULL(11) - 1) #define TXSCHQ_IDX(reg, shift) (((reg) >> (shift)) & TXSCHQ_IDX_MASK) u8 num_regs; #define MAX_REGS_PER_MBOX_MSG 20 diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c index 153eb57bad06..68cf730a8372 100644 --- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c @@ -2850,9 +2850,9 @@ static void nix_tl1_default_cfg(struct rvu *rvu, struct nix_hw *nix_hw, } /* Register offset - [15:0] - * Scheduler Queue number - [25:16] + * Scheduler Queue number - [26:16] */ -#define NIX_TX_SCHQ_MASK GENMASK_ULL(25, 0) +#define NIX_TX_SCHQ_MASK GENMASK_ULL(26, 0) static int nix_txschq_cfg_read(struct rvu *rvu, struct nix_hw *nix_hw, int blkaddr, struct nix_txschq_config *req, -- 2.25.1