From patchwork Fri Jul 31 13:51:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Dwivedi X-Patchwork-Id: 75105 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B81ECA052B; Fri, 31 Jul 2020 15:52:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5A54D276C; Fri, 31 Jul 2020 15:52:26 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id D8D6911A2 for ; Fri, 31 Jul 2020 15:52:23 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06VDkB6Q000398; Fri, 31 Jul 2020 06:52:22 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0818; bh=V2Y5ByQz57MwMuGj7RmW+2jwJxT6c034szi0VrHEHCw=; b=y8tBjfBr2ReiR+WWd6g/yP6r6324FV5OypsX6VfBF7rAP+8i/ivbtmuWIEO6aiIlraOF IlMVRMnLn2/FJM2SXWd1snsr3KFHX9Z7cePVrKMGOi/6Qzsq3gjnxtwUlLgEsVLAnV41 EuYrOLRIC0qZ3VSUTO7M6wpxKSEj6RtRAmLrEX62Pynl7IzcpoIXyyTTzGzwByP++La4 p2D+gRLKQP3ReUP+LSRZ6WoXbtZD2b7eN1oIWZw5D1oTrn+8UzmuR1Vuk7Jsp5kkSHvx cebnIa0zt4L2P2uTzwMdkCmAOQF/8P0H63VR5Vj5x0Uwg00hH8ved4jn0Qv+am4bHb8C TA== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 32gj3rav1u-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2020 06:52:22 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 31 Jul 2020 06:52:21 -0700 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.2 via Frontend Transport; Fri, 31 Jul 2020 06:52:21 -0700 Received: from hyd1349.t110.caveonetworks.com (unknown [10.29.45.13]) by maili.marvell.com (Postfix) with ESMTP id CFD223F703F; Fri, 31 Jul 2020 06:52:18 -0700 (PDT) From: Ankur Dwivedi To: CC: , , , , , Ankur Dwivedi Date: Fri, 31 Jul 2020 19:21:52 +0530 Message-ID: <1596203513-21124-1-git-send-email-adwivedi@marvell.com> X-Mailer: git-send-email 1.9.3 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-07-31_04:2020-07-31, 2020-07-31 signatures=0 Subject: [dpdk-dev] [PATCH 1/2] common/octeontx2: sync cpt mailbox X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Tejasree Kondoj This patch syncs the pmd mailbox with the cpt pf driver. Signed-off-by: Ankur Dwivedi Signed-off-by: Tejasree Kondoj --- drivers/common/octeontx2/otx2_mbox.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/common/octeontx2/otx2_mbox.h b/drivers/common/octeontx2/otx2_mbox.h index 34b1d06..51e657a 100644 --- a/drivers/common/octeontx2/otx2_mbox.h +++ b/drivers/common/octeontx2/otx2_mbox.h @@ -1224,6 +1224,8 @@ struct cpt_rd_wr_reg_msg { uint64_t __otx2_io *ret_val; uint64_t __otx2_io val; uint8_t __otx2_io is_write; + /* BLKADDR_CPT0/BLKADDR_CPT1 or 0 for BLKADDR_CPT0 */ + uint8_t __otx2_io blkaddr; }; struct cpt_set_crypto_grp_req_msg { @@ -1235,11 +1237,14 @@ struct cpt_lf_alloc_req_msg { struct mbox_msghdr hdr; uint16_t __otx2_io nix_pf_func; uint16_t __otx2_io sso_pf_func; + uint16_t __otx2_io eng_grpmask; + /* BLKADDR_CPT0/BLKADDR_CPT1 or 0 for BLKADDR_CPT0 */ + uint8_t __otx2_io blkaddr; }; struct cpt_lf_alloc_rsp_msg { struct mbox_msghdr hdr; - uint8_t __otx2_io crypto_eng_grp; + uint16_t __otx2_io eng_grpmsk; }; #define CPT_INLINE_INBOUND 0 From patchwork Fri Jul 31 13:51:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ankur Dwivedi X-Patchwork-Id: 75106 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EFB20A052B; Fri, 31 Jul 2020 15:52:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CACA21C00D; Fri, 31 Jul 2020 15:52:36 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 1320811A2 for ; Fri, 31 Jul 2020 15:52:34 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 06VDkB6V000398; Fri, 31 Jul 2020 06:52:34 -0700 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-type; s=pfpt0818; bh=/zlskoz+tTwwVTqpChTH1dMD2jrTs68QNtwBD1DAqCo=; b=gEgJX6MndwTGbiBhQuCfcFC+Z+zHf3Rz5slu+6WB7s8oB7l8zU3aKcXKjGbOmHO6T1JG 1tpCLNAkClW/1uC4YiFPNH9Z26rl+VNDkbn19zvG8kSkUmav4MnwIuaHJ0SQt3Fp8LtB cLdU92GUVPyuzo/11zCGQUpjza80fwLkupb7NHhYuKkyLpbmyeqIyVy5kMTNZPZ/s9E0 johLfUT3fgf4d4SVKeEaazYVSRn0Z2bZKH9Ldton/VvgAjjJW0IlfEx5p9phaGt0T00+ qbt2mWkT3RLcQ1jppvf/D0icj2w2vEaACxLaLvFIGadMrQyK8zBTuavMRHV3Se38pjxu qw== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0a-0016f401.pphosted.com with ESMTP id 32gj3rav36-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 31 Jul 2020 06:52:34 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 31 Jul 2020 06:52:32 -0700 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.2 via Frontend Transport; Fri, 31 Jul 2020 06:52:33 -0700 Received: from hyd1349.t110.caveonetworks.com (unknown [10.29.45.13]) by maili.marvell.com (Postfix) with ESMTP id 075533F703F; Fri, 31 Jul 2020 06:52:30 -0700 (PDT) From: Ankur Dwivedi To: CC: , , , , , Ankur Dwivedi Date: Fri, 31 Jul 2020 19:21:53 +0530 Message-ID: <1596203513-21124-2-git-send-email-adwivedi@marvell.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1596203513-21124-1-git-send-email-adwivedi@marvell.com> References: <1596203513-21124-1-git-send-email-adwivedi@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-07-31_04:2020-07-31, 2020-07-31 signatures=0 Subject: [dpdk-dev] [PATCH 2/2] crypto/octeontx2: add cpt kernel driver version check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Tejasree Kondoj This patch checks if cpt pmd is compatible with kernel cpt driver. Signed-off-by: Ankur Dwivedi Signed-off-by: Tejasree Kondoj --- drivers/crypto/octeontx2/otx2_cryptodev.h | 1 + drivers/crypto/octeontx2/otx2_cryptodev_mbox.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/crypto/octeontx2/otx2_cryptodev.h b/drivers/crypto/octeontx2/otx2_cryptodev.h index a00f3d6..fba7222 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev.h +++ b/drivers/crypto/octeontx2/otx2_cryptodev.h @@ -15,6 +15,7 @@ #define OTX2_CPT_MAX_LFS 64 #define OTX2_CPT_MAX_QUEUES_PER_VF 64 +#define OTX2_CPT_PMD_VERSION 3 /** * Device private data diff --git a/drivers/crypto/octeontx2/otx2_cryptodev_mbox.c b/drivers/crypto/octeontx2/otx2_cryptodev_mbox.c index 6028439..75e610d 100644 --- a/drivers/crypto/octeontx2/otx2_cryptodev_mbox.c +++ b/drivers/crypto/octeontx2/otx2_cryptodev_mbox.c @@ -29,6 +29,13 @@ if (ret) return -EIO; + if (rsp->cpt_pf_drv_version != OTX2_CPT_PMD_VERSION) { + otx2_err("Incompatible CPT PMD version" + "(Kernel: 0x%04x DPDK: 0x%04x)", + rsp->cpt_pf_drv_version, OTX2_CPT_PMD_VERSION); + return -EPIPE; + } + memcpy(hw_caps, rsp->eng_caps, sizeof(union cpt_eng_caps) * CPT_MAX_ENG_TYPES);