Skip to contentSkip to conversation

Add Support for Marvell OcteonTX2 Cryptographic

PATCH Superseded Srujana Challa 2 participants 15 messages Oct 12, 2020

Subsystems (6)

v6 of 10 Superseded Latest is v10 →

lore
Share & tools
lore

Srujana Challa

author maintainer
#0 lore raw

v6 cover Add Support for Marvell OcteonTX2 Cryptographic

This series introduces crypto(CPT) drivers(PF & VF) for Marvell OcteonTX2 CN96XX Soc.

OcteonTX2 SOC's resource virtualization unit (RVU) supports multiple physical and virtual functions. Each of the PF/VF's functionality is determined by what kind of resources are attached to it. When the CPT block is attached to a VF, it can function as a security device. The following document provides an overview of the hardware and different drivers for the OcteonTX2 SOC:
https://www.kernel.org/doc/Documentation/networking/device_drivers/marvell/octeontx2.rst

The CPT PF driver is responsible for:
- Forwarding messages to/from VFs from/to admin function(AF),
- Enabling/disabling VFs,
- Loading/unloading microcode (creation/deletion of engine groups).

The CPT VF driver works as a crypto offload device.

This patch series includes:
- Patch to update existing Marvell sources to support the CPT driver.
- Patch that adds mailbox messages to the admin function (AF) driver, to configure CPT HW registers.
- CPT PF driver patches that include AF<=>PF<=>VF mailbox communication, sriov_configure, and firmware load to the acceleration engines.
- CPT VF driver patches that include VF<=>PF mailbox communication and crypto offload support through the kernel cryptographic API.

This series is tested with CRYPTO_EXTRA_TESTS enabled and CRYPTO_DISABLE_TESTS disabled.

Changes since v4:
* Rebased the patches onto net-next tree with base
'commit bc081a693a56 ("Merge branch 'Offload-tc-vlan-mangle-to-mscc_ocelot-switch'")'
Changes since v3:
* Splitup the patches into smaller patches with more informartion. Changes since v2:
* Fixed C=1 warnings.
* Added code to exit CPT VF driver gracefully.
* Moved OcteonTx2 asm code to a header file under include/linux/soc/
Changes since v1:
* Moved Makefile changes from patch4 to patch2 and patch3.

Srujana Challa (13):
octeontx2-pf: move lmt flush to include/linux/soc
octeontx2-af: add mailbox interface for CPT
octeontx2-af: add debugfs entries for CPT block
drivers: crypto: add Marvell OcteonTX2 CPT PF driver
crypto: octeontx2: add mailbox communication with AF
crypto: octeontx2: enable SR-IOV and mailbox communication with VF
crypto: octeontx2: load microcode and create engine groups
crypto: octeontx2: add LF framework
crypto: octeontx2: add support to get engine capabilities
crypto: octeontx2: add mailbox for inline-IPsec RX LF cfg
crypto: octeontx2: add virtual function driver support
crypto: octeontx2: add support to process the crypto request
crypto: octeontx2: register with linux crypto framework

 MAINTAINERS                                   |    2 +
 drivers/crypto/marvell/Kconfig                |   14 +
 drivers/crypto/marvell/Makefile               |    1 +
 drivers/crypto/marvell/octeontx2/Makefile     |   10 +
 .../marvell/octeontx2/otx2_cpt_common.h       |  132 ++
 .../marvell/octeontx2/otx2_cpt_hw_types.h     |  464 +++++
 .../marvell/octeontx2/otx2_cpt_mbox_common.c  |  202 ++
 .../marvell/octeontx2/otx2_cpt_reqmgr.h       |  197 ++
 drivers/crypto/marvell/octeontx2/otx2_cptlf.c |  426 +++++
 drivers/crypto/marvell/octeontx2/otx2_cptlf.h |  351 ++++
 drivers/crypto/marvell/octeontx2/otx2_cptpf.h |   53 +
 .../marvell/octeontx2/otx2_cptpf_main.c       |  533 ++++++
 .../marvell/octeontx2/otx2_cptpf_mbox.c       |  424 +++++
 .../marvell/octeontx2/otx2_cptpf_ucode.c      | 1533 +++++++++++++++
 .../marvell/octeontx2/otx2_cptpf_ucode.h      |  162 ++
 drivers/crypto/marvell/octeontx2/otx2_cptvf.h |   28 +
 .../marvell/octeontx2/otx2_cptvf_algs.c       | 1665 +++++++++++++++++
 .../marvell/octeontx2/otx2_cptvf_algs.h       |  170 ++
 .../marvell/octeontx2/otx2_cptvf_main.c       |  408 ++++
 .../marvell/octeontx2/otx2_cptvf_mbox.c       |  139 ++
 .../marvell/octeontx2/otx2_cptvf_reqmgr.c     |  539 ++++++
 .../ethernet/marvell/octeontx2/af/Makefile    |    3 +-
 .../net/ethernet/marvell/octeontx2/af/mbox.h  |   85 +
 .../net/ethernet/marvell/octeontx2/af/rvu.c   |    2 +-
 .../net/ethernet/marvell/octeontx2/af/rvu.h   |    7 +
 .../ethernet/marvell/octeontx2/af/rvu_cpt.c   |  343 ++++
 .../marvell/octeontx2/af/rvu_debugfs.c        |  342 ++++
 .../ethernet/marvell/octeontx2/af/rvu_nix.c   |   75 +
 .../ethernet/marvell/octeontx2/af/rvu_reg.h   |   65 +-
 .../marvell/octeontx2/nic/otx2_common.h       |   13 +-
 include/linux/soc/marvell/octeontx2/asm.h     |   29 +
 31 files changed, 8397 insertions(+), 20 deletions(-)
 create mode 100644 drivers/crypto/marvell/octeontx2/Makefile
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_common.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_hw_types.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptlf.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptlf.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c
 create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c
 create mode 100644 include/linux/soc/marvell/octeontx2/asm.h
Signature · 1 line
2.28.0
author maintainer
#1 lore raw

PATCH v6 1/13 octeontx2-pf: move lmt flush to include/linux/soc

On OcteonTX2 platform CPT instruction enqueue and NIX packet send are only possible via LMTST operations which uses LDEOR instruction. This patch moves lmt flush function from OcteonTX2 nic driver to include/linux/soc since it will be used by OcteonTX2 CPT and NIC driver for LMTST.

---
 MAINTAINERS                                   |  2 ++
 .../marvell/octeontx2/nic/otx2_common.h       | 13 +--------
 include/linux/soc/marvell/octeontx2/asm.h     | 29 +++++++++++++++++++
 3 files changed, 32 insertions(+), 12 deletions(-)
 create mode 100644 include/linux/soc/marvell/octeontx2/asm.h
MAINTAINERS +2 -0
index c80f87d7258c..ee903a39e2e9 100644
@@ -10441,6 +10441,7 @@ M:	Srujana Challa <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/crypto/marvell/
+F:	include/linux/soc/marvell/octeontx2/
 
 MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
 M:	Mirko Lindner <[email protected]>
@@ -10513,6 +10514,7 @@ M:	hariprasad <[email protected]>
 L:	[email protected]
 S:	Supported
 F:	drivers/net/ethernet/marvell/octeontx2/nic/
+F:	include/linux/soc/marvell/octeontx2/
 
 MARVELL OCTEONTX2 RVU ADMIN FUNCTION DRIVER
 M:	Sunil Goutham <[email protected]>
drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h +1 -12
index d6253f2a414d..2e8288445dcb 100644
@@ -16,6 +16,7 @@
 #include <linux/net_tstamp.h>
 #include <linux/ptp_clock_kernel.h>
 #include <linux/timecounter.h>
+#include <linux/soc/marvell/octeontx2/asm.h>
 
 #include <mbox.h>
 #include "otx2_reg.h"
@@ -421,21 +422,9 @@ static inline u64 otx2_atomic64_add(u64 incr, u64 *ptr)
 	return result;
 }
 
-static inline u64 otx2_lmt_flush(uint64_t addr)
-{
-	u64 result = 0;
-
-	__asm__ volatile(".cpu  generic+lse\n"
-			 "ldeor xzr,%x[rf],[%[rs]]"
-			 : [rf]"=r"(result)
-			 : [rs]"r"(addr));
-	return result;
-}
-
 #else
 #define otx2_write128(lo, hi, addr)
 #define otx2_atomic64_add(incr, ptr)		({ *ptr += incr; })
-#define otx2_lmt_flush(addr)			({ 0; })
 #endif
 
 /* Alloc pointer from pool/aura */
include/linux/soc/marvell/octeontx2/asm.h new file +29 -0
new file mode 100644
index 000000000000..ae2279fe830a
@@ -0,0 +1,29 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ * Copyright (C) 2020 Marvell.
+ */
+
+#ifndef __SOC_OTX2_ASM_H
+#define __SOC_OTX2_ASM_H
+
+#if defined(CONFIG_ARM64)
+/*
+ * otx2_lmt_flush is used for LMT store operation.
+ * On octeontx2 platform CPT instruction enqueue and
+ * NIX packet send are only possible via LMTST
+ * operations and it uses LDEOR instruction targeting
+ * the coprocessor address.
+ */
+#define otx2_lmt_flush(ioaddr)                          \
+({                                                      \
+	u64 result = 0;                                 \
+	__asm__ volatile(".cpu  generic+lse\n"          \
+			 "ldeor xzr, %x[rf], [%[rs]]"   \
+			 : [rf]"=r" (result)            \
+			 : [rs]"r" (ioaddr));           \
+	(result);                                       \
+})
+#else
+#define otx2_lmt_flush(ioaddr)          ({ 0; })
+#endif
+
+#endif /* __SOC_OTX2_ASM_H */
Signature · 1 line
2.28.0
author maintainer
#2 lore raw

PATCH v6 2/13 octeontx2-af: add mailbox interface for CPT

In reply to Srujana Challa

On OcteonTX2 SoC, the admin function (AF) is the only one with all priviliges to configure HW and alloc resources, PFs and it's VFs have to request AF via mailbox for all their needs. This patch adds a mailbox interface for CPT PFs and VFs to allocate resources for cryptography and inline-IPsec.
Inline-IPsec mailbox messages are added here to provide the interface to Marvell VFIO drivers to allocate and configure HW resources for inline IPsec feature.

---
 .../ethernet/marvell/octeontx2/af/Makefile    |   3 +-
 .../net/ethernet/marvell/octeontx2/af/mbox.h  |  85 +++++
 .../net/ethernet/marvell/octeontx2/af/rvu.c   |   2 +-
 .../net/ethernet/marvell/octeontx2/af/rvu.h   |   1 +
 .../ethernet/marvell/octeontx2/af/rvu_cpt.c   | 343 ++++++++++++++++++
 .../ethernet/marvell/octeontx2/af/rvu_nix.c   |  75 ++++
 .../ethernet/marvell/octeontx2/af/rvu_reg.h   |  65 +++-
 7 files changed, 566 insertions(+), 8 deletions(-)
 create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c
drivers/net/ethernet/marvell/octeontx2/af/Makefile +2 -1
index 2f7a861d0c7b..d258b9a8cefb 100644
@@ -9,4 +9,5 @@ obj-$(CONFIG_OCTEONTX2_AF) += octeontx2_af.o
 
 octeontx2_mbox-y := mbox.o rvu_trace.o
 octeontx2_af-y := cgx.o rvu.o rvu_cgx.o rvu_npa.o rvu_nix.o \
-		  rvu_reg.o rvu_npc.o rvu_debugfs.o ptp.o
+		  rvu_reg.o rvu_npc.o rvu_debugfs.o ptp.o \
+		  rvu_cpt.o
drivers/net/ethernet/marvell/octeontx2/af/mbox.h +85 -0

107 lines not on this page · raw message

drivers/net/ethernet/marvell/octeontx2/af/rvu.c +1 -1
index e1f918960730..3e24897ed9b5 100644
@@ -1025,7 +1025,7 @@ int rvu_mbox_handler_ready(struct rvu *rvu, struct msg_req *req,
 /* Get current count of a RVU block's LF/slots
  * provisioned to a given RVU func.
  */
-static u16 rvu_get_rsrc_mapcount(struct rvu_pfvf *pfvf, int blktype)
+u16 rvu_get_rsrc_mapcount(struct rvu_pfvf *pfvf, int blktype)
 {
 	switch (blktype) {
 	case BLKTYPE_NPA:
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +1 -0
index 90eed3160915..c37e106d7006 100644
@@ -429,6 +429,7 @@ int rvu_get_lf(struct rvu *rvu, struct rvu_block *block, u16 pcifunc, u16 slot);
 int rvu_lf_reset(struct rvu *rvu, struct rvu_block *block, int lf);
 int rvu_get_blkaddr(struct rvu *rvu, int blktype, u16 pcifunc);
 int rvu_poll_reg(struct rvu *rvu, u64 block, u64 offset, u64 mask, bool zero);
+u16 rvu_get_rsrc_mapcount(struct rvu_pfvf *pfvf, int blktype);
 
 /* RVU HW reg validation */
 enum regmap_block {
drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c new file +343 -0

343 lines not on this page · raw message

drivers/net/ethernet/marvell/octeontx2/af/rvu_nix.c +75 -0

78 lines not on this page · raw message

drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h +59 -6

77 lines not on this page · raw message

Signature · 1 line
2.28.0
author maintainer
#3 lore raw

PATCH v6 3/13 octeontx2-af: add debugfs entries for CPT block

In reply to Srujana Challa

Add entries to debugfs at /sys/kernel/debug/octeontx2/cpt.

cpt_pc: dump cpt performance HW registers.
Usage: cat /sys/kernel/debug/octeontx2/cpt/cpt_pc

cpt_engines_sts: show cpt engines current state (busy/free status) Usage:
echo "AE/SE/IE/all" > /sys/kernel/debug/octeontx2/cpt/cpt_engines_sts cat /sys/kernel/debug/octeontx2/cpt/cpt_engines_sts

cpt_engines_info: dump cpt engine control registers.
Usage:
echo "AE/SE/IE/all" > /sys/kernel/debug/octeontx2/cpt/cpt_engines_info cat /sys/kernel/debug/octeontx2/cpt/cpt_engines_info

cpt_lfs_info: dump cpt lfs control registers.
Usage:
cat /sys/kernel/debug/octeontx2/cpt/cpt_lfs_info

cpt_err_info: dump cpt error registers.
Usage:
/sys/kernel/debug/octeontx2/cpt/cpt_err_info

---
 .../net/ethernet/marvell/octeontx2/af/rvu.h   |   6 +
 .../marvell/octeontx2/af/rvu_debugfs.c        | 342 ++++++++++++++++++
 2 files changed, 348 insertions(+)
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +6 -0
index c37e106d7006..fd3e27b96bd3 100644
@@ -42,6 +42,10 @@ struct dump_ctx {
 	bool	all;
 };
 
+struct cpt_dump_ctx {
+	char e_type[NAME_SIZE];
+};
+
 struct rvu_debugfs {
 	struct dentry *root;
 	struct dentry *cgx_root;
@@ -50,11 +54,13 @@ struct rvu_debugfs {
 	struct dentry *npa;
 	struct dentry *nix;
 	struct dentry *npc;
+	struct dentry *cpt;
 	struct dump_ctx npa_aura_ctx;
 	struct dump_ctx npa_pool_ctx;
 	struct dump_ctx nix_cq_ctx;
 	struct dump_ctx nix_rq_ctx;
 	struct dump_ctx nix_sq_ctx;
+	struct cpt_dump_ctx cpt_ctx;
 	int npa_qsize_id;
 	int nix_qsize_id;
 };
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c +342 -0

354 lines not on this page · raw message

Signature · 1 line
2.28.0
#4 lore raw

Re: [PATCH v6,net-next,03/13] octeontx2-af: add debugfs entries for CPT block

I love your patch! Yet something to improve:

Hi Srujana,

I love your patch! Yet something to improve:

[auto build test ERROR on ipvs/master]
[also build test ERROR on linus/master v5.9 next-20201009] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Srujana-Challa/octeontx2-af-add-debugfs-entries-for-CPT-block/20201012-161457
base:   https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git master
config: arm64-randconfig-r001-20201012 (attached as .config)
compiler: clang version 12.0.0 (https://github.com/llvm/llvm-project 9e72d3eaf38f217698f72cb8fdc969a6e72dad3a)

reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm64 cross compiling tool for clang build
# apt-get install binutils-aarch64-linux-gnu
# https://github.com/0day-ci/linux/commit/e56a51df7a3a1e85e34c91f054ed9e042df486c5
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Srujana-Challa/octeontx2-af-add-debugfs-entries-for-CPT-block/20201012-161457 git checkout e56a51df7a3a1e85e34c91f054ed9e042df486c5
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64

If you fix the issue, kindly add following tag as appropriate

All errors (new ones prefixed by >>):

>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1764:33: error: use of undeclared identifier 'CPT_AF_CONSTANTS1'
           reg = rvu_read64(rvu, blkaddr, CPT_AF_CONSTANTS1);
                                          ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1788:34: error: implicit declaration of function 'CPT_AF_EXEX_STS' [-Werror,-Wimplicit-function-declaration]
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_EXEX_STS(e));
                                                  ^
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1833:33: error: use of undeclared identifier 'CPT_AF_CONSTANTS1'
           reg = rvu_read64(rvu, blkaddr, CPT_AF_CONSTANTS1);
                                          ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1858:34: error: implicit declaration of function 'CPT_AF_EXEX_CTL2' [-Werror,-Wimplicit-function-declaration]
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_EXEX_CTL2(e));
                                                  ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1861:34: error: implicit declaration of function 'CPT_AF_EXEX_ACTIVE' [-Werror,-Wimplicit-function-declaration]
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_EXEX_ACTIVE(e));
                                                  ^
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1861:34: note: did you mean 'CPT_AF_EXEX_CTL2'?
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1858:34: note: 'CPT_AF_EXEX_CTL2' declared here
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_EXEX_CTL2(e));
                                                  ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1864:34: error: implicit declaration of function 'CPT_AF_EXEX_CTL' [-Werror,-Wimplicit-function-declaration]
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_EXEX_CTL(e));
                                                  ^
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1864:34: note: did you mean 'CPT_AF_EXEX_CTL2'?
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1858:34: note: 'CPT_AF_EXEX_CTL2' declared here
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_EXEX_CTL2(e));
                                                  ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1894:34: error: implicit declaration of function 'CPT_AF_LFX_CTL' [-Werror,-Wimplicit-function-declaration]
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_LFX_CTL(lf));
                                                  ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1896:34: error: implicit declaration of function 'CPT_AF_LFX_CTL2' [-Werror,-Wimplicit-function-declaration]
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_LFX_CTL2(lf));
                                                  ^
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1896:34: note: did you mean 'CPT_AF_LFX_CTL'?
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1894:34: note: 'CPT_AF_LFX_CTL' declared here
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_LFX_CTL(lf));
                                                  ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1898:34: error: implicit declaration of function 'CPT_AF_LFX_PTR_CTL' [-Werror,-Wimplicit-function-declaration]
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_LFX_PTR_CTL(lf));
                                                  ^
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1898:34: note: did you mean 'CPT_AF_LFX_CTL'?
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1894:34: note: 'CPT_AF_LFX_CTL' declared here
                   reg = rvu_read64(rvu, blkaddr, CPT_AF_LFX_CTL(lf));
                                                  ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1920:34: error: implicit declaration of function 'CPT_AF_FLTX_INT' [-Werror,-Wimplicit-function-declaration]
           reg0 = rvu_read64(rvu, blkaddr, CPT_AF_FLTX_INT(0));
                                           ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1923:34: error: implicit declaration of function 'CPT_AF_PSNX_EXE' [-Werror,-Wimplicit-function-declaration]
           reg0 = rvu_read64(rvu, blkaddr, CPT_AF_PSNX_EXE(0));
                                           ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1926:34: error: implicit declaration of function 'CPT_AF_PSNX_LF' [-Werror,-Wimplicit-function-declaration]
           reg0 = rvu_read64(rvu, blkaddr, CPT_AF_PSNX_LF(0));
                                           ^
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1926:34: note: did you mean 'CPT_AF_PSNX_EXE'?
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1923:34: note: 'CPT_AF_PSNX_EXE' declared here
           reg0 = rvu_read64(rvu, blkaddr, CPT_AF_PSNX_EXE(0));
                                           ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1928:34: error: use of undeclared identifier 'CPT_AF_RVU_INT'; did you mean 'CPT_AF_FLTX_INT'?
           reg0 = rvu_read64(rvu, blkaddr, CPT_AF_RVU_INT);
                                           ^~~~~~~~~~~~~~
                                           CPT_AF_FLTX_INT
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1920:34: note: 'CPT_AF_FLTX_INT' declared here
           reg0 = rvu_read64(rvu, blkaddr, CPT_AF_FLTX_INT(0));
                                           ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1930:34: error: use of undeclared identifier 'CPT_AF_RAS_INT'; did you mean 'CPT_AF_FLTX_INT'?
           reg0 = rvu_read64(rvu, blkaddr, CPT_AF_RAS_INT);
                                           ^~~~~~~~~~~~~~
                                           CPT_AF_FLTX_INT
   drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1920:34: note: 'CPT_AF_FLTX_INT' declared here
           reg0 = rvu_read64(rvu, blkaddr, CPT_AF_FLTX_INT(0));
                                           ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1932:34: error: use of undeclared identifier 'CPT_AF_EXE_ERR_INFO'
           reg0 = rvu_read64(rvu, blkaddr, CPT_AF_EXE_ERR_INFO);
                                           ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1951:33: error: use of undeclared identifier 'CPT_AF_INST_REQ_PC'
           reg = rvu_read64(rvu, blkaddr, CPT_AF_INST_REQ_PC);
                                          ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1953:33: error: use of undeclared identifier 'CPT_AF_INST_LATENCY_PC'
           reg = rvu_read64(rvu, blkaddr, CPT_AF_INST_LATENCY_PC);
                                          ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1955:33: error: use of undeclared identifier 'CPT_AF_RD_REQ_PC'
           reg = rvu_read64(rvu, blkaddr, CPT_AF_RD_REQ_PC);
                                          ^
>> drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c:1957:33: error: use of undeclared identifier 'CPT_AF_RD_LATENCY_PC'
           reg = rvu_read64(rvu, blkaddr, CPT_AF_RD_LATENCY_PC);
                                          ^

fatal error: too many errors emitted, stopping now [-ferror-limit=] 20 errors generated.

vim +/CPT_AF_CONSTANTS1 +1764 drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c

1749
1750 static int rvu_dbg_cpt_engines_sts_display(struct seq_file *filp, void *unused)
1751 {
1752 u64 busy_sts[2] = {0}, free_sts[2] = {0};
1753 struct rvu *rvu = filp->private;

  1754		u16  max_ses, max_ies, max_aes;
  1755		u32  e_min = 0, e_max = 0, e;
  1756		int  blkaddr;
  1757		char *e_type;
  1758		u64  reg;
  1759	
  1760		blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
  1761		if (blkaddr < 0)
  1762			return -ENODEV;
  1763	
> 1764		reg = rvu_read64(rvu, blkaddr, CPT_AF_CONSTANTS1);
  1765		max_ses = reg & 0xffff;
  1766		max_ies = (reg >> 16) & 0xffff;
  1767		max_aes = (reg >> 32) & 0xffff;
  1768	
  1769		e_type = rvu->rvu_dbg.cpt_ctx.e_type;
  1770	
  1771		if (strcmp(e_type, "SE") == 0) {
  1772			e_min = 0;
  1773			e_max = max_ses - 1;
  1774		} else if (strcmp(e_type, "IE") == 0) {
  1775			e_min = max_ses;
  1776			e_max = max_ses + max_ies - 1;
  1777		} else if (strcmp(e_type, "AE") == 0) {
  1778			e_min = max_ses + max_ies;
  1779			e_max = max_ses + max_ies + max_aes - 1;
  1780		} else if (strcmp(e_type, "all") == 0) {
  1781			e_min = 0;
  1782			e_max = max_ses + max_ies + max_aes - 1;
  1783		} else {
  1784			return -EINVAL;
  1785		}
  1786	
  1787		for (e = e_min; e <= e_max; e++) {
> 1788			reg = rvu_read64(rvu, blkaddr, CPT_AF_EXEX_STS(e));
  1789			if (reg & 0x1) {
  1790				if (e < max_ses)
  1791					busy_sts[0] |= 1ULL << e;
  1792				else if (e >= max_ses)
  1793					busy_sts[1] |= 1ULL << (e - max_ses);
  1794			}
  1795			if (reg & 0x2) {
  1796				if (e < max_ses)
  1797					free_sts[0] |= 1ULL << e;
  1798				else if (e >= max_ses)
  1799					free_sts[1] |= 1ULL << (e - max_ses);
  1800			}
  1801		}
  1802		seq_printf(filp, "FREE STS : 0x%016llx  0x%016llx\n", free_sts[1],
  1803			   free_sts[0]);
  1804		seq_printf(filp, "BUSY STS : 0x%016llx  0x%016llx\n", busy_sts[1],
  1805			   busy_sts[0]);
  1806	
  1807		return 0;
  1808	}
  1809	
  1810	RVU_DEBUG_SEQ_FOPS(cpt_engines_sts, cpt_engines_sts_display,
  1811			   cpt_engines_sts_write);
  1812	
  1813	static ssize_t rvu_dbg_cpt_engines_info_write(struct file *filp,
  1814						      const char __user *buffer,
  1815						      size_t count, loff_t *ppos)
  1816	{
  1817		return rvu_dbg_cpt_cmd_parser(filp, buffer, count, ppos);
  1818	}
  1819	
  1820	static int rvu_dbg_cpt_engines_info_display(struct seq_file *filp, void *unused)
  1821	{
  1822		struct rvu *rvu = filp->private;
  1823		u16  max_ses, max_ies, max_aes;
  1824		u32  e_min, e_max, e;
  1825		int  blkaddr;
  1826		char *e_type;
  1827		u64  reg;
  1828	
  1829		blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
  1830		if (blkaddr < 0)
  1831			return -ENODEV;
  1832	
  1833		reg = rvu_read64(rvu, blkaddr, CPT_AF_CONSTANTS1);
  1834		max_ses = reg & 0xffff;
  1835		max_ies = (reg >> 16) & 0xffff;
  1836		max_aes = (reg >> 32) & 0xffff;
  1837	
  1838		e_type = rvu->rvu_dbg.cpt_ctx.e_type;
  1839	
  1840		if (strcmp(e_type, "SE") == 0) {
  1841			e_min = 0;
  1842			e_max = max_ses - 1;
  1843		} else if (strcmp(e_type, "IE") == 0) {
  1844			e_min = max_ses;
  1845			e_max = max_ses + max_ies - 1;
  1846		} else if (strcmp(e_type, "AE") == 0) {
  1847			e_min = max_ses + max_ies;
  1848			e_max = max_ses + max_ies + max_aes - 1;
  1849		} else if (strcmp(e_type, "all") == 0) {
  1850			e_min = 0;
  1851			e_max = max_ses + max_ies + max_aes - 1;
  1852		} else {
  1853			return -EINVAL;
  1854		}
  1855	
  1856		seq_puts(filp, "===========================================\n");
  1857		for (e = e_min; e <= e_max; e++) {
> 1858			reg = rvu_read64(rvu, blkaddr, CPT_AF_EXEX_CTL2(e));
  1859			seq_printf(filp, "CPT Engine[%u] Group Enable   0x%02llx\n", e,
  1860				   reg & 0xff);
> 1861			reg = rvu_read64(rvu, blkaddr, CPT_AF_EXEX_ACTIVE(e));
  1862			seq_printf(filp, "CPT Engine[%u] Active Info    0x%llx\n", e,
  1863				   reg);
> 1864			reg = rvu_read64(rvu, blkaddr, CPT_AF_EXEX_CTL(e));
  1865			seq_printf(filp, "CPT Engine[%u] Control        0x%llx\n", e,
  1866				   reg);
  1867			seq_puts(filp, "===========================================\n");
  1868		}
  1869		return 0;
  1870	}
  1871	
  1872	RVU_DEBUG_SEQ_FOPS(cpt_engines_info, cpt_engines_info_display,
  1873			   cpt_engines_info_write);
  1874	
  1875	static int rvu_dbg_cpt_lfs_info_display(struct seq_file *filp, void *unused)
  1876	{
  1877		struct rvu *rvu = filp->private;
  1878		struct rvu_hwinfo *hw = rvu->hw;
  1879		struct rvu_block *block;
  1880		int blkaddr;
  1881		u64 reg;
  1882		u32 lf;
  1883	
  1884		blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
  1885		if (blkaddr < 0)
  1886			return -ENODEV;
  1887	
  1888		block = &hw->block[blkaddr];
  1889		if (!block->lf.bmap)
  1890			return -ENODEV;
  1891	
  1892		seq_puts(filp, "===========================================\n");
  1893		for (lf = 0; lf < block->lf.max; lf++) {
> 1894			reg = rvu_read64(rvu, blkaddr, CPT_AF_LFX_CTL(lf));
  1895			seq_printf(filp, "CPT Lf[%u] CTL          0x%llx\n", lf, reg);
> 1896			reg = rvu_read64(rvu, blkaddr, CPT_AF_LFX_CTL2(lf));
  1897			seq_printf(filp, "CPT Lf[%u] CTL2         0x%llx\n", lf, reg);
> 1898			reg = rvu_read64(rvu, blkaddr, CPT_AF_LFX_PTR_CTL(lf));
  1899			seq_printf(filp, "CPT Lf[%u] PTR_CTL      0x%llx\n", lf, reg);
  1900			reg = rvu_read64(rvu, blkaddr, block->lfcfg_reg |
  1901					(lf << block->lfshift));
  1902			seq_printf(filp, "CPT Lf[%u] CFG          0x%llx\n", lf, reg);
  1903			seq_puts(filp, "===========================================\n");
  1904		}
  1905		return 0;
  1906	}
  1907	
  1908	RVU_DEBUG_SEQ_FOPS(cpt_lfs_info, cpt_lfs_info_display, NULL);
  1909	
  1910	static int rvu_dbg_cpt_err_info_display(struct seq_file *filp, void *unused)
  1911	{
  1912		struct rvu *rvu = filp->private;
  1913		u64 reg0, reg1;
  1914		int blkaddr;
  1915	
  1916		blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
  1917		if (blkaddr < 0)
  1918			return -ENODEV;
  1919	
> 1920		reg0 = rvu_read64(rvu, blkaddr, CPT_AF_FLTX_INT(0));
  1921		reg1 = rvu_read64(rvu, blkaddr, CPT_AF_FLTX_INT(1));
  1922		seq_printf(filp, "CPT_AF_FLTX_INT:       0x%llx 0x%llx\n", reg0, reg1);
> 1923		reg0 = rvu_read64(rvu, blkaddr, CPT_AF_PSNX_EXE(0));
  1924		reg1 = rvu_read64(rvu, blkaddr, CPT_AF_PSNX_EXE(1));
  1925		seq_printf(filp, "CPT_AF_PSNX_EXE:       0x%llx 0x%llx\n", reg0, reg1);
> 1926		reg0 = rvu_read64(rvu, blkaddr, CPT_AF_PSNX_LF(0));
  1927		seq_printf(filp, "CPT_AF_PSNX_LF:        0x%llx\n", reg0);
> 1928		reg0 = rvu_read64(rvu, blkaddr, CPT_AF_RVU_INT);
  1929		seq_printf(filp, "CPT_AF_RVU_INT:        0x%llx\n", reg0);
> 1930		reg0 = rvu_read64(rvu, blkaddr, CPT_AF_RAS_INT);
  1931		seq_printf(filp, "CPT_AF_RAS_INT:        0x%llx\n", reg0);
> 1932		reg0 = rvu_read64(rvu, blkaddr, CPT_AF_EXE_ERR_INFO);
  1933		seq_printf(filp, "CPT_AF_EXE_ERR_INFO:   0x%llx\n", reg0);
  1934	
  1935		return 0;
  1936	}
  1937	
  1938	RVU_DEBUG_SEQ_FOPS(cpt_err_info, cpt_err_info_display, NULL);
  1939	
  1940	static int rvu_dbg_cpt_pc_display(struct seq_file *filp, void *unused)
  1941	{
  1942		struct rvu *rvu;
  1943		int blkaddr;
  1944		u64 reg;
  1945	
  1946		rvu = filp->private;
  1947		blkaddr = rvu_get_blkaddr(rvu, BLKTYPE_CPT, 0);
  1948		if (blkaddr < 0)
  1949			return -ENODEV;
  1950	
> 1951		reg = rvu_read64(rvu, blkaddr, CPT_AF_INST_REQ_PC);
  1952		seq_printf(filp, "CPT instruction requests   %llu\n", reg);
> 1953		reg = rvu_read64(rvu, blkaddr, CPT_AF_INST_LATENCY_PC);
  1954		seq_printf(filp, "CPT instruction latency    %llu\n", reg);
> 1955		reg = rvu_read64(rvu, blkaddr, CPT_AF_RD_REQ_PC);
  1956		seq_printf(filp, "CPT NCB read requests      %llu\n", reg);
> 1957		reg = rvu_read64(rvu, blkaddr, CPT_AF_RD_LATENCY_PC);

1958 seq_printf(filp, "CPT NCB read latency %llu\n", reg);
1959 reg = rvu_read64(rvu, blkaddr, CPT_AF_RD_UC_PC);
1960 seq_printf(filp, "CPT read requests caused by UC fills %llu\n", reg);
1961 reg = rvu_read64(rvu, blkaddr, CPT_AF_ACTIVE_CYCLES_PC);
1962 seq_printf(filp, "CPT active cycles pc %llu\n", reg);
1963 reg = rvu_read64(rvu, blkaddr, CPT_AF_CPTCLK_CNT);
1964 seq_printf(filp, "CPT clock count pc %llu\n", reg);
1965
1966 return 0;
1967 }
1968

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

author maintainer
#5 lore raw

PATCH v6 4/13 drivers: crypto: add Marvell OcteonTX2 CPT PF driver

In reply to Srujana Challa

Adds skeleton for the Marvell OcteonTX2 CPT physical function driver which includes probe, PCI specific initialization and hardware register defines.
RVU defines are present in AF driver (drivers/net/ethernet/marvell/octeontx2/af), header files from AF driver are included here to avoid duplication.

---
 drivers/crypto/marvell/Kconfig                |  10 +
 drivers/crypto/marvell/Makefile               |   1 +
 drivers/crypto/marvell/octeontx2/Makefile     |   6 +
 .../marvell/octeontx2/otx2_cpt_common.h       |  32 ++
 .../marvell/octeontx2/otx2_cpt_hw_types.h     | 464 ++++++++++++++++++
 drivers/crypto/marvell/octeontx2/otx2_cptpf.h |  13 +
 .../marvell/octeontx2/otx2_cptpf_main.c       | 113 +++++
 7 files changed, 639 insertions(+)
 create mode 100644 drivers/crypto/marvell/octeontx2/Makefile
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_common.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_hw_types.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c
drivers/crypto/marvell/Kconfig +10 -0
index 13063384f958..1440ec9e1fb4 100644
@@ -35,3 +35,13 @@ config CRYPTO_DEV_OCTEONTX_CPT
 
 		To compile this driver as module, choose M here:
 		the modules will be called octeontx-cpt and octeontx-cptvf
+
+config CRYPTO_DEV_OCTEONTX2_CPT
+	tristate "Marvell OcteonTX2 CPT driver"
+	depends on ARM64 || COMPILE_TEST
+	depends on PCI_MSI && 64BIT
+	select OCTEONTX2_MBOX
+	select CRYPTO_DEV_MARVELL
+	help
+		This driver allows you to utilize the Marvell Cryptographic
+		Accelerator Unit(CPT) found in OcteonTX2 series of processors.
drivers/crypto/marvell/Makefile +1 -0
index 6c6a1519b0f1..39db6d9c0aaf 100644
@@ -2,3 +2,4 @@
 
 obj-$(CONFIG_CRYPTO_DEV_MARVELL_CESA) += cesa/
 obj-$(CONFIG_CRYPTO_DEV_OCTEONTX_CPT) += octeontx/
+obj-$(CONFIG_CRYPTO_DEV_OCTEONTX2_CPT) += octeontx2/
drivers/crypto/marvell/octeontx2/Makefile new file +6 -0
new file mode 100644
index 000000000000..db763ad46a91
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+obj-$(CONFIG_CRYPTO_DEV_OCTEONTX2_CPT) += octeontx2-cpt.o
+
+octeontx2-cpt-objs := otx2_cptpf_main.o
+
+ccflags-y += -I$(srctree)/drivers/net/ethernet/marvell/octeontx2/af
drivers/crypto/marvell/octeontx2/otx2_cpt_common.h new file +32 -0
new file mode 100644
index 000000000000..eff4ffa58dc4
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ * Copyright (C) 2020 Marvell.
+ */
+
+#ifndef __OTX2_CPT_COMMON_H
+#define __OTX2_CPT_COMMON_H
+
+#include <linux/pci.h>
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/delay.h>
+#include <linux/crypto.h>
+#include "otx2_cpt_hw_types.h"
+#include "rvu.h"
+
+#define OTX2_CPT_RVU_FUNC_ADDR_S(blk, slot, offs) \
+		(((blk) << 20) | ((slot) << 12) | (offs))
+
+static inline void otx2_cpt_write64(void __iomem *reg_base, u64 blk, u64 slot,
+				    u64 offs, u64 val)
+{
+	writeq_relaxed(val, reg_base +
+		       OTX2_CPT_RVU_FUNC_ADDR_S(blk, slot, offs));
+}
+
+static inline u64 otx2_cpt_read64(void __iomem *reg_base, u64 blk, u64 slot,
+				  u64 offs)
+{
+	return readq_relaxed(reg_base +
+			     OTX2_CPT_RVU_FUNC_ADDR_S(blk, slot, offs));
+}
+#endif /* __OTX2_CPT_COMMON_H */
drivers/crypto/marvell/octeontx2/otx2_cpt_hw_types.h new file +464 -0

464 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf.h new file +13 -0
new file mode 100644
index 000000000000..84cdc8cc2c15
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ * Copyright (C) 2020 Marvell.
+ */
+
+#ifndef __OTX2_CPTPF_H
+#define __OTX2_CPTPF_H
+
+struct otx2_cptpf_dev {
+	void __iomem *reg_base;		/* CPT PF registers start address */
+	struct pci_dev *pdev;		/* PCI device handle */
+};
+
+#endif /* __OTX2_CPTPF_H */
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c new file +113 -0

113 lines not on this page · raw message

Signature · 1 line
2.28.0
author maintainer
#6 lore raw

PATCH v6 5/13 crypto: octeontx2: add mailbox communication with AF

In reply to Srujana Challa

In the resource virtualization unit (RVU) each of the PF and AF (admin function) share a 64KB of reserved memory region for communication. This patch initializes PF <=> AF mailbox IRQs, registers handlers for processing these communication messages.

---
 drivers/crypto/marvell/octeontx2/Makefile     |   3 +-
 .../marvell/octeontx2/otx2_cpt_common.h       |   4 +
 .../marvell/octeontx2/otx2_cpt_mbox_common.c  |  37 +++++++
 drivers/crypto/marvell/octeontx2/otx2_cptpf.h |  12 +++
 .../marvell/octeontx2/otx2_cptpf_main.c       | 101 +++++++++++++++++-
 .../marvell/octeontx2/otx2_cptpf_mbox.c       |  80 ++++++++++++++
 6 files changed, 235 insertions(+), 2 deletions(-)
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c
drivers/crypto/marvell/octeontx2/Makefile +2 -1
index db763ad46a91..8c8262e94f78 100644
@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_CRYPTO_DEV_OCTEONTX2_CPT) += octeontx2-cpt.o
 
-octeontx2-cpt-objs := otx2_cptpf_main.o
+octeontx2-cpt-objs := otx2_cptpf_main.o otx2_cptpf_mbox.o \
+		      otx2_cpt_mbox_common.o
 
 ccflags-y += -I$(srctree)/drivers/net/ethernet/marvell/octeontx2/af
drivers/crypto/marvell/octeontx2/otx2_cpt_common.h +4 -0
index eff4ffa58dc4..b677f8c7e724 100644
@@ -12,6 +12,7 @@
 #include <linux/crypto.h>
 #include "otx2_cpt_hw_types.h"
 #include "rvu.h"
+#include "mbox.h"
 
 #define OTX2_CPT_RVU_FUNC_ADDR_S(blk, slot, offs) \
 		(((blk) << 20) | ((slot) << 12) | (offs))
@@ -29,4 +30,7 @@ static inline u64 otx2_cpt_read64(void __iomem *reg_base, u64 blk, u64 slot,
 	return readq_relaxed(reg_base +
 			     OTX2_CPT_RVU_FUNC_ADDR_S(blk, slot, offs));
 }
+
+int otx2_cpt_send_ready_msg(struct otx2_mbox *mbox, struct pci_dev *pdev);
+int otx2_cpt_send_mbox_msg(struct otx2_mbox *mbox, struct pci_dev *pdev);
 #endif /* __OTX2_CPT_COMMON_H */
drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c new file +37 -0
new file mode 100644
index 000000000000..a122483b5976
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright (C) 2020 Marvell. */
+
+#include "otx2_cpt_common.h"
+
+int otx2_cpt_send_mbox_msg(struct otx2_mbox *mbox, struct pci_dev *pdev)
+{
+	int ret;
+
+	otx2_mbox_msg_send(mbox, 0);
+	ret = otx2_mbox_wait_for_rsp(mbox, 0);
+	if (ret == -EIO) {
+		dev_err(&pdev->dev, "RVU MBOX timeout.\n");
+		return ret;
+	} else if (ret) {
+		dev_err(&pdev->dev, "RVU MBOX error: %d.\n", ret);
+		return -EFAULT;
+	}
+	return ret;
+}
+
+int otx2_cpt_send_ready_msg(struct otx2_mbox *mbox, struct pci_dev *pdev)
+{
+	struct mbox_msghdr *req;
+
+	req = otx2_mbox_alloc_msg_rsp(mbox, 0, sizeof(*req),
+				      sizeof(struct ready_msg_rsp));
+	if (req == NULL) {
+		dev_err(&pdev->dev, "RVU MBOX failed to get message.\n");
+		return -EFAULT;
+	}
+	req->id = MBOX_MSG_READY;
+	req->sig = OTX2_MBOX_REQ_SIG;
+	req->pcifunc = 0;
+
+	return otx2_cpt_send_mbox_msg(mbox, pdev);
+}
drivers/crypto/marvell/octeontx2/otx2_cptpf.h +12 -0
index 84cdc8cc2c15..87fe4c6838e5 100644
@@ -5,9 +5,21 @@
 #ifndef __OTX2_CPTPF_H
 #define __OTX2_CPTPF_H
 
+#include "otx2_cpt_common.h"
+
 struct otx2_cptpf_dev {
 	void __iomem *reg_base;		/* CPT PF registers start address */
+	void __iomem *afpf_mbox_base;	/* PF-AF mbox start address */
 	struct pci_dev *pdev;		/* PCI device handle */
+	/* AF <=> PF mbox */
+	struct otx2_mbox	afpf_mbox;
+	struct work_struct	afpf_mbox_work;
+	struct workqueue_struct *afpf_mbox_wq;
+
+	u8 pf_id;               /* RVU PF number */
 };
 
+irqreturn_t otx2_cptpf_afpf_mbox_intr(int irq, void *arg);
+void otx2_cptpf_afpf_mbox_handler(struct work_struct *work);
+
 #endif /* __OTX2_CPTPF_H */
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c +100 -1

126 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c new file +80 -0

80 lines not on this page · raw message

Signature · 1 line
2.28.0
author maintainer
#7 lore raw

PATCH v6 6/13 crypto: octeontx2: enable SR-IOV and mailbox communication with VF

In reply to Srujana Challa

Adds 'sriov_configure' to enable/disable virtual functions (VFs). Also Initializes VF<=>PF mailbox IRQs, register handlers for processing these mailbox messages.

Admin function (AF) handles resource allocation and configuration for PFs and their VFs. PFs request the AF directly, via mailboxes. Unlike PFs, VFs cannot send a mailbox request directly. A VF sends mailbox messages to its parent PF, with which it shares a mailbox region. The PF then forwards these messages to the AF. After handling the request, the AF sends a response back to the VF, through the PF.

This patch adds support for this 'VF <=> PF <=> AF' mailbox communication.

---
 .../marvell/octeontx2/otx2_cpt_common.h       |   1 +
 drivers/crypto/marvell/octeontx2/otx2_cptpf.h |  19 ++
 .../marvell/octeontx2/otx2_cptpf_main.c       | 209 +++++++++++++++++-
 .../marvell/octeontx2/otx2_cptpf_mbox.c       | 172 +++++++++++++-
 4 files changed, 393 insertions(+), 8 deletions(-)
drivers/crypto/marvell/octeontx2/otx2_cpt_common.h +1 -0
index b677f8c7e724..277c7c7f95cf 100644
@@ -14,6 +14,7 @@
 #include "rvu.h"
 #include "mbox.h"
 
+#define OTX2_CPT_MAX_VFS_NUM 128
 #define OTX2_CPT_RVU_FUNC_ADDR_S(blk, slot, offs) \
 		(((blk) << 20) | ((slot) << 12) | (offs))
 
drivers/crypto/marvell/octeontx2/otx2_cptpf.h +19 -0
index 87fe4c6838e5..c7c687cb091e 100644
@@ -7,19 +7,38 @@
 
 #include "otx2_cpt_common.h"
 
+struct otx2_cptpf_dev;
+struct otx2_cptvf_info {
+	struct otx2_cptpf_dev *cptpf;	/* PF pointer this VF belongs to */
+	struct work_struct vfpf_mbox_work;
+	struct pci_dev *vf_dev;
+	int vf_id;
+	int intr_idx;
+};
+
 struct otx2_cptpf_dev {
 	void __iomem *reg_base;		/* CPT PF registers start address */
 	void __iomem *afpf_mbox_base;	/* PF-AF mbox start address */
+	void __iomem *vfpf_mbox_base;   /* VF-PF mbox start address */
 	struct pci_dev *pdev;		/* PCI device handle */
+	struct otx2_cptvf_info vf[OTX2_CPT_MAX_VFS_NUM];
 	/* AF <=> PF mbox */
 	struct otx2_mbox	afpf_mbox;
 	struct work_struct	afpf_mbox_work;
 	struct workqueue_struct *afpf_mbox_wq;
 
+	/* VF <=> PF mbox */
+	struct otx2_mbox	vfpf_mbox;
+	struct workqueue_struct *vfpf_mbox_wq;
+
 	u8 pf_id;               /* RVU PF number */
+	u8 max_vfs;		/* Maximum number of VFs supported by CPT */
+	u8 enabled_vfs;		/* Number of enabled VFs */
 };
 
 irqreturn_t otx2_cptpf_afpf_mbox_intr(int irq, void *arg);
 void otx2_cptpf_afpf_mbox_handler(struct work_struct *work);
+irqreturn_t otx2_cptpf_vfpf_mbox_intr(int irq, void *arg);
+void otx2_cptpf_vfpf_mbox_handler(struct work_struct *work);
 
 #endif /* __OTX2_CPTPF_H */
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c +203 -6

247 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c +170 -2

196 lines not on this page · raw message

Signature · 1 line
2.28.0
author maintainer
#8 lore raw

PATCH v6 7/13 crypto: octeontx2: load microcode and create engine groups

In reply to Srujana Challa

CPT includes microcoded GigaCypher symmetric engines(SEs), IPsec symmetric engines(IEs), and asymmetric engines (AEs). Each engine receives CPT instructions from the engine groups it has subscribed to. This patch loads microcode, configures three engine groups(one for SEs, one for IEs and one for AEs), and configures all engines.

---
 drivers/crypto/marvell/octeontx2/Makefile     |    2 +-
 .../marvell/octeontx2/otx2_cpt_common.h       |   42 +
 .../marvell/octeontx2/otx2_cpt_mbox_common.c  |   77 +
 drivers/crypto/marvell/octeontx2/otx2_cptpf.h |    3 +
 .../marvell/octeontx2/otx2_cptpf_main.c       |   73 +
 .../marvell/octeontx2/otx2_cptpf_mbox.c       |   46 +-
 .../marvell/octeontx2/otx2_cptpf_ucode.c      | 1368 +++++++++++++++++
 .../marvell/octeontx2/otx2_cptpf_ucode.h      |  161 ++
 8 files changed, 1770 insertions(+), 2 deletions(-)
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h
drivers/crypto/marvell/octeontx2/Makefile +1 -1
index 8c8262e94f78..3c4155446296 100644
@@ -2,6 +2,6 @@
 obj-$(CONFIG_CRYPTO_DEV_OCTEONTX2_CPT) += octeontx2-cpt.o
 
 octeontx2-cpt-objs := otx2_cptpf_main.o otx2_cptpf_mbox.o \
-		      otx2_cpt_mbox_common.o
+		      otx2_cpt_mbox_common.o otx2_cptpf_ucode.o
 
 ccflags-y += -I$(srctree)/drivers/net/ethernet/marvell/octeontx2/af
drivers/crypto/marvell/octeontx2/otx2_cpt_common.h +42 -0

52 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c +77 -0

80 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf.h +3 -0
index c7c687cb091e..528a3975b9c2 100644
@@ -6,6 +6,7 @@
 #define __OTX2_CPTPF_H
 
 #include "otx2_cpt_common.h"
+#include "otx2_cptpf_ucode.h"
 
 struct otx2_cptpf_dev;
 struct otx2_cptvf_info {
@@ -22,6 +23,8 @@ struct otx2_cptpf_dev {
 	void __iomem *vfpf_mbox_base;   /* VF-PF mbox start address */
 	struct pci_dev *pdev;		/* PCI device handle */
 	struct otx2_cptvf_info vf[OTX2_CPT_MAX_VFS_NUM];
+	struct otx2_cpt_eng_grps eng_grps;/* Engine groups information */
+
 	/* AF <=> PF mbox */
 	struct otx2_mbox	afpf_mbox;
 	struct work_struct	afpf_mbox_work;
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c +73 -0

105 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c +45 -1

70 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c new file +1368 -0

1,368 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h new file +161 -0

161 lines not on this page · raw message

Signature · 1 line
2.28.0
author maintainer
#9 lore raw

PATCH v6 8/13 crypto: octeontx2: add LF framework

In reply to Srujana Challa

CPT RVU Local Functions(LFs) needs to be attached to the PF/VF to submit the instructions to CPT.
This patch adds the interface to initialize and attach the LFs. It also adds interface to register the LF's interrupts.

---
 drivers/crypto/marvell/octeontx2/Makefile     |   2 +-
 .../marvell/octeontx2/otx2_cpt_common.h       |   4 +
 .../marvell/octeontx2/otx2_cpt_mbox_common.c  |  56 +++
 drivers/crypto/marvell/octeontx2/otx2_cptlf.c | 426 ++++++++++++++++++
 drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 282 ++++++++++++
 drivers/crypto/marvell/octeontx2/otx2_cptpf.h |   2 +
 .../marvell/octeontx2/otx2_cptpf_mbox.c       |   8 +
 7 files changed, 779 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptlf.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptlf.h
drivers/crypto/marvell/octeontx2/Makefile +1 -1
index 3c4155446296..e47a55961bb8 100644
@@ -2,6 +2,6 @@
 obj-$(CONFIG_CRYPTO_DEV_OCTEONTX2_CPT) += octeontx2-cpt.o
 
 octeontx2-cpt-objs := otx2_cptpf_main.o otx2_cptpf_mbox.o \
-		      otx2_cpt_mbox_common.o otx2_cptpf_ucode.o
+		      otx2_cpt_mbox_common.o otx2_cptpf_ucode.o otx2_cptlf.o
 
 ccflags-y += -I$(srctree)/drivers/net/ethernet/marvell/octeontx2/af
drivers/crypto/marvell/octeontx2/otx2_cpt_common.h +4 -0
index ae16dc102459..d5576f5d3b90 100644
@@ -76,4 +76,8 @@ int otx2_cpt_read_af_reg(struct otx2_mbox *mbox, struct pci_dev *pdev,
 			 u64 reg, u64 *val);
 int otx2_cpt_write_af_reg(struct otx2_mbox *mbox, struct pci_dev *pdev,
 			  u64 reg, u64 val);
+struct otx2_cptlfs_info;
+int otx2_cpt_attach_rscrs_msg(struct otx2_cptlfs_info *lfs);
+int otx2_cpt_detach_rsrcs_msg(struct otx2_cptlfs_info *lfs);
+
 #endif /* __OTX2_CPT_COMMON_H */
drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c +56 -0

65 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptlf.c new file +426 -0

426 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptlf.h new file +282 -0

282 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf.h +2 -0
index 528a3975b9c2..15561fe50bc0 100644
@@ -7,6 +7,7 @@
 
 #include "otx2_cpt_common.h"
 #include "otx2_cptpf_ucode.h"
+#include "otx2_cptlf.h"
 
 struct otx2_cptpf_dev;
 struct otx2_cptvf_info {
@@ -24,6 +25,7 @@ struct otx2_cptpf_dev {
 	struct pci_dev *pdev;		/* PCI device handle */
 	struct otx2_cptvf_info vf[OTX2_CPT_MAX_VFS_NUM];
 	struct otx2_cpt_eng_grps eng_grps;/* Engine groups information */
+	struct otx2_cptlfs_info lfs;      /* CPT LFs attached to this PF */
 
 	/* AF <=> PF mbox */
 	struct otx2_mbox	afpf_mbox;
drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c +8 -0
index 8852a7e5e035..c9bb6b14876c 100644
@@ -207,6 +207,14 @@ static void process_afpf_mbox_msg(struct otx2_cptpf_dev *cptpf,
 		if (!rsp_rd_wr->is_write)
 			*rsp_rd_wr->ret_val = rsp_rd_wr->val;
 		break;
+	case MBOX_MSG_ATTACH_RESOURCES:
+		if (!msg->rc)
+			cptpf->lfs.are_lfs_attached = 1;
+		break;
+	case MBOX_MSG_DETACH_RESOURCES:
+		if (!msg->rc)
+			cptpf->lfs.are_lfs_attached = 0;
+		break;
 
 	default:
 		dev_err(dev,
Signature · 1 line
2.28.0
author maintainer
#10 lore raw

PATCH v6 9/13 crypto: octeontx2: add support to get engine capabilities

In reply to Srujana Challa

Adds support to get engine capabilities and adds a new mailbox to share the engine capabilities to CPT VFIO drivers.

---
 .../marvell/octeontx2/otx2_cpt_common.h       |  36 ++++
 .../marvell/octeontx2/otx2_cpt_reqmgr.h       |  51 ++++++
 drivers/crypto/marvell/octeontx2/otx2_cptlf.h |  62 +++++++
 drivers/crypto/marvell/octeontx2/otx2_cptpf.h |   3 +
 .../marvell/octeontx2/otx2_cptpf_main.c       |   5 +
 .../marvell/octeontx2/otx2_cptpf_mbox.c       |  31 ++++
 .../marvell/octeontx2/otx2_cptpf_ucode.c      | 165 ++++++++++++++++++
 .../marvell/octeontx2/otx2_cptpf_ucode.h      |   1 +
 8 files changed, 354 insertions(+)
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h
drivers/crypto/marvell/octeontx2/otx2_cpt_common.h +36 -0
index d5576f5d3b90..705a0503b962 100644
@@ -20,6 +20,7 @@
 
 #define OTX2_CPT_INVALID_CRYPTO_ENG_GRP 0xFF
 #define OTX2_CPT_NAME_LENGTH 64
+#define OTX2_CPT_DMA_MINALIGN 128
 
 #define BAD_OTX2_CPT_ENG_TYPE OTX2_CPT_MAX_ENG_TYPES
 
@@ -32,6 +33,7 @@ enum otx2_cpt_eng_type {
 
 /* Take mbox id from end of CPT mbox range in AF (range 0xA00 - 0xBFF) */
 #define MBOX_MSG_GET_ENG_GRP_NUM        0xBFF
+#define MBOX_MSG_GET_CAPS               0xBFD
 
 /*
  * Message request and response to get engine group number
@@ -49,6 +51,40 @@ struct otx2_cpt_egrp_num_rsp {
 	u8 eng_grp_num;
 };
 
+/* CPT HW capabilities */
+union otx2_cpt_eng_caps {
+	u64 u;
+	struct {
+		u64 reserved_0_4:5;
+		u64 mul:1;
+		u64 sha1_sha2:1;
+		u64 chacha20:1;
+		u64 zuc_snow3g:1;
+		u64 sha3:1;
+		u64 aes:1;
+		u64 kasumi:1;
+		u64 des:1;
+		u64 crc:1;
+		u64 reserved_14_63:50;
+	};
+};
+
+/*
+ * Message request and response to get HW capabilities for each
+ * engine type (SE, IE, AE).
+ * This messages are only used between CPT PF <=> CPT VF
+ */
+struct otx2_cpt_caps_msg {
+	struct mbox_msghdr hdr;
+};
+
+struct otx2_cpt_caps_rsp {
+	struct mbox_msghdr hdr;
+	u16 cpt_pf_drv_version;
+	u8 cpt_revision;
+	union otx2_cpt_eng_caps eng_caps[OTX2_CPT_MAX_ENG_TYPES];
+};
+
 static inline void otx2_cpt_write64(void __iomem *reg_base, u64 blk, u64 slot,
 				    u64 offs, u64 val)
 {
drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h new file +51 -0

51 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptlf.h +62 -0

77 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf.h +3 -0
index 15561fe50bc0..fabe9fd33ee7 100644
@@ -26,6 +26,9 @@ struct otx2_cptpf_dev {
 	struct otx2_cptvf_info vf[OTX2_CPT_MAX_VFS_NUM];
 	struct otx2_cpt_eng_grps eng_grps;/* Engine groups information */
 	struct otx2_cptlfs_info lfs;      /* CPT LFs attached to this PF */
+	/* HW capabilities for each engine type */
+	union otx2_cpt_eng_caps eng_caps[OTX2_CPT_MAX_ENG_TYPES];
+	bool is_eng_caps_discovered;
 
 	/* AF <=> PF mbox */
 	struct otx2_mbox	afpf_mbox;
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c +5 -0
index b1bd2e668898..548bf614dda5 100644
@@ -319,6 +319,11 @@ static int cptpf_sriov_enable(struct pci_dev *pdev, int numvfs)
 	if (ret)
 		goto free_mbox;
 
+	/* Get CPT HW capabilities using LOAD_FVC operation. */
+	ret = otx2_cpt_discover_eng_capabilities(cptpf);
+	if (ret)
+		goto disable_intr;
+
 	ret = otx2_cpt_create_eng_grps(cptpf->pdev, &cptpf->eng_grps);
 	if (ret)
 		goto disable_intr;
drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c +31 -0
index c9bb6b14876c..c273e6a2a3b7 100644
@@ -5,6 +5,12 @@
 #include "otx2_cptpf.h"
 #include "rvu_reg.h"
 
+/*
+ * CPT PF driver version, It will be incremented by 1 for every feature
+ * addition in CPT mailbox messages.
+ */
+#define OTX2_CPT_PF_DRV_VERSION 0x1
+
 static int forward_to_af(struct otx2_cptpf_dev *cptpf,
 			 struct otx2_cptvf_info *vf,
 			 struct mbox_msghdr *req, int size)
@@ -35,6 +41,28 @@ static int forward_to_af(struct otx2_cptpf_dev *cptpf,
 	return 0;
 }
 
+static int handle_msg_get_caps(struct otx2_cptpf_dev *cptpf,
+			       struct otx2_cptvf_info *vf,
+			       struct mbox_msghdr *req)
+{
+	struct otx2_cpt_caps_rsp *rsp;
+
+	rsp = (struct otx2_cpt_caps_rsp *)
+	      otx2_mbox_alloc_msg(&cptpf->vfpf_mbox, vf->vf_id,
+				  sizeof(*rsp));
+	if (!rsp)
+		return -ENOMEM;
+
+	rsp->hdr.id = MBOX_MSG_GET_CAPS;
+	rsp->hdr.sig = OTX2_MBOX_RSP_SIG;
+	rsp->hdr.pcifunc = req->pcifunc;
+	rsp->cpt_pf_drv_version = OTX2_CPT_PF_DRV_VERSION;
+	rsp->cpt_revision = cptpf->pdev->revision;
+	memcpy(&rsp->eng_caps, &cptpf->eng_caps, sizeof(rsp->eng_caps));
+
+	return 0;
+}
+
 static int handle_msg_get_eng_grp_num(struct otx2_cptpf_dev *cptpf,
 				      struct otx2_cptvf_info *vf,
 				      struct mbox_msghdr *req)
@@ -72,6 +100,9 @@ static int cptpf_handle_vf_req(struct otx2_cptpf_dev *cptpf,
 	case MBOX_MSG_GET_ENG_GRP_NUM:
 		err = handle_msg_get_eng_grp_num(cptpf, vf, req);
 		break;
+	case MBOX_MSG_GET_CAPS:
+		err = handle_msg_get_caps(cptpf, vf, req);
+		break;
 	default:
 		err = forward_to_af(cptpf, vf, req, size);
 		break;
drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.c +165 -0

174 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf_ucode.h +1 -0
index ab7a1461b095..2decbf2f1e4a 100644
@@ -157,5 +157,6 @@ int otx2_cpt_create_eng_grps(struct pci_dev *pdev,
 			     struct otx2_cpt_eng_grps *eng_grps);
 int otx2_cpt_disable_all_cores(struct otx2_cptpf_dev *cptpf);
 int otx2_cpt_get_eng_grp(struct otx2_cpt_eng_grps *eng_grps, int eng_type);
+int otx2_cpt_discover_eng_capabilities(struct otx2_cptpf_dev *cptpf);
 
 #endif /* __OTX2_CPTPF_UCODE_H */
Signature · 1 line
2.28.0
author maintainer
#11 lore raw

PATCH v6 10/13 crypto: octeontx2: add mailbox for inline-IPsec RX LF cfg

In reply to Srujana Challa

Add new mailbox message to configure a LF for RX inline-IPsec. This message is added to serve Marvell CPT VFIO driver, since a VF can not send mailbox messages to admin function(AF) directly.

---
 .../marvell/octeontx2/otx2_cpt_common.h       | 12 +++
 drivers/crypto/marvell/octeontx2/otx2_cptpf.h |  1 +
 .../marvell/octeontx2/otx2_cptpf_main.c       | 44 +++++++++
 .../marvell/octeontx2/otx2_cptpf_mbox.c       | 97 ++++++++++++++++++-
 4 files changed, 152 insertions(+), 2 deletions(-)
drivers/crypto/marvell/octeontx2/otx2_cpt_common.h +12 -0
index 705a0503b962..1642e4f92d7c 100644
@@ -17,6 +17,9 @@
 #define OTX2_CPT_MAX_VFS_NUM 128
 #define OTX2_CPT_RVU_FUNC_ADDR_S(blk, slot, offs) \
 		(((blk) << 20) | ((slot) << 12) | (offs))
+#define OTX2_CPT_RVU_PFFUNC(pf, func)	\
+		((((pf) & RVU_PFVF_PF_MASK) << RVU_PFVF_PF_SHIFT) | \
+		(((func) & RVU_PFVF_FUNC_MASK) << RVU_PFVF_FUNC_SHIFT))
 
 #define OTX2_CPT_INVALID_CRYPTO_ENG_GRP 0xFF
 #define OTX2_CPT_NAME_LENGTH 64
@@ -34,6 +37,7 @@ enum otx2_cpt_eng_type {
 /* Take mbox id from end of CPT mbox range in AF (range 0xA00 - 0xBFF) */
 #define MBOX_MSG_GET_ENG_GRP_NUM        0xBFF
 #define MBOX_MSG_GET_CAPS               0xBFD
+#define MBOX_MSG_RX_INLINE_IPSEC_LF_CFG 0xBFE
 
 /*
  * Message request and response to get engine group number
@@ -84,6 +88,14 @@ struct otx2_cpt_caps_rsp {
 	u8 cpt_revision;
 	union otx2_cpt_eng_caps eng_caps[OTX2_CPT_MAX_ENG_TYPES];
 };
+/*
+ * Message request to config cpt lf for inline inbound ipsec.
+ * This message is only used between CPT PF <=> CPT VF
+ */
+struct otx2_cpt_rx_inline_lf_cfg {
+	struct mbox_msghdr hdr;
+	u16 sso_pf_func;
+};
 
 static inline void otx2_cpt_write64(void __iomem *reg_base, u64 blk, u64 slot,
 				    u64 offs, u64 val)
drivers/crypto/marvell/octeontx2/otx2_cptpf.h +1 -0
index fabe9fd33ee7..7ed28c1176dd 100644
@@ -42,6 +42,7 @@ struct otx2_cptpf_dev {
 	u8 pf_id;               /* RVU PF number */
 	u8 max_vfs;		/* Maximum number of VFs supported by CPT */
 	u8 enabled_vfs;		/* Number of enabled VFs */
+	u8 sso_pf_func_ovrd;	/* SSO PF_FUNC override bit */
 };
 
 irqreturn_t otx2_cptpf_afpf_mbox_intr(int irq, void *arg);
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c +44 -0

63 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptpf_mbox.c +95 -2

125 lines not on this page · raw message

Signature · 1 line
2.28.0
author maintainer
#12 lore raw

PATCH v6 11/13 crypto: octeontx2: add virtual function driver support

In reply to Srujana Challa

Add support for the Marvell OcteonTX2 CPT virtual function driver. This patch includes probe, PCI specific initialization and interrupt handling.

---
 drivers/crypto/marvell/octeontx2/Makefile     |   4 +-
 .../marvell/octeontx2/otx2_cpt_common.h       |   1 +
 .../marvell/octeontx2/otx2_cpt_mbox_common.c  |  32 +++
 drivers/crypto/marvell/octeontx2/otx2_cptvf.h |  28 +++
 .../marvell/octeontx2/otx2_cptvf_main.c       | 201 ++++++++++++++++++
 .../marvell/octeontx2/otx2_cptvf_mbox.c       | 113 ++++++++++
 6 files changed, 378 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf.h
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c
drivers/crypto/marvell/octeontx2/Makefile +3 -1
index e47a55961bb8..ef6fb2ab3571 100644
@@ -1,7 +1,9 @@
 # SPDX-License-Identifier: GPL-2.0-only
-obj-$(CONFIG_CRYPTO_DEV_OCTEONTX2_CPT) += octeontx2-cpt.o
+obj-$(CONFIG_CRYPTO_DEV_OCTEONTX2_CPT) += octeontx2-cpt.o octeontx2-cptvf.o
 
 octeontx2-cpt-objs := otx2_cptpf_main.o otx2_cptpf_mbox.o \
 		      otx2_cpt_mbox_common.o otx2_cptpf_ucode.o otx2_cptlf.o
+octeontx2-cptvf-objs := otx2_cptvf_main.o otx2_cptvf_mbox.o otx2_cptlf.o \
+			otx2_cpt_mbox_common.o
 
 ccflags-y += -I$(srctree)/drivers/net/ethernet/marvell/octeontx2/af
drivers/crypto/marvell/octeontx2/otx2_cpt_common.h +1 -0
index 1642e4f92d7c..e95ec9786bf8 100644
@@ -127,5 +127,6 @@ int otx2_cpt_write_af_reg(struct otx2_mbox *mbox, struct pci_dev *pdev,
 struct otx2_cptlfs_info;
 int otx2_cpt_attach_rscrs_msg(struct otx2_cptlfs_info *lfs);
 int otx2_cpt_detach_rsrcs_msg(struct otx2_cptlfs_info *lfs);
+int otx2_cpt_msix_offset_msg(struct otx2_cptlfs_info *lfs);
 
 #endif /* __OTX2_CPT_COMMON_H */
drivers/crypto/marvell/octeontx2/otx2_cpt_mbox_common.c +32 -0
index 0933031ac827..51cb6404ded7 100644
@@ -168,3 +168,35 @@ int otx2_cpt_detach_rsrcs_msg(struct otx2_cptlfs_info *lfs)
 
 	return ret;
 }
+
+int otx2_cpt_msix_offset_msg(struct otx2_cptlfs_info *lfs)
+{
+	struct otx2_mbox *mbox = lfs->mbox;
+	struct pci_dev *pdev = lfs->pdev;
+	struct mbox_msghdr *req;
+	int ret, i;
+
+	req = otx2_mbox_alloc_msg_rsp(mbox, 0, sizeof(*req),
+				      sizeof(struct msix_offset_rsp));
+	if (req == NULL) {
+		dev_err(&pdev->dev, "RVU MBOX failed to get message.\n");
+		return -EFAULT;
+	}
+
+	req->id = MBOX_MSG_MSIX_OFFSET;
+	req->sig = OTX2_MBOX_REQ_SIG;
+	req->pcifunc = 0;
+	ret = otx2_cpt_send_mbox_msg(mbox, pdev);
+	if (ret)
+		return ret;
+
+	for (i = 0; i < lfs->lfs_num; i++) {
+		if (lfs->lf[i].msix_offset == MSIX_VECTOR_INVALID) {
+			dev_err(&pdev->dev,
+				"Invalid msix offset %d for LF %d\n",
+				lfs->lf[i].msix_offset, i);
+			return -EINVAL;
+		}
+	}
+	return ret;
+}
drivers/crypto/marvell/octeontx2/otx2_cptvf.h new file +28 -0
new file mode 100644
index 000000000000..4b01eb9d9f70
@@ -0,0 +1,28 @@
+/* SPDX-License-Identifier: GPL-2.0-only
+ * Copyright (C) 2020 Marvell.
+ */
+
+#ifndef __OTX2_CPTVF_H
+#define __OTX2_CPTVF_H
+
+#include "mbox.h"
+#include "otx2_cptlf.h"
+
+struct otx2_cptvf_dev {
+	void __iomem *reg_base;		/* Register start address */
+	void __iomem *pfvf_mbox_base;	/* PF-VF mbox start address */
+	struct pci_dev *pdev;		/* PCI device handle */
+	struct otx2_cptlfs_info lfs;	/* CPT LFs attached to this VF */
+	u8 vf_id;			/* Virtual function index */
+
+	/* PF <=> VF mbox */
+	struct otx2_mbox	pfvf_mbox;
+	struct work_struct	pfvf_mbox_work;
+	struct workqueue_struct *pfvf_mbox_wq;
+};
+
+irqreturn_t otx2_cptvf_pfvf_mbox_intr(int irq, void *arg);
+void otx2_cptvf_pfvf_mbox_handler(struct work_struct *work);
+int otx2_cptvf_send_eng_grp_num_msg(struct otx2_cptvf_dev *cptvf, int eng_type);
+
+#endif /* __OTX2_CPTVF_H */
drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c new file +201 -0

201 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c new file +113 -0

113 lines not on this page · raw message

Signature · 1 line
2.28.0
author maintainer
#13 lore raw

PATCH v6 12/13 crypto: octeontx2: add support to process the crypto request

In reply to Srujana Challa

Attach LFs to CPT VF to process the crypto requests and register LF interrupts.

---
 drivers/crypto/marvell/octeontx2/Makefile     |   2 +-
 .../marvell/octeontx2/otx2_cpt_reqmgr.h       | 145 +++++
 drivers/crypto/marvell/octeontx2/otx2_cptlf.h |   7 +
 .../marvell/octeontx2/otx2_cptvf_main.c       | 196 +++++++
 .../marvell/octeontx2/otx2_cptvf_mbox.c       |  26 +
 .../marvell/octeontx2/otx2_cptvf_reqmgr.c     | 532 ++++++++++++++++++
 6 files changed, 907 insertions(+), 1 deletion(-)
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c
drivers/crypto/marvell/octeontx2/Makefile +1 -1
index ef6fb2ab3571..41c0a5832b3f 100644
@@ -4,6 +4,6 @@ obj-$(CONFIG_CRYPTO_DEV_OCTEONTX2_CPT) += octeontx2-cpt.o octeontx2-cptvf.o
 octeontx2-cpt-objs := otx2_cptpf_main.o otx2_cptpf_mbox.o \
 		      otx2_cpt_mbox_common.o otx2_cptpf_ucode.o otx2_cptlf.o
 octeontx2-cptvf-objs := otx2_cptvf_main.o otx2_cptvf_mbox.o otx2_cptlf.o \
-			otx2_cpt_mbox_common.o
+			otx2_cpt_mbox_common.o otx2_cptvf_reqmgr.o
 
 ccflags-y += -I$(srctree)/drivers/net/ethernet/marvell/octeontx2/af
drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h +145 -0

161 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptlf.h +7 -0
index edf404f039cf..18cedfb06131 100644
@@ -80,6 +80,7 @@ struct otx2_cptlf_info {
 	u8 slot;                                /* Slot number of this LF */
 
 	struct otx2_cpt_inst_queue iqueue;/* Instruction queue */
+	struct otx2_cpt_pending_queue pqueue; /* Pending queue */
 	struct otx2_cptlf_wqe *wqe;       /* Tasklet work info */
 };
 
@@ -91,6 +92,7 @@ struct otx2_cptlfs_info {
 	struct otx2_mbox *mbox;
 	u8 are_lfs_attached;	/* Whether CPT LFs are attached */
 	u8 lfs_num;		/* Number of CPT LFs */
+	u8 kcrypto_eng_grp_num;	/* Kernel crypto engine group number */
 	atomic_t state;         /* LF's state. started/reset */
 };
 
@@ -333,6 +335,11 @@ static inline void otx2_cpt_send_cmd(union otx2_cpt_inst_s *cptinst,
 	} while (!ret);
 }
 
+static inline bool otx2_cptlf_started(struct otx2_cptlfs_info *lfs)
+{
+	return atomic_read(&lfs->state) == OTX2_CPTLF_STARTED;
+}
+
 int otx2_cptlf_init(struct otx2_cptlfs_info *lfs, u8 eng_grp_msk, int pri,
 		    int lfs_num);
 void otx2_cptlf_shutdown(struct otx2_cptlfs_info *lfs);
drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c +196 -0

221 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c +26 -0
index 417099a86742..092a5ab18417 100644
@@ -28,6 +28,7 @@ static void process_pfvf_mbox_mbox_msg(struct otx2_cptvf_dev *cptvf,
 				       struct mbox_msghdr *msg)
 {
 	struct otx2_cptlfs_info *lfs = &cptvf->lfs;
+	struct otx2_cpt_egrp_num_rsp *rsp_grp;
 	struct cpt_rd_wr_reg_msg *rsp_reg;
 	struct msix_offset_rsp *rsp_msix;
 	int i;
@@ -75,6 +76,10 @@ static void process_pfvf_mbox_mbox_msg(struct otx2_cptvf_dev *cptvf,
 		if (!rsp_reg->is_write)
 			*rsp_reg->ret_val = rsp_reg->val;
 		break;
+	case MBOX_MSG_GET_ENG_GRP_NUM:
+		rsp_grp = (struct otx2_cpt_egrp_num_rsp *) msg;
+		cptvf->lfs.kcrypto_eng_grp_num = rsp_grp->eng_grp_num;
+		break;
 	default:
 		dev_err(&cptvf->pdev->dev, "Unsupported msg %d received.\n",
 			msg->id);
@@ -111,3 +116,24 @@ void otx2_cptvf_pfvf_mbox_handler(struct work_struct *work)
 	}
 	otx2_mbox_reset(pfvf_mbox, 0);
 }
+
+int otx2_cptvf_send_eng_grp_num_msg(struct otx2_cptvf_dev *cptvf, int eng_type)
+{
+	struct otx2_mbox *mbox = &cptvf->pfvf_mbox;
+	struct pci_dev *pdev = cptvf->pdev;
+	struct otx2_cpt_egrp_num_msg *req;
+
+	req = (struct otx2_cpt_egrp_num_msg *)
+	      otx2_mbox_alloc_msg_rsp(mbox, 0, sizeof(*req),
+				      sizeof(struct otx2_cpt_egrp_num_rsp));
+	if (req == NULL) {
+		dev_err(&pdev->dev, "RVU MBOX failed to get message.\n");
+		return -EFAULT;
+	}
+	req->hdr.id = MBOX_MSG_GET_ENG_GRP_NUM;
+	req->hdr.sig = OTX2_MBOX_REQ_SIG;
+	req->hdr.pcifunc = OTX2_CPT_RVU_PFFUNC(cptvf->vf_id, 0);
+	req->eng_type = eng_type;
+
+	return otx2_cpt_send_mbox_msg(mbox, pdev);
+}
drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c new file +532 -0

532 lines not on this page · raw message

Signature · 1 line
2.28.0
author maintainer
#14 lore raw

PATCH v6 13/13 crypto: octeontx2: register with linux crypto framework

In reply to Srujana Challa

CPT offload module utilises the linux crypto framework to offload crypto processing. This patch registers supported algorithms by calling registration functions provided by the kernel crypto API.

The module currently supports:
- AES block cipher in CBC,ECB,XTS and CFB mode.
- 3DES block cipher in CBC and ECB mode.
- AEAD algorithms.
authenc(hmac(sha1),cbc(aes)),
authenc(hmac(sha256),cbc(aes)),
authenc(hmac(sha384),cbc(aes)),
authenc(hmac(sha512),cbc(aes)),
authenc(hmac(sha1),ecb(cipher_null)),
authenc(hmac(sha256),ecb(cipher_null)),
authenc(hmac(sha384),ecb(cipher_null)),
authenc(hmac(sha512),ecb(cipher_null)),
rfc4106(gcm(aes)).

---
 drivers/crypto/marvell/Kconfig                |    4 +
 drivers/crypto/marvell/octeontx2/Makefile     |    3 +-
 .../marvell/octeontx2/otx2_cpt_reqmgr.h       |    1 +
 .../marvell/octeontx2/otx2_cptvf_algs.c       | 1665 +++++++++++++++++
 .../marvell/octeontx2/otx2_cptvf_algs.h       |  170 ++
 .../marvell/octeontx2/otx2_cptvf_main.c       |   13 +-
 .../marvell/octeontx2/otx2_cptvf_reqmgr.c     |    7 +
 7 files changed, 1861 insertions(+), 2 deletions(-)
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c
 create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.h
drivers/crypto/marvell/Kconfig +4 -0
index 1440ec9e1fb4..2efbd79180ce 100644
@@ -40,8 +40,12 @@ config CRYPTO_DEV_OCTEONTX2_CPT
 	tristate "Marvell OcteonTX2 CPT driver"
 	depends on ARM64 || COMPILE_TEST
 	depends on PCI_MSI && 64BIT
+	depends on CRYPTO_LIB_AES
 	select OCTEONTX2_MBOX
 	select CRYPTO_DEV_MARVELL
+	select CRYPTO_SKCIPHER
+	select CRYPTO_HASH
+	select CRYPTO_AEAD
 	help
 		This driver allows you to utilize the Marvell Cryptographic
 		Accelerator Unit(CPT) found in OcteonTX2 series of processors.
drivers/crypto/marvell/octeontx2/Makefile +2 -1
index 41c0a5832b3f..b9c6201019e0 100644
@@ -4,6 +4,7 @@ obj-$(CONFIG_CRYPTO_DEV_OCTEONTX2_CPT) += octeontx2-cpt.o octeontx2-cptvf.o
 octeontx2-cpt-objs := otx2_cptpf_main.o otx2_cptpf_mbox.o \
 		      otx2_cpt_mbox_common.o otx2_cptpf_ucode.o otx2_cptlf.o
 octeontx2-cptvf-objs := otx2_cptvf_main.o otx2_cptvf_mbox.o otx2_cptlf.o \
-			otx2_cpt_mbox_common.o otx2_cptvf_reqmgr.o
+			otx2_cpt_mbox_common.o otx2_cptvf_reqmgr.o \
+			otx2_cptvf_algs.o
 
 ccflags-y += -I$(srctree)/drivers/net/ethernet/marvell/octeontx2/af
drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h +1 -0
index 5e191434ab98..60e57a13166f 100644
@@ -192,5 +192,6 @@ struct otx2_cptlf_wqe;
 int otx2_cpt_do_request(struct pci_dev *pdev, struct otx2_cpt_req_info *req,
 			int cpu_num);
 void otx2_cpt_post_process(struct otx2_cptlf_wqe *wqe);
+int otx2_cpt_get_kcrypto_eng_grp_num(struct pci_dev *pdev);
 
 #endif /* __OTX2_CPT_REQMGR_H */
drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c new file +1665 -0

1,665 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.h new file +170 -0

170 lines not on this page · raw message

drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c +12 -1
index 6798e42dfade..46829e9f2efd 100644
@@ -4,6 +4,7 @@
 #include "otx2_cpt_common.h"
 #include "otx2_cptvf.h"
 #include "otx2_cptlf.h"
+#include "otx2_cptvf_algs.h"
 #include <rvu_reg.h>
 
 #define OTX2_CPTVF_DRV_NAME "octeontx2-cptvf"
@@ -211,6 +212,8 @@ static void cptvf_lf_shutdown(struct otx2_cptlfs_info *lfs)
 	otx2_cptlf_free_irqs_affinity(lfs);
 	/* Disable instruction queue */
 	otx2_cptlf_disable_iqueues(lfs);
+	/* Unregister crypto algorithms */
+	otx2_cpt_crypto_exit(lfs->pdev, THIS_MODULE);
 	/* Unregister LFs interrupts */
 	otx2_cptlf_unregister_interrupts(lfs);
 	/* Cleanup LFs software side */
@@ -270,8 +273,16 @@ static int cptvf_lf_init(struct otx2_cptvf_dev *cptvf)
 		goto unregister_intr;
 
 	atomic_set(&lfs->state, OTX2_CPTLF_STARTED);
-
+	/* Register crypto algorithms */
+	ret = otx2_cpt_crypto_init(lfs->pdev, THIS_MODULE, lfs_num, 1);
+	if (ret) {
+		dev_err(&lfs->pdev->dev, "algorithms registration failed\n");
+		goto disable_irqs;
+	}
 	return 0;
+
+disable_irqs:
+	otx2_cptlf_free_irqs_affinity(lfs);
 unregister_intr:
 	otx2_cptlf_unregister_interrupts(lfs);
 cleanup_lf_sw:
drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c +7 -0
index 05fd59082b5a..b8d567ed9168 100644
@@ -530,3 +530,10 @@ void otx2_cpt_post_process(struct otx2_cptlf_wqe *wqe)
 	process_pending_queue(wqe->lfs->pdev,
 			      &wqe->lfs->lf[wqe->lf_num].pqueue);
 }
+
+int otx2_cpt_get_kcrypto_eng_grp_num(struct pci_dev *pdev)
+{
+	struct otx2_cptvf_dev *cptvf = pci_get_drvdata(pdev);
+
+	return cptvf->lfs.kcrypto_eng_grp_num;
+}
Signature · 1 line
2.28.0