patch 'event/cnxk: fix getwork mode devargs parsing' has been queued to stable release 22.11.4

Xueming Li xuemingl at nvidia.com
Sun Oct 22 16:21:23 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.4

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/15/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=148478f997f740041ac0da856d3db012c8965064

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 148478f997f740041ac0da856d3db012c8965064 Mon Sep 17 00:00:00 2001
From: Pavan Nikhilesh <pbhagavatula at marvell.com>
Date: Mon, 24 Jul 2023 14:06:44 +0530
Subject: [PATCH] event/cnxk: fix getwork mode devargs parsing
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 343216ff0c9f89d8d31060c53ad7271c87bc1323 ]

CN10K can support up to three types of getwork modes, use parse value
function to parse the device arguments.

Fixes: 5fb651552c79 ("event/cnxk: fix SSO and TIM argument parsing")

Signed-off-by: Pavan Nikhilesh <pbhagavatula at marvell.com>
---
 drivers/event/cnxk/cnxk_eventdev.c | 2 +-
 drivers/event/cnxk/cnxk_eventdev.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c
index 93e46e1b9b..d2f1708297 100644
--- a/drivers/event/cnxk/cnxk_eventdev.c
+++ b/drivers/event/cnxk/cnxk_eventdev.c
@@ -551,7 +551,7 @@ cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs)
 			   &dev->force_ena_bp);
 	rte_kvargs_process(kvlist, CN9K_SSO_SINGLE_WS, &parse_kvargs_flag,
 			   &single_ws);
-	rte_kvargs_process(kvlist, CN10K_SSO_GW_MODE, &parse_kvargs_flag,
+	rte_kvargs_process(kvlist, CN10K_SSO_GW_MODE, &parse_kvargs_value,
 			   &dev->gw_mode);
 	dev->dual_ws = !single_ws;
 	rte_kvargs_free(kvlist);
diff --git a/drivers/event/cnxk/cnxk_eventdev.h b/drivers/event/cnxk/cnxk_eventdev.h
index 738e335ea4..b4e5f81f8c 100644
--- a/drivers/event/cnxk/cnxk_eventdev.h
+++ b/drivers/event/cnxk/cnxk_eventdev.h
@@ -128,7 +128,7 @@ struct cnxk_sso_evdev {
 	/* CN9K */
 	uint8_t dual_ws;
 	/* CN10K */
-	uint8_t gw_mode;
+	uint32_t gw_mode;
 	/* Crypto adapter */
 	uint8_t is_ca_internal_port;
 } __rte_cache_aligned;
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-10-22 22:17:36.407209300 +0800
+++ 0054-event-cnxk-fix-getwork-mode-devargs-parsing.patch	2023-10-22 22:17:34.266723700 +0800
@@ -1 +1 @@
-From 343216ff0c9f89d8d31060c53ad7271c87bc1323 Mon Sep 17 00:00:00 2001
+From 148478f997f740041ac0da856d3db012c8965064 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 343216ff0c9f89d8d31060c53ad7271c87bc1323 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -19 +21 @@
-index 27883a3619..9c9192bd40 100644
+index 93e46e1b9b..d2f1708297 100644
@@ -22 +24 @@
-@@ -612,7 +612,7 @@ cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs)
+@@ -551,7 +551,7 @@ cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs)
@@ -29,2 +31,2 @@
- 	rte_kvargs_process(kvlist, CN10K_SSO_STASH,
- 			   &parse_sso_kvargs_stash_dict, dev);
+ 	dev->dual_ws = !single_ws;
+ 	rte_kvargs_free(kvlist);
@@ -32 +34 @@
-index 962e630256..9d95092669 100644
+index 738e335ea4..b4e5f81f8c 100644
@@ -35 +37 @@
-@@ -119,7 +119,7 @@ struct cnxk_sso_evdev {
+@@ -128,7 +128,7 @@ struct cnxk_sso_evdev {
@@ -41,2 +43,2 @@
- 	uint16_t stash_cnt;
- 	struct cnxk_sso_stash *stash_parse_data;
+ 	/* Crypto adapter */
+ 	uint8_t is_ca_internal_port;


More information about the stable mailing list