octeontx2-af: fix NPC mailbox codes in mbox.h

Several NPC mailbox command IDs in the 0x601x range were assigned out of
order. Renumber and reorder the M() definitions so each opcode matches
the stable contract expected by userspace tools and applications.

Fixes: 4e527f1e5c15 ("octeontx2-af: npc: cn20k: Add new mailboxes for CN20K silicon")
Cc: Suman Ghosh <sumang@marvell.com>
Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20260611083330.1652181-1-rkannoth@marvell.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
index dc42c81c094256bcba2a0d7c310ac063283ea5a8..44fdd6ba7307c8a278ca560cf31ba6733f208e6b 100644 (file)
--- a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
@@ -283,31 +283,30 @@ M(NPC_GET_FIELD_HASH_INFO, 0x6013, npc_get_field_hash_info,
 M(NPC_GET_FIELD_STATUS, 0x6014, npc_get_field_status,                     \
                                   npc_get_field_status_req,              \
                                   npc_get_field_status_rsp)              \
-M(NPC_CN20K_MCAM_GET_FREE_COUNT, 0x6015, npc_cn20k_get_fcnt,           \
-                                msg_req, npc_cn20k_get_fcnt_rsp)       \
-M(NPC_CN20K_GET_KEX_CFG, 0x6016, npc_cn20k_get_kex_cfg,                        \
+M(NPC_MCAM_DEFRAG,      0x6016,        npc_defrag,                     \
+                                       msg_req,                        \
+                                       msg_rsp)                \
+M(NPC_CN20K_GET_KEX_CFG, 0x6017, npc_cn20k_get_kex_cfg,                        \
                                   msg_req, npc_cn20k_get_kex_cfg_rsp)  \
-M(NPC_CN20K_MCAM_WRITE_ENTRY,  0x6017, npc_cn20k_mcam_write_entry,     \
-                                npc_cn20k_mcam_write_entry_req, msg_rsp)  \
-M(NPC_CN20K_MCAM_ALLOC_AND_WRITE_ENTRY, 0x6018,                                   \
-npc_cn20k_mcam_alloc_and_write_entry,                                     \
+M(NPC_CN20K_MCAM_GET_FREE_COUNT, 0x6018, npc_cn20k_get_fcnt,                   \
+                                msg_req, npc_cn20k_get_fcnt_rsp)       \
+M(NPC_CN20K_MCAM_WRITE_ENTRY,  0x6019, npc_cn20k_mcam_write_entry,                     \
+                                npc_cn20k_mcam_write_entry_req, msg_rsp)       \
+M(NPC_CN20K_MCAM_ALLOC_AND_WRITE_ENTRY, 0x601a, npc_cn20k_mcam_alloc_and_write_entry,  \
                                npc_cn20k_mcam_alloc_and_write_entry_req,  \
                                npc_mcam_alloc_and_write_entry_rsp)  \
-M(NPC_CN20K_MCAM_READ_ENTRY,   0x6019, npc_cn20k_mcam_read_entry,      \
+M(NPC_CN20K_MCAM_READ_ENTRY,   0x601b, npc_cn20k_mcam_read_entry,      \
                                  npc_mcam_read_entry_req,              \
                                  npc_cn20k_mcam_read_entry_rsp)        \
-M(NPC_CN20K_MCAM_READ_BASE_RULE, 0x601a, npc_cn20k_read_base_steer_rule,       \
-                                  msg_req, npc_cn20k_mcam_read_base_rule_rsp) \
-M(NPC_MCAM_DEFRAG,          0x601b,    npc_defrag,                     \
-                                       msg_req,                        \
-                                       msg_rsp)                        \
-M(NPC_MCAM_GET_NUM_KWS, 0x601c, npc_get_num_kws,               \
+M(NPC_CN20K_MCAM_READ_BASE_RULE, 0x601c, npc_cn20k_read_base_steer_rule,            \
+                                  msg_req, npc_cn20k_mcam_read_base_rule_rsp)  \
+M(NPC_MCAM_GET_NUM_KWS, 0x601d, npc_get_num_kws,               \
                                npc_get_num_kws_req,            \
                                npc_get_num_kws_rsp)            \
-M(NPC_MCAM_GET_DFT_RL_IDXS, 0x601d, npc_get_dft_rl_idxs,       \
+M(NPC_MCAM_GET_DFT_RL_IDXS, 0x601e, npc_get_dft_rl_idxs,       \
                                        msg_req,                \
                                        npc_get_dft_rl_idxs_rsp)\
-M(NPC_MCAM_GET_NPC_PFL_INFO, 0x601e, npc_get_pfl_info,         \
+M(NPC_MCAM_GET_NPC_PFL_INFO, 0x601f, npc_get_pfl_info,         \
                                        msg_req,                \
                                        npc_get_pfl_info_rsp)   \
 /* NIX mbox IDs (range 0x8000 - 0xFFFF) */                             \