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 71663428F8 for ; Sun, 9 Apr 2023 17:26:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6034842C76; Sun, 9 Apr 2023 17:26:48 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by mails.dpdk.org (Postfix) with ESMTP id C8B7142BFE for ; Sun, 9 Apr 2023 17:26:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NY+iuZbOjJi1hIFp4/R1MMluRQb6motMjtsdibj20Q8GNrM7iHmlZzjSNrIKtodYwGCs5DjbVD9w/EWp7fjaGtCZm2LVfOEdUmCFyWaVKYo4J7dji1UzPVuoP8pPIz8G7u7R3E6gkRae//sGnEvC4G7CEiRaC8MbBPaXaZhg2m9itsr5VHU8jJJqMrJ5yblJcbcB1XxyCNFEK56G2URuK1SZGOkf4HPDK1gDSxEbTZHfn99XHOKSot0W3pPPlELdqXG6F5yiymad/Mcp4yRQGkeE1w/tvzg6ZC7GjhWDTqp6fMNgWWi9tobZzwzqzDIku8Ep6u4wRgGV6MdDPBwyTw== 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=Om0w+7dm2PiR1vSr2lasWO/Le6M8bJIpjWL5PFbE0Gk=; b=BFKwquj8+TRyTJrWjHAzdJnhLNeb2cOdVZfqm2rJiYh4ZqNGyt5Z58GS5pXcb+sN0fwV/yNPxYjCobiR+CzzHEKYo9xSvWUVZmuqsoiUy5F59qxDij7p4K535rBCAWSfyOrylS8pxKB/i8m6BdPwE4mtbcgjAHU02tV6V91xCewz/FrS+KpsPwDZ3ztMaF0G1o1PW7lxD0OmthY7nyr0Pb295bE9Zhy8FlloKAyaaBY1zIl4Qn10VuoplUH1I9FYYqXnSpt0/kuhTNJ30Es/bpUh71UXpa4yahg0Bq38+mBCRG5nltUnZpDE8Ntq7YpQLuLdAa66Gu5cV76TKHwSuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=Om0w+7dm2PiR1vSr2lasWO/Le6M8bJIpjWL5PFbE0Gk=; b=HAsS3/Zrf+3MbT534t/4qLZztXVkar81stTIC5rnsw8QbDEwFG3c8bBPERvue9DIpJr9oi5Zty5s+PeU1pRIBaK/vWMQAizIQ8SrCHqvWbZPoc65EEYli2zkdUKvo6euPi/soIM8kQyrLVaUtdHuveUIZFyomeI8T5M2JCGa855D1kSLhUGqd8LYDav/Sp69NDrpRcNzfSbKiNtFE44duuLl/fvc1hl3P1WOD8mB+Ni50NtyVnGiRZgshdwKtoGtUiwEwK2Y97bUwkn6N3/CK58Tp8PLhkvBOJ6G2G2LSMm9oMI6VG3s3sxUPr2gnX7k49jJSjWhGzPp11EjsAw2TQ== Received: from DS7P222CA0024.NAMP222.PROD.OUTLOOK.COM (2603:10b6:8:2e::13) by DM4PR12MB6231.namprd12.prod.outlook.com (2603:10b6:8:a6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.35; Sun, 9 Apr 2023 15:26:44 +0000 Received: from DM6NAM11FT097.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2e:cafe::6f) by DS7P222CA0024.outlook.office365.com (2603:10b6:8:2e::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38 via Frontend Transport; Sun, 9 Apr 2023 15:26:44 +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 DM6NAM11FT097.mail.protection.outlook.com (10.13.172.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.20 via Frontend Transport; Sun, 9 Apr 2023 15:26:43 +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.5; Sun, 9 Apr 2023 08:26:39 -0700 Received: from nvidia.com (10.126.230.37) 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.37; Sun, 9 Apr 2023 08:26:38 -0700 From: Xueming Li To: Nicolas Chautru CC: Maxime Coquelin , dpdk stable Subject: patch 'baseband/acc: fix iteration counter in TB mode' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:19 +0800 Message-ID: <20230409152529.5308-12-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT097:EE_|DM4PR12MB6231:EE_ X-MS-Office365-Filtering-Correlation-Id: 025651b0-8a83-4d6b-73e2-08db390ed355 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: C0gykUFucBE5ZefpyoHR+3w2mTGsbWI3PPoJmlGYPaNwIpox8Vf/rsK3rLcFRIlBQFwEOmuj2Ihmo5iJuUklgFRgbHVn2CTqpclE/mQRhEPdhSABH4kL12Jk+JIEEIvYFGuEkRwVCO5orrIC1wK+6W1eln4eGXnyHJUP91uDFUGoJeGZn+Ab8KNbDOzjvpam9bxfZFqAm8A/lk8VRLF8QPUvTsdcq8QsKZkOG+dlkaPtFjyd865kaJSi1SOnMZ8bb7eYXI99vslH6LxK1/oBO4Sf/w+X1J4KjtlVWtQT8lJ1t3T7fPnRecfJ0PFU2wEAEvSO2cK1xcUHyZOLiU+LNmiXRv5dQMgo2H97I4eFnWvluTS/ZABYjehx2ycHyGUR8mvOiKuVL4M722iUkRJoM97hI+QMJhjSe+cbmdl8SRVScn4Zg/NK6Vf+J2kKx/PyQJoQ+1Rtpv2tPvlKyv6U5hC06hu08o1Tg8Dc5RPbKxbeTUIV5llY0xC8fbvxNwkZLEmKpwcHu2YDaVhGcjZMWUFzS2vq/XJZg0YPUceW9eP1LNqaqM9ZBBHJ1veBgOoN2u+f+PUroWU9XP4atn9PeMtOGBdeyH8zJnU9qqM3y1kjh9y4OjRnaXUf+qsi6P3cR1Nvso/iOhElrz4om4e3NV4uksFVOD1ZvKP6bzRFTMYtbPM2yPtGpc40xGwvxFiV9RVfBbMmMHyzG7Kxz4jh86OHKq9ZKYW+hKy4krA0XgV86ywXYfDomqNtpph5N/BdeoS8gKDw58lK762Y+1QYVuDvbUzu+MutKUcQweZL9WX72OaaZ/l6OzRkAwBasQ6L7SBlW/K0b9cGIQS9rbI6oA== 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:(13230028)(4636009)(346002)(136003)(396003)(39860400002)(376002)(451199021)(40470700004)(36840700001)(46966006)(478600001)(7696005)(54906003)(316002)(53546011)(1076003)(26005)(16526019)(6286002)(186003)(6666004)(966005)(2906002)(4326008)(70586007)(70206006)(5660300002)(8676002)(6916009)(41300700001)(8936002)(82310400005)(7636003)(356005)(82740400003)(55016003)(86362001)(40480700001)(36756003)(40460700003)(47076005)(83380400001)(2616005)(426003)(336012)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:26:43.9569 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 025651b0-8a83-4d6b-73e2-08db390ed355 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: DM6NAM11FT097.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6231 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/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/log/?h=22.11-staging/commit/bf521b9f8028426ceba43479b18e8791e8c7b062 Thanks. Xueming Li --- >From bf521b9f8028426ceba43479b18e8791e8c7b062 Mon Sep 17 00:00:00 2001 From: Nicolas Chautru Date: Fri, 10 Feb 2023 17:58:37 +0000 Subject: [PATCH] baseband/acc: fix iteration counter in TB mode Cc: Xueming Li [ upstream commit ef5b556d58a40517e4088481dee71c545ad465ac ] The iteration count was not using correct structure (4G vs 5G) in TB mode. Fixes: bec597b78a0e ("baseband/acc200: add LTE processing") Signed-off-by: Nicolas Chautru Reviewed-by: Maxime Coquelin --- drivers/baseband/acc/rte_acc200_pmd.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/baseband/acc/rte_acc200_pmd.c b/drivers/baseband/acc/rte_acc200_pmd.c index ee9a050d24..b25a83a588 100644 --- a/drivers/baseband/acc/rte_acc200_pmd.c +++ b/drivers/baseband/acc/rte_acc200_pmd.c @@ -2895,7 +2895,7 @@ dequeue_ldpc_dec_one_op_cb(struct rte_bbdev_queue_data *q_data, return 1; } -/* Dequeue one decode operations from ACC200 device in TB mode. */ +/* Dequeue one decode operations from device in TB mode for 4G or 5G. */ static inline int dequeue_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op **ref_op, uint16_t dequeued_cbs, uint32_t *aq_dequeued) @@ -2949,8 +2949,12 @@ dequeue_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op **ref_op, /* CRC invalid if error exists. */ if (!op->status) op->status |= rsp.crc_status << RTE_BBDEV_CRC_ERROR; - op->turbo_dec.iter_count = RTE_MAX((uint8_t) rsp.iter_cnt, - op->turbo_dec.iter_count); + if (q->op_type == RTE_BBDEV_OP_LDPC_DEC) + op->ldpc_dec.iter_count = RTE_MAX((uint8_t) rsp.iter_cnt, + op->ldpc_dec.iter_count); + else + op->turbo_dec.iter_count = RTE_MAX((uint8_t) rsp.iter_cnt, + op->turbo_dec.iter_count); /* Check if this is the last desc in batch (Atomic Queue). */ if (desc->req.last_desc_in_batch) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.121163100 +0800 +++ 0011-baseband-acc-fix-iteration-counter-in-TB-mode.patch 2023-04-09 21:45:38.579042200 +0800 @@ -1 +1 @@ -From ef5b556d58a40517e4088481dee71c545ad465ac Mon Sep 17 00:00:00 2001 +From bf521b9f8028426ceba43479b18e8791e8c7b062 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit ef5b556d58a40517e4088481dee71c545ad465ac ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -15 +17 @@ - drivers/baseband/acc/rte_vrb_pmd.c | 10 +++++++--- + drivers/baseband/acc/rte_acc200_pmd.c | 10 +++++++--- @@ -18,5 +20,5 @@ -diff --git a/drivers/baseband/acc/rte_vrb_pmd.c b/drivers/baseband/acc/rte_vrb_pmd.c -index a7d0b1e33c..ccd3adaf93 100644 ---- a/drivers/baseband/acc/rte_vrb_pmd.c -+++ b/drivers/baseband/acc/rte_vrb_pmd.c -@@ -2875,7 +2875,7 @@ vrb_dequeue_ldpc_dec_one_op_cb(struct rte_bbdev_queue_data *q_data, +diff --git a/drivers/baseband/acc/rte_acc200_pmd.c b/drivers/baseband/acc/rte_acc200_pmd.c +index ee9a050d24..b25a83a588 100644 +--- a/drivers/baseband/acc/rte_acc200_pmd.c ++++ b/drivers/baseband/acc/rte_acc200_pmd.c +@@ -2895,7 +2895,7 @@ dequeue_ldpc_dec_one_op_cb(struct rte_bbdev_queue_data *q_data, @@ -26 +28 @@ --/* Dequeue one decode operations from device in TB mode. */ +-/* Dequeue one decode operations from ACC200 device in TB mode. */ @@ -29 +31 @@ - vrb_dequeue_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op **ref_op, + dequeue_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op **ref_op, @@ -31 +33 @@ -@@ -2929,8 +2929,12 @@ vrb_dequeue_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op **ref_op, +@@ -2949,8 +2949,12 @@ dequeue_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op **ref_op,