On Mon, Feb 7, 2022 at 1:01 PM Nithin Dabilpuram
<ndabilpu...@marvell.com> wrote:
>
> From: Satha Rao <skotesh...@marvell.com>
Subject change removed to remove
>
> Removed roc npc apis which tracks addition and deletion of
NPC and APIs
> mark actions.
Tell why it is removed.
>
> Signed-off-by: Satha Rao <skotesh...@marvell.com>
> ---
> drivers/common/cnxk/roc_npc.c | 21 ---------------------
> drivers/common/cnxk/roc_npc.h | 3 ---
> drivers/common/cnxk/roc_npc_priv.h | 1 -
> drivers/common/cnxk/version.map | 2 --
> 4 files changed, 27 deletions(-)
>
> diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c
> index e3961bf..d2ebe61 100644
> --- a/drivers/common/cnxk/roc_npc.c
> +++ b/drivers/common/cnxk/roc_npc.c
> @@ -166,8 +166,6 @@ roc_npc_init(struct roc_npc *roc_npc)
> roc_npc->kex_capability = npc_get_kex_capability(npc);
> roc_npc->rx_parse_nibble = npc->keyx_supp_nmask[NPC_MCAM_RX];
>
> - npc->mark_actions = 0;
> -
> npc->mcam_entries = npc_mcam_tot_entries() >> npc->keyw[NPC_MCAM_RX];
>
> /* Free, free_rev, live and live_rev entries */
> @@ -323,13 +321,11 @@ npc_parse_actions(struct roc_npc *roc_npc, const struct
> roc_npc_attr *attr,
> }
> mark = act_mark->id + 1;
> req_act |= ROC_NPC_ACTION_TYPE_MARK;
> - npc->mark_actions += 1;
> break;
>
> case ROC_NPC_ACTION_TYPE_FLAG:
> mark = NPC_FLOW_FLAG_VAL;
> req_act |= ROC_NPC_ACTION_TYPE_FLAG;
> - npc->mark_actions += 1;
> break;
>
> case ROC_NPC_ACTION_TYPE_COUNT:
> @@ -812,23 +808,6 @@ npc_rss_action_program(struct roc_npc *roc_npc,
> return 0;
> }
>
> -int
> -roc_npc_mark_actions_get(struct roc_npc *roc_npc)
> -{
> - struct npc *npc = roc_npc_to_npc_priv(roc_npc);
> -
> - return npc->mark_actions;
> -}
> -
> -int
> -roc_npc_mark_actions_sub_return(struct roc_npc *roc_npc, uint32_t count)
> -{
> - struct npc *npc = roc_npc_to_npc_priv(roc_npc);
> -
> - npc->mark_actions -= count;
> - return npc->mark_actions;
> -}
> -
> static int
> npc_vtag_cfg_delete(struct roc_npc *roc_npc, struct roc_npc_flow *flow)
> {
> diff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h
> index b836e26..6dcdd29 100644
> --- a/drivers/common/cnxk/roc_npc.h
> +++ b/drivers/common/cnxk/roc_npc.h
> @@ -337,9 +337,6 @@ int __roc_api roc_npc_mcam_free_all_resources(struct
> roc_npc *roc_npc);
> void __roc_api roc_npc_flow_dump(FILE *file, struct roc_npc *roc_npc);
> void __roc_api roc_npc_flow_mcam_dump(FILE *file, struct roc_npc *roc_npc,
> struct roc_npc_flow *mcam);
> -int __roc_api roc_npc_mark_actions_get(struct roc_npc *roc_npc);
> -int __roc_api roc_npc_mark_actions_sub_return(struct roc_npc *roc_npc,
> - uint32_t count);
> int __roc_api roc_npc_vtag_actions_get(struct roc_npc *roc_npc);
> int __roc_api roc_npc_vtag_actions_sub_return(struct roc_npc *roc_npc,
> uint32_t count);
> diff --git a/drivers/common/cnxk/roc_npc_priv.h
> b/drivers/common/cnxk/roc_npc_priv.h
> index afd11ad..a04f621 100644
> --- a/drivers/common/cnxk/roc_npc_priv.h
> +++ b/drivers/common/cnxk/roc_npc_priv.h
> @@ -380,7 +380,6 @@ struct npc {
> uint16_t flow_prealloc_size; /* Pre allocated mcam size */
> uint16_t flow_max_priority; /* Max priority for flow */
> uint16_t switch_header_type; /* Supported switch header type */
> - uint32_t mark_actions; /* Number of mark actions */
> uint32_t vtag_strip_actions; /* vtag insert/strip actions */
> uint16_t pf_func; /* pf_func of device */
> npc_dxcfg_t prx_dxcfg; /* intf, lid, lt, extract */
> diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
> index 7a8aff1..0f990d3 100644
> --- a/drivers/common/cnxk/version.map
> +++ b/drivers/common/cnxk/version.map
> @@ -305,8 +305,6 @@ INTERNAL {
> roc_npc_flow_parse;
> roc_npc_get_low_priority_mcam;
> roc_npc_init;
> - roc_npc_mark_actions_get;
> - roc_npc_mark_actions_sub_return;
> roc_npc_vtag_actions_get;
> roc_npc_vtag_actions_sub_return;
> roc_npc_mcam_alloc_entries;
> --
> 2.8.4
>
