This patch improves the return value for retired queues to enchance debugging prints.
Signed-off-by: Gagandeep Singh <g.si...@nxp.com> --- drivers/bus/dpaa/base/qbman/qman.c | 5 +++-- drivers/crypto/dpaa_sec/dpaa_sec.c | 10 +++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c index 6d2fbdcf02..9975271ba2 100644 --- a/drivers/bus/dpaa/base/qbman/qman.c +++ b/drivers/bus/dpaa/base/qbman/qman.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0) * * Copyright 2008-2016 Freescale Semiconductor Inc. - * Copyright 2017,2019-2023 NXP + * Copyright 2017,2019-2024 NXP * */ @@ -1746,9 +1746,10 @@ int qman_retire_fq(struct qman_fq *fq, u32 *flags) int rval; u8 res; + /* Queue is already in retire or oos state */ if ((fq->state != qman_fq_state_parked) && (fq->state != qman_fq_state_sched)) - return -EINVAL; + return 0; #ifdef RTE_LIBRTE_DPAA_HWDEBUG if (unlikely(fq_isset(fq, QMAN_FQ_FLAG_NO_MODIFY))) return -EINVAL; diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 679f78c4b9..105274e49e 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * * Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved. - * Copyright 2017-2022 NXP + * Copyright 2017-2024 NXP * */ @@ -2504,11 +2504,15 @@ static int dpaa_sec_detach_rxq(struct dpaa_sec_dev_private *qi, struct qman_fq *fq) { unsigned int i; + int ret; for (i = 0; i < RTE_DPAA_MAX_RX_QUEUE; i++) { if (&qi->inq[i] == fq) { - if (qman_retire_fq(fq, NULL) != 0) - DPAA_SEC_DEBUG("Queue is not retired\n"); + ret = qman_retire_fq(fq, NULL); + if (ret != 0) + DPAA_SEC_ERR("Queue %d is not retired" + " err: %d\n", fq->fqid, + ret); qman_oos_fq(fq); qi->inq_attach[i] = 0; return 0; -- 2.25.1