[1/3] common/cnxk: fix channel mask for SDP interfaces
Checks
Commit Message
From: Satheesh Paul <psatheesh@marvell.com>
Fix channel mask of SDP interfaces on CN10K.
Fixes: f137566333 ("common/cnxk: support setting channel mask for SDP interfaces")
Cc: stable@dpdk.org
Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
Reviewed-by: Kiran Kumar K <kirankumark@marvell.com>
---
drivers/common/cnxk/roc_npc.c | 9 +++++++--
drivers/common/cnxk/roc_npc_priv.h | 3 +++
2 files changed, 10 insertions(+), 2 deletions(-)
Comments
On Fri, Feb 10, 2023 at 9:51 AM <psatheesh@marvell.com> wrote:
>
> From: Satheesh Paul <psatheesh@marvell.com>
>
> Fix channel mask of SDP interfaces on CN10K.
>
> Fixes: f137566333 ("common/cnxk: support setting channel mask for SDP interfaces")
> Cc: stable@dpdk.org
>
> Signed-off-by: Satheesh Paul <psatheesh@marvell.com>
> Reviewed-by: Kiran Kumar K <kirankumark@marvell.com>
Please run ./devtools/check-git-log.sh -n 3 and
./devtools/checkpatches.sh -n 3 before pushing the patches
to fix below issues.
WARNING:BAD_FIXES_TAG: Please use correct Fixes: style 'Fixes: <12
chars of sha1> ("<title line>")' - ie: 'Fixes: f13756633330
("common/cnxk: support setting channel mask for SDP interfaces")'
#8:
Fixes: f137566333 ("common/cnxk: support setting channel mask for SDP
interfaces")
total: 0 errors, 1 warnings, 24 lines checked
### [PATCH] common/cnxk: fix printing IPsec flow rules
WARNING:BAD_FIXES_TAG: Please use correct Fixes: style 'Fixes: <12
chars of sha1> ("<title line>")' - ie: 'Fixes: 1aa86a170e27 ("drivers:
support IPsec rule reservation scheme")'
#8:
Fixes: 1aa86a170e ("drivers: support IPsec rule reservation scheme")
total: 0 errors, 1 warnings, 224 lines checked
### [PATCH] common/cnxk: fix inline IPsec rule creation
WARNING:BAD_FIXES_TAG: Please use correct Fixes: style 'Fixes: <12
chars of sha1> ("<title line>")' - ie: 'Fixes: 1aa86a170e27 ("drivers:
support IPsec rule reservation scheme")'
> ---
> drivers/common/cnxk/roc_npc.c | 9 +++++++--
> drivers/common/cnxk/roc_npc_priv.h | 3 +++
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c
> index c872548230..9edccb5258 100644
> --- a/drivers/common/cnxk/roc_npc.c
> +++ b/drivers/common/cnxk/roc_npc.c
> @@ -1380,8 +1380,13 @@ roc_npc_flow_create(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
> /* By default set the channel and mask to cover
> * the whole SDP channel range.
> */
> - npc->sdp_channel = (uint16_t)NIX_CHAN_SDP_CH_START;
> - npc->sdp_channel_mask = (uint16_t)NIX_CHAN_SDP_CH_START;
> + if (roc_model_is_cn10k()) {
> + npc->sdp_channel = (uint16_t)CN10K_SDP_CH_START;
> + npc->sdp_channel_mask = (uint16_t)CN10K_SDP_CH_MASK;
> + } else {
> + npc->sdp_channel = (uint16_t)NIX_CHAN_SDP_CH_START;
> + npc->sdp_channel_mask = (uint16_t)NIX_CHAN_SDP_CH_START;
> + }
> }
> }
>
> diff --git a/drivers/common/cnxk/roc_npc_priv.h b/drivers/common/cnxk/roc_npc_priv.h
> index 2a7d3137fb..aa27228354 100644
> --- a/drivers/common/cnxk/roc_npc_priv.h
> +++ b/drivers/common/cnxk/roc_npc_priv.h
> @@ -77,6 +77,9 @@
> #define NPC_LFLAG_LC_OFFSET (NPC_LTYPE_OFFSET_START + 6)
> #define NPC_LTYPE_LC_OFFSET (NPC_LTYPE_OFFSET_START + 8)
>
> +#define CN10K_SDP_CH_START 0x80
> +#define CN10K_SDP_CH_MASK 0xF80
> +
> struct npc_action_vtag_info {
> uint16_t vlan_id;
> uint16_t vlan_ethtype;
> --
> 2.35.3
>
@@ -1380,8 +1380,13 @@ roc_npc_flow_create(struct roc_npc *roc_npc, const struct roc_npc_attr *attr,
/* By default set the channel and mask to cover
* the whole SDP channel range.
*/
- npc->sdp_channel = (uint16_t)NIX_CHAN_SDP_CH_START;
- npc->sdp_channel_mask = (uint16_t)NIX_CHAN_SDP_CH_START;
+ if (roc_model_is_cn10k()) {
+ npc->sdp_channel = (uint16_t)CN10K_SDP_CH_START;
+ npc->sdp_channel_mask = (uint16_t)CN10K_SDP_CH_MASK;
+ } else {
+ npc->sdp_channel = (uint16_t)NIX_CHAN_SDP_CH_START;
+ npc->sdp_channel_mask = (uint16_t)NIX_CHAN_SDP_CH_START;
+ }
}
}
@@ -77,6 +77,9 @@
#define NPC_LFLAG_LC_OFFSET (NPC_LTYPE_OFFSET_START + 6)
#define NPC_LTYPE_LC_OFFSET (NPC_LTYPE_OFFSET_START + 8)
+#define CN10K_SDP_CH_START 0x80
+#define CN10K_SDP_CH_MASK 0xF80
+
struct npc_action_vtag_info {
uint16_t vlan_id;
uint16_t vlan_ethtype;