From: Ratheesh Kannoth <rkannoth@marvell.com>
To: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Cc: <sgoutham@marvell.com>, <davem@davemloft.net>,
<edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
<andrew+netdev@lunn.ch>,
"Ratheesh Kannoth" <rkannoth@marvell.com>
Subject: [PATCH net-next v3 13/13] octeontx2-af: npc: Use common structures
Date: Fri, 9 Jan 2026 11:18:28 +0530 [thread overview]
Message-ID: <20260109054828.1822307-14-rkannoth@marvell.com> (raw)
In-Reply-To: <20260109054828.1822307-1-rkannoth@marvell.com>
CN20K and legacy silicon differ in the size of key words used
in NPC MCAM. However, SoC-specific structures are not required
for low-level functions. Remove the SoC-specific structures
and rename the macros to improve readability.
Signed-off-by: Ratheesh Kannoth <rkannoth@marvell.com>
---
.../ethernet/marvell/octeontx2/af/cn20k/npc.c | 11 ++++---
.../net/ethernet/marvell/octeontx2/af/mbox.h | 18 +++++++----
.../net/ethernet/marvell/octeontx2/af/rvu.h | 2 +-
.../marvell/octeontx2/af/rvu_npc_fs.c | 31 ++++++++-----------
4 files changed, 32 insertions(+), 30 deletions(-)
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
index ece561353f91..fecb666ed19a 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/cn20k/npc.c
@@ -3920,10 +3920,10 @@ int rvu_mbox_handler_npc_get_num_kws(struct rvu *rvu,
struct npc_get_num_kws_req *req,
struct npc_get_num_kws_rsp *rsp)
{
+ u64 kw_mask[NPC_KWS_IN_KEY_SZ_MAX] = { 0 };
+ u64 kw[NPC_KWS_IN_KEY_SZ_MAX] = { 0 };
struct rvu_npc_mcam_rule dummy = { 0 };
- struct cn20k_mcam_entry cn20k_entry = { 0 };
struct mcam_entry_mdata mdata = { };
- struct mcam_entry entry = { 0 };
struct npc_install_flow_req *fl;
int i, cnt = 0, blkaddr;
@@ -3940,7 +3940,8 @@ int rvu_mbox_handler_npc_get_num_kws(struct rvu *rvu,
return NPC_MCAM_INVALID_REQ;
}
- npc_populate_mcam_mdata(rvu, &mdata, &cn20k_entry, &entry);
+ mdata.kw = kw;
+ mdata.kw_mask = kw_mask;
npc_update_flow(rvu, &mdata, fl->features, &fl->packet,
&fl->mask, &dummy, fl->intf, blkaddr);
@@ -3948,8 +3949,8 @@ int rvu_mbox_handler_npc_get_num_kws(struct rvu *rvu,
/* Find the most significant word valid. Traverse from
* MSB to LSB, check if cam0 or cam1 is set
*/
- for (i = NPC_CN20K_MAX_KWS_IN_KEY - 1; i >= 0; i--) {
- if (cn20k_entry.kw[i] || cn20k_entry.kw_mask[i]) {
+ for (i = NPC_KWS_IN_KEY_SZ_MAX - 1; i >= 0; i--) {
+ if (kw[i] || kw_mask[i]) {
cnt = i + 1;
break;
}
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
index 6f26f7393709..d65aaf4fae8b 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/mbox.h
@@ -1592,18 +1592,24 @@ struct mcam_entry_mdata {
u8 max_kw;
};
+enum npc_kws_in_key_sz {
+ NPC_KWS_IN_KEY_SZ_7 = 7,
+ NPC_KWS_IN_KEY_SZ_8 = 8,
+ NPC_KWS_IN_KEY_SZ_9 = 9,
+ NPC_KWS_IN_KEY_SZ_10 = 10,
+ NPC_KWS_IN_KEY_SZ_MAX,
+};
+
struct mcam_entry {
-#define NPC_MAX_KWS_IN_KEY 7 /* Number of keywords in max keywidth */
- u64 kw[NPC_MAX_KWS_IN_KEY];
- u64 kw_mask[NPC_MAX_KWS_IN_KEY];
+ u64 kw[NPC_KWS_IN_KEY_SZ_7];
+ u64 kw_mask[NPC_KWS_IN_KEY_SZ_7];
u64 action;
u64 vtag_action;
};
struct cn20k_mcam_entry {
-#define NPC_CN20K_MAX_KWS_IN_KEY 8 /* Number of keywords in max keywidth */
- u64 kw[NPC_CN20K_MAX_KWS_IN_KEY];
- u64 kw_mask[NPC_CN20K_MAX_KWS_IN_KEY];
+ u64 kw[NPC_KWS_IN_KEY_SZ_8];
+ u64 kw_mask[NPC_KWS_IN_KEY_SZ_8];
u64 action;
u64 vtag_action;
u64 action2;
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
index f811d6b5c545..a466181cf908 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu.h
@@ -197,7 +197,7 @@ struct npc_key_field {
/* Masks where all set bits indicate position
* of a field in the key
*/
- u64 kw_mask[NPC_CN20K_MAX_KWS_IN_KEY];
+ u64 kw_mask[NPC_KWS_IN_KEY_SZ_MAX];
/* Number of words in the key a field spans. If a field is
* of 16 bytes and key offset is 4 then the field will use
* 4 bytes in KW0, 8 bytes in KW1 and 4 bytes in KW2 and
diff --git a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
index 5300b7faefbf..23231222b5fe 100644
--- a/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
+++ b/drivers/net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c
@@ -254,7 +254,7 @@ static bool npc_check_overlap(struct rvu *rvu, int blkaddr,
* other field bits.
*/
if (npc_check_overlap_fields(dummy, input,
- NPC_MAX_KWS_IN_KEY))
+ NPC_KWS_IN_KEY_SZ_7))
return true;
}
}
@@ -285,7 +285,7 @@ static bool npc_check_overlap(struct rvu *rvu, int blkaddr,
start_kwi, offset, intf);
/* check any input field bits falls in any other field bits */
if (npc_check_overlap_fields(dummy, input,
- NPC_CN20K_MAX_KWS_IN_KEY))
+ NPC_KWS_IN_KEY_SZ_8))
return true;
}
}
@@ -456,9 +456,9 @@ static void npc_handle_multi_layer_fields(struct rvu *rvu, int blkaddr, u8 intf)
u8 start_lid;
if (is_cn20k(rvu->pdev))
- max_kw = NPC_CN20K_MAX_KWS_IN_KEY;
+ max_kw = NPC_KWS_IN_KEY_SZ_8;
else
- max_kw = NPC_MAX_KWS_IN_KEY;
+ max_kw = NPC_KWS_IN_KEY_SZ_7;
key_fields = mcam->rx_key_fields;
features = &mcam->rx_features;
@@ -902,12 +902,12 @@ void npc_update_entry(struct rvu *rvu, enum key_fields type,
struct mcam_entry_mdata *mdata, u64 val_lo,
u64 val_hi, u64 mask_lo, u64 mask_hi, u8 intf)
{
- struct cn20k_mcam_entry cn20k_dummy = { {0} };
+ u64 kw_mask[NPC_KWS_IN_KEY_SZ_MAX] = { 0 };
+ u64 kw[NPC_KWS_IN_KEY_SZ_MAX] = { 0 };
struct npc_mcam *mcam = &rvu->hw->mcam;
- struct mcam_entry dummy = { {0} };
- u64 *kw, *kw_mask, *val, *mask;
struct npc_key_field *field;
u64 kw1, kw2, kw3;
+ u64 *val, *mask;
int i, max_kw;
u8 shift;
@@ -918,15 +918,10 @@ void npc_update_entry(struct rvu *rvu, enum key_fields type,
if (!field->nr_kws)
return;
- if (is_cn20k(rvu->pdev)) {
- max_kw = NPC_CN20K_MAX_KWS_IN_KEY;
- kw = cn20k_dummy.kw;
- kw_mask = cn20k_dummy.kw_mask;
- } else {
- max_kw = NPC_MAX_KWS_IN_KEY;
- kw = dummy.kw;
- kw_mask = dummy.kw_mask;
- }
+ if (is_cn20k(rvu->pdev))
+ max_kw = NPC_KWS_IN_KEY_SZ_8;
+ else
+ max_kw = NPC_KWS_IN_KEY_SZ_7;
for (i = 0; i < max_kw; i++) {
if (!field->kw_mask[i])
@@ -1309,14 +1304,14 @@ npc_populate_mcam_mdata(struct rvu *rvu,
mdata->kw_mask = cn20k_entry->kw_mask;
mdata->action = &cn20k_entry->action;
mdata->vtag_action = &cn20k_entry->vtag_action;
- mdata->max_kw = NPC_CN20K_MAX_KWS_IN_KEY;
+ mdata->max_kw = NPC_KWS_IN_KEY_SZ_8;
return;
}
mdata->kw = entry->kw;
mdata->kw_mask = entry->kw_mask;
mdata->action = &entry->action;
mdata->vtag_action = &entry->vtag_action;
- mdata->max_kw = NPC_MAX_KWS_IN_KEY;
+ mdata->max_kw = NPC_KWS_IN_KEY_SZ_7;
}
static int npc_update_rx_entry(struct rvu *rvu, struct rvu_pfvf *pfvf,
--
2.43.0
prev parent reply other threads:[~2026-01-09 5:49 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-09 5:48 [PATCH net-next v3 00/13] NPC HW block support for cn20k Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 01/13] octeontx2-af: npc: cn20k: Index management Ratheesh Kannoth
2026-01-10 22:51 ` Jakub Kicinski
2026-01-13 10:08 ` Ratheesh Kannoth
2026-01-10 22:58 ` Jakub Kicinski
2026-01-13 10:29 ` Ratheesh Kannoth
2026-01-13 15:07 ` Jakub Kicinski
2026-01-14 5:52 ` Ratheesh Kannoth
2026-01-15 3:14 ` Jakub Kicinski
2026-01-10 22:59 ` [net-next,v3,01/13] " Jakub Kicinski
2026-01-13 10:08 ` Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 02/13] octeontx2-af: npc: cn20k: KPM profile changes Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 03/13] octeontx2-af: npc: cn20k: Add default profile Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 04/13] ocetontx2-af: npc: cn20k: MKEX profile support Ratheesh Kannoth
2026-01-10 22:59 ` [net-next,v3,04/13] " Jakub Kicinski
2026-01-13 10:02 ` Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 05/13] octeontx2-af: npc: cn20k: Allocate default MCAM indexes Ratheesh Kannoth
2026-01-10 22:52 ` Jakub Kicinski
2026-01-13 9:58 ` Ratheesh Kannoth
2026-01-10 22:59 ` [net-next,v3,05/13] " Jakub Kicinski
2026-01-13 9:56 ` Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 06/13] octeontx2-af: npc: cn20k: Use common APIs Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 07/13] octeontx2-af: npc: cn20k: Prepare for new SoC Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 08/13] octeontx2-af: npc: cn20k: Add new mailboxes for CN20K silicon Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 09/13] octeontx2-af: npc: cn20k: virtual index support Ratheesh Kannoth
2026-01-10 22:52 ` Jakub Kicinski
2026-01-13 10:09 ` Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 10/13] octeontx2-af: npc: cn20k: Allocate MCAM entry for flow installation Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 11/13] octeontx2-pf: cn20k: Add TC rules support Ratheesh Kannoth
2026-01-10 22:59 ` [net-next,v3,11/13] " Jakub Kicinski
2026-01-13 9:54 ` Ratheesh Kannoth
2026-01-09 5:48 ` [PATCH net-next v3 12/13] octeontx2-af: npc: cn20k: add debugfs support Ratheesh Kannoth
2026-01-09 5:48 ` Ratheesh Kannoth [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260109054828.1822307-14-rkannoth@marvell.com \
--to=rkannoth@marvell.com \
--cc=andrew+netdev@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sgoutham@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox