From patchwork Thu Jan 12 19:36:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121969 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A994B423BA; Thu, 12 Jan 2023 20:36:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A679C42DCF; Thu, 12 Jan 2023 20:36:19 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 1A36D42D55; Thu, 12 Jan 2023 20:36:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673552178; x=1705088178; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6AcE7CHRV49s2YcvdXmjcnNo9uPyh2T1uYlS9ipuXak=; b=JIDbeU171U/8k2knv/8E6ZlJGvEl6t90TQr20zPr6fpzBTF1UJ5itO4I IElWpIf10XnCTqekV05tXDe2GQfFVdyJamfhtmbypfWk9lBG0G2GH6LA8 UPdENoCnfiwNYlwPckcSczEYexhhG8DWB20t8M2dv6nDv/+XyCEzzdm6g zEMajPlXjaloRSTZ8hwv4/jw+8QHPBxFJjEYa6/KdsoiXdhvDxTTN3AUv KEmKSOUzI+hlRFth3vfaZdxmvwcZxzHQP2yiMNxGAzH9b25nz6mbtKPJJ g5zb99khIyfhGq/SFtzWEEB0mA6e1yzYaqBYlEs/LL9BJJEzSOS3kC8pw A==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="322502812" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="322502812" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 11:36:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="690245064" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="690245064" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga001.jf.intel.com with ESMTP; 12 Jan 2023 11:36:16 -0800 From: Hernan Vargas To: dev@dpdk.org, maxime.coquelin@redhat.com, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com, Hernan Vargas , stable@dpdk.org Subject: [PATCH v3 1/7] baseband/acc: acc100 free harq layout pointer Date: Thu, 12 Jan 2023 11:36:03 -0800 Message-Id: <20230112193609.273578-2-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230112193609.273578-1-hernan.vargas@intel.com> References: <20230112193609.273578-1-hernan.vargas@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Explicitly call rte_free for harq_layout pointer in dev_close function to prevent memory leak. Fixes: ba2262fe16c ("baseband/acc100: fix close cleanup") Cc: stable@dpdk.org Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc/rte_acc100_pmd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c index b3164529dd..146a22bd64 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -620,6 +620,7 @@ acc100_dev_close(struct rte_bbdev *dev) rte_free(d->tail_ptrs); rte_free(d->info_ring); rte_free(d->sw_rings_base); + rte_free(d->harq_layout); d->sw_rings_base = NULL; d->tail_ptrs = NULL; d->info_ring = NULL; From patchwork Thu Jan 12 19:36:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121970 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id BC413423BA; Thu, 12 Jan 2023 20:36:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AAA0342DD9; Thu, 12 Jan 2023 20:36:20 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 1D29D42DAD; Thu, 12 Jan 2023 20:36:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673552179; x=1705088179; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ikDm4nGunVdicRPn+qF+AGHSLA4LeyLY2H5EKzxeqtY=; b=MdApj/0EQqvcs6TRvadZXbCUk7DC7hPg5wJC8o724i7nYF6B/fu4daPr KAoWORzyp7V9z6lhPUWNGjhFHStLi5KiWo3tfgMpLKv2CK/dm8iECqORp WN9+3JSbaP5Eb+6az+vK79aIK1HktZJ9xCzn8zZhfdU5HynmwrDxi246f S20evy7dJKd1lcTb4bBw11tnHO4BQBAhHVppRRUh+ubmm/W++2I2+MwBs b1uT9rYyzvgZYzi3TedKLdF5BPC0TQp+RRvNzyS/0iXrd7tcFtqSuy47P 9QrNzHlndTg39EnNQafkXNzPPPfbvz1CuaefI6mMKaiZmuSal6/NaFHK4 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="322502815" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="322502815" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 11:36:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="690245071" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="690245071" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga001.jf.intel.com with ESMTP; 12 Jan 2023 11:36:17 -0800 From: Hernan Vargas To: dev@dpdk.org, maxime.coquelin@redhat.com, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com, Hernan Vargas , stable@dpdk.org Subject: [PATCH v3 2/7] baseband/acc: acc100 fix iteration counter in TB Date: Thu, 12 Jan 2023 11:36:04 -0800 Message-Id: <20230112193609.273578-3-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230112193609.273578-1-hernan.vargas@intel.com> References: <20230112193609.273578-1-hernan.vargas@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use ldpc or turbo iteration counter based on the operation type. Fixes: 5ad5060f8f7 ("baseband/acc100: add LDPC processing functions") Cc: stable@dpdk.org Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc/rte_acc100_pmd.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c index 146a22bd64..a00314c957 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -4033,8 +4033,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) { From patchwork Thu Jan 12 19:36:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121971 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5889A423BA; Thu, 12 Jan 2023 20:36:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 878C042DDB; Thu, 12 Jan 2023 20:36:21 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 9DB9442DCC for ; Thu, 12 Jan 2023 20:36:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673552179; x=1705088179; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=GGDB9E7erXR+xVh/wR+4NBJ5DXdLMun3H2dp6D+LEKg=; b=fpjFfBNXHu/4Mo6NUaOwyWtuUnOjWVodQKgEZtsFwD1FRBipAZVJZKAz 3HozNFqK0XuyZs3qBHQJuWuW+LBn/N87ljt7ZzoY9VIAshvVZVqVL9vPg R/d6JnALxW20kRIpr9Nh83ok1gRPiNexxEW0m2V3klRyktADibSqzR1c7 aAiQx2OGKtWQ6LhXoBaQsewk7YYQFdBF+c9LYTcQpE4vCEzKvbqngRelC ooWtmWs/W3RYtem8DNuTdgKUFENrQbBQF5sEG7TaVu8N9824SEmxMHofj lJSAcxTGRkcMR6HAwWAOO8Q7Ag9pD44p5vQmOFPLRtliS/UrUoeJ2Sf/0 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="322502819" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="322502819" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 11:36:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="690245075" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="690245075" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga001.jf.intel.com with ESMTP; 12 Jan 2023 11:36:17 -0800 From: Hernan Vargas To: dev@dpdk.org, maxime.coquelin@redhat.com, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com, Hernan Vargas Subject: [PATCH v3 3/7] baseband/acc: acc100 fix multiplexing multiple ops Date: Thu, 12 Jan 2023 11:36:05 -0800 Message-Id: <20230112193609.273578-4-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230112193609.273578-1-hernan.vargas@intel.com> References: <20230112193609.273578-1-hernan.vargas@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Function to check if multiplexing is possible for multiple operations in one descriptor returns number of enqueued ops. Fixes: 32e8b7ea35d ("baseband/acc100: refactor to segregate common code") Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc/rte_acc100_pmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c index a00314c957..eb18cc2215 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -3421,9 +3421,9 @@ acc100_enqueue_ldpc_enc_cb(struct rte_bbdev_queue_data *q_data, } avail--; enq = RTE_MIN(left, ACC_MUX_5GDL_DESC); - if (check_mux(&ops[i], enq)) { - ret = enqueue_ldpc_enc_n_op_cb(q, &ops[i], - desc_idx, enq); + enq = check_mux(&ops[i], enq); + if (enq > 1) { + ret = enqueue_ldpc_enc_n_op_cb(q, &ops[i], desc_idx, enq); if (ret < 0) { acc_enqueue_invalid(q_data); break; From patchwork Thu Jan 12 19:36:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121972 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8BA39423BA; Thu, 12 Jan 2023 20:36:40 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 71F9E42DCE; Thu, 12 Jan 2023 20:36:23 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id F01AD42DAD for ; Thu, 12 Jan 2023 20:36:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673552180; x=1705088180; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lJ5Nkc7PryPcXlZLtCMWz1dIA62BYF+tfVXhJoJsDPw=; b=lnYF1+HXn1hBvR+KuIZFLc1vcVoE4BAynpUw9mcCC9jnplvbm1XCUCCv r1qj9j3kB21tktgyN4MKNYqxapREyArhzXn7EOQBe00Kskqwr8xjQovPU tLGG6vDT3K7qPmPYdGjeWQ/g9nbuffrgymmh4hHAZw9xNYKc2bntEqgKx LTnSc8OeBXQ2TZtGxUqJ63MWEKodMLuuc/s5Q2bZt+oWlXuUnxUb5TwwM ZNnxfp8d8i4wMOh+fiVzBSQyIzDALIuSlyTemdBUQgL3SRY52qS8MNq7R vqyCQHUHiJXuciwhpoOOK9BAlK1H0Yd7whKU9QKh4cAt3T3yvkYWXro/8 A==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="322502823" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="322502823" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 11:36:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="690245078" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="690245078" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga001.jf.intel.com with ESMTP; 12 Jan 2023 11:36:18 -0800 From: Hernan Vargas To: dev@dpdk.org, maxime.coquelin@redhat.com, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com, Hernan Vargas Subject: [PATCH v3 4/7] baseband/acc: acc100 fix queue mapping to 64 bits Date: Thu, 12 Jan 2023 11:36:06 -0800 Message-Id: <20230112193609.273578-5-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230112193609.273578-1-hernan.vargas@intel.com> References: <20230112193609.273578-1-hernan.vargas@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Fix potential overflow for Q mapping extension to 64 bits. Fixes: 32e8b7ea35d ("baseband/acc100: refactor to segregate common code") Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc/rte_acc100_pmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c index eb18cc2215..3660d3b240 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -662,7 +662,7 @@ acc100_find_free_queue_idx(struct rte_bbdev *dev, for (aq_idx = 0; aq_idx < qtop->num_aqs_per_groups; aq_idx++) { if (((d->q_assigned_bit_map[group_idx] >> aq_idx) & 0x1) == 0) { /* Mark the Queue as assigned */ - d->q_assigned_bit_map[group_idx] |= (1 << aq_idx); + d->q_assigned_bit_map[group_idx] |= (1ULL << aq_idx); /* Report the AQ Index */ return (group_idx << ACC100_GRP_ID_SHIFT) + aq_idx; } From patchwork Thu Jan 12 19:36:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121973 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 618C8423BA; Thu, 12 Jan 2023 20:36:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F2F142DD3; Thu, 12 Jan 2023 20:36:24 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 4B99142DCC for ; Thu, 12 Jan 2023 20:36:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673552180; x=1705088180; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=EAnXVmZ6T3PhF5HXWPx+JZCJ0V3QVwKa4CV5GwI+xGE=; b=NEyVvplwAvgoYMdfVy95YByGesO0aWlZKXR+I+/5/5CPTIAb1Jf29/2c +Yz4cl0WwpiEP/GW3otWTSCwgs5jUCiEs3mKwHAMKW/D8jIavvRTQyiFE t+I0CFTvKC/cfWQyXmcaxG5ykbkM17Ld0skA1imlqFfYmReU5K/npY2hb fHTeTdh8mTo2MLDkCWmFNNFLbTa5YOOPsVxBBkGhP3Cjxe1ZfFwpudGQE 7oKhVVSiYv4mMKdYH4/s+JQceHMkATF4UBa/lBo4thHArIcWYnrph5fki 21qB3ar+Wb7etSVWkzrUclG1tRzrygRhgmsFFiUw3jhMCDN5NRsLdnO50 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="322502828" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="322502828" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 11:36:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="690245081" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="690245081" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga001.jf.intel.com with ESMTP; 12 Jan 2023 11:36:18 -0800 From: Hernan Vargas To: dev@dpdk.org, maxime.coquelin@redhat.com, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com, Hernan Vargas Subject: [PATCH v3 5/7] baseband/acc: acc100 use define constant Date: Thu, 12 Jan 2023 11:36:07 -0800 Message-Id: <20230112193609.273578-6-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230112193609.273578-1-hernan.vargas@intel.com> References: <20230112193609.273578-1-hernan.vargas@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use define constant ACC_HARQ_ALIGN_64B instead of hardcoded number. No functional impact. Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc/rte_acc100_pmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c index 3660d3b240..ef1c488a1c 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -1390,7 +1390,7 @@ acc101_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc_fcw_ld *fcw, harq_in_length = RTE_MIN(harq_in_length, op->ldpc_dec.n_cb - op->ldpc_dec.n_filler); /* Alignment on next 64B - Already enforced from HC output */ - harq_in_length = RTE_ALIGN_FLOOR(harq_in_length, 64); + harq_in_length = RTE_ALIGN_FLOOR(harq_in_length, ACC_HARQ_ALIGN_64B); fcw->hcin_size0 = harq_in_length; fcw->hcin_offset = 0; fcw->hcin_size1 = 0; @@ -1433,7 +1433,7 @@ acc101_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc_fcw_ld *fcw, /* Cannot exceed the pruned Ncb circular buffer */ harq_out_length = RTE_MIN(harq_out_length, ncb_p); /* Alignment on next 64B */ - harq_out_length = RTE_ALIGN_CEIL(harq_out_length, 64); + harq_out_length = RTE_ALIGN_CEIL(harq_out_length, ACC_HARQ_ALIGN_64B); fcw->hcout_size0 = harq_out_length; fcw->hcout_size1 = 0; fcw->hcout_offset = 0; From patchwork Thu Jan 12 19:36:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121974 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F2DDD423BA; Thu, 12 Jan 2023 20:36:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 525D642DE8; Thu, 12 Jan 2023 20:36:25 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id A3CDC42DC5 for ; Thu, 12 Jan 2023 20:36:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673552180; x=1705088180; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zGYPSjT/phDsbDbY1JkZVLom/L3Ui6Fbzoq9gs8YDm4=; b=jBIcaPyJ3pBaNw/5WVRjh/lOx1jTJn8/APvKC8oOalqVPimwvGYb7JQx v47B2p0kU8vhLVERVVlXH2pg9AFqYHKHhWJ51ZZtuj8kftXMjhD+cKFZe UV+sk+7YXE6nd9g8+su2nwVpwfXMS2IvMNdiAKvMgCY55O1JbOTH22iUc JQFmW56nAgMQiHzpbYDLC5WesOcAGAlCjeAX2yTkKnsU0JYN6gYoqf/a/ 9gLUgolCrBWoRRp9GsUCAXgD7Kqvl59VIEXNZ6OLxGTWX/GaVbX3vvRSC ZS5bD0RCCmbrGcsiA31ov/unSPrTJAdZLIi25/ESB8Rh0V6uWP+K1bzSd w==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="322502834" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="322502834" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 11:36:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="690245088" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="690245088" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga001.jf.intel.com with ESMTP; 12 Jan 2023 11:36:19 -0800 From: Hernan Vargas To: dev@dpdk.org, maxime.coquelin@redhat.com, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com, Hernan Vargas Subject: [PATCH v3 6/7] baseband/acc: acc100 use desc helper functions Date: Thu, 12 Jan 2023 11:36:08 -0800 Message-Id: <20230112193609.273578-7-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230112193609.273578-1-hernan.vargas@intel.com> References: <20230112193609.273578-1-hernan.vargas@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Use the designated descriptor helper functions for descriptor address calculations. No functional impact. Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc/rte_acc100_pmd.c | 35 +++++++++------------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c index ef1c488a1c..d3aaeb8f2c 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -2422,9 +2422,8 @@ enqueue_ldpc_enc_part_tb(struct acc_queue *q, struct rte_bbdev_enc_op *op, struct rte_mbuf *output_head, *output; int i, next_triplet; struct rte_bbdev_op_ldpc_enc *enc = &op->ldpc_enc; - uint16_t desc_idx = ((q->sw_ring_head + total_enqueued_descs) & q->sw_ring_wrap_mask); - desc = q->ring_addr + desc_idx; + desc = acc_desc(q, total_enqueued_descs); acc_fcw_le_fill(op, &desc->req.fcw_le, num_cbs, e); /* This could be done at polling. */ @@ -2613,7 +2612,6 @@ enqueue_ldpc_enc_one_op_tb(struct acc_queue *q, struct rte_bbdev_enc_op *op, } #endif uint8_t num_a, num_b; - uint16_t desc_idx; uint8_t r = op->ldpc_enc.tb_params.r; uint8_t cab = op->ldpc_enc.tb_params.cab; union acc_dma_desc *desc; @@ -2655,16 +2653,15 @@ enqueue_ldpc_enc_one_op_tb(struct acc_queue *q, struct rte_bbdev_enc_op *op, return_descs = enq_descs - init_enq_descs; /* Keep total number of CBs in first TB. */ - desc_idx = ((q->sw_ring_head + init_enq_descs) & q->sw_ring_wrap_mask); - desc = q->ring_addr + desc_idx; + desc = acc_desc(q, init_enq_descs); desc->req.cbs_in_tb = return_descs; /** Actual number of descriptors. */ desc->req.op_addr = op; /* Set SDone on last CB descriptor for TB mode. */ - desc_idx = ((q->sw_ring_head + enq_descs - 1) & q->sw_ring_wrap_mask); - desc = q->ring_addr + desc_idx; + desc = acc_desc(q, enq_descs - 1); desc->req.sdone_enable = 1; desc->req.op_addr = op; + return return_descs; } @@ -3275,7 +3272,7 @@ enqueue_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op *op, h_out_length, mbuf_total_left, seg_total_left; struct rte_mbuf *input, *h_output_head, *h_output, *s_output_head, *s_output; - uint16_t desc_idx, current_enqueued_cbs = 0; + uint16_t current_enqueued_cbs = 0; uint64_t fcw_offset; #ifndef RTE_LIBRTE_BBDEV_SKIP_VALIDATE @@ -3290,9 +3287,8 @@ enqueue_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op *op, } #endif - desc_idx = acc_desc_idx(q, total_enqueued_cbs); - desc = q->ring_addr + desc_idx; - fcw_offset = (desc_idx << 8) + ACC_DESC_FCW_OFFSET; + desc = acc_desc(q, total_enqueued_cbs); + fcw_offset = (acc_desc_idx(q, total_enqueued_cbs) << 8) + ACC_DESC_FCW_OFFSET; acc100_fcw_td_fill(op, &desc->req.fcw_td); input = op->turbo_dec.input.data; @@ -3777,7 +3773,6 @@ dequeue_enc_one_op_cb(struct acc_queue *q, struct rte_bbdev_enc_op **ref_op, /* Clearing status, it will be set based on response */ op->status = 0; - op->status |= ((rsp.dma_err) ? (1 << RTE_BBDEV_DRV_ERROR) : 0); op->status |= ((rsp.fcw_err) ? (1 << RTE_BBDEV_DRV_ERROR) : 0); @@ -4023,8 +4018,8 @@ dequeue_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op **ref_op, atom_desc.atom_hdr = __atomic_load_n((uint64_t *)desc, __ATOMIC_RELAXED); rsp.val = atom_desc.rsp.val; - rte_bbdev_log_debug("Resp. desc %p: %x", desc, - rsp.val); + rte_bbdev_log_debug("Resp. desc %p: %x r %d c %d\n", + desc, rsp.val, cb_idx, cbs_in_tb); op->status |= ((rsp.input_err) ? (1 << RTE_BBDEV_DATA_ERROR) : 0); op->status |= ((rsp.dma_err) ? (1 << RTE_BBDEV_DRV_ERROR) : 0); @@ -4077,8 +4072,7 @@ acc100_dequeue_enc(struct rte_bbdev_queue_data *q_data, return 0; } #endif - op = (q->ring_addr + (q->sw_ring_tail & - q->sw_ring_wrap_mask))->req.op_addr; + op = acc_op_tail(q, 0); if (unlikely(ops == NULL || op == NULL)) return 0; cbm = op->turbo_enc.code_block_mode; @@ -4120,7 +4114,6 @@ acc100_dequeue_ldpc_enc(struct rte_bbdev_queue_data *q_data, uint16_t i, dequeued_ops = 0, dequeued_descs = 0; int ret, cbm; struct rte_bbdev_enc_op *op; - union acc_dma_desc *desc; if (q == NULL) return 0; @@ -4128,10 +4121,7 @@ acc100_dequeue_ldpc_enc(struct rte_bbdev_queue_data *q_data, if (unlikely(ops == 0)) return 0; #endif - desc = q->ring_addr + (q->sw_ring_tail & q->sw_ring_wrap_mask); - if (unlikely(desc == NULL)) - return 0; - op = desc->req.op_addr; + op = acc_op_tail(q, 0); if (unlikely(ops == NULL || op == NULL)) return 0; cbm = op->ldpc_enc.code_block_mode; @@ -4227,8 +4217,7 @@ acc100_dequeue_ldpc_dec(struct rte_bbdev_queue_data *q_data, dequeue_num = RTE_MIN(avail, num); for (i = 0; i < dequeue_num; ++i) { - op = (q->ring_addr + ((q->sw_ring_tail + dequeued_cbs) - & q->sw_ring_wrap_mask))->req.op_addr; + op = acc_op_tail(q, dequeued_cbs); if (unlikely(op == NULL)) break; if (op->ldpc_dec.code_block_mode == RTE_BBDEV_TRANSPORT_BLOCK) From patchwork Thu Jan 12 19:36:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121975 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AA3C2423BA; Thu, 12 Jan 2023 20:36:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 39AB342DEF; Thu, 12 Jan 2023 20:36:26 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id B5A0342DDB for ; Thu, 12 Jan 2023 20:36:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1673552180; x=1705088180; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kobiSZEI9tXM+mRe3FO/VQVUS0WdLQTjMfn4jEjL0DM=; b=DHc0ARkkZ6Cx0xiKFpfpQT6Hx7EAoxVi+v+Tjq11JoclXrFqC5aljy5z p87P8+f3No55dEV7LHgOMctSlVjczM/ilLC8xSa14HoVOu5Ef3xnPLvoV D6w4TgEYCwCJrKO2eLkwIYL4otGc4BcdS1XF3e9zrCzHhEemxfgLAl1Ep /z4iL0PGJbu0XTPBhhjwBH7jLGYrqF+D6gjE1ADrnO3JKvOiWsLnWO4Ee T8oUmOows4skIuY8Cm8LzrilAAOiN25tKfu0NbISvjv++bvrcd7ix9Jdv 9eyzgM8VLmQkAhNqLDc2TOC1I6c5Sr9csbjg3X1gH3NwwiGBgMpzVa+p4 g==; X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="322502839" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="322502839" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Jan 2023 11:36:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10588"; a="690245092" X-IronPort-AV: E=Sophos;i="5.97,211,1669104000"; d="scan'208";a="690245092" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga001.jf.intel.com with ESMTP; 12 Jan 2023 11:36:19 -0800 From: Hernan Vargas To: dev@dpdk.org, maxime.coquelin@redhat.com, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com, Hernan Vargas Subject: [PATCH v3 7/7] baseband/acc: acc100 ignore missing mempools Date: Thu, 12 Jan 2023 11:36:09 -0800 Message-Id: <20230112193609.273578-8-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230112193609.273578-1-hernan.vargas@intel.com> References: <20230112193609.273578-1-hernan.vargas@intel.com> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Mempool not strictly required to be present in op for processing. Previous criteria too strict. No functional impact. Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- drivers/baseband/acc/rte_acc100_pmd.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c index d3aaeb8f2c..0992cb5d1e 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include @@ -1830,10 +1829,6 @@ validate_enc_op(struct rte_bbdev_enc_op *op, struct acc_queue *q) if (!validate_op_required(q)) return 0; - if (op->mempool == NULL) { - rte_bbdev_log(ERR, "Invalid mempool pointer"); - return -1; - } if (turbo_enc->input.data == NULL) { rte_bbdev_log(ERR, "Invalid input pointer"); return -1; @@ -2677,10 +2672,6 @@ validate_dec_op(struct rte_bbdev_dec_op *op, struct acc_queue *q) if (!validate_op_required(q)) return 0; - if (op->mempool == NULL) { - rte_bbdev_log(ERR, "Invalid mempool pointer"); - return -1; - } if (turbo_dec->input.data == NULL) { rte_bbdev_log(ERR, "Invalid input pointer"); return -1;