[PATCH v2 10/10] baseband/acc: cosmetic changes

[Maxime Coquelin]

On 10/3/24 22:49, Hernan Vargas wrote:
> Cosmetic code changes.
> No functional impact.
> 
> Signed-off-by: Hernan Vargas <hernan.vargas at intel.com>
> ---
>   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