patch 'net/ice/base: fix function descriptions for parser' has been queued to stable release 21.11.3
Kevin Traynor
ktraynor at redhat.com
Tue Oct 25 17:06:48 CEST 2022
Hi,
FYI, your patch has been queued to stable release 21.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/01/22. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/13824e6da2a94333bfa5cd591643822554b6696b
Thanks.
Kevin
---
>From 13824e6da2a94333bfa5cd591643822554b6696b Mon Sep 17 00:00:00 2001
From: Qi Zhang <qi.z.zhang at intel.com>
Date: Mon, 15 Aug 2022 03:31:21 -0400
Subject: [PATCH] net/ice/base: fix function descriptions for parser
[ upstream commit 0486c968f63a4ad81fa285ddac894fdd7a04727d ]
Some function descriptions for parser are mismatched, thus fixed
with this patch.
Fixes: 7fe2d98070e0 ("net/ice/base: add parser create and destroy skeleton")
Fixes: 1792942b2df6 ("net/ice/base: init boost TCAM table for parser")
Fixes: f787952d13d2 ("net/ice/base: init flag redirect table for parser")
Fixes: b3e73a812f98 ("net/ice/base: init IMEM table for parser")
Fixes: 2f7a1864cc19 ("net/ice/base: init metainit table for parser")
Fixes: 90bbd7d9545f ("net/ice/base: init marker group table for parser")
Fixes: c55b1ba93f07 ("net/ice/base: init parse graph CAM table for parser")
Fixes: 7b61be517fd5 ("net/ice/base: init protocol group table for parser")
Fixes: 111871087cdf ("net/ice/base: init ptype marker TCAM table for parser")
Fixes: 0cbacf60dce7 ("net/ice/base: init XLT key builder for parser")
Signed-off-by: Junfeng Guo <junfeng.guo at intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
drivers/net/ice/base/ice_bst_tcam.c | 6 +++---
drivers/net/ice/base/ice_flg_rd.c | 4 ++--
drivers/net/ice/base/ice_imem.c | 4 ++--
drivers/net/ice/base/ice_metainit.c | 4 ++--
drivers/net/ice/base/ice_mk_grp.c | 4 ++--
drivers/net/ice/base/ice_parser.c | 7 ++++---
drivers/net/ice/base/ice_pg_cam.c | 12 ++++++------
drivers/net/ice/base/ice_proto_grp.c | 4 ++--
drivers/net/ice/base/ice_ptype_mk.c | 4 ++--
drivers/net/ice/base/ice_xlt_kb.c | 10 +++++-----
10 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/drivers/net/ice/base/ice_bst_tcam.c b/drivers/net/ice/base/ice_bst_tcam.c
index 306f62db2a..74a2de869e 100644
--- a/drivers/net/ice/base/ice_bst_tcam.c
+++ b/drivers/net/ice/base/ice_bst_tcam.c
@@ -54,5 +54,5 @@ static void _bst_alu_dump(struct ice_hw *hw, struct ice_alu *alu, int index)
/**
* ice_bst_tcam_dump - dump a boost tcam info
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
* @item: boost tcam to dump
*/
@@ -206,5 +206,5 @@ static void _bst_parse_item(struct ice_hw *hw, u16 idx, void *item,
/**
* ice_bst_tcam_table_get - create a boost tcam table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_bst_tcam_item *ice_bst_tcam_table_get(struct ice_hw *hw)
@@ -229,5 +229,5 @@ static void _parse_lbl_item(struct ice_hw *hw, u16 idx, void *item,
/**
* ice_bst_lbl_table_get - create a boost label table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_lbl_item *ice_bst_lbl_table_get(struct ice_hw *hw)
diff --git a/drivers/net/ice/base/ice_flg_rd.c b/drivers/net/ice/base/ice_flg_rd.c
index 833986cac3..80d3b51ad6 100644
--- a/drivers/net/ice/base/ice_flg_rd.c
+++ b/drivers/net/ice/base/ice_flg_rd.c
@@ -10,5 +10,5 @@
/**
* ice_flg_rd_dump - dump a flag redirect item info
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
* @item: flag redirect item to dump
*/
@@ -41,5 +41,5 @@ static void _flg_rd_parse_item(struct ice_hw *hw, u16 idx, void *item,
/**
* ice_flg_rd_table_get - create a flag redirect table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_flg_rd_item *ice_flg_rd_table_get(struct ice_hw *hw)
diff --git a/drivers/net/ice/base/ice_imem.c b/drivers/net/ice/base/ice_imem.c
index 2136e0393b..9a76d21ce5 100644
--- a/drivers/net/ice/base/ice_imem.c
+++ b/drivers/net/ice/base/ice_imem.c
@@ -70,5 +70,5 @@ static void _imem_alu_dump(struct ice_hw *hw, struct ice_alu *alu, int index)
/**
* ice_imem_dump - dump an imem item info
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
* @item: imem item to dump
*/
@@ -232,5 +232,5 @@ static void _imem_parse_item(struct ice_hw *hw, u16 idx, void *item,
/**
* ice_imem_table_get - create an imem table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_imem_item *ice_imem_table_get(struct ice_hw *hw)
diff --git a/drivers/net/ice/base/ice_metainit.c b/drivers/net/ice/base/ice_metainit.c
index 3f9e5d6833..a899125b37 100644
--- a/drivers/net/ice/base/ice_metainit.c
+++ b/drivers/net/ice/base/ice_metainit.c
@@ -10,5 +10,5 @@
/**
* ice_metainit_dump - dump an metainit item info
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
* @item: metainit item to dump
*/
@@ -131,5 +131,5 @@ static void _metainit_parse_item(struct ice_hw *hw, u16 idx, void *item,
/**
* ice_metainit_table_get - create a metainit table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_metainit_item *ice_metainit_table_get(struct ice_hw *hw)
diff --git a/drivers/net/ice/base/ice_mk_grp.c b/drivers/net/ice/base/ice_mk_grp.c
index 4e9ab5c13a..814001c49e 100644
--- a/drivers/net/ice/base/ice_mk_grp.c
+++ b/drivers/net/ice/base/ice_mk_grp.c
@@ -11,5 +11,5 @@
/**
* ice_mk_grp_dump - dump an marker group item info
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
* @item: marker group item to dump
*/
@@ -43,5 +43,5 @@ static void _mk_grp_parse_item(struct ice_hw *hw, u16 idx, void *item,
/**
* ice_mk_grp_table_get - create a marker group table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_mk_grp_item *ice_mk_grp_table_get(struct ice_hw *hw)
diff --git a/drivers/net/ice/base/ice_parser.c b/drivers/net/ice/base/ice_parser.c
index 9b106baff0..4d490dda7b 100644
--- a/drivers/net/ice/base/ice_parser.c
+++ b/drivers/net/ice/base/ice_parser.c
@@ -107,5 +107,5 @@ void *ice_parser_sect_item_get(u32 sect_type, void *section,
* @length: number of items in the table to create
* @item_get: the function will be parsed to ice_pkg_enum_entry
- * @parser_item: the function to parse the item
+ * @parse_item: the function to parse the item
* @no_offset: ignore header offset, calculate index from 0
*/
@@ -360,4 +360,5 @@ static void _bst_vm_set(struct ice_parser *psr, const char *prefix, bool on)
* ice_parser_dvm_set - configure double vlan mode for parser
* @psr: pointer to a parser instance
+ * @on: true to turn on; false to turn off
*/
void ice_parser_dvm_set(struct ice_parser *psr, bool on)
@@ -479,6 +480,6 @@ static bool _nearest_proto_id(struct ice_parser_result *rslt, u16 offset,
* @rslt: a instance of a parser result
* @pkt_buf: packet data buffer
- * @pkt_msk: packet mask buffer
- * @pkt_len: packet length
+ * @msk_buf: packet mask buffer
+ * @buf_len: packet length
* @blk: FXP pipeline stage
* @prefix_match: match protocol stack exactly or only prefix
diff --git a/drivers/net/ice/base/ice_pg_cam.c b/drivers/net/ice/base/ice_pg_cam.c
index fe461ad849..73f7c34ffd 100644
--- a/drivers/net/ice/base/ice_pg_cam.c
+++ b/drivers/net/ice/base/ice_pg_cam.c
@@ -51,5 +51,5 @@ static void _pg_cam_action_dump(struct ice_hw *hw,
/**
* ice_pg_cam_dump - dump an parse graph cam info
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
* @item: parse graph cam to dump
*/
@@ -63,5 +63,5 @@ void ice_pg_cam_dump(struct ice_hw *hw, struct ice_pg_cam_item *item)
/**
* ice_pg_nm_cam_dump - dump an parse graph no match cam info
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
* @item: parse graph no match cam to dump
*/
@@ -244,5 +244,5 @@ static void _pg_nm_sp_cam_parse_item(struct ice_hw *hw, u16 idx, void *item,
/**
* ice_pg_cam_table_get - create a parse graph cam table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_pg_cam_item *ice_pg_cam_table_get(struct ice_hw *hw)
@@ -258,5 +258,5 @@ struct ice_pg_cam_item *ice_pg_cam_table_get(struct ice_hw *hw)
/**
* ice_pg_sp_cam_table_get - create a parse graph spill cam table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_pg_cam_item *ice_pg_sp_cam_table_get(struct ice_hw *hw)
@@ -272,5 +272,5 @@ struct ice_pg_cam_item *ice_pg_sp_cam_table_get(struct ice_hw *hw)
/**
* ice_pg_nm_cam_table_get - create a parse graph no match cam table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_pg_nm_cam_item *ice_pg_nm_cam_table_get(struct ice_hw *hw)
@@ -286,5 +286,5 @@ struct ice_pg_nm_cam_item *ice_pg_nm_cam_table_get(struct ice_hw *hw)
/**
* ice_pg_nm_sp_cam_table_get - create a parse graph no match spill cam table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_pg_nm_cam_item *ice_pg_nm_sp_cam_table_get(struct ice_hw *hw)
diff --git a/drivers/net/ice/base/ice_proto_grp.c b/drivers/net/ice/base/ice_proto_grp.c
index 69d5d9a18a..b1d149b66a 100644
--- a/drivers/net/ice/base/ice_proto_grp.c
+++ b/drivers/net/ice/base/ice_proto_grp.c
@@ -19,5 +19,5 @@ static void _proto_off_dump(struct ice_hw *hw, struct ice_proto_off *po,
/**
* ice_proto_grp_dump - dump a proto group item info
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
* @item: proto group item to dump
*/
@@ -96,5 +96,5 @@ static void _proto_grp_parse_item(struct ice_hw *hw, u16 idx, void *item,
/**
* ice_proto_grp_table_get - create a proto group table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_proto_grp_item *ice_proto_grp_table_get(struct ice_hw *hw)
diff --git a/drivers/net/ice/base/ice_ptype_mk.c b/drivers/net/ice/base/ice_ptype_mk.c
index 97c41cb586..9807e688b1 100644
--- a/drivers/net/ice/base/ice_ptype_mk.c
+++ b/drivers/net/ice/base/ice_ptype_mk.c
@@ -10,5 +10,5 @@
/**
* ice_ptype_mk_tcam_dump - dump an ptype marker tcam info_
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
* @item: ptype marker tcam to dump
*/
@@ -42,5 +42,5 @@ static void _parse_ptype_mk_tcam_item(struct ice_hw *hw, u16 idx, void *item,
/**
* ice_ptype_mk_tcam_table_get - create a ptype marker tcam table
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_ptype_mk_tcam_item *ice_ptype_mk_tcam_table_get(struct ice_hw *hw)
diff --git a/drivers/net/ice/base/ice_xlt_kb.c b/drivers/net/ice/base/ice_xlt_kb.c
index 4c1ab747cf..5efe209cad 100644
--- a/drivers/net/ice/base/ice_xlt_kb.c
+++ b/drivers/net/ice/base/ice_xlt_kb.c
@@ -26,5 +26,5 @@ static void _xlt_kb_entry_dump(struct ice_hw *hw,
/**
* ice_imem_dump - dump a xlt key build info
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
* @kb: key build to dump
*/
@@ -155,5 +155,5 @@ static struct ice_xlt_kb *_xlt_kb_get(struct ice_hw *hw, u32 sect_type)
/**
* ice_xlt_kb_get_sw - create switch xlt key build
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_xlt_kb *ice_xlt_kb_get_sw(struct ice_hw *hw)
@@ -164,5 +164,5 @@ struct ice_xlt_kb *ice_xlt_kb_get_sw(struct ice_hw *hw)
/**
* ice_xlt_kb_get_acl - create acl xlt key build
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_xlt_kb *ice_xlt_kb_get_acl(struct ice_hw *hw)
@@ -173,5 +173,5 @@ struct ice_xlt_kb *ice_xlt_kb_get_acl(struct ice_hw *hw)
/**
* ice_xlt_kb_get_fd - create fdir xlt key build
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_xlt_kb *ice_xlt_kb_get_fd(struct ice_hw *hw)
@@ -182,5 +182,5 @@ struct ice_xlt_kb *ice_xlt_kb_get_fd(struct ice_hw *hw)
/**
* ice_xlt_kb_get_fd - create rss xlt key build
- * @ice_hw: pointer to the hardware structure
+ * @hw: pointer to the hardware structure
*/
struct ice_xlt_kb *ice_xlt_kb_get_rss(struct ice_hw *hw)
--
2.37.3
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2022-10-25 14:18:59.734971336 +0100
+++ 0053-net-ice-base-fix-function-descriptions-for-parser.patch 2022-10-25 14:18:58.424798138 +0100
@@ -1 +1 @@
-From 0486c968f63a4ad81fa285ddac894fdd7a04727d Mon Sep 17 00:00:00 2001
+From 13824e6da2a94333bfa5cd591643822554b6696b Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0486c968f63a4ad81fa285ddac894fdd7a04727d ]
+
@@ -19 +20,0 @@
-Cc: stable at dpdk.org
@@ -135 +136 @@
-index 6529f5d635..5a461d83be 100644
+index 9b106baff0..4d490dda7b 100644
@@ -207 +208 @@
-index 7ce87de110..5dbe07d258 100644
+index 69d5d9a18a..b1d149b66a 100644
@@ -210 +211 @@
-@@ -18,5 +18,5 @@ static void _proto_off_dump(struct ice_hw *hw, struct ice_proto_off *po,
+@@ -19,5 +19,5 @@ static void _proto_off_dump(struct ice_hw *hw, struct ice_proto_off *po,
@@ -217 +218 @@
-@@ -95,5 +95,5 @@ static void _proto_grp_parse_item(struct ice_hw *hw, u16 idx, void *item,
+@@ -96,5 +96,5 @@ static void _proto_grp_parse_item(struct ice_hw *hw, u16 idx, void *item,
More information about the stable
mailing list