common/cnxk: fix channel number setting in MCAM entries
PATCH 1/1 common/cnxk: fix channel number setting in MCAM entries
From: Satheesh Paul <[email protected]>
Adding changes to accommodate the following requirements while masking the channel number.
1. For CN10K device, channel number should not be masked for first pass rules with RTE_FLOW_ACTION_TYPE_SECURITY action. And channel number should be masked for all other flow rules.
2. For CN9K device channel number should not be masked.
--- drivers/common/cnxk/roc_npc_mcam.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-)
drivers/common/cnxk/roc_npc_mcam.c +18 -12
@@ -508,19 +508,25 @@ npc_mcam_set_channel(struct roc_npc_flow *flow, req->entry_data.kw_mask[0 ] &= ~(GENMASK (11 ,0 )); flow->mcam_data[0 ] &= ~(GENMASK (11 ,0 )); flow->mcam_mask[0 ] &= ~(GENMASK (11 ,0 )); + chan = channel; + mask = chan_mask; -if (is_second_pass) { - chan = (channel |NIX_CHAN_CPT_CH_START ); - mask = (chan_mask |NIX_CHAN_CPT_CH_START ); - }else { -/* -* Clear bits 10 & 11 corresponding to CPT -* channel. By default, rules should match -* both first pass packets and second pass -* packets from CPT. -*/ - chan = (channel &NIX_CHAN_CPT_X2P_MASK ); - mask = (chan_mask &NIX_CHAN_CPT_X2P_MASK ); +if (roc_model_runtime_is_cn10k ()) { +if (is_second_pass) { + chan = (channel |NIX_CHAN_CPT_CH_START ); + mask = (chan_mask |NIX_CHAN_CPT_CH_START ); + }else { +if (!(flow->npc_action &NIX_RX_ACTIONOP_UCAST_IPSEC )) { +/* +* Clear bits 10 & 11 corresponding to CPT +* channel. By default, rules should match +* both first pass packets and second pass +* packets from CPT. +*/ + chan = (channel &NIX_CHAN_CPT_X2P_MASK ); + mask = (chan_mask &NIX_CHAN_CPT_X2P_MASK ); + } + } } req->entry_data.kw[0 ] |= (uint64_t )chan;
Signature · 1 line
2.25.4
Jerin Jacob
AppliedQuoted 11 lines · On Mon, May 2, 2022 at 2:17 PM <[email protected]> wrote:
From: Satheesh Paul <[email protected]>
Adding changes to accommodate the following requirements while masking the channel number.
1. For CN10K device, channel number should not be masked for first pass rules withRTE_FLOW_ACTION_TYPE_SECURITYaction. And channel number should be masked for all other flow rules.
2. For CN9K device channel number should not be masked.
Quoted 1 line
Fixes 29dcc20985 ("common/cnxk: support for CPT second pass flow rules")
Not correct. Updated as
Quoted 4 lines
Signed-off-by Satheesh Paul <[email protected]>Reviewed-by Kiran Kumar Kokkilagadda <[email protected]>
Updated as Reviewed-by: Kiran Kumar K <[email protected]> Please check this in future patches,
Applied to dpdk-next-net-mrvl/for-next-net. Thanks
Quoted 49 lines
--- drivers/common/cnxk/roc_npc_mcam.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-)drivers/common/cnxk/roc_npc_mcam.c +18
-13@@ -508,19 +508,25 @@ npc_mcam_set_channel(struct roc_npc_flow *flow, req->entry_data.kw_mask[0 ] &= ~(GENMASK (11 ,0 )); flow->mcam_data[0 ] &= ~(GENMASK (11 ,0 )); flow->mcam_mask[0 ] &= ~(GENMASK (11 ,0 )); + chan = channel; + mask = chan_mask; -if (is_second_pass) { - chan = (channel |NIX_CHAN_CPT_CH_START ); - mask = (chan_mask |NIX_CHAN_CPT_CH_START ); - }else { -/* -* Clear bits 10 & 11 corresponding to CPT -* channel. By default, rules should match -* both first pass packets and second pass -* packets from CPT. -*/ - chan = (channel &NIX_CHAN_CPT_X2P_MASK ); - mask = (chan_mask &NIX_CHAN_CPT_X2P_MASK ); +if (roc_model_runtime_is_cn10k ()) { +if (is_second_pass) { + chan = (channel |NIX_CHAN_CPT_CH_START ); + mask = (chan_mask |NIX_CHAN_CPT_CH_START ); + }else { +if (!(flow->npc_action &NIX_RX_ACTIONOP_UCAST_IPSEC )) { +/* +* Clear bits 10 & 11 corresponding to CPT +* channel. By default, rules should match +* both first pass packets and second pass +* packets from CPT. +*/ + chan = (channel &NIX_CHAN_CPT_X2P_MASK ); + mask = (chan_mask &NIX_CHAN_CPT_X2P_MASK ); + } + } } req->entry_data.kw[0 ] |= (uint64_t )chan; --2.25.4