From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6C3A74326F for ; Thu, 2 Nov 2023 14:14:03 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD81542DDC; Thu, 2 Nov 2023 14:14:02 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 7100442DCE for ; Thu, 2 Nov 2023 14:14:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1698930841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VnwouuvOgi9WEsfnYo6guVC/MIxRCn+io3DHUuPG9Rk=; b=MW+zYhMLTitW68bp2i83ZZvQBUGL4yQvfTTuERg+AjlS7kiWOq5Nr4KPRCK5+7SNcQ//Xm cjEdLZc+RIRG7bDvHJDh2Gfycxvx3crniRBeZVmlyOiRQw7Wp0DXkFQ6PUYMZK+X5Nb3hn I5fvVgbUkVoj7/IKMbM1iIvzP5jN+Do= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-613-RLfUQFdwPhij8dI1f61n3w-1; Thu, 02 Nov 2023 09:13:59 -0400 X-MC-Unique: RLfUQFdwPhij8dI1f61n3w-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D959C185A789; Thu, 2 Nov 2023 13:13:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.45]) by smtp.corp.redhat.com (Postfix) with ESMTP id 476AE492BFA; Thu, 2 Nov 2023 13:13:58 +0000 (UTC) From: Kevin Traynor To: Pavan Nikhilesh Cc: dpdk stable Subject: patch 'event/cnxk: fix getwork mode devargs parsing' has been queued to stable release 21.11.6 Date: Thu, 2 Nov 2023 13:11:41 +0000 Message-ID: <20231102131254.315947-35-ktraynor@redhat.com> In-Reply-To: <20231102131254.315947-1-ktraynor@redhat.com> References: <20231102131254.315947-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.6 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/08/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d31f9b208dd10423874a5d66d87cc33750570a8a Thanks. Kevin --- >From d31f9b208dd10423874a5d66d87cc33750570a8a Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Mon, 24 Jul 2023 14:06:44 +0530 Subject: [PATCH] event/cnxk: fix getwork mode devargs parsing [ 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 --- 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 74bf39205a..27c1840f71 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -575,5 +575,5 @@ cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs) 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; diff --git a/drivers/event/cnxk/cnxk_eventdev.h b/drivers/event/cnxk/cnxk_eventdev.h index 39c13b02fc..981a2efc5f 100644 --- a/drivers/event/cnxk/cnxk_eventdev.h +++ b/drivers/event/cnxk/cnxk_eventdev.h @@ -114,5 +114,5 @@ struct cnxk_sso_evdev { uint8_t dual_ws; /* CN10K */ - uint8_t gw_mode; + uint32_t gw_mode; /* Crypto adapter */ uint8_t is_ca_internal_port; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-02 13:09:41.721575041 +0000 +++ 0035-event-cnxk-fix-getwork-mode-devargs-parsing.patch 2023-11-02 13:09:40.835163406 +0000 @@ -1 +1 @@ -From 343216ff0c9f89d8d31060c53ad7271c87bc1323 Mon Sep 17 00:00:00 2001 +From d31f9b208dd10423874a5d66d87cc33750570a8a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 343216ff0c9f89d8d31060c53ad7271c87bc1323 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 27883a3619..9c9192bd40 100644 +index 74bf39205a..27c1840f71 100644 @@ -22 +23 @@ -@@ -613,5 +613,5 @@ cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs) +@@ -575,5 +575,5 @@ cnxk_sso_parse_devargs(struct cnxk_sso_evdev *dev, struct rte_devargs *devargs) @@ -28 +29 @@ - rte_kvargs_process(kvlist, CN10K_SSO_STASH, + dev->dual_ws = !single_ws; @@ -30 +31 @@ -index 962e630256..9d95092669 100644 +index 39c13b02fc..981a2efc5f 100644 @@ -33 +34 @@ -@@ -120,5 +120,5 @@ struct cnxk_sso_evdev { +@@ -114,5 +114,5 @@ struct cnxk_sso_evdev { @@ -38,2 +39,2 @@ - uint16_t stash_cnt; - struct cnxk_sso_stash *stash_parse_data; + /* Crypto adapter */ + uint8_t is_ca_internal_port;