From patchwork Fri Feb 24 05:48:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejasree Kondoj X-Patchwork-Id: 124483 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DBC8441D5B; Fri, 24 Feb 2023 06:48:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C7EB442C4D; Fri, 24 Feb 2023 06:48:32 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 1D3AB41143 for ; Fri, 24 Feb 2023 06:48:31 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31O3LIBH005076 for ; Thu, 23 Feb 2023 21:48:30 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=Sg0ujwxArllnOhBwOP1bL5V+tOBeY3susLa8FGs75GI=; b=LuaS8kqHvAYf79lxIdW6HOc4vSSNAZm+hqq88oGlnllMqILXiEG+Hb4wzMeCQm/Q5H88 toZKaTp66X0iqXx4uAXbcthBFnfYJbg3qnOKNDzrYOa9bhF7gRgWRrcGbQhq6hBNV4Xz hxuJhAuGPWsmOnJq64xlYMyY6f+4Ii3NAJCmJBmT43oA4bZo0byse30UNi53yt6Wy2gO okEkiRGrssybv2+zYEa4habqsNoI6fgUxkjNIWqEr0lLf86swJnLe6EHfGQgiFXOvdOg 3N2H6Tm3+qfAfL5GvuUbctt1gLm3XQwMTTXkYKFao0zMNeb/KF8gW1lzUmx2OiQahEv8 wA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nxfkwa3bw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 23 Feb 2023 21:48:30 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 23 Feb 2023 21:48:28 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Thu, 23 Feb 2023 21:48:28 -0800 Received: from hyd1554.marvell.com (unknown [10.29.57.11]) by maili.marvell.com (Postfix) with ESMTP id CD2E73F7070; Thu, 23 Feb 2023 21:48:26 -0800 (PST) From: Tejasree Kondoj To: Akhil Goyal CC: Anoob Joseph , Gowrishankar Muthukrishnan , Subject: [PATCH 06/11] common/cnxk: ensure flush inval completion with CSR read Date: Fri, 24 Feb 2023 11:18:08 +0530 Message-ID: <20230224054813.2855914-7-ktejasree@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230224054813.2855914-1-ktejasree@marvell.com> References: <20230224054813.2855914-1-ktejasree@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: ERvms1ocyD5VV8opp7mM8xM7SEzH1jW4 X-Proofpoint-ORIG-GUID: ERvms1ocyD5VV8opp7mM8xM7SEzH1jW4 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-24_02,2023-02-23_01,2023-02-09_01 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 From: Anoob Joseph If a CSR read is issued after a write, the read would block till the write operation is complete. This would help in determining when the FLUSH+INVALIDATE operation is complete. Signed-off-by: Anoob Joseph --- drivers/common/cnxk/hw/cpt.h | 11 +++++++++++ drivers/common/cnxk/roc_cpt.c | 16 ++++++++++++++++ drivers/crypto/cnxk/cnxk_cryptodev_ops.c | 4 ---- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/common/cnxk/hw/cpt.h b/drivers/common/cnxk/hw/cpt.h index d378a4eadd..44ff8b08b2 100644 --- a/drivers/common/cnxk/hw/cpt.h +++ b/drivers/common/cnxk/hw/cpt.h @@ -100,6 +100,17 @@ union cpt_lf_ctx_flush { } s; }; +union cpt_lf_ctx_err { + uint64_t u; + struct { + uint64_t flush_st_flt : 1; + uint64_t busy_flr : 1; + uint64_t busy_sw_flush : 1; + uint64_t reload_faulted : 1; + uint64_t reserved_4_63 : 1; + } s; +}; + union cpt_lf_ctx_reload { uint64_t u; struct { diff --git a/drivers/common/cnxk/roc_cpt.c b/drivers/common/cnxk/roc_cpt.c index cf514be69f..dff2fbf2a4 100644 --- a/drivers/common/cnxk/roc_cpt.c +++ b/drivers/common/cnxk/roc_cpt.c @@ -783,6 +783,7 @@ int roc_cpt_lf_ctx_flush(struct roc_cpt_lf *lf, void *cptr, bool inval) { union cpt_lf_ctx_flush reg; + union cpt_lf_ctx_err err; if (lf == NULL) { plt_err("Could not trigger CTX flush"); @@ -795,6 +796,21 @@ roc_cpt_lf_ctx_flush(struct roc_cpt_lf *lf, void *cptr, bool inval) plt_write64(reg.u, lf->rbase + CPT_LF_CTX_FLUSH); + plt_atomic_thread_fence(__ATOMIC_ACQ_REL); + + /* Read a CSR to ensure that the FLUSH operation is complete */ + err.u = plt_read64(lf->rbase + CPT_LF_CTX_ERR); + + if (err.s.busy_sw_flush && inval) { + plt_err("CTX entry could not be invalidated due to active usage."); + return -EAGAIN; + } + + if (err.s.flush_st_flt) { + plt_err("CTX flush could not complete due to store fault"); + abort(); + } + return 0; } diff --git a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c index f03646fe1a..67bd7e3243 100644 --- a/drivers/crypto/cnxk/cnxk_cryptodev_ops.c +++ b/drivers/crypto/cnxk/cnxk_cryptodev_ops.c @@ -737,8 +737,6 @@ sym_session_clear(struct rte_cryptodev_sym_session *sess, bool is_session_less) /* Trigger CTX flush + invalidate to remove from CTX_CACHE */ roc_cpt_lf_ctx_flush(sess_priv->lf, &sess_priv->roc_se_ctx.se_ctx, true); - plt_delay_ms(1); - if (sess_priv->roc_se_ctx.auth_key != NULL) plt_free(sess_priv->roc_se_ctx.auth_key); @@ -767,8 +765,6 @@ cnxk_ae_session_clear(struct rte_cryptodev *dev, struct rte_cryptodev_asym_sessi /* Trigger CTX flush + invalidate to remove from CTX_CACHE */ roc_cpt_lf_ctx_flush(priv->lf, &priv->hw_ctx, true); - plt_delay_ms(1); - /* Free resources allocated in session_cfg */ cnxk_ae_free_session_parameters(priv);