From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hemant Agrawal Subject: [PATCH 11/20] bus/fslmc: rename portal pi index to consumer index Date: Thu, 27 Dec 2018 06:23:08 +0000 Message-ID: <20181227062233.30781-12-hemant.agrawal@nxp.com> References: <20181227062233.30781-1-hemant.agrawal@nxp.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Cc: "ferruh.yigit@intel.com" , Shreyansh Jain , Youri Querry To: "dev@dpdk.org" Return-path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-eopbgr140084.outbound.protection.outlook.com [40.107.14.84]) by dpdk.org (Postfix) with ESMTP id 63B6B5689 for ; Thu, 27 Dec 2018 07:23:09 +0100 (CET) In-Reply-To: <20181227062233.30781-1-hemant.agrawal@nxp.com> Content-Language: en-US List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This is to align with the latest qbman hw library Signed-off-by: Youri Querry Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/qbman/qbman_portal.c | 51 +++++++++++--------------- drivers/bus/fslmc/qbman/qbman_portal.h | 2 +- 2 files changed, 23 insertions(+), 30 deletions(-) diff --git a/drivers/bus/fslmc/qbman/qbman_portal.c b/drivers/bus/fslmc/qbm= an/qbman_portal.c index 08bfdc9f8..14f4b0344 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.c +++ b/drivers/bus/fslmc/qbman/qbman_portal.c @@ -251,21 +251,21 @@ struct qbman_swp *qbman_swp_init(const struct qbman_s= wp_desc *d) } =20 for (mask_size =3D p->eqcr.pi_ring_size; mask_size > 0; mask_size >>=3D 1= ) - p->eqcr.pi_mask =3D (p->eqcr.pi_mask<<1) + 1; + p->eqcr.pi_ci_mask =3D (p->eqcr.pi_ci_mask<<1) + 1; eqcr_pi =3D qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_PI); - p->eqcr.pi =3D eqcr_pi & p->eqcr.pi_mask; + p->eqcr.pi =3D eqcr_pi & p->eqcr.pi_ci_mask; p->eqcr.pi_vb =3D eqcr_pi & QB_VALID_BIT; if ((p->desc.qman_version & QMAN_REV_MASK) >=3D QMAN_REV_5000 && (d->cena_access_mode =3D=3D qman_cena_fastest_access)) - p->eqcr.ci =3D qbman_cinh_read(&p->sys, - QBMAN_CINH_SWP_EQCR_CI) & p->eqcr.pi_mask; + p->eqcr.ci =3D qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_PI) + & p->eqcr.pi_ci_mask; else - p->eqcr.ci =3D qbman_cinh_read(&p->sys, - QBMAN_CINH_SWP_EQCR_PI) & p->eqcr.pi_mask; + p->eqcr.ci =3D qbman_cinh_read(&p->sys, QBMAN_CINH_SWP_EQCR_CI) + & p->eqcr.pi_ci_mask; p->eqcr.available =3D p->eqcr.pi_ring_size - qm_cyc_diff(p->eqcr.pi_ring_size, - p->eqcr.ci & (p->eqcr.pi_mask<<1), - p->eqcr.pi & (p->eqcr.pi_mask<<1)); + p->eqcr.ci & (p->eqcr.pi_ci_mask<<1), + p->eqcr.pi & (p->eqcr.pi_ci_mask<<1)); =20 portal_idx_map[p->desc.idx] =3D p; return p; @@ -646,8 +646,8 @@ static int qbman_swp_enqueue_ring_mode_direct(struct qb= man_swp *s, const uint32_t *cl =3D qb_cl(d); uint32_t eqcr_ci, full_mask, half_mask; =20 - half_mask =3D (s->eqcr.pi_mask>>1); - full_mask =3D s->eqcr.pi_mask; + half_mask =3D (s->eqcr.pi_ci_mask>>1); + full_mask =3D s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci =3D s->eqcr.ci; s->eqcr.ci =3D qbman_cena_read_reg(&s->sys, @@ -685,8 +685,8 @@ static int qbman_swp_enqueue_ring_mode_mem_back(struct = qbman_swp *s, const uint32_t *cl =3D qb_cl(d); uint32_t eqcr_ci, full_mask, half_mask; =20 - half_mask =3D (s->eqcr.pi_mask>>1); - full_mask =3D s->eqcr.pi_mask; + half_mask =3D (s->eqcr.pi_ci_mask>>1); + full_mask =3D s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci =3D s->eqcr.ci; s->eqcr.ci =3D qbman_cena_read_reg(&s->sys, @@ -743,8 +743,8 @@ static int qbman_swp_enqueue_multiple_direct(struct qbm= an_swp *s, int i, num_enqueued =3D 0; uint64_t addr_cena; =20 - half_mask =3D (s->eqcr.pi_mask>>1); - full_mask =3D s->eqcr.pi_mask; + half_mask =3D (s->eqcr.pi_ci_mask>>1); + full_mask =3D s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci =3D s->eqcr.ci; s->eqcr.ci =3D qbman_cena_read_reg(&s->sys, @@ -811,8 +811,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct q= bman_swp *s, uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask; int i, num_enqueued =3D 0; =20 - half_mask =3D (s->eqcr.pi_mask>>1); - full_mask =3D s->eqcr.pi_mask; + half_mask =3D (s->eqcr.pi_ci_mask>>1); + full_mask =3D s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci =3D s->eqcr.ci; s->eqcr.ci =3D qbman_cena_read_reg(&s->sys, @@ -833,15 +833,6 @@ static int qbman_swp_enqueue_multiple_mem_back(struct = qbman_swp *s, QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask)); memcpy(&p[1], &cl[1], 28); memcpy(&p[8], &fd[i], sizeof(*fd)); - eqcr_pi++; - } - - /* Set the verb byte, have to substitute in the valid-bit */ - eqcr_pi =3D s->eqcr.pi; - for (i =3D 0; i < num_enqueued; i++) { - p =3D qbman_cena_write_start_wo_shadow(&s->sys, - QBMAN_CENA_SWP_EQCR(eqcr_pi & half_mask)); - p[0] =3D cl[0] | s->eqcr.pi_vb; if (flags && (flags[i] & QBMAN_ENQUEUE_FLAG_DCA)) { struct qbman_eq_desc *d =3D (struct qbman_eq_desc *)p; =20 @@ -849,6 +840,8 @@ static int qbman_swp_enqueue_multiple_mem_back(struct q= bman_swp *s, ((flags[i]) & QBMAN_EQCR_DCA_IDXMASK); } eqcr_pi++; + p[0] =3D cl[0] | s->eqcr.pi_vb; + if (!(eqcr_pi & half_mask)) s->eqcr.pi_vb ^=3D QB_VALID_BIT; } @@ -880,8 +873,8 @@ static int qbman_swp_enqueue_multiple_desc_direct(struc= t qbman_swp *s, int i, num_enqueued =3D 0; uint64_t addr_cena; =20 - half_mask =3D (s->eqcr.pi_mask>>1); - full_mask =3D s->eqcr.pi_mask; + half_mask =3D (s->eqcr.pi_ci_mask>>1); + full_mask =3D s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci =3D s->eqcr.ci; s->eqcr.ci =3D qbman_cena_read_reg(&s->sys, @@ -943,8 +936,8 @@ static int qbman_swp_enqueue_multiple_desc_mem_back(str= uct qbman_swp *s, uint32_t eqcr_ci, eqcr_pi, half_mask, full_mask; int i, num_enqueued =3D 0; =20 - half_mask =3D (s->eqcr.pi_mask>>1); - full_mask =3D s->eqcr.pi_mask; + half_mask =3D (s->eqcr.pi_ci_mask>>1); + full_mask =3D s->eqcr.pi_ci_mask; if (!s->eqcr.available) { eqcr_ci =3D s->eqcr.ci; s->eqcr.ci =3D qbman_cena_read_reg(&s->sys, diff --git a/drivers/bus/fslmc/qbman/qbman_portal.h b/drivers/bus/fslmc/qbm= an/qbman_portal.h index 3b0fc540b..e54f2661c 100644 --- a/drivers/bus/fslmc/qbman/qbman_portal.h +++ b/drivers/bus/fslmc/qbman/qbman_portal.h @@ -98,7 +98,7 @@ struct qbman_swp { uint32_t pi; uint32_t pi_vb; uint32_t pi_ring_size; - uint32_t pi_mask; + uint32_t pi_ci_mask; uint32_t ci; int available; } eqcr; --=20 2.17.1