From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <Anoob.Joseph@cavium.com>
Received: from NAM01-SN1-obe.outbound.protection.outlook.com
(mail-sn1nam01on0082.outbound.protection.outlook.com [104.47.32.82])
by dpdk.org (Postfix) with ESMTP id 4D77B2F4F
for <dev@dpdk.org>; Tue, 4 Sep 2018 06:03:09 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=XDVm2Utbs+/rL/oAPdwJ63Ehq8k8eKKhnXnHrxVlfHk=;
b=auLthpT7cT3rex6lpMRQzzwpATm7EVr8VUd1PiiUTs2VYA1j3/L0DCnV+dSAOUTVXe0VlRbo69mB0dOBbW5HVE6NQaD8j9B+bidWcbshB+eKKBnZuHMSqn5bjpE3oLG3wumc7Fht+4PWJAw0IEz/GCn+pM/DSiC0Myi4wSn46RE=
Authentication-Results: spf=none (sender IP is )
smtp.mailfrom=Anoob.Joseph@cavium.com;
Received: from ajoseph83.caveonetworks.com.com (115.113.156.2) by
BYAPR07MB4902.namprd07.prod.outlook.com (2603:10b6:a02:ef::25) with Microsoft
SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
15.20.1101.15; Tue, 4 Sep 2018 04:02:48 +0000
From: Anoob Joseph <ajoseph@caviumnetworks.com>
To: Akhil Goyal <akhil.goyal@nxp.com>,
Pablo de Lara <pablo.de.lara.guarch@intel.com>,
Thomas Monjalon <thomas@monjalon.net>
Cc: Nithin Dabilpuram <nithin.dabilpuram@caviumnetworks.com>,
Jerin Jacob <jerin.jacob@caviumnetworks.com>,
Narayana Prasad <narayanaprasad.athreya@caviumnetworks.com>, dev@dpdk.org,
Ankur Dwivedi <ankur.dwivedi@caviumnetworks.com>,
Anoob Joseph <anoob.joseph@caviumnetworks.com>,
Murthy NSSR <nidadavolu.murthy@caviumnetworks.com>,
Ragothaman Jayaraman <rjayaraman@caviumnetworks.com>,
Srisivasubramanian S <ssrinivasan@caviumnetworks.com>,
Tejasree Kondoj <kondoj.tejasree@caviumnetworks.com>
Date: Tue, 4 Sep 2018 09:29:02 +0530
Message-Id: <1536033560-21541-16-git-send-email-ajoseph@caviumnetworks.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1536033560-21541-1-git-send-email-ajoseph@caviumnetworks.com>
References: <1528476325-15585-1-git-send-email-anoob.joseph@caviumnetworks.com>
<1536033560-21541-1-git-send-email-ajoseph@caviumnetworks.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Originating-IP: [115.113.156.2]
X-ClientProxiedBy: BMXPR01CA0023.INDPRD01.PROD.OUTLOOK.COM
(2603:1096:b00:d::33) To BYAPR07MB4902.namprd07.prod.outlook.com
(2603:10b6:a02:ef::25)
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: e69e54ab-1ca4-4a45-0e10-08d6121b4990
X-Microsoft-Antispam: BCL:0; PCL:0;
RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020);
SRVR:BYAPR07MB4902;
X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4902;
3:ko6SuL4sEVOV9V0Wx2708KHbLfrjgDBEt3VBou8ellSmme6eHZSXS8vNRgKcXkcNVnWdNIHIMaFnqrUW1wm+efKRqA8fX8SK+ixdaJiuSUoei0bValkxtZNxEz1c3tXBq9lb7kWXSK0GuQ6HU9CJz4X2V3+jERXcjgI+wQNs8UB0aiHVpJGcWvaAUtNdT1qKKZEz3QPF04UiWO9bN8e1/stdugb6a0+NmxO/lALIbYH9XamVol3xK1F8FUvIOOXn;
25:tTkpTHk/rwbD4uPJ8puDfgxQdaz7bJsq65WYvACtPSrh7Fi3lfw9elihAodrrIbUpfMsJ0FtzZWlnjqbm+EjB/92n7sWxSyMzHFqeJZjtD8S6knKSH7iC+x74uR9kkqEgbWqfc0YfgrN/BC3oRRNBTXHXKWutKYLh1dPp+I4kq3YGPA+TkyMY/aA0L5YDxC6BSqRd09CmVDxNE1n8aunH1WTJe4TvLQ8/GvIGIoRReWeehgi5qqB16bLKllCgE+hbW/jwDEy3ekCm+sFmrlWbk1hySwdgj1QHZEuMxAmRiz1SnxxaToM7pnp9YUlQAw0v/QEGaJ0Xhv5Xif30I7/9w==;
31:vnpo2pvNWeTLtbovQjdpuzVDeac0sExWODmqlrSVeYPjyqGw+5gEVs1ox8fX4R3P5g3fS7SsnqmQBtn3u0kCDX6HSDpxcdZiKUTHNyGV8fVDU2epGHxoLU+0ClqgvrcexxrwLrMNswg4qQvVxt9FZqvVoUfP7Ycyl0s7Gbxv+uMCPwIHUQrB5mvTOYlJVN/JsQZors40B4nmj9SCSIqtqgnpLyfSMX6QJWjlEzigXwk=
X-MS-TrafficTypeDiagnostic: BYAPR07MB4902:
X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4902;
20:2DC3llHG74G/wfs+INtK0NNjPMcFwToPj8cFKd3en99WJ20Y8GEH5scOX+b+hTVltSsuKXpIMlBvYf/ksav9YTpSAqfnvddgSrpo1n4S3kkLlN1rvnvVmj2GFH7tGFdmqDCgLZjQfm9NnO5p15176UZ7zuTyKLNxHAjd/H8e7VYBkbv+QwMBsHp/ke4dh9+dlQQcFv2GTOyP+KR6UQawKl4m65GWPVb2ieKOWz9P6Sbo/E0tjKylwpSur34NUap7aFVyRCaV5FX8zWf7gNDMiP+vd1PUwQl5ZX8QoQrwCNgRobWXaXoiUKgD4HJaHHI0o+BznQIcgl3AiZVvMFbLwl1DD7KxW25/jQxM9VeC2dlSExA3mjqIYEe6wq3VrXsuRdivI3swPCoSbVOz1XPsf/V0rKxmZ//+TOgYn9sgArFEd8X83M9/BvrVHqxptEAXpuDLRYgASnhObbT6gqzyLGzsfz5jCROr76YYV++MPDDSBFDYkRllLsSU4TuaAzZdxmN7pG3TbUlgB2WhpNEDNnNA4ZDz6gmDpvbEc5r9wqJYd+iCujjrABE30d+auHl1eW8YtZ+d3Mlrhli8rWZw8oXOie0JS57rSzokHy/2DoA=;
4:9G8bK1BaUL5ssNwAF6gm3bFywUU+otnGehVbQdwlzWAH5abH4rpWyFTp39hdHEmCzFo4o2v8yN0b45PXNivlg5wt9WdPs2NWUXF/fd1ot1N4BHgwiTGaOMtMX6llCLKxwWZFRfZKg1FzRyxk74qMyhrAHY3OTLJXx1VA0jC5nHutE7+kw6HSjFfl/6KED3g0DosQHV2Kx9FZcQ7ZO/ztI8BKroSc8Wwwzm0Wawc6Of1MsMaY7aGi3yl1yiIkmWJonfaTv9drAjSVTSA3k9PFGg==
X-Microsoft-Antispam-PRVS: <BYAPR07MB49029575542F4A672C0160B4F8030@BYAPR07MB4902.namprd07.prod.outlook.com>
X-Exchange-Antispam-Report-Test: UriScan:;
X-MS-Exchange-SenderADCheck: 1
X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0;
RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(3231311)(944501410)(52105095)(3002001)(149027)(150027)(6041310)(20161123562045)(20161123564045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(201708071742011)(7699016);
SRVR:BYAPR07MB4902; BCL:0; PCL:0; RULEID:; SRVR:BYAPR07MB4902;
X-Forefront-PRVS: 0785459C39
X-Forefront-Antispam-Report: SFV:NSPM;
SFS:(10009020)(366004)(396003)(136003)(346002)(376002)(39860400002)(199004)(189003)(26005)(51416003)(52116002)(76176011)(81166006)(305945005)(81156014)(7736002)(105586002)(316002)(6506007)(106356001)(6512007)(8936002)(446003)(54906003)(25786009)(6666003)(68736007)(50226002)(110136005)(53936002)(16586007)(42882007)(386003)(5660300001)(2906002)(72206003)(50466002)(6486002)(36756003)(6116002)(107886003)(2616005)(14444005)(186003)(3846002)(478600001)(66066001)(476003)(8676002)(47776003)(486006)(956004)(48376002)(11346002)(4326008)(97736004)(16526019);
DIR:OUT; SFP:1101; SCL:1; SRVR:BYAPR07MB4902;
H:ajoseph83.caveonetworks.com.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords;
A:1; MX:1;
Received-SPF: None (protection.outlook.com: cavium.com does not designate
permitted sender hosts)
X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BYAPR07MB4902;
23:e02twWYPnngPWqBFokA578HQqCi/kLIwZSSGGfqlm?=
=?us-ascii?Q?Z3PYode4+CXjTA4oJlGZhPLnneU4bVVaH8UzyQPG7NEGnLVWnx30M2h4W0ht?=
=?us-ascii?Q?2VmEWXg52hV+t5DEuwRWnIUnKMnyTH1my2BKtU51zDfhiGcgsgxGMEcYVpH9?=
=?us-ascii?Q?aj4+i6uYiv6vsMz5+/klK9b277H1JrQ/dLNBHnb3h56qpmMcR5sQbEycqjm0?=
=?us-ascii?Q?5O+YPalK4YOXO6EPhrmEm7YoUrzUpQJqAyfpwi4ASSTVD/TYCmXCvFuLW9tK?=
=?us-ascii?Q?TxJ1mdE9hf4v8PQfyg9j8aIv1img6SjZhNReGZyrSF1hdIse3QY6gXYFdZ2+?=
=?us-ascii?Q?9VcKH61ImLfddnOkWxwzxey5ZJw9wefQ7GAaojgdJoieipZcDwXA6nrxDKBK?=
=?us-ascii?Q?mDD2IjF+zb81IcigwxGLAB8fd66QBW+KqCle9LtpRYbqTJvw7P724Pk1Wik3?=
=?us-ascii?Q?DijuEWz/kPBOPHqRHQyi04KX07bTh6eq2QMlZbRPaJO3cv1lXEoExokRGV4j?=
=?us-ascii?Q?xswLUNw2im1gpdrjvsaXbzw3OfSsuHFjv13SQDCeezdAOYZQhH0tRyDwDTnW?=
=?us-ascii?Q?TJzyP4mKN2xEFHeteCDiWP9iCPcoZRJYcTCoRrxQksyfDDNtS2TyDE1clvM/?=
=?us-ascii?Q?zsySDxEd4+Rd5c9K0n1relkNnHpDw1yYRgXZ+x/SNWEcF7q5ok0QigoT4ncC?=
=?us-ascii?Q?FNIMfqJmCkLgRq03iSeja1G4+H87GNNOgQ+mLblsOhHMGojoFMh/4x5CnJAY?=
=?us-ascii?Q?Q9RiZC1k8L/JSqJbuUy01T2OLseoqWJeYvkpiXCekrWMcg5XN1ldMNCIzbHr?=
=?us-ascii?Q?2f1hYugzWh4WzXR3v4HD+4apEHulmqHREVktBz3/QcEA+K4epFsS88xlfZWP?=
=?us-ascii?Q?c37JOh9sUz6rHBLSb93NYKxXrvVzMzAOcwvesp9GYzVUP1wSxatpEOxF66Jb?=
=?us-ascii?Q?IX2VmX6cs0rmixy2rpG9Oiq5yJdur0J8BCB1HKkPiLSjBrZVvtdOx2Wj/PJY?=
=?us-ascii?Q?iH3hZSUz9xs3nTDMKl8a1kxCiXUz10NdeIM/RJeqekzLjHgkNa7VHU0q6Dyw?=
=?us-ascii?Q?ZO7zkmzec0nIN9jCF5nG9JSrSnyahg5WvszwaY+kEiOfxofQgBUokxRWYKP+?=
=?us-ascii?Q?X4Sk7vTCUTBw6eanppbockY72qHI2pu4ZEMc9FNjYVzWO+4kK3MjSvuQr306?=
=?us-ascii?Q?prmJ1h/3ZjiiLxHVwCtzvOnfDQZ+nNUA3ZWsihmQqMhlU8yOnllfiP7QdxPZ?=
=?us-ascii?Q?v8CENpO1P16u/QK9Do=3D?=
X-Microsoft-Antispam-Message-Info: DH4k0j+xOkrfUM0DUyXBxmCokWR/wBgTS6qISbrka27kr1OSsuCHcPTH2pNA1BoC9mEJSoXqwW+O1Vw5s2Oq9ceF4dK/BclS9jl3qVe06jI8sCEsnU0vdrW+QBvHbrdHjw4xucZeFf4vULZ/NHIgzKil6YBM7MGbRJDLM7yZlcEfYqHuY2Qp8Qpt5cibg2tW3cvxPZgZJTt2drtgtyThEgl0dH+jvNdUFp1CaEKyiBGmhFr7udrdzxoRP0CfTXVA9CsvYxkqbb4LQmGYroKUY92R0/SaVRwF7iGyAscqky9Omuol6MAnqE0A3ULUa+VG2YnD5GEW3IIQAxn/mlPvfxFTR7kq/lEmhHMyGihFBZQ=
X-Microsoft-Exchange-Diagnostics: 1; BYAPR07MB4902;
6:s7LKQoy7QeTRl4AUfVtBdAQRuTJHBzlyR+mbkQaDAdyTtwufqr/+FgH862iveEKhSYqdp79tvM8oSFoD7hlfTO+vp0jeJ6j6A4aiYQDp+8QEs1sgnczxtAfiO+ls6Rx7j3R/WJaYL17AvKZWerNL4zXp9FWJ+Vr46WLbR5YxlxotgSR+fAaBGNg3rCyoJcxqB7y3rmsz7b5tYEqLURcqoKcQcJqDlWLSwLIUDVH940fzeq2IMhtmszVWzFjilpgaC4Lyexo7giP/1lyqjc1dlbjf3aMSIaBVLsSISimV4gydEVcC+Ntu8YCfk9ktqIRtnM2/JauIxB+4Fw3zpp4oTC8DU4CvMkhQQAqkhwypsiTGaTMwbI85i/6+LEDXr6JH79ZCDPzuD5LQiNEeQ4gF5kVtfN9HDiDsm9BL7AvpgwBGAVabAV+IgkXdtVdlxyI9cZ7tyb7hs0X9LHD20fWPnw==;
5:KOiah7IK9g9C/WPvn1/HFNEjvVwvYg5wd3y+gj2W/PYrFjoulRxJkFQQcaGIRCsnH/+nV5eBUkSGCxuptBbQ3g9RF7Xmp2wuK+hdaoPr7LvWWztccyOQkyR3zgRec9LUeQsqwVFd0RJTuGhqepE7OZLSTnRd3DT2TOPWaPy22+c=;
7:o/aQR/J9iHlJA+ozJ47VC9c7xrX+75EK7Ec7r9AvqcHXw2S8V70qcJATc9dO6tkv0YXIYDvk12JWxK11816laOM/J7NrKxvOaVGY5cEL8BFpNfB4pkudnoJEVmmHuXABgef+UxiTNz437kE9ubbE/3GRvtOdD0o5A/T0vBWpOUaz54ATgv6rIqjNq/y0xB5xlhQZJDGJ6xydvo8WIAYN1Id3IeGBbOaMXebJgAWbImTt+tgjAKri9cTrCGAik30V
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-OriginatorOrg: caviumnetworks.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2018 04:02:48.8348 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: e69e54ab-1ca4-4a45-0e10-08d6121b4990
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR07MB4902
Subject: [dpdk-dev] [PATCH v2 15/33] crypto/octeontx: add queue pair
functions
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Sep 2018 04:03:09 -0000
From: Nithin Dabilpuram <nithin.dabilpuram@caviumnetworks.com>
Adding queue pair setup and release functions
Signed-off-by: Ankur Dwivedi <ankur.dwivedi@caviumnetworks.com>
Signed-off-by: Anoob Joseph <anoob.joseph@caviumnetworks.com>
Signed-off-by: Murthy NSSR <nidadavolu.murthy@caviumnetworks.com>
Signed-off-by: Nithin Dabilpuram <nithin.dabilpuram@caviumnetworks.com>
Signed-off-by: Ragothaman Jayaraman <rjayaraman@caviumnetworks.com>
Signed-off-by: Srisivasubramanian S <ssrinivasan@caviumnetworks.com>
Signed-off-by: Tejasree Kondoj <kondoj.tejasree@caviumnetworks.com>
---
drivers/crypto/octeontx/otx_cryptodev_hw_access.c | 285 ++++++++++++++++++++++
drivers/crypto/octeontx/otx_cryptodev_hw_access.h | 8 +
drivers/crypto/octeontx/otx_cryptodev_ops.c | 82 ++++++-
3 files changed, 373 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/octeontx/otx_cryptodev_hw_access.c b/drivers/crypto/octeontx/otx_cryptodev_hw_access.c
index d8b8872..fe054e6 100644
--- a/drivers/crypto/octeontx/otx_cryptodev_hw_access.c
+++ b/drivers/crypto/octeontx/otx_cryptodev_hw_access.c
@@ -1,11 +1,14 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2018 Cavium, Inc
*/
+#include <assert.h>
#include <string.h>
#include <unistd.h>
#include <rte_branch_prediction.h>
#include <rte_common.h>
+#include <rte_errno.h>
+#include <rte_memzone.h>
#include "otx_cryptodev_hw_access.h"
#include "otx_cryptodev_mbox.h"
@@ -180,6 +183,136 @@ otx_cpt_clear_dovf_intr(struct cpt_vf *cptvf)
CPTX_VQX_MISC_INT(0, 0), vqx_misc_int.u);
}
+/* Write to VQX_CTL register
+ */
+static void
+otx_cpt_write_vq_ctl(struct cpt_vf *cptvf, bool val)
+{
+ cptx_vqx_ctl_t vqx_ctl;
+
+ vqx_ctl.u = CPT_READ_CSR(CPT_CSR_REG_BASE(cptvf),
+ CPTX_VQX_CTL(0, 0));
+ vqx_ctl.s.ena = val;
+ CPT_WRITE_CSR(CPT_CSR_REG_BASE(cptvf),
+ CPTX_VQX_CTL(0, 0), vqx_ctl.u);
+}
+
+/* Write to VQX_INPROG register
+ */
+static void
+otx_cpt_write_vq_inprog(struct cpt_vf *cptvf, uint8_t val)
+{
+ cptx_vqx_inprog_t vqx_inprg;
+
+ vqx_inprg.u = CPT_READ_CSR(CPT_CSR_REG_BASE(cptvf),
+ CPTX_VQX_INPROG(0, 0));
+ vqx_inprg.s.inflight = val;
+ CPT_WRITE_CSR(CPT_CSR_REG_BASE(cptvf),
+ CPTX_VQX_INPROG(0, 0), vqx_inprg.u);
+}
+
+/* Write to VQX_DONE_WAIT NUMWAIT register
+ */
+static void
+otx_cpt_write_vq_done_numwait(struct cpt_vf *cptvf, uint32_t val)
+{
+ cptx_vqx_done_wait_t vqx_dwait;
+
+ vqx_dwait.u = CPT_READ_CSR(CPT_CSR_REG_BASE(cptvf),
+ CPTX_VQX_DONE_WAIT(0, 0));
+ vqx_dwait.s.num_wait = val;
+ CPT_WRITE_CSR(CPT_CSR_REG_BASE(cptvf),
+ CPTX_VQX_DONE_WAIT(0, 0), vqx_dwait.u);
+}
+
+/* Write to VQX_DONE_WAIT NUM_WAIT register
+ */
+static void
+otx_cpt_write_vq_done_timewait(struct cpt_vf *cptvf, uint16_t val)
+{
+ cptx_vqx_done_wait_t vqx_dwait;
+
+ vqx_dwait.u = CPT_READ_CSR(CPT_CSR_REG_BASE(cptvf),
+ CPTX_VQX_DONE_WAIT(0, 0));
+ vqx_dwait.s.time_wait = val;
+ CPT_WRITE_CSR(CPT_CSR_REG_BASE(cptvf),
+ CPTX_VQX_DONE_WAIT(0, 0), vqx_dwait.u);
+}
+
+/* Write to VQX_SADDR register
+ */
+static void
+otx_cpt_write_vq_saddr(struct cpt_vf *cptvf, uint64_t val)
+{
+ cptx_vqx_saddr_t vqx_saddr;
+
+ vqx_saddr.u = val;
+ CPT_WRITE_CSR(CPT_CSR_REG_BASE(cptvf),
+ CPTX_VQX_SADDR(0, 0), vqx_saddr.u);
+}
+
+static void
+otx_cpt_vfvq_init(struct cpt_vf *cptvf)
+{
+ uint64_t base_addr = 0;
+
+ /* Disable the VQ */
+ otx_cpt_write_vq_ctl(cptvf, 0);
+
+ /* Reset the doorbell */
+ otx_cpt_write_vq_doorbell(cptvf, 0);
+ /* Clear inflight */
+ otx_cpt_write_vq_inprog(cptvf, 0);
+
+ /* Write VQ SADDR */
+ base_addr = (uint64_t)(cptvf->cqueue.chead[0].dma_addr);
+ otx_cpt_write_vq_saddr(cptvf, base_addr);
+
+ /* Configure timerhold / coalescence */
+ otx_cpt_write_vq_done_timewait(cptvf, CPT_TIMER_THOLD);
+ otx_cpt_write_vq_done_numwait(cptvf, CPT_COUNT_THOLD);
+
+ /* Enable the VQ */
+ otx_cpt_write_vq_ctl(cptvf, 1);
+
+ /* Flag the VF ready */
+ cptvf->flags |= CPT_FLAG_DEVICE_READY;
+}
+
+static int
+cpt_vq_init(struct cpt_vf *cptvf, uint8_t group)
+{
+ int err;
+
+ /* Convey VQ LEN to PF */
+ err = otx_cpt_send_vq_size_msg(cptvf);
+ if (err) {
+ CPT_LOG_ERR("%s: PF not responding to QLEN msg",
+ cptvf->dev_name);
+ err = -EBUSY;
+ goto cleanup;
+ }
+
+ /* CPT VF device initialization */
+ otx_cpt_vfvq_init(cptvf);
+
+ /* Send msg to PF to assign currnet Q to required group */
+ cptvf->vfgrp = group;
+ err = otx_cpt_send_vf_grp_msg(cptvf, group);
+ if (err) {
+ CPT_LOG_ERR("%s: PF not responding to VF_GRP msg",
+ cptvf->dev_name);
+ err = -EBUSY;
+ goto cleanup;
+ }
+
+ CPT_LOG_DP_DEBUG("%s: %s done", cptvf->dev_name, __func__);
+ return 0;
+
+cleanup:
+ return err;
+}
+
void
otx_cpt_poll_misc(struct cpt_vf *cptvf)
{
@@ -268,6 +401,158 @@ otx_cpt_deinit_device(void *dev)
}
int
+otx_cpt_get_resource(void *dev, uint8_t group, struct cpt_instance **instance)
+{
+ int ret = -ENOENT, len, qlen, i;
+ int chunk_len, chunks, chunk_size;
+ struct cpt_vf *cptvf = (struct cpt_vf *)dev;
+ struct cpt_instance *cpt_instance;
+ struct command_chunk *chunk_head = NULL, *chunk_prev = NULL;
+ struct command_chunk *chunk = NULL;
+ uint8_t *mem;
+ const struct rte_memzone *rz;
+ uint64_t dma_addr = 0, alloc_len, used_len;
+ uint64_t *next_ptr;
+ uint64_t pg_sz = sysconf(_SC_PAGESIZE);
+
+ CPT_LOG_DP_DEBUG("Initializing cpt resource %s", cptvf->dev_name);
+
+ cpt_instance = &cptvf->instance;
+
+ memset(&cptvf->cqueue, 0, sizeof(cptvf->cqueue));
+ memset(&cptvf->pqueue, 0, sizeof(cptvf->pqueue));
+
+ /* Chunks are of fixed size buffers */
+ chunks = DEFAULT_CMD_QCHUNKS;
+ chunk_len = DEFAULT_CMD_QCHUNK_SIZE;
+
+ qlen = chunks * chunk_len;
+ /* Chunk size includes 8 bytes of next chunk ptr */
+ chunk_size = chunk_len * CPT_INST_SIZE + CPT_NEXT_CHUNK_PTR_SIZE;
+
+ /* For command chunk structures */
+ len = chunks * RTE_ALIGN(sizeof(struct command_chunk), 8);
+
+ /* For pending queue */
+ len += qlen * RTE_ALIGN(sizeof(struct rid), 8);
+
+ /* So that instruction queues start as pg size aligned */
+ len = RTE_ALIGN(len, pg_sz);
+
+ /* For Instruction queues */
+ len += chunks * RTE_ALIGN(chunk_size, 128);
+
+ /* Wastage after instruction queues */
+ len = RTE_ALIGN(len, pg_sz);
+
+ rz = rte_memzone_reserve_aligned(cptvf->dev_name, len, cptvf->node,
+ RTE_MEMZONE_SIZE_HINT_ONLY |
+ RTE_MEMZONE_256MB,
+ RTE_CACHE_LINE_SIZE);
+ if (!rz) {
+ ret = rte_errno;
+ goto cleanup;
+ }
+
+ mem = rz->addr;
+ dma_addr = rz->phys_addr;
+ alloc_len = len;
+
+ memset(mem, 0, len);
+
+ cpt_instance->rsvd = (uintptr_t)rz;
+
+ /* Pending queue setup */
+ cptvf->pqueue.rid_queue = (struct rid *)mem;
+ cptvf->pqueue.soft_qlen = qlen;
+ cptvf->pqueue.enq_tail = 0;
+ cptvf->pqueue.deq_head = 0;
+ cptvf->pqueue.pending_count = 0;
+
+ mem += qlen * RTE_ALIGN(sizeof(struct rid), 8);
+ len -= qlen * RTE_ALIGN(sizeof(struct rid), 8);
+ dma_addr += qlen * RTE_ALIGN(sizeof(struct rid), 8);
+
+ /* Alignment wastage */
+ used_len = alloc_len - len;
+ mem += RTE_ALIGN(used_len, pg_sz) - used_len;
+ len -= RTE_ALIGN(used_len, pg_sz) - used_len;
+ dma_addr += RTE_ALIGN(used_len, pg_sz) - used_len;
+
+ /* Init instruction queues */
+ chunk_head = &cptvf->cqueue.chead[0];
+ i = qlen;
+
+ chunk_prev = NULL;
+ for (i = 0; i < DEFAULT_CMD_QCHUNKS; i++) {
+ int csize;
+
+ chunk = &cptvf->cqueue.chead[i];
+ chunk->head = mem;
+ chunk->dma_addr = dma_addr;
+
+ csize = RTE_ALIGN(chunk_size, 128);
+ mem += csize;
+ dma_addr += csize;
+ len -= csize;
+
+ if (chunk_prev) {
+ next_ptr = (uint64_t *)(chunk_prev->head +
+ chunk_size - 8);
+ *next_ptr = (uint64_t)chunk->dma_addr;
+ }
+ chunk_prev = chunk;
+ }
+ /* Circular loop */
+ next_ptr = (uint64_t *)(chunk_prev->head + chunk_size - 8);
+ *next_ptr = (uint64_t)chunk_head->dma_addr;
+
+ assert(!len);
+
+ cptvf->qlen = qlen;
+ /* This is used for CPT(0)_PF_Q(0..15)_CTL.size config */
+ cptvf->qsize = chunk_size / 8;
+ cptvf->cqueue.qhead = chunk_head->head;
+ cptvf->cqueue.idx = 0;
+ cptvf->cqueue.cchunk = 0;
+
+ if (cpt_vq_init(cptvf, group)) {
+ CPT_LOG_ERR("Failed to initialize CPT VQ of device %s",
+ cptvf->dev_name);
+ ret = -EBUSY;
+ goto cleanup;
+ }
+
+ *instance = cpt_instance;
+
+ CPT_LOG_DP_DEBUG("Crypto device (%s) initialized", cptvf->dev_name);
+
+ return 0;
+cleanup:
+ rte_memzone_free(rz);
+ *instance = NULL;
+ return ret;
+}
+
+int
+otx_cpt_put_resource(struct cpt_instance *instance)
+{
+ struct cpt_vf *cptvf = (struct cpt_vf *)instance;
+ struct rte_memzone *rz;
+
+ if (!cptvf) {
+ CPT_LOG_ERR("Invalid CPTVF handle");
+ return -EINVAL;
+ }
+
+ CPT_LOG_DP_DEBUG("Releasing cpt device %s", cptvf->dev_name);
+
+ rz = (struct rte_memzone *)instance->rsvd;
+ rte_memzone_free(rz);
+ return 0;
+}
+
+int
otx_cpt_start_device(void *dev)
{
int rc;
diff --git a/drivers/crypto/octeontx/otx_cryptodev_hw_access.h b/drivers/crypto/octeontx/otx_cryptodev_hw_access.h
index 7dbc41e..b9a634b 100644
--- a/drivers/crypto/octeontx/otx_cryptodev_hw_access.h
+++ b/drivers/crypto/octeontx/otx_cryptodev_hw_access.h
@@ -15,11 +15,13 @@
/* Flags to indicate the features supported */
#define CPT_FLAG_VF_DRIVER (uint16_t)(1 << 3)
+#define CPT_FLAG_DEVICE_READY (uint16_t)(1 << 4)
#define CPT_INTR_POLL_INTERVAL_MS (50)
/* Default command queue length */
#define DEFAULT_CMD_QCHUNKS 2
+#define DEFAULT_CMD_QCHUNK_SIZE 1023
#define CPT_CSR_REG_BASE(cpt) ((cpt)->reg_base)
@@ -152,6 +154,12 @@ int
otx_cpt_deinit_device(void *dev);
int
+otx_cpt_get_resource(void *dev, uint8_t group, struct cpt_instance **instance);
+
+int
+otx_cpt_put_resource(struct cpt_instance *instance);
+
+int
otx_cpt_start_device(void *cptvf);
void
diff --git a/drivers/crypto/octeontx/otx_cryptodev_ops.c b/drivers/crypto/octeontx/otx_cryptodev_ops.c
index 2bbf82f..e6b2ed9 100644
--- a/drivers/crypto/octeontx/otx_cryptodev_ops.c
+++ b/drivers/crypto/octeontx/otx_cryptodev_ops.c
@@ -28,6 +28,11 @@ static struct rte_mempool *otx_cpt_meta_pool;
static int otx_cpt_op_mlen;
static int otx_cpt_op_sb_mlen;
+/* Forward declarations */
+
+static int
+otx_cpt_que_pair_release(struct rte_cryptodev *dev, uint16_t que_pair_id);
+
/*
* Initializes global variables used by fast-path code
*
@@ -136,9 +141,16 @@ static int
otx_cpt_dev_close(struct rte_cryptodev *c_dev)
{
void *cptvf = c_dev->data->dev_private;
+ int i, ret;
CPT_PMD_INIT_FUNC_TRACE();
+ for (i = 0; i < c_dev->data->nb_queue_pairs; i++) {
+ ret = otx_cpt_que_pair_release(c_dev, i);
+ if (ret)
+ return ret;
+ }
+
otx_cpt_periodic_alarm_stop(cptvf);
otx_cpt_deinit_device(cptvf);
@@ -173,6 +185,72 @@ otx_cpt_stats_reset(struct rte_cryptodev *dev __rte_unused)
CPT_PMD_INIT_FUNC_TRACE();
}
+static int
+otx_cpt_que_pair_setup(struct rte_cryptodev *dev,
+ uint16_t que_pair_id,
+ const struct rte_cryptodev_qp_conf *qp_conf,
+ int socket_id __rte_unused,
+ struct rte_mempool *session_pool __rte_unused)
+{
+ void *cptvf = dev->data->dev_private;
+ struct cpt_instance *instance = NULL;
+ struct rte_pci_device *pci_dev;
+ int ret = -1;
+
+ CPT_PMD_INIT_FUNC_TRACE();
+
+ if (dev->data->queue_pairs[que_pair_id] != NULL) {
+ ret = otx_cpt_que_pair_release(dev, que_pair_id);
+ if (ret)
+ return ret;
+ }
+
+ if (qp_conf->nb_descriptors > DEFAULT_CMD_QLEN) {
+ CPT_LOG_INFO("Number of descriptors too big %d, using default "
+ "queue length of %d", qp_conf->nb_descriptors,
+ DEFAULT_CMD_QLEN);
+ }
+
+ pci_dev = RTE_DEV_TO_PCI(dev->device);
+
+ if (pci_dev->mem_resource[0].addr == NULL) {
+ CPT_PMD_DRV_LOG(ERR, "PCI mem address null");
+ return -EIO;
+ }
+
+ ret = otx_cpt_get_resource(cptvf, 0, &instance);
+ if (ret != 0) {
+ CPT_LOG_ERR("Error getting instance handle from device %s : "
+ "ret = %d", dev->data->name, ret);
+ return ret;
+ }
+
+ instance->queue_id = que_pair_id;
+ dev->data->queue_pairs[que_pair_id] = instance;
+
+ return 0;
+}
+
+static int
+otx_cpt_que_pair_release(struct rte_cryptodev *dev, uint16_t que_pair_id)
+{
+ struct cpt_instance *instance = dev->data->queue_pairs[que_pair_id];
+ int ret;
+
+ CPT_PMD_INIT_FUNC_TRACE();
+
+ ret = otx_cpt_put_resource(instance);
+ if (ret != 0) {
+ CPT_PMD_DRV_LOG(ERR, "Error putting instance handle"
+ " of device %s : ret = %d\n", dev->data->name, ret);
+ return ret;
+ }
+
+ dev->data->queue_pairs[que_pair_id] = NULL;
+
+ return 0;
+}
+
static struct rte_cryptodev_ops cptvf_ops = {
/* Device related operations */
.dev_configure = otx_cpt_dev_config,
@@ -183,8 +261,8 @@ static struct rte_cryptodev_ops cptvf_ops = {
.stats_get = otx_cpt_stats_get,
.stats_reset = otx_cpt_stats_reset,
- .queue_pair_setup = NULL,
- .queue_pair_release = NULL,
+ .queue_pair_setup = otx_cpt_que_pair_setup,
+ .queue_pair_release = otx_cpt_que_pair_release,
.queue_pair_count = NULL,
/* Crypto related operations */
--
2.7.4