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 DCAD445AE1; Tue, 8 Oct 2024 10:11:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A1C804021F; Tue, 8 Oct 2024 10:11:57 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 763FE4021E for ; Tue, 8 Oct 2024 10:11:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728375115; 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:autocrypt:autocrypt; bh=Wxg73gFQhIWZtqFntMe2eiy8hONt+CDTp8ra/ZdGLto=; b=MLiGG9pq4+8GFyRMuZq5zGLmDFuvim1Q8Tc2a56jYjTvMqQuagMuYC+/GTGF90n6zopi3i 9dbjSosDP9d3MsNNE4NQYZYSjqiOrn+poOPQGumZpaheVPhAngHo6iF2fkknp6dKh3rZyQ e6Ar4o2IbrpR7bZ/RjF/9lQ3QJiPTss= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-56-mPD_NccmOAGEuUwTh9szjg-1; Tue, 08 Oct 2024 04:11:52 -0400 X-MC-Unique: mPD_NccmOAGEuUwTh9szjg-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id C3AA51954B04; Tue, 8 Oct 2024 08:11:50 +0000 (UTC) Received: from [10.39.208.26] (unknown [10.39.208.26]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 023D1300018D; Tue, 8 Oct 2024 08:11:48 +0000 (UTC) Message-ID: Date: Tue, 8 Oct 2024 10:11:46 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v2 10/10] baseband/acc: cosmetic changes To: Hernan Vargas , dev@dpdk.org, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com References: <20241003204912.131319-1-hernan.vargas@intel.com> <20241003204912.131319-11-hernan.vargas@intel.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= In-Reply-To: <20241003204912.131319-11-hernan.vargas@intel.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 On 10/3/24 22:49, Hernan Vargas wrote: > Cosmetic code changes. > No functional impact. > > Signed-off-by: Hernan Vargas > --- > drivers/baseband/acc/rte_acc100_pmd.c | 2 +- > drivers/baseband/acc/rte_vrb_pmd.c | 62 +++++++++++++++++++-------- > 2 files changed, 44 insertions(+), 20 deletions(-) > > diff --git a/drivers/baseband/acc/rte_acc100_pmd.c b/drivers/baseband/acc/rte_acc100_pmd.c > index e3a523946448..c33e2758b100 100644 > --- a/drivers/baseband/acc/rte_acc100_pmd.c > +++ b/drivers/baseband/acc/rte_acc100_pmd.c > @@ -4199,7 +4199,7 @@ poweron_cleanup(struct rte_bbdev *bbdev, struct acc_device *d, > acc_reg_write(d, HWPfQmgrIngressAq + 0x100, enq_req.val); > usleep(ACC_LONG_WAIT * 100); > if (desc->req.word0 != 2) > - rte_bbdev_log(WARNING, "DMA Response %#"PRIx32, desc->req.word0); > + rte_bbdev_log(WARNING, "DMA Response %#"PRIx32"", desc->req.word0); > } > > /* Reset LDPC Cores */ > diff --git a/drivers/baseband/acc/rte_vrb_pmd.c b/drivers/baseband/acc/rte_vrb_pmd.c > index 5f7568a4b7ea..c8875447d3d0 100644 > --- a/drivers/baseband/acc/rte_vrb_pmd.c > +++ b/drivers/baseband/acc/rte_vrb_pmd.c > @@ -956,6 +956,9 @@ vrb_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, > struct acc_queue *q; > int32_t q_idx; > int ret; > + union acc_dma_desc *desc = NULL; > + unsigned int desc_idx, b_idx; > + int fcw_len; > > if (d == NULL) { > rte_bbdev_log(ERR, "Undefined device"); > @@ -982,16 +985,33 @@ vrb_queue_setup(struct rte_bbdev *dev, uint16_t queue_id, > } > > /* Prepare the Ring with default descriptor format. */ > - union acc_dma_desc *desc = NULL; > - unsigned int desc_idx, b_idx; > - int fcw_len = (conf->op_type == RTE_BBDEV_OP_LDPC_ENC ? > - ACC_FCW_LE_BLEN : (conf->op_type == RTE_BBDEV_OP_TURBO_DEC ? > - ACC_FCW_TD_BLEN : (conf->op_type == RTE_BBDEV_OP_LDPC_DEC ? > - ACC_FCW_LD_BLEN : (conf->op_type == RTE_BBDEV_OP_FFT ? > - ACC_FCW_FFT_BLEN : ACC_FCW_MLDTS_BLEN)))); > - > - if ((q->d->device_variant == VRB2_VARIANT) && (conf->op_type == RTE_BBDEV_OP_FFT)) > - fcw_len = ACC_FCW_FFT_BLEN_3; > + switch (conf->op_type) { > + case RTE_BBDEV_OP_LDPC_ENC: > + fcw_len = ACC_FCW_LE_BLEN; > + break; > + case RTE_BBDEV_OP_LDPC_DEC: > + fcw_len = ACC_FCW_LD_BLEN; > + break; > + case RTE_BBDEV_OP_TURBO_DEC: > + fcw_len = ACC_FCW_TD_BLEN; > + break; > + case RTE_BBDEV_OP_TURBO_ENC: > + fcw_len = ACC_FCW_TE_BLEN; > + break; > + case RTE_BBDEV_OP_FFT: > + fcw_len = ACC_FCW_FFT_BLEN; > + if (q->d->device_variant == VRB2_VARIANT) > + fcw_len = ACC_FCW_FFT_BLEN_3; > + break; > + case RTE_BBDEV_OP_MLDTS: > + fcw_len = ACC_FCW_MLDTS_BLEN; > + break; > + default: > + /* NOT REACHED. */ > + fcw_len = 0; > + rte_bbdev_log(ERR, "Unexpected error in %s using type %d", __func__, conf->op_type); > + break; > + } This part is useful as it makes the code clearer. > for (desc_idx = 0; desc_idx < d->sw_ring_max_depth; desc_idx++) { > desc = q->ring_addr + desc_idx; > @@ -1757,8 +1777,7 @@ vrb_fcw_ld_fill(struct rte_bbdev_dec_op *op, struct acc_fcw_ld *fcw, > if (fcw->hcout_en > 0) { > parity_offset = (op->ldpc_dec.basegraph == 1 ? 20 : 8) > * op->ldpc_dec.z_c - op->ldpc_dec.n_filler; > - k0_p = (fcw->k0 > parity_offset) ? > - fcw->k0 - op->ldpc_dec.n_filler : fcw->k0; > + k0_p = (fcw->k0 > parity_offset) ? fcw->k0 - op->ldpc_dec.n_filler : fcw->k0; > ncb_p = fcw->ncb - op->ldpc_dec.n_filler; > l = k0_p + fcw->rm_e; > harq_out_length = (uint16_t) fcw->hcin_size0; > @@ -2000,16 +2019,15 @@ vrb_dma_desc_ld_fill(struct rte_bbdev_dec_op *op, > next_triplet++; > } > > - if (check_bit(op->ldpc_dec.op_flags, > - RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE)) { > + if (check_bit(op->ldpc_dec.op_flags, RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE)) { > if (op->ldpc_dec.harq_combined_output.data == 0) { > rte_bbdev_log(ERR, "HARQ output is not defined"); > return -1; > } > > - /* Pruned size of the HARQ */ > + /* Pruned size of the HARQ. */ > h_p_size = fcw->hcout_size0 + fcw->hcout_size1; > - /* Non-Pruned size of the HARQ */ > + /* Non-Pruned size of the HARQ. */ > h_np_size = fcw->hcout_offset > 0 ? > fcw->hcout_offset + fcw->hcout_size1 : > h_p_size; > @@ -2583,7 +2601,6 @@ vrb_enqueue_ldpc_dec_one_op_cb(struct acc_queue *q, struct rte_bbdev_dec_op *op, > seg_total_left = rte_pktmbuf_data_len(input) - in_offset; > else > seg_total_left = fcw->rm_e; > - > ret = vrb_dma_desc_ld_fill(op, &desc->req, &input, h_output, > &in_offset, &h_out_offset, > &h_out_length, &mbuf_total_left, > @@ -2645,7 +2662,6 @@ vrb_enqueue_ldpc_dec_one_op_tb(struct acc_queue *q, struct rte_bbdev_dec_op *op, > desc_first = desc; > fcw_offset = (desc_idx << 8) + ACC_DESC_FCW_OFFSET; > harq_layout = q->d->harq_layout; > - > vrb_fcw_ld_fill(op, &desc->req.fcw_ld, harq_layout, q->d->device_variant); > > input = op->ldpc_dec.input.data; > @@ -2849,6 +2865,7 @@ vrb_enqueue_enc_cb(struct rte_bbdev_queue_data *q_data, > acc_dma_enqueue(q, i, &q_data->queue_stats); > > acc_update_qstat_enqueue(q_data, i, num - i); > + > return i; > } > > @@ -2956,6 +2973,7 @@ vrb_enqueue_ldpc_enc_tb(struct rte_bbdev_queue_data *q_data, > } > descs_used = vrb2_enqueue_ldpc_enc_one_op_tb(q, ops[i], enqueued_descs); > } > + > if (descs_used < 0) { > acc_enqueue_invalid(q_data); > break; > @@ -3062,6 +3080,7 @@ vrb_enqueue_ldpc_dec_tb(struct rte_bbdev_queue_data *q_data, > acc_dma_enqueue(q, enqueued_cbs, &q_data->queue_stats); > > acc_update_qstat_enqueue(q_data, i, num - i); > + > return i; > } > > @@ -3103,6 +3122,7 @@ vrb_enqueue_ldpc_dec_cb(struct rte_bbdev_queue_data *q_data, > acc_dma_enqueue(q, i, &q_data->queue_stats); > > acc_update_qstat_enqueue(q_data, i, num - i); > + > return i; > } > > @@ -3273,7 +3293,7 @@ vrb2_dequeue_ldpc_enc_one_op_tb(struct acc_queue *q, struct rte_bbdev_enc_op **r > return 1; > } > > -/* Dequeue one LDPC encode operations from device in TB mode. > +/* Dequeue one encode operations from device in TB mode. > * That operation may cover multiple descriptors. > */ > static inline int > @@ -3873,6 +3893,7 @@ vrb_enqueue_fft(struct rte_bbdev_queue_data *q_data, > acc_dma_enqueue(q, i, &q_data->queue_stats); > > acc_update_qstat_enqueue(q_data, i, num - i); > + > return i; > } > > @@ -3939,7 +3960,9 @@ vrb_dequeue_fft(struct rte_bbdev_queue_data *q_data, > > q->aq_dequeued += aq_dequeued; > q->sw_ring_tail += dequeued_cbs; > + > acc_update_qstat_dequeue(q_data, i); > + > return i; > } > > @@ -4194,6 +4217,7 @@ vrb2_enqueue_mldts(struct rte_bbdev_queue_data *q_data, > acc_dma_enqueue(q, enqueued_descs, &q_data->queue_stats); > > acc_update_qstat_enqueue(q_data, i, num - i); > + > return i; > } > All the new lines removal does not bring clarity, they could be skipped. Regards, Maxime