From: Jun Yang <[email protected]> Pass the full FQ descriptor to qman_shutdown_fq() instead of just the fqid, so that channel-affine portals can be correctly accessed when shutting down push-mode Rx queues.
Signed-off-by: Jun Yang <[email protected]> --- drivers/bus/dpaa/base/qbman/qman.c | 9 +++++---- drivers/bus/dpaa/include/fsl_qman.h | 11 ++++++++++- drivers/net/dpaa/dpaa_ethdev.c | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/bus/dpaa/base/qbman/qman.c b/drivers/bus/dpaa/base/qbman/qman.c index 931d487de4..2315b81065 100644 --- a/drivers/bus/dpaa/base/qbman/qman.c +++ b/drivers/bus/dpaa/base/qbman/qman.c @@ -2784,18 +2784,19 @@ qm_mc_result_timeout(struct qm_portal *portal, RTE_EXPORT_INTERNAL_SYMBOL(qman_shutdown_fq) int -qman_shutdown_fq(u32 fqid) +qman_shutdown_fq(struct qman_fq *fq) { - struct qman_portal *p; + struct qman_portal *p = fq->qp; struct qm_mc_command *mcc; struct qm_mc_result *mcr; int orl_empty, drain = 0, ret = 0; - u32 res; + u32 res, fqid = fq->fqid; u8 state; u32 channel, wq; DPAA_BUS_DEBUG("In shutdown for queue = %x", fqid); - p = get_affine_portal(); + if (!p) + p = get_affine_portal(); /* Determine the state of the FQID */ mcc = qm_mc_start(&p->p); mcc->queryfq_np.fqid = cpu_to_be32(fqid); diff --git a/drivers/bus/dpaa/include/fsl_qman.h b/drivers/bus/dpaa/include/fsl_qman.h index 52027b194d..39854f3b9c 100644 --- a/drivers/bus/dpaa/include/fsl_qman.h +++ b/drivers/bus/dpaa/include/fsl_qman.h @@ -1897,7 +1897,16 @@ static inline void qman_release_fqid(u32 fqid) void qman_seed_fqid_range(u32 fqid, unsigned int count); __rte_internal -int qman_shutdown_fq(u32 fqid); +int qman_shutdown_fq(struct qman_fq *fq); + +static inline int qman_shutdown_fq_by_fqid(u32 fqid) +{ + struct qman_fq fq; + + memset(&fq, 0, sizeof(struct qman_fq)); + fq.fqid = fqid; + return qman_shutdown_fq(&fq); +} /** * qman_reserve_fqid_range - Reserve the specified range of frame queue IDs diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 184e4ced9e..82e5f496cd 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -1120,7 +1120,7 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, queue_idx, rxq->fqid); /* Shutdown FQ before configure */ - qman_shutdown_fq(rxq->fqid); + qman_shutdown_fq_by_fqid(rxq->fqid); if (!fif->num_profiles) { if (dpaa_intf->bp_info && dpaa_intf->bp_info->bp && -- 2.25.1
