From patchwork Fri Jan 6 05:44:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121631 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 7C488A00C2; Thu, 5 Jan 2023 22:49:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E22E4282D; Thu, 5 Jan 2023 22:49:43 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id C2ED34067C; Thu, 5 Jan 2023 22:49:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672955381; x=1704491381; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PJM2ousEbQo0tnh9EDfOr5wE5MeGE9fSxKAFyg9lbUQ=; b=Hr+Yn0Zhqkg8jwX8jrKQmaTkAqcKZw5nV5gQaIEck6ZlWMe+uAit4A71 fNMcLlS+BwEwe7UA+ikUw4HA9WBJ7e5owavxTuzfuMLjIaeD6fxTt4cmz JN51Zh188/D56fvUHwCK5sfj1zaZGadi7ARydtnYqr8ynRkM7asqPbsKT bMY3qUGMQUGrI5GPlJVL4WpA39/pQTFpVWTTEqm1imjxRqu1g82snTobM FQrC1C2u3QMvtjwG5mvZn22b65ImF4xW2vkfUBgCjcpmMshZ/cOAMEIkB MS/2ApRDlF7wzTpGTdst93f2cLqKj6EyPlrjOYw8yxmdFr22mEioQS3WV Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="302700459" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="302700459" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2023 13:49:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="686264706" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="686264706" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga008.jf.intel.com with ESMTP; 05 Jan 2023 13:49:35 -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 v2 1/7] baseband/acc: acc100 free harq layout pointer Date: Thu, 5 Jan 2023 21:44:37 -0800 Message-Id: <20230106054443.199473-2-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230106054443.199473-1-hernan.vargas@intel.com> References: <20230106054443.199473-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 --- 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 ba8247d47e..0177a9e0ea 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -622,6 +622,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 Fri Jan 6 05:44:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121633 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 0FA9FA00C2; Thu, 5 Jan 2023 22:49:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 91ACD42D28; Thu, 5 Jan 2023 22:49:45 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 6F9F040A82; Thu, 5 Jan 2023 22:49:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672955381; x=1704491381; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Y6GNgI5WaUjcZfze+Etw1l/KX97trqHIHP081L3KUKM=; b=XPxmdifNcoYoM4uYY+h85CJlJwTHmmJy3o29NljPVnJl+SGjUQniBWrl DNov9OgxOkXZTyKnrg77ID2Z5If6v5s5axnswvFz2SmhAb4w/q9zfwBHE l8BHVpArI+y3PsUfg5x4TP1jeGNCKwmduhUS7w3PZGCnCV5h1Ibc8OJfc LlIV6aIGQvhvnm+5R5iXvC0zo0OkqJF5oMLWi+/Zf0prNklc/dbcffRcl uXLVqlatE0oYXyDPDM/4B6O9dL3/KLqpG0MB1ipuR8lwMjZbPfcOQ6E7E TW6/ibAboh9JXblNePZE33wbvpjYh+JID4WaLlCYW+P/D5Nu4ZyibXgvG g==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="302700470" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="302700470" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2023 13:49:37 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="686264709" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="686264709" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga008.jf.intel.com with ESMTP; 05 Jan 2023 13:49:36 -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 v2 2/7] baseband/acc: acc100 fix iteration counter in TB Date: Thu, 5 Jan 2023 21:44:38 -0800 Message-Id: <20230106054443.199473-3-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230106054443.199473-1-hernan.vargas@intel.com> References: <20230106054443.199473-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 0177a9e0ea..d77d3b77b5 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -4035,8 +4035,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 Fri Jan 6 05:44:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121632 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 87851A00C2; Thu, 5 Jan 2023 22:49:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AAEA042D25; Thu, 5 Jan 2023 22:49:44 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 9BFD14282D for ; Thu, 5 Jan 2023 22:49:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672955381; x=1704491381; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=iPs2igpD5UfMTM/5jJnSmXrFNiavS9okyqzCperpevQ=; b=EYfRadLK+vbd/fhU3lmQP4maS3/y7PYUcUjJKh6JeCPNqFUNqcMroqO0 T9Bau4YE53Mrl9PQSiQ9cW88MOfQ5BgXJaitgX3zlfhR9gcLbuwKhhjun qCMajK8ufZee3aBHQpt3yO+Q6cx9YSI0pUSGFoTQAZedC2dJtDu5ewy06 6OM9PaySh9WehIzMmn9l5oY5OJd0mdt/g/TM5f/uV12fCPHrgwrM6suKl Ybp+Q98nygbvu0frurSrz9aKd5QmlXnrkvmvCb34yZGEgctlnPWpSgaxb jWGDnYt58BX0AyZQx+8xN5aCLzlRszVHFLhlnaKx6UP+SH84OiBLdvDQf w==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="302700473" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="302700473" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2023 13:49:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="686264715" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="686264715" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga008.jf.intel.com with ESMTP; 05 Jan 2023 13:49:37 -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 v2 3/7] baseband/acc: acc100 fix multiplexing multiple ops Date: Thu, 5 Jan 2023 21:44:39 -0800 Message-Id: <20230106054443.199473-4-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230106054443.199473-1-hernan.vargas@intel.com> References: <20230106054443.199473-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 d77d3b77b5..2f65f290b5 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -3423,9 +3423,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 Fri Jan 6 05:44:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121634 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 0A5F2A00C2; Thu, 5 Jan 2023 22:50:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8198942D31; Thu, 5 Jan 2023 22:49:46 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 54C5340A82 for ; Thu, 5 Jan 2023 22:49:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672955382; x=1704491382; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=63YfFmHDnBd8LTWMdIuaJbGjT1SnYYj4QPKZMKovEmU=; b=m6ySqDJsMTsUXIsT3Cbq0ZWa4q2810uXrvjKHC1hVnupg7r7Y3ZfPpmv Ho+BnTWwVnl6bSNamErZj9anBu/h9ljFPsurO5lxoO1PzPLHn3mBWTcmZ 4Ecld9bUcYgrvA51htTpwoZPVu41rl4QoBga1CLd+1DyDeHyEVzeX2QM7 PG4dlL0v2+ef7UQbmtJrzGTZ5ADMSCvMoj1m9LvavbLzkIFhPimubeAuL QXU1/WOqZD0jen2Q9FwGDGhk6u4e4O3ww5eOY8rnLFcaZOZMLEgIf358m szfG7ikbfduKngcA3iipFmqM7FtsiDwup4LRuWfMDpU5aGpsWYCSTGysJ Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="302700476" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="302700476" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2023 13:49:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="686264721" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="686264721" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga008.jf.intel.com with ESMTP; 05 Jan 2023 13:49:37 -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 v2 4/7] baseband/acc: acc100 fix queue mapping to 64 bits Date: Thu, 5 Jan 2023 21:44:40 -0800 Message-Id: <20230106054443.199473-5-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230106054443.199473-1-hernan.vargas@intel.com> References: <20230106054443.199473-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 2f65f290b5..1ca95f4440 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -664,7 +664,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 Fri Jan 6 05:44:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121636 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 F076CA00C2; Thu, 5 Jan 2023 22:50:14 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 14E6942D3A; Thu, 5 Jan 2023 22:49:48 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 3615F42D1D for ; Thu, 5 Jan 2023 22:49:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672955383; x=1704491383; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Be/DsGYezOVc++Ga1hUBfonGm/g5K3LRBMyEfnuXv0c=; b=eA403e6W+jnkZqXWrRGlTrzCcD+yC19hqQ7hojflsc+CFIUJ+cxXC/hT hxLhX0Mbfrbgo0AZPA2iVdxyKGT/gQ2DUG0CSLqkP6DXyAtBrhYcaRfro DrVhltbujMqV4U2Mt++y6M/9MbuWzSwWT3ma933xoClMpxfzGMqMSjp6U 5qayTp7JGCnLSsaZQDtPL0IhnP1NJoHgdH38JgWbWCMbJ2EvZznSveclX v7+IQRr3riZoPUO/tUvbM7//tZ3UZU81OEPxFGBOh42goI4jYLtlnuMi3 HcebwRlVPKMHrMluhgF5XKis7r5XvMEII/aHgWF47K9K83ncBRuS76BWq Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="302700482" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="302700482" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2023 13:49:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="686264728" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="686264728" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga008.jf.intel.com with ESMTP; 05 Jan 2023 13:49:38 -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 v2 5/7] baseband/acc: acc100 use define constant Date: Thu, 5 Jan 2023 21:44:41 -0800 Message-Id: <20230106054443.199473-6-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230106054443.199473-1-hernan.vargas@intel.com> References: <20230106054443.199473-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 1ca95f4440..4ac8061ebd 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -1392,7 +1392,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; @@ -1435,7 +1435,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 Fri Jan 6 05:44:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121637 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 B20DDA00C2; Thu, 5 Jan 2023 22:50:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C1C1E42D3C; Thu, 5 Jan 2023 22:49:48 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 5BD7142D1F for ; Thu, 5 Jan 2023 22:49:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672955383; x=1704491383; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0pYOSE6MJF3d95RgUQQ4ihfhDpEactM58EFTcFfMowU=; b=SqJjGFzREk9Q0TolpxkH/DEtvKh/QR0an8YW6DRme8oyYuMGCcBHi9BI WuutCgUnDcfb5OjU6EZ5VhToNG2eZbvIURPVbtX6Ica+tWBBm5nd+vWJ5 V5TEWWTqsO201ipXLaHPs6HDyxNiCWB9MDmENySX4EtuQPMeWr4vGuhSF mcoa5GacKOvrL7JIB0uLFKOwtakkUhX+bjI0yJ+d8eoyUfjOUzpzJKsBA 3A0phXxNdLrjaUPGw12QWR0bcW7XxvftoexSGITGHDX+p+9x9EhPhiZXp feZGAaCMhR34qcf2QyQNNst030cwYOledTU4rY3+fh37mPEqm4AhY6rzY g==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="302700490" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="302700490" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2023 13:49:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="686264732" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="686264732" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga008.jf.intel.com with ESMTP; 05 Jan 2023 13:49:38 -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 v2 6/7] baseband/acc: acc100 use desc helper functions Date: Thu, 5 Jan 2023 21:44:42 -0800 Message-Id: <20230106054443.199473-7-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230106054443.199473-1-hernan.vargas@intel.com> References: <20230106054443.199473-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 4ac8061ebd..f841b31348 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -2424,9 +2424,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. */ @@ -2615,7 +2614,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; @@ -2657,16 +2655,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; } @@ -3277,7 +3274,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 @@ -3292,9 +3289,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; @@ -3779,7 +3775,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); @@ -4025,8 +4020,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); @@ -4079,8 +4074,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; @@ -4122,7 +4116,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; @@ -4130,10 +4123,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; @@ -4229,8 +4219,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 Fri Jan 6 05:44:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hernan Vargas X-Patchwork-Id: 121635 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 75E1DA00C2; Thu, 5 Jan 2023 22:50:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5405E42D35; Thu, 5 Jan 2023 22:49:47 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mails.dpdk.org (Postfix) with ESMTP id 5AC344282D for ; Thu, 5 Jan 2023 22:49:42 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672955382; x=1704491382; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JtpoPNVUh20YZqMkOAI+vhrHQ53zC50WvqP/l0BXEwo=; b=OeyS4QYUh/0ZsNC1sP7RYYxX7qRNqpD4XJwlfDlBL/eUfI0PYrcPW8qf kjWQutSS62uAhplHK8Sn3y4ycHuy/20qfdFqumAIbsm6OsL9I/5mUlPrH T32f+HA86XQHTBWUvLW47Pd/sFB/PMcrSyIl5WfIiJAs8yzmcstt8noI1 o0+/cHPUGjTWLPWyqqEqI0V0P9ZW7LK7OjPAzhJJUSIv2SOPTJZpCIiCV FfbU3qpXLEsFTBk4TR98zLdpFE+B8C1QjSzDoofsL2DjCP/WN7S0LGx+q IPNR/poLCTKRu25ol8V9LzPTwMOm3rc9iX8FFyozcosoS0PadpkZ+ZgB/ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="302700491" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="302700491" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2023 13:49:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10581"; a="686264735" X-IronPort-AV: E=Sophos;i="5.96,303,1665471600"; d="scan'208";a="686264735" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga008.jf.intel.com with ESMTP; 05 Jan 2023 13:49:39 -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 v2 7/7] baseband/acc: acc100 ignore missing mempools Date: Thu, 5 Jan 2023 21:44:43 -0800 Message-Id: <20230106054443.199473-8-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230106054443.199473-1-hernan.vargas@intel.com> References: <20230106054443.199473-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 --- drivers/baseband/acc/rte_acc100_pmd.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c index f841b31348..b4b7418c40 100644 --- a/drivers/baseband/acc/rte_acc100_pmd.c +++ b/drivers/baseband/acc/rte_acc100_pmd.c @@ -1832,10 +1832,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; @@ -2679,10 +2675,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;