From 8b9f07b8a492afa66dac17103d8094067a9d6fc3 Mon Sep 17 00:00:00 2001 From: Harman Kalra Date: Fri, 30 Jul 2021 21:40:08 +0530 Subject: [PATCH] common/cnxk: update NPC MACM range for cn98xx NPC MCAM entry distribution is based on maximum number of PFs and LFs available. Fixing the max no of PFs and LFs available on cn98xx to fix the MCAM alloc entry range. Signed-off-by: Harman Kalra Acked-by: Jerin Jacob --- drivers/common/cnxk/roc_npc.c | 2 ++ drivers/common/cnxk/roc_npc_priv.h | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c index 52a54b3990..afaa8a7a8f 100644 --- a/drivers/common/cnxk/roc_npc.c +++ b/drivers/common/cnxk/roc_npc.c @@ -108,6 +108,8 @@ roc_npc_get_low_priority_mcam(struct roc_npc *roc_npc) if (roc_model_is_cn10k()) return (npc->mcam_entries - NPC_MCAME_RESVD_10XX - 1); + else if (roc_model_is_cn98xx()) + return (npc->mcam_entries - NPC_MCAME_RESVD_98XX - 1); else return (npc->mcam_entries - NPC_MCAME_RESVD_9XXX - 1); } diff --git a/drivers/common/cnxk/roc_npc_priv.h b/drivers/common/cnxk/roc_npc_priv.h index b11f5b5027..2567846a77 100644 --- a/drivers/common/cnxk/roc_npc_priv.h +++ b/drivers/common/cnxk/roc_npc_priv.h @@ -46,10 +46,12 @@ #define NPC_MCAM_KEY_X4_WORDS 7 /* Number of 64-bit words */ #define NPC_RVUPF_MAX_9XXX 0x10 /* HRM: RVU_PRIV_CONST */ +#define NPC_RVUPF_MAX_98XX 0x18 /* HRM: RVU_PRIV_CONST */ #define NPC_RVUPF_MAX_10XX 0x20 /* HRM: RVU_PRIV_CONST */ #define NPC_NIXLF_MAX 0x80 /* HRM: NIX_AF_CONST2 */ #define NPC_MCAME_PER_PF 3 /* DRV: RSVD_MCAM_ENTRIES_PER_PF */ #define NPC_MCAME_PER_LF 1 /* DRV: RSVD_MCAM_ENTRIES_PER_NIXLF */ +#define NPC_NIXLF_MAX_98XX (2 * NPC_NIXLF_MAX) /*2 NIXLFs */ #define NPC_MCAME_RESVD_9XXX \ (NPC_NIXLF_MAX * NPC_MCAME_PER_LF + \ (NPC_RVUPF_MAX_9XXX - 1) * NPC_MCAME_PER_PF) @@ -58,6 +60,10 @@ (NPC_NIXLF_MAX * NPC_MCAME_PER_LF + \ (NPC_RVUPF_MAX_10XX - 1) * NPC_MCAME_PER_PF) +#define NPC_MCAME_RESVD_98XX \ + (NPC_NIXLF_MAX_98XX * NPC_MCAME_PER_LF + \ + (NPC_RVUPF_MAX_98XX - 1) * NPC_MCAME_PER_PF) + #define NPC_ACTION_MAX_VLAN_PARAMS 3 #define NPC_ACTION_MAX_VLANS_STRIPPED 2 -- 2.20.1