[dpdk-dev] [PATCH] common/cnxk: add ROC API to merge base steering rule

[psatheesh]

From: Satheesh Paul <psathe...@marvell.com>

This patch adds an ROC API to merge base steering rule with rules
added by VF.

Signed-off-by: Satheesh Paul <psathe...@marvell.com>
Reviewed-by: Kiran Kumar Kokkilagadda <kirankum...@marvell.com>
---
 drivers/common/cnxk/roc_npc.c   | 27 +++++++++++++++++++++++++++
 drivers/common/cnxk/roc_npc.h   |  5 ++---
 drivers/common/cnxk/version.map |  1 +
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/drivers/common/cnxk/roc_npc.c b/drivers/common/cnxk/roc_npc.c
index aff4eef554..53074bed99 100644
--- a/drivers/common/cnxk/roc_npc.c
+++ b/drivers/common/cnxk/roc_npc.c
@@ -1136,3 +1136,30 @@ roc_npc_flow_dump(FILE *file, struct roc_npc *roc_npc)
                }
        }
 }
+
+int
+roc_npc_mcam_merge_base_steering_rule(struct roc_npc *roc_npc,
+                                     struct roc_npc_flow *flow)
+{
+       struct npc_mcam_read_base_rule_rsp *base_rule_rsp;
+       struct npc *npc = roc_npc_to_npc_priv(roc_npc);
+       struct mcam_entry *base_entry;
+       int idx, rc;
+
+       if (roc_nix_is_pf(roc_npc->roc_nix))
+               return 0;
+
+       (void)mbox_alloc_msg_npc_read_base_steer_rule(npc->mbox);
+       rc = mbox_process_msg(npc->mbox, (void *)&base_rule_rsp);
+       if (rc) {
+               plt_err("Failed to fetch VF's base MCAM entry");
+               return rc;
+       }
+       base_entry = &base_rule_rsp->entry_data;
+       for (idx = 0; idx < ROC_NPC_MAX_MCAM_WIDTH_DWORDS; idx++) {
+               flow->mcam_data[idx] |= base_entry->kw[idx];
+               flow->mcam_mask[idx] |= base_entry->kw_mask[idx];
+       }
+
+       return 0;
+}
diff --git a/drivers/common/cnxk/roc_npc.h b/drivers/common/cnxk/roc_npc.h
index bab25fd72e..1f9d29e2dd 100644
--- a/drivers/common/cnxk/roc_npc.h
+++ b/drivers/common/cnxk/roc_npc.h
@@ -215,15 +215,12 @@ int __roc_api roc_npc_flow_parse(struct roc_npc *roc_npc,
                                 const struct roc_npc_action actions[],
                                 struct roc_npc_flow *flow);
 int __roc_api roc_npc_get_low_priority_mcam(struct roc_npc *roc_npc);
-
 int __roc_api roc_npc_mcam_free_counter(struct roc_npc *roc_npc,
                                        uint16_t ctr_id);
-
 int __roc_api roc_npc_mcam_read_counter(struct roc_npc *roc_npc,
                                        uint32_t ctr_id, uint64_t *count);
 int __roc_api roc_npc_mcam_clear_counter(struct roc_npc *roc_npc,
                                         uint32_t ctr_id);
-
 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,
@@ -234,4 +231,6 @@ int __roc_api roc_npc_mark_actions_sub_return(struct 
roc_npc *roc_npc,
 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);
+int __roc_api roc_npc_mcam_merge_base_steering_rule(struct roc_npc *roc_npc,
+                                                   struct roc_npc_flow *flow);
 #endif /* _ROC_NPC_H_ */
diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index 2cbcc4b93a..13231fcf04 100644
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -234,6 +234,7 @@ INTERNAL {
        roc_npc_mcam_free_all_resources;
        roc_npc_mcam_free_counter;
        roc_npc_mcam_free_entry;
+       roc_npc_mcam_merge_base_steering_rule;
        roc_npc_mcam_write_entry;
        roc_npc_mcam_read_counter;
        roc_npc_profile_name_get;
-- 
2.25.4