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 B90F0431D5 for ; Sun, 22 Oct 2023 16:27:55 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE45C40A79; Sun, 22 Oct 2023 16:27:55 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2061.outbound.protection.outlook.com [40.107.223.61]) by mails.dpdk.org (Postfix) with ESMTP id 3C7C940695 for ; Sun, 22 Oct 2023 16:27:54 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nujF5e+HTDvSqu2e8vUndTQ7IEVIA4w49cw4i1Gq/smNqGFo+k6R7IS+e+blE5W9A5QwxsPVKBcIYjoRU30mviVmt+JNpIfLUFMkGR7U+/DOI9VqlgGR4m4VvjjcNC988hniPpvC5lyuINSD1MeiC5L8m7spOPEKwaByLWLZS0i4ohg94j1EQkTEha7EfbVtSlhbuv7SAdY5AcoDJ3WVpC8dm/PifeC5r5vaPmpEAvG9O4Nt16MKo2/ag+vwlutYQj3xc939+u3TaN/vG4dGuSnzyfAj64/BIv0m9sEWhhaonMH8uwa/r5far45pq/ZGekQ0UBJf4R+5rUk5X0PIaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LFDXzC/gf0jV555wsBK2IldxYXNoVjmxZS32DVwLVSA=; b=eMeyUvWJJCYWilekicyfHkH+rU29NtvjBm2nE5uiyJRTvQX/b6mRJeILUx33gtpkzfHEXP7B+UZk8HBKmOptggpOOhRjJDBQ8Edmjpn2UVUaEYAxhaHxn/rFeghZQwdqx6lHZXxQyJHxAhURMc3XwYk6wr13DobrHUNFM898js3eZtCDddKQttF+yIbFR7VCPpa2H71Q9DU1brpgnikUUNCTUHSapjxRXcJDvFs49kHHylQjkUrrW6JKc8Vay8tQxgqgZrTz9GATdQvkbbCoojq9eHcsFy49dr1RMbIpY/qszMc3xi4kF+Jrthl4W5csmLHH2HWBB7dzXuEDyO6+CA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LFDXzC/gf0jV555wsBK2IldxYXNoVjmxZS32DVwLVSA=; b=CJ/GCqIEh+N/XYngoOBwIJVCCOuMMDBj4YYMXCNkdVNwUCKi9SUMVy1cgRQ4YrJAQABFhDTR1iJ6BiuyoTtSSVlQIn+FPz6rxP0IiMnrDGm8jKC4V9BK4T51A+HPy/L42TFrLZIPV7R7el8LoYPU4P+7uWODn3ju/5CjIFLth4q4dBLkFYUxs5bamHyk0d0kCokbNhACtOnJJtgHOby37Al6VCkxSKO/t/gk6MMymw5MOexvqqdDemGuogUwCY12wN+QdrhFn8pma6savADeJFInka4Y3/Q0N6puuflAhro7CKojMCK1RGS3a1FKt7jdcjt4ysQtRAoJa5PhZykr8g== Received: from SJ0PR03CA0390.namprd03.prod.outlook.com (2603:10b6:a03:3a1::35) by DS7PR12MB6309.namprd12.prod.outlook.com (2603:10b6:8:96::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:27:52 +0000 Received: from CO1PEPF000044F5.namprd05.prod.outlook.com (2603:10b6:a03:3a1:cafe::19) by SJ0PR03CA0390.outlook.office365.com (2603:10b6:a03:3a1::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33 via Frontend Transport; Sun, 22 Oct 2023 14:27:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000044F5.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:27:51 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:27:39 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:27:37 -0700 From: Xueming Li To: Pavan Nikhilesh CC: dpdk stable Subject: patch 'event/cnxk: fix getwork mode devargs parsing' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:23 +0800 Message-ID: <20231022142250.10324-55-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F5:EE_|DS7PR12MB6309:EE_ X-MS-Office365-Filtering-Correlation-Id: ed199bef-0f36-449d-d131-08dbd30b12e0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VyUJTu+303/Yu3ebN2hX38fIjw44nOfqiRmomcnPYOauJeFvval1Qg8kTdyQId1OWgl9Lqryq6tcFYsr6eN1NWct2klNT4L3Md0hAnk891wkkIFaIMzHh5FWacgesyVNxTTylcIjPZpFrAdV1IjwxK0lgr5W1XN/ZUphNu4effC43O+fSPGJ6xs7Aoc9cwe0YiDIpL9QZjWTkw77mrhDfYBj1JQEo+ADtyXkLfxH33Yw5xfmvedK7MIzT0ci5gIkcmwqZ6HbyCfLU/HmthFJfe4ffC1nY2UF2coQd042jKj2Xqt4fR8oomluVC4OJ7P3JB/VM6rp4HCAJAdpXv9DNRM6LA/K7liVTmOJ3eO8WbwjInoUYxGe9YKAK/gKSTwbaI7PstuY7QntsdYC48x0uDVi7q5ySoRQHNcoue6OHrqMuGLG9h7OAZgbQZQSS0o33dA9GCEW+Uv4WuSs2q26FbPaitK7y9B/ocj/sUBL5ES+xWy/5usbB4Rm9PMupzA0dZ2jorBd9m1wIzOQ28YRmIk2z3JJqtLVJ2ZPRHLOzqX2nJ8/bZIIEScZSK2WtYjs+fkwGLgAKd5CxRL8HZ0f7sqvQ2WcuhTmzSq4sdwPrDzQeCNhwcZGk1yNez6DQyxRctg7lfSf+hmLdm9tWinmSCdzyQw7lOVE0sq1c/8wdPt/MAglQN0mPKBK6PV80xA9uDNoFhDII5fHK+g56oLquRJ7w8TE1sjdwVL3wTb+RMTmpE4f3CAGWNftn6Sd+j3BgAy06BrxTzy7Q6QYoE81AP+XN/xYr3BsLTcj0mLVBc0= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(346002)(376002)(396003)(136003)(39860400002)(230922051799003)(1800799009)(82310400011)(186009)(64100799003)(451199024)(40470700004)(46966006)(36840700001)(40480700001)(36756003)(55016003)(40460700003)(316002)(6916009)(70586007)(70206006)(86362001)(82740400003)(356005)(7636003)(53546011)(36860700001)(83380400001)(6286002)(16526019)(426003)(2616005)(1076003)(336012)(26005)(6666004)(7696005)(4001150100001)(2906002)(8936002)(966005)(478600001)(41300700001)(47076005)(8676002)(5660300002)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:27:51.6787 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed199bef-0f36-449d-d131-08dbd30b12e0 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6309 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 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 --- >From 148478f997f740041ac0da856d3db012c8965064 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 Cc: Xueming Li [ 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 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 + +[ upstream commit 343216ff0c9f89d8d31060c53ad7271c87bc1323 ] @@ -10 +12,0 @@ -Cc: stable@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;