* [dpdk-dev] [PATCH] net/octeontx2: fix flow create on CN98xx
@ 2021-06-01 10:25 psatheesh
2021-06-26 7:02 ` Jerin Jacob
0 siblings, 1 reply; 2+ messages in thread
From: psatheesh @ 2021-06-01 10:25 UTC (permalink / raw)
To: Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K; +Cc: dev, Satheesh Paul
From: Satheesh Paul <psatheesh@marvell.com>
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 <psatheesh@marvell.com>
---
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(-)
diff --git a/drivers/common/octeontx2/otx2_dev.h b/drivers/common/octeontx2/otx2_dev.h
index cd4fe517d..9d8dcca79 100644
--- a/drivers/common/octeontx2/otx2_dev.h
+++ b/drivers/common/octeontx2/otx2_dev.h
@@ -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 */
diff --git a/drivers/net/octeontx2/otx2_flow.c b/drivers/net/octeontx2/otx2_flow.c
index 1c90d753f..6df073218 100644
--- a/drivers/net/octeontx2/otx2_flow.c
+++ b/drivers/net/octeontx2/otx2_flow.c
@@ -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,
diff --git a/drivers/net/octeontx2/otx2_flow.h b/drivers/net/octeontx2/otx2_flow.h
index 82a5064d9..790e6ef1e 100644
--- a/drivers/net/octeontx2/otx2_flow.h
+++ b/drivers/net/octeontx2/otx2_flow.h
@@ -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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-dev] [PATCH] net/octeontx2: fix flow create on CN98xx
2021-06-01 10:25 [dpdk-dev] [PATCH] net/octeontx2: fix flow create on CN98xx psatheesh
@ 2021-06-26 7:02 ` Jerin Jacob
0 siblings, 0 replies; 2+ messages in thread
From: Jerin Jacob @ 2021-06-26 7:02 UTC (permalink / raw)
To: Satheesh Paul; +Cc: Jerin Jacob, Nithin Dabilpuram, Kiran Kumar K, dpdk-dev
On Tue, Jun 1, 2021 at 3:56 PM <psatheesh@marvell.com> wrote:
>
> From: Satheesh Paul <psatheesh@marvell.com>
>
> 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 <psatheesh@marvell.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
Applied to dpdk-next-net-mrvl/for-next-net. Thanks
> ---
> 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(-)
>
> diff --git a/drivers/common/octeontx2/otx2_dev.h b/drivers/common/octeontx2/otx2_dev.h
> index cd4fe517d..9d8dcca79 100644
> --- a/drivers/common/octeontx2/otx2_dev.h
> +++ b/drivers/common/octeontx2/otx2_dev.h
> @@ -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 */
> diff --git a/drivers/net/octeontx2/otx2_flow.c b/drivers/net/octeontx2/otx2_flow.c
> index 1c90d753f..6df073218 100644
> --- a/drivers/net/octeontx2/otx2_flow.c
> +++ b/drivers/net/octeontx2/otx2_flow.c
> @@ -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,
> diff --git a/drivers/net/octeontx2/otx2_flow.h b/drivers/net/octeontx2/otx2_flow.h
> index 82a5064d9..790e6ef1e 100644
> --- a/drivers/net/octeontx2/otx2_flow.h
> +++ b/drivers/net/octeontx2/otx2_flow.h
> @@ -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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-26 7:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-01 10:25 [dpdk-dev] [PATCH] net/octeontx2: fix flow create on CN98xx psatheesh
2021-06-26 7:02 ` Jerin Jacob
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).