|WARNING| pw120402 [PATCH] common/cnxk: fix dual VLAN parsing issue

[dpdklab at iol.unh.edu]

Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/120402

_apply patch failure_

Submitter: Satheesh Paul Antonysamy <psatheesh at marvell.com>
Date: Thursday, December 01 2022 04:29:37 
Applied on: CommitID:f262f16087ea6a77357a915cf4c0d10ddc7b6562
Apply patch set 120402 failed:

Checking patch drivers/common/cnxk/roc_npc_parse.c...
Hunk #1 succeeded at 238 (offset -1 lines).
Hunk #2 succeeded at 429 (offset -1 lines).
Hunk #3 succeeded at 445 (offset -1 lines).
Checking patch drivers/common/cnxk/roc_npc_priv.h...
error: while searching for:
int npc_mcam_alloc_entries(struct mbox *mbox, int ref_mcam, int *alloc_entry, int req_count,
			   int prio, int *resp_count, bool is_conti);

int npc_mcam_ena_dis_entry(struct npc *npc, struct roc_npc_flow *mcam,
			   bool enable);
int npc_mcam_write_entry(struct mbox *mbox, struct roc_npc_flow *mcam);
int npc_flow_enable_all_entries(struct npc *npc, bool enable);
int npc_update_parse_state(struct npc_parse_state *pst,
			   struct npc_parse_item_info *info, int lid, int lt,
			   uint8_t flags);
void npc_get_hw_supp_mask(struct npc_parse_state *pst,
			  struct npc_parse_item_info *info, int lid, int lt);
int npc_parse_item_basic(const struct roc_npc_item_info *item,
			 struct npc_parse_item_info *info);
int npc_parse_meta_items(struct npc_parse_state *pst);
int npc_parse_mark_item(struct npc_parse_state *pst);
int npc_parse_pre_l2(struct npc_parse_state *pst);

error: patch failed: drivers/common/cnxk/roc_npc_priv.h:418
Checking patch drivers/common/cnxk/roc_npc_utils.c...
Applied patch drivers/common/cnxk/roc_npc_parse.c cleanly.
Applying patch drivers/common/cnxk/roc_npc_priv.h with 1 reject...
Rejected hunk #1.
Applied patch drivers/common/cnxk/roc_npc_utils.c cleanly.
diff a/drivers/common/cnxk/roc_npc_priv.h b/drivers/common/cnxk/roc_npc_priv.h	(rejected hunks)
@@ -418,17 +418,15 @@ int npc_mcam_alloc_entry(struct npc *npc, struct roc_npc_flow *mcam,
 int npc_mcam_alloc_entries(struct mbox *mbox, int ref_mcam, int *alloc_entry, int req_count,
 			   int prio, int *resp_count, bool is_conti);
 
-int npc_mcam_ena_dis_entry(struct npc *npc, struct roc_npc_flow *mcam,
-			   bool enable);
+int npc_mcam_ena_dis_entry(struct npc *npc, struct roc_npc_flow *mcam, bool enable);
 int npc_mcam_write_entry(struct mbox *mbox, struct roc_npc_flow *mcam);
 int npc_flow_enable_all_entries(struct npc *npc, bool enable);
-int npc_update_parse_state(struct npc_parse_state *pst,
-			   struct npc_parse_item_info *info, int lid, int lt,
-			   uint8_t flags);
-void npc_get_hw_supp_mask(struct npc_parse_state *pst,
-			  struct npc_parse_item_info *info, int lid, int lt);
-int npc_parse_item_basic(const struct roc_npc_item_info *item,
-			 struct npc_parse_item_info *info);
+int npc_update_parse_state(struct npc_parse_state *pst, struct npc_parse_item_info *info, int lid,
+			   int lt, uint8_t flags);
+void npc_get_hw_supp_mask(struct npc_parse_state *pst, struct npc_parse_item_info *info, int lid,
+			  int lt);
+int npc_mask_is_supported(const char *mask, const char *hw_mask, int len);
+int npc_parse_item_basic(const struct roc_npc_item_info *item, struct npc_parse_item_info *info);
 int npc_parse_meta_items(struct npc_parse_state *pst);
 int npc_parse_mark_item(struct npc_parse_state *pst);
 int npc_parse_pre_l2(struct npc_parse_state *pst);

https://lab.dpdk.org/results/dashboard/patchsets/24613/

UNH-IOL DPDK Community Lab