net/octeontx2: fix flow create on CN98xx
PATCH 1/1 net/octeontx2: fix flow create on CN98xx
From: Satheesh Paul <[email protected]>
CN96xx and CN98xx have 4096 and 16384 MCAM entries respectively. Aligning the code with the same numbers.
Fixes 092b3834185 ("net/octeontx2: add flow init and fini")
Signed-off-by Satheesh Paul <[email protected]>
--- drivers/common/octeontx2/otx2_dev.h | 3 +++ drivers/net/octeontx2/otx2_flow.c | 16 ++++++++++++++-- drivers/net/octeontx2/otx2_flow.h | 1 - 3 files changed, 17 insertions(+), 3 deletions(-)
drivers/common/octeontx2/otx2_dev.h +3 -0
@@ -55,6 +55,9 @@ (RVU_PCI_REV_MINOR(otx2_dev_revid(dev)) == 0x0) && \ (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x0)) +#define otx2_dev_is_98xx (dev) \ + (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x3) +struct otx2_dev ;/* Link status callback */
drivers/net/octeontx2/otx2_flow.c +14 -2
@@ -1003,12 +1003,23 @@ flow_fetch_kex_cfg(struct otx2_eth_dev *dev)return rc; } +#define OTX2_MCAM_TOT_ENTRIES_96XX (4096) +#define OTX2_MCAM_TOT_ENTRIES_98XX (16384) + +static int otx2_mcam_tot_entries (struct otx2_eth_dev *dev) +{ +if (otx2_dev_is_98xx (dev)) +return OTX2_MCAM_TOT_ENTRIES_98XX ; +else +return OTX2_MCAM_TOT_ENTRIES_96XX ; +} +int otx2_flow_init (struct otx2_eth_dev *hw) {uint8_t *mem =NULL , *nix_mem =NULL , *npc_mem =NULL ;struct otx2_npc_flow_info *npc = &hw->npc_flow; -uint32_t bmap_sz; +uint32_t bmap_sz, tot_mcam_entries =0 ;int rc =0 , idx; rc =flow_fetch_kex_cfg (hw);
@@ -1020,7 +1031,8 @@ otx2_flow_init(struct otx2_eth_dev *hw)rte_atomic32_init (&npc->mark_actions); npc->vtag_actions =0 ; - npc->mcam_entries =NPC_MCAM_TOT_ENTRIES >> npc->keyw[NPC_MCAM_RX ]; + tot_mcam_entries =otx2_mcam_tot_entries (hw); + npc->mcam_entries = tot_mcam_entries >> npc->keyw[NPC_MCAM_RX ];/* Free, free_rev, live and live_rev entries */ bmap_sz =rte_bitmap_get_memory_footprint (npc->mcam_entries); mem = rte_zmalloc(NULL, 4 * bmap_sz * npc->flow_max_priority,
drivers/net/octeontx2/otx2_flow.h +0 -1
@@ -35,7 +35,6 @@ enum {/* 32 bytes from LDATA_CFG & 32 bytes from FLAGS_CFG */ #define NPC_MAX_EXTRACT_DATA_LEN (64)#define NPC_LDATA_LFLAG_LEN (16) -#define NPC_MCAM_TOT_ENTRIES (4096)#define NPC_MAX_KEY_NIBBLES (31)/* Nibble offsets */ #define NPC_LAYER_KEYX_SZ (3)
Signature · 1 line
2.25.4
Quoted 9 lines · On Tue, Jun 1, 2021 at 3:56 PM <[email protected]> wrote:
From: Satheesh Paul <[email protected]>
CN96xx and CN98xx have 4096 and 16384 MCAM entries respectively. Aligning the code with the same numbers.
Fixes 092b3834185 ("net/octeontx2: add flow init and fini")Signed-off-by Satheesh Paul <[email protected]>
Acked-by Jerin Jacob <[email protected]>
Applied to dpdk-next-net-mrvl/for-next-net. Thanks
Quoted 74 lines
--- drivers/common/octeontx2/otx2_dev.h | 3 +++ drivers/net/octeontx2/otx2_flow.c | 16 ++++++++++++++-- drivers/net/octeontx2/otx2_flow.h | 1 - 3 files changed, 17 insertions(+), 3 deletions(-)drivers/common/octeontx2/otx2_dev.h +3
-0@@ -55,6 +55,9 @@ (RVU_PCI_REV_MINOR(otx2_dev_revid(dev)) == 0x0) && \ (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x0)) +#define otx2_dev_is_98xx (dev) \ + (RVU_PCI_REV_MIDR_ID(otx2_dev_revid(dev)) == 0x3) +struct otx2_dev ;/* Link status callback */ drivers/net/octeontx2/otx2_flow.c +14
-2@@ -1003,12 +1003,23 @@ flow_fetch_kex_cfg(struct otx2_eth_dev *dev)return rc; } +#define OTX2_MCAM_TOT_ENTRIES_96XX (4096) +#define OTX2_MCAM_TOT_ENTRIES_98XX (16384) + +static int otx2_mcam_tot_entries (struct otx2_eth_dev *dev) +{ +if (otx2_dev_is_98xx (dev)) +return OTX2_MCAM_TOT_ENTRIES_98XX ; +else +return OTX2_MCAM_TOT_ENTRIES_96XX ; +} +int otx2_flow_init (struct otx2_eth_dev *hw) {uint8_t *mem =NULL , *nix_mem =NULL , *npc_mem =NULL ;struct otx2_npc_flow_info *npc = &hw->npc_flow; -uint32_t bmap_sz; +uint32_t bmap_sz, tot_mcam_entries =0 ;int rc =0 , idx; rc =flow_fetch_kex_cfg (hw);@@ -1020,7 +1031,8 @@ otx2_flow_init(struct otx2_eth_dev *hw)rte_atomic32_init (&npc->mark_actions); npc->vtag_actions =0 ; - npc->mcam_entries =NPC_MCAM_TOT_ENTRIES >> npc->keyw[NPC_MCAM_RX ]; + tot_mcam_entries =otx2_mcam_tot_entries (hw); + npc->mcam_entries = tot_mcam_entries >> npc->keyw[NPC_MCAM_RX ];/* Free, free_rev, live and live_rev entries */ bmap_sz =rte_bitmap_get_memory_footprint (npc->mcam_entries); mem = rte_zmalloc(NULL, 4 * bmap_sz * npc->flow_max_priority,drivers/net/octeontx2/otx2_flow.h +0
-2@@ -35,7 +35,6 @@ enum {/* 32 bytes from LDATA_CFG & 32 bytes from FLAGS_CFG */ #define NPC_MAX_EXTRACT_DATA_LEN (64)#define NPC_LDATA_LFLAG_LEN (16) -#define NPC_MCAM_TOT_ENTRIES (4096)#define NPC_MAX_KEY_NIBBLES (31)/* Nibble offsets */ #define NPC_LAYER_KEYX_SZ (3) --2.25.4