Add Support for Marvell OcteonTX2
Subsystems (6)
Srujana Challa
maintainerv8 cover Add Support for Marvell OcteonTX2
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 v7:
* Removed writable entries in debugfs.
* Dropped IPsec support.
Changes since v6:
* Removed driver version.
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 (12):
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 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 | 123 ++ .../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 | 52 + .../marvell/octeontx2/otx2_cptpf_main.c | 570 ++++++ .../marvell/octeontx2/otx2_cptpf_mbox.c | 331 ++++ .../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 | 401 ++++ .../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 | 33 + .../net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- .../net/ethernet/marvell/octeontx2/af/rvu.h | 2 + .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 229 +++ .../marvell/octeontx2/af/rvu_debugfs.c | 304 +++ .../ethernet/marvell/octeontx2/af/rvu_reg.h | 63 +- .../marvell/octeontx2/nic/otx2_common.h | 13 +- include/linux/soc/marvell/octeontx2/asm.h | 29 + 30 files changed, 8038 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
Srujana Challa
maintainerPATCH v8 1/12 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
@@ -10476,6 +10476,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]>
@@ -10548,6 +10549,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
@@ -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
@@ -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
Srujana Challa
maintainerPATCH v8 2/12 octeontx2-af: add mailbox interface for CPT
In reply to Srujana ChallaOn 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.
--- .../ethernet/marvell/octeontx2/af/Makefile | 3 +- .../net/ethernet/marvell/octeontx2/af/mbox.h | 33 +++ .../net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- .../net/ethernet/marvell/octeontx2/af/rvu.h | 1 + .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 229 ++++++++++++++++++ .../ethernet/marvell/octeontx2/af/rvu_reg.h | 63 ++++- 6 files changed, 323 insertions(+), 8 deletions(-) create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.c
drivers/net/ethernet/marvell/octeontx2/af/Makefile +2 -1
@@ -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 +33 -0
@@ -158,6 +158,11 @@ M(NPA_HWCTX_DISABLE, 0x403, npa_hwctx_disable, hwctx_disable_req, msg_rsp)\/* SSO/SSOW mbox IDs (range 0x600 - 0x7FF) */ \/* TIM mbox IDs (range 0x800 - 0x9FF) */ \/* CPT mbox IDs (range 0xA00 - 0xBFF) */ \ +M (CPT_LF_ALLOC ,0xA00 , cpt_lf_alloc, cpt_lf_alloc_req_msg, \ + msg_rsp) \ +M(CPT_LF_FREE, 0xA01, cpt_lf_free, msg_req, msg_rsp) \ +M (CPT_RD_WR_REGISTER ,0xA02 , cpt_rd_wr_register, cpt_rd_wr_reg_msg, \ + cpt_rd_wr_reg_msg) \ /* NPC mbox IDs (range 0x6000 - 0x7FFF) */ \M (NPC_MCAM_ALLOC_ENTRY ,0x6000 , npc_mcam_alloc_entry, npc_mcam_alloc_entry_req,\ npc_mcam_alloc_entry_rsp) \
@@ -881,4 +886,32 @@ struct ptp_rsp { u64 clk; }; +/* CPT mailbox error codes +* Range 901 - 1000. +*/ +enum cpt_af_status { +CPT_AF_ERR_PARAM =-901 , +CPT_AF_ERR_GRP_INVALID =-902 , +CPT_AF_ERR_LF_INVALID =-903 , +CPT_AF_ERR_ACCESS_DENIED =-904 , +CPT_AF_ERR_SSO_PF_FUNC_INVALID =-905 , +CPT_AF_ERR_NIX_PF_FUNC_INVALID =-906 +}; + +/* CPT mbox message formats */ +struct cpt_rd_wr_reg_msg { +struct mbox_msghdr hdr; +u64 reg_offset; +u64 *ret_val; +u64 val; +u8 is_write; +}; + +struct cpt_lf_alloc_req_msg { +struct mbox_msghdr hdr; +u16 nix_pf_func; +u16 sso_pf_func; +u16 eng_grpmsk; +}; +#endif /* MBOX_H */
drivers/net/ethernet/marvell/octeontx2/af/rvu.c +1 -1
@@ -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
@@ -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 +229 -0
229 lines not on this page · raw message
drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h +57 -6
69 lines not on this page · raw message
Signature · 1 line
2.28.0
Re: [PATCH v8,net-next,02/12] octeontx2-af: add mailbox interface for CPT
Quoted 82 lines · 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.
Signed-off-by Suheil Chandran <[email protected]>Signed-off-by Srujana Challa <[email protected]>--- .../ethernet/marvell/octeontx2/af/Makefile | 3 +- .../net/ethernet/marvell/octeontx2/af/mbox.h | 33 +++ .../net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- .../net/ethernet/marvell/octeontx2/af/rvu.h | 1 + .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 229 ++++++++++++++++++ .../ethernet/marvell/octeontx2/af/rvu_reg.h | 63 ++++- 6 files changed, 323 insertions(+), 8 deletions(-) create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.cdrivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h +49
-6@@ -429,12 +429,63 @@#define TIM_AF_LF_RST (0x20)/* CPT */ -#define CPT_AF_CONSTANTS0 (0x0000) -#define CPT_PRIV_LFX_CFG (0x41000) -#define CPT_PRIV_LFX_INT_CFG (0x43000) -#define CPT_AF_RVU_LF_CFG_DEBUG (0x45000) -#define CPT_AF_LF_RST (0x44000) -#define CPT_AF_BLK_RST (0x46000) +#define CPT_AF_CONSTANTS0 (0x0000) +#define CPT_AF_CONSTANTS1 (0x1000) +#define CPT_AF_DIAG (0x3000) +#define CPT_AF_ECO (0x4000) +#define CPT_AF_FLTX_INT (a) (0xa000ull | (u64)(a) << 3) +#define CPT_AF_FLTX_INT_W1S (a) (0xb000ull | (u64)(a) << 3) +#define CPT_AF_FLTX_INT_ENA_W1C (a) (0xc000ull | (u64)(a) << 3) +#define CPT_AF_FLTX_INT_ENA_W1S (a) (0xd000ull | (u64)(a) << 3) +#define CPT_AF_PSNX_EXE (a) (0xe000ull | (u64)(a) << 3) +#define CPT_AF_PSNX_EXE_W1S (a) (0xf000ull | (u64)(a) << 3) +#define CPT_AF_PSNX_LF (a) (0x10000ull | (u64)(a) << 3) +#define CPT_AF_PSNX_LF_W1S (a) (0x11000ull | (u64)(a) << 3) +#define CPT_AF_EXEX_CTL2 (a) (0x12000ull | (u64)(a) << 3) +#define CPT_AF_EXEX_STS (a) (0x13000ull | (u64)(a) << 3) +#define CPT_AF_EXE_ERR_INFO (0x14000) +#define CPT_AF_EXEX_ACTIVE (a) (0x16000ull | (u64)(a) << 3) +#define CPT_AF_INST_REQ_PC (0x17000) +#define CPT_AF_INST_LATENCY_PC (0x18000) +#define CPT_AF_RD_REQ_PC (0x19000) +#define CPT_AF_RD_LATENCY_PC (0x1a000) +#define CPT_AF_RD_UC_PC (0x1b000) +#define CPT_AF_ACTIVE_CYCLES_PC (0x1c000) +#define CPT_AF_EXE_DBG_CTL (0x1d000) +#define CPT_AF_EXE_DBG_DATA (0x1e000) +#define CPT_AF_EXE_REQ_TIMER (0x1f000) +#define CPT_AF_EXEX_CTL (a) (0x20000ull | (u64)(a) << 3) +#define CPT_AF_EXE_PERF_CTL (0x21000) +#define CPT_AF_EXE_DBG_CNTX (a) (0x22000ull | (u64)(a) << 3) +#define CPT_AF_EXE_PERF_EVENT_CNT (0x23000) +#define CPT_AF_EXE_EPCI_INBX_CNT (a) (0x24000ull | (u64)(a) << 3) +#define CPT_AF_EXE_EPCI_OUTBX_CNT (a) (0x25000ull | (u64)(a) << 3) +#define CPT_AF_EXEX_UCODE_BASE (a) (0x26000ull | (u64)(a) << 3) +#define CPT_AF_LFX_CTL (a) (0x27000ull | (u64)(a) << 3) +#define CPT_AF_LFX_CTL2 (a) (0x29000ull | (u64)(a) << 3) +#define CPT_AF_CPTCLK_CNT (0x2a000) +#define CPT_AF_PF_FUNC (0x2b000) +#define CPT_AF_LFX_PTR_CTL (a) (0x2c000ull | (u64)(a) << 3) +#define CPT_AF_GRPX_THR (a) (0x2d000ull | (u64)(a) << 3) +#define CPT_AF_CTL (0x2e000ull) +#define CPT_AF_XEX_THR (a) (0x2f000ull | (u64)(a) << 3) +#define CPT_PRIV_LFX_CFG (0x41000) +#define CPT_PRIV_AF_INT_CFG (0x42000) +#define CPT_PRIV_LFX_INT_CFG (0x43000) +#define CPT_AF_LF_RST (0x44000) +#define CPT_AF_RVU_LF_CFG_DEBUG (0x45000) +#define CPT_AF_BLK_RST (0x46000) +#define CPT_AF_RVU_INT (0x47000) +#define CPT_AF_RVU_INT_W1S (0x47008) +#define CPT_AF_RVU_INT_ENA_W1S (0x47010)
drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h line 490
Quoted 10 lines
drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h +8
-0+#define CPT_AF_RVU_INT_ENA_W1C (0x47018) +#define CPT_AF_RAS_INT (0x47020) +#define CPT_AF_RAS_INT_W1S (0x47028) +#define CPT_AF_RAS_INT_ENA_W1S (0x47030) +#define CPT_AF_RAS_INT_ENA_W1C (0x47038) + +#define CPT_AF_LF_CTL2_SHIFT 3 +#define CPT_AF_LF_SSO_PF_FUNC_SHIFT 32#define NPC_AF_BLK_RST (0x00040)
Most of these are not related to this patch. Used only in the follow-on debug interface one?
Srujana Challa
maintainerRE: [EXT] Re: [PATCH v8,net-next,02/12] octeontx2-af: add mailbox interface for CPT
Quoted 93 lines · Srujana Challa
Quoted 19 lines
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.
Signed-off-by Suheil Chandran <[email protected]>Signed-off-by Srujana Challa <[email protected]>--- .../ethernet/marvell/octeontx2/af/Makefile | 3 +- .../net/ethernet/marvell/octeontx2/af/mbox.h | 33 +++ .../net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- .../net/ethernet/marvell/octeontx2/af/rvu.h | 1 + .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 229 ++++++++++++++++++ .../ethernet/marvell/octeontx2/af/rvu_reg.h | 63 ++++- 6 files changed, 323 insertions(+), 8 deletions(-) create mode 100644 drivers/net/ethernet/marvell/octeontx2/af/rvu_cpt.cReview
Quoted 1 line
(quoted diff) +0
-0
b/drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.hQuoted 71 lines
index
7ca599b973c0..807b1c1a9d85100644drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h +57
-6@@ -429,12 +429,63 @@#define TIM_AF_LF_RST (0x20)/* CPT */ -#define CPT_AF_CONSTANTS0 (0x0000) -#define CPT_PRIV_LFX_CFG (0x41000) -#define CPT_PRIV_LFX_INT_CFG (0x43000) -#define CPT_AF_RVU_LF_CFG_DEBUG (0x45000) -#define CPT_AF_LF_RST (0x44000) -#define CPT_AF_BLK_RST (0x46000) +#define CPT_AF_CONSTANTS0 (0x0000) +#define CPT_AF_CONSTANTS1 (0x1000) +#define CPT_AF_DIAG (0x3000) +#define CPT_AF_ECO (0x4000) +#define CPT_AF_FLTX_INT (a) (0xa000ull | (u64)(a) << 3) +#define CPT_AF_FLTX_INT_W1S (a) (0xb000ull | (u64)(a) << 3) +#define CPT_AF_FLTX_INT_ENA_W1C (a) (0xc000ull | (u64)(a) << 3) +#define CPT_AF_FLTX_INT_ENA_W1S (a) (0xd000ull | (u64)(a) << 3) +#define CPT_AF_PSNX_EXE (a) (0xe000ull | (u64)(a) << 3) +#define CPT_AF_PSNX_EXE_W1S (a) (0xf000ull | (u64)(a) << 3) +#define CPT_AF_PSNX_LF (a) (0x10000ull | (u64)(a) << 3) +#define CPT_AF_PSNX_LF_W1S (a) (0x11000ull | (u64)(a) << 3) +#define CPT_AF_EXEX_CTL2 (a) (0x12000ull | (u64)(a) << 3) +#define CPT_AF_EXEX_STS (a) (0x13000ull | (u64)(a) << 3) +#define CPT_AF_EXE_ERR_INFO (0x14000) +#define CPT_AF_EXEX_ACTIVE (a) (0x16000ull | (u64)(a) << 3) +#define CPT_AF_INST_REQ_PC (0x17000) +#define CPT_AF_INST_LATENCY_PC (0x18000) +#define CPT_AF_RD_REQ_PC (0x19000) +#define CPT_AF_RD_LATENCY_PC (0x1a000) +#define CPT_AF_RD_UC_PC (0x1b000) +#define CPT_AF_ACTIVE_CYCLES_PC (0x1c000) +#define CPT_AF_EXE_DBG_CTL (0x1d000) +#define CPT_AF_EXE_DBG_DATA (0x1e000) +#define CPT_AF_EXE_REQ_TIMER (0x1f000) +#define CPT_AF_EXEX_CTL (a) (0x20000ull | (u64)(a) << 3) +#define CPT_AF_EXE_PERF_CTL (0x21000) +#define CPT_AF_EXE_DBG_CNTX (a) (0x22000ull | (u64)(a) << 3) +#define CPT_AF_EXE_PERF_EVENT_CNT (0x23000) +#define CPT_AF_EXE_EPCI_INBX_CNT (a) (0x24000ull | (u64)(a) << 3) +#define CPT_AF_EXE_EPCI_OUTBX_CNT (a) (0x25000ull | (u64)(a) << 3) +#define CPT_AF_EXEX_UCODE_BASE (a) (0x26000ull | (u64)(a) << 3) +#define CPT_AF_LFX_CTL (a) (0x27000ull | (u64)(a) << 3) +#define CPT_AF_LFX_CTL2 (a) (0x29000ull | (u64)(a) << 3) +#define CPT_AF_CPTCLK_CNT (0x2a000) +#define CPT_AF_PF_FUNC (0x2b000) +#define CPT_AF_LFX_PTR_CTL (a) (0x2c000ull | (u64)(a) << 3) +#define CPT_AF_GRPX_THR (a) (0x2d000ull | (u64)(a) << 3) +#define CPT_AF_CTL (0x2e000ull) +#define CPT_AF_XEX_THR (a) (0x2f000ull | (u64)(a) << 3) +#define CPT_PRIV_LFX_CFG (0x41000) +#define CPT_PRIV_AF_INT_CFG (0x42000) +#define CPT_PRIV_LFX_INT_CFG (0x43000) +#define CPT_AF_LF_RST (0x44000) +#define CPT_AF_RVU_LF_CFG_DEBUG (0x45000) +#define CPT_AF_BLK_RST (0x46000) +#define CPT_AF_RVU_INT (0x47000) +#define CPT_AF_RVU_INT_W1S (0x47008) +#define CPT_AF_RVU_INT_ENA_W1S (0x47010) +#define CPT_AF_RVU_INT_ENA_W1C (0x47018) +#define CPT_AF_RAS_INT (0x47020) +#define CPT_AF_RAS_INT_W1S (0x47028) +#define CPT_AF_RAS_INT_ENA_W1S (0x47030) +#define CPT_AF_RAS_INT_ENA_W1C (0x47038) + +#define CPT_AF_LF_CTL2_SHIFT 3 +#define CPT_AF_LF_SSO_PF_FUNC_SHIFT 32
Quoted 4 lines
drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h line 490
Quoted 1 line
drivers/net/ethernet/marvell/octeontx2/af/rvu_reg.h +0
-0#define NPC_AF_BLK_RST (0x00040)Most of these are not related to this patch. Used only in the follow-on debug interface one?
Added all hardware CPT AF register defines here. I will add this point to the patch description in next version. Thanks.
Srujana Challa
maintainerPATCH v8 3/12 octeontx2-af: add debugfs entries for CPT block
In reply to Srujana ChallaAdd 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_ae_sts: show cpt asymmetric engines current state Usage:
cat /sys/kernel/debug/octeontx2/cpt/cpt_ae_sts
cpt_se_sts: show cpt symmetric engines current state Usage:
cat /sys/kernel/debug/octeontx2/cpt/cpt_se_sts
cpt_engines_info: dump cpt engine control registers. Usage:
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:
cat /sys/kernel/debug/octeontx2/cpt/cpt_err_info
--- .../net/ethernet/marvell/octeontx2/af/rvu.h | 1 + .../marvell/octeontx2/af/rvu_debugfs.c | 304 ++++++++++++++++++ 2 files changed, 305 insertions(+)
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +1 -0
@@ -50,6 +50,7 @@ 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;
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c +304 -0
316 lines not on this page · raw message
Signature · 1 line
2.28.0
Re: [PATCH v8,net-next,03/12] octeontx2-af: add debugfs entries for CPT block
Quoted 150 lines · 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_ae_sts: show cpt asymmetric engines current state Usage:
cat/sys/kernel/debug/octeontx2/cpt/cpt_ae_sts
cpt_se_sts: show cpt symmetric engines current state Usage:
cat/sys/kernel/debug/octeontx2/cpt/cpt_se_sts
cpt_engines_info: dump cpt engine control registers. Usage:
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:
cat/sys/kernel/debug/octeontx2/cpt/cpt_err_infoSigned-off-by Suheil Chandran <[email protected]>Signed-off-by Srujana Challa <[email protected]>--- .../net/ethernet/marvell/octeontx2/af/rvu.h | 1 + .../marvell/octeontx2/af/rvu_debugfs.c | 304 ++++++++++++++++++ 2 files changed, 305 insertions(+)drivers/net/ethernet/marvell/octeontx2/af/rvu.h +1
-0@@ -50,6 +50,7 @@ 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;drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c +96
-0@@ -1676,6 +1676,309 @@ static void rvu_dbg_npc_init(struct rvu *rvu)debugfs_remove_recursive (rvu->rvu_dbg.npc); } +/* CPT debugfs APIs */ +static int rvu_dbg_cpt_ae_sts_display (struct seq_file *filp,void *unused) +{ +struct rvu *rvu = filp->private; +u64 busy_sts =0 , free_sts =0 ; +u32 e_min =0 , e_max =0 , e, i; +u16 max_ses, max_ies, max_aes; +int blkaddr; +u64 reg; + + blkaddr =rvu_get_blkaddr (rvu,BLKTYPE_CPT ,0 ); +if (blkaddr <0 ) +return -ENODEV ; + + reg =rvu_read64 (rvu, blkaddr,CPT_AF_CONSTANTS1 ); + max_ses = reg &0xffff ; + max_ies = (reg >>16 ) &0xffff ; + max_aes = (reg >>32 ) &0xffff ; + + e_min = max_ses + max_ies; + e_max = max_ses + max_ies + max_aes; + +for (e = e_min, i =0 ; e < e_max; e++, i++) { + reg =rvu_read64 (rvu, blkaddr,CPT_AF_EXEX_STS (e)); +if (reg &0x1 ) + busy_sts |=1ULL << i; + +if (reg &0x2 ) + free_sts |=1ULL << i; + } +seq_printf (filp,"FREE STS : 0x%016llx\n" , free_sts); +seq_printf (filp,"BUSY STS : 0x%016llx\n" , busy_sts); + +return 0 ; +} + +RVU_DEBUG_SEQ_FOPS (cpt_ae_sts, cpt_ae_sts_display,NULL ); + +static int rvu_dbg_cpt_se_sts_display (struct seq_file *filp,void *unused) +{ +struct rvu *rvu = filp->private; +u64 busy_sts =0 , free_sts =0 ; +u32 e_min =0 , e_max =0 , e; +u16 max_ses; +int blkaddr; +u64 reg; + + blkaddr =rvu_get_blkaddr (rvu,BLKTYPE_CPT ,0 ); +if (blkaddr <0 ) +return -ENODEV ; + + reg =rvu_read64 (rvu, blkaddr,CPT_AF_CONSTANTS1 ); + max_ses = reg &0xffff ; + + e_min =0 ; + e_max = max_ses; + +for (e = e_min; e < e_max; e++) { + reg =rvu_read64 (rvu, blkaddr,CPT_AF_EXEX_STS (e)); +if (reg &0x1 ) + busy_sts |=1ULL << e; + +if (reg &0x2 ) + free_sts |=1ULL << e; + } +seq_printf (filp,"FREE STS : 0x%016llx\n" , free_sts); +seq_printf (filp,"BUSY STS : 0x%016llx\n" , busy_sts); + +return 0 ; +} + +RVU_DEBUG_SEQ_FOPS (cpt_se_sts, cpt_se_sts_display,NULL ); + +static int rvu_dbg_cpt_ie_sts_display (struct seq_file *filp,void *unused) +{ +struct rvu *rvu = filp->private; +u64 busy_sts =0 , free_sts =0 ; +u32 e_min =0 , e_max =0 , e, i; +u16 max_ses, max_ies; +int blkaddr; +u64 reg; + + blkaddr =rvu_get_blkaddr (rvu,BLKTYPE_CPT ,0 ); +if (blkaddr <0 ) +return -ENODEV ; + + reg =rvu_read64 (rvu, blkaddr,CPT_AF_CONSTANTS1 ); + max_ses = reg &0xffff ; + max_ies = (reg >>16 ) &0xffff ; + + e_min = max_ses; + e_max = max_ses + max_ies; + +for (e = e_min, i =0 ; e < e_max; e++, i++) { + reg =rvu_read64 (rvu, blkaddr,CPT_AF_EXEX_STS (e)); +if (reg &0x1 )
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c static void rvu_dbg_npc_init(struct rvu *rvu) · line 1784
Quoted 10 lines
drivers/net/ethernet/marvell/octeontx2/af/rvu_debugfs.c +10
-0+ busy_sts |=1ULL << i; + +if (reg &0x2 ) + free_sts |=1ULL << i; + } +seq_printf (filp,"FREE STS : 0x%016llx\n" , free_sts); +seq_printf (filp,"BUSY STS : 0x%016llx\n" , busy_sts); + +return 0 ; +}
The above three are very similar. Could they use a single helper?
Srujana Challa
maintainerPATCH v8 4/12 drivers: crypto: add Marvell OcteonTX2 CPT PF driver
In reply to Srujana ChallaAdds 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 | 106 ++++ 7 files changed, 632 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 +106 -0
106 lines not on this page · raw message
Signature · 1 line
2.28.0
Srujana Challa
maintainerPATCH v8 5/12 crypto: octeontx2: add mailbox communication with AF
In reply to Srujana ChallaIn 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
@@ -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
@@ -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
@@ -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
@@ -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
Srujana Challa
maintainerPATCH v8 6/12 crypto: octeontx2: enable SR-IOV and mailbox communication with VF
In reply to Srujana ChallaAdds '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 | 287 ++++++++++++++++++ .../marvell/octeontx2/otx2_cptpf_mbox.c | 172 ++++++++++- 4 files changed, 477 insertions(+), 2 deletions(-)
drivers/crypto/marvell/octeontx2/otx2_cpt_common.h +1 -0
@@ -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
@@ -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 +287 -0
317 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
Srujana Challa
maintainerPATCH v8 7/12 crypto: octeontx2: load microcode and create engine groups
In reply to Srujana ChallaCPT 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
@@ -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
@@ -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
Srujana Challa
maintainerPATCH v8 8/12 crypto: octeontx2: add LF framework
In reply to Srujana ChallaCPT 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
@@ -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
@@ -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
@@ -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
@@ -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
Srujana Challa
maintainerPATCH v8 9/12 crypto: octeontx2: add support to get engine capabilities
In reply to Srujana ChallaAdds support to get engine capabilities and adds a new mailbox to share capabilities with VF driver.
--- .../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
@@ -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
@@ -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
@@ -408,6 +408,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
@@ -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
@@ -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
Srujana Challa
maintainerPATCH v8 10/12 crypto: octeontx2: add virtual function driver support
In reply to Srujana ChallaAdd 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 | 194 ++++++++++++++++++ .../marvell/octeontx2/otx2_cptvf_mbox.c | 113 ++++++++++ 6 files changed, 371 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
@@ -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
@@ -115,5 +115,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
@@ -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
@@ -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 +194 -0
194 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
Srujana Challa
maintainerPATCH v8 11/12 crypto: octeontx2: add support to process the crypto request
In reply to Srujana ChallaAttach LFs to CPT VF to process the crypto requests and register LF interrupts.
--- drivers/crypto/marvell/octeontx2/Makefile | 2 +- .../marvell/octeontx2/otx2_cpt_common.h | 3 + .../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 ++++++++++++++++++ 7 files changed, 910 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c
drivers/crypto/marvell/octeontx2/Makefile +1 -1
@@ -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_common.h +3 -0
@@ -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
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
@@ -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
@@ -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
Re: [PATCH v8,net-next,11/12] crypto: octeontx2: add support to process the crypto request
Quoted 27 lines · Srujana Challa
Attach LFs to CPT VF to process the crypto requests and register LF interrupts.
Signed-off-by Suheil Chandran <[email protected]>Signed-off-by Srujana Challa <[email protected]>--- drivers/crypto/marvell/octeontx2/Makefile | 2 +- .../marvell/octeontx2/otx2_cpt_common.h | 3 + .../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 ++++++++++++++++++ 7 files changed, 910 insertions(+), 1 deletion(-) create mode 100644 drivers/crypto/marvell/octeontx2/otx2_cptvf_reqmgr.cdrivers/crypto/marvell/octeontx2/otx2_cptvf_main.c +9
-0+static int init_tasklet_work (struct otx2_cptlfs_info *lfs) +{ +struct otx2_cptlf_wqe *wqe; +int i, ret =0 ; + +for (i =0 ; i < lfs->lfs_num; i++) { + wqe =kzalloc (sizeof (struct otx2_cptlf_wqe ),GFP_KERNEL ); +if (!wqe) { + ret = -ENOMEM ;
drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c static void cptvf_pfvf_mbox_destroy(struct otx2_cptvf_dev *cptvf) · line 135
Quoted 10 lines
drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c +10
-0+ goto cleanup_tasklet; + } + +tasklet_init (&wqe->work, cptlf_work_handler, (u64 ) wqe); + wqe->lfs = lfs; + wqe->lf_num = i; + lfs->lf[i].wqe = wqe; + } +return 0 ; +cleanup_tasklet:
nit: here and elsewhere, please leave an empty line between the return statement and subsequent label.
Srujana Challa
maintainerPATCH v8 12/12 crypto: octeontx2: register with linux crypto framework
In reply to Srujana ChallaCPT 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
Re: [PATCH v8,net-next,12/12] crypto: octeontx2: register with linux crypto framework
Quoted 19 lines · 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)).
Quoted 8 lines
Signed-off-by Suheil Chandran <[email protected]>Signed-off-by Srujana Challa <[email protected]>--- 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 ++
These files are almost verbatim copies of .../marvell/octeontx/otx_cptvf_algs.(ch), with the usual name changes otx_ to otx2_
Is there some way to avoid code duplication? I guess this is not uncommon for subsequent hardware device drivers from the same vendor.
If nothing else, knowing this makes reviewing a lot easier.
Quoted 105 lines · Srujana Challa
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.rstThe 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_TESTSenabled andCRYPTO_DISABLE_TESTSdisabled.Changes since v7:
* Removed writable entries in debugfs.
* Dropped IPsec support.
Changes since v6:
* Removed driver version.
Changes since v4:
* Rebased the patches onto net-next tree with base
'commitbc081a693a56("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 underinclude/linux/soc/
Changes since v1:
* MovedMakefilechanges from patch4 to patch2 and patch3.Srujana Challa (12):
octeontx2-pf: move lmt flush toinclude/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 virtual function driver support
crypto: octeontx2: add support to process the crypto request
crypto: octeontx2: register with linux crypto frameworkMAINTAINERS | 2 + drivers/crypto/marvell/Kconfig | 14 + drivers/crypto/marvell/Makefile | 1 + drivers/crypto/marvell/octeontx2/Makefile | 10 + .../marvell/octeontx2/otx2_cpt_common.h | 123 ++ .../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 | 52 + .../marvell/octeontx2/otx2_cptpf_main.c | 570 ++++++ .../marvell/octeontx2/otx2_cptpf_mbox.c | 331 ++++ .../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 | 401 ++++ .../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 | 33 + .../net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- .../net/ethernet/marvell/octeontx2/af/rvu.h | 2 + .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 229 +++ .../marvell/octeontx2/af/rvu_debugfs.c | 304 +++ .../ethernet/marvell/octeontx2/af/rvu_reg.h | 63 +- .../marvell/octeontx2/nic/otx2_common.h | 13 +- include/linux/soc/marvell/octeontx2/asm.h | 29 + 30 files changed, 8038 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
Quoted 8 lines
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
For netdrv review. I don't have a lot of detailed feedback. Overall it looks sensible to me.
It is obviously a big beast of a patchset. Looking at previous review comments, the documentation is now a lot better, which helps follow the thread.
The point about parsing tar files remains open. In general error-prone parsing is better left to userspace. In practice this is not a lot of code, nor terribly complex.
The other point is that some files are very close to their oncteontx counterparts. With minor cleanups, such as using in-place cpu_to_be64s swap. Those cleanups probably make sense to the older device, too. One option would be to apply them there first, then copy the files and use coccinelle for mass renaming. But frankly that is a lot of extra work to arrive at the same state. I just used --color-words=. --no-index to perform an iterative review, which works well enough.
Jakub Kicinski
maintainerQuoted 2 lines · On Sat, 31 Oct 2020 15:28:59 -0400 Willem de Bruijn wrote:
The point about parsing tar files remains open. In general error-prone parsing is better left to userspace.
The tar files have to go. Srujana said they have 3 files to load, just load them individually.
Srujana Challa
maintainerQuoted 8 lines
Subject: Re: [PATCH v8,net-next,00/12] Add Support for Marvell OcteonTX2
Quoted 2 lines · On Sat, 31 Oct 2020 15:28:59 -0400 Willem de Bruijn wrote:
The point about parsing tar files remains open. In general error-prone parsing is better left to userspace.
The tar files have to go. Srujana said they have 3 files to load, just load them individually.
Okay, I will do the changes and submit next version.
Srujana Challa
maintainerQuoted 133 lines · Srujana Challa
Quoted 11 lines
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://urldefense.proofpoint.com/v2/url?u=https-3A__www.kernel.org_doc_Documentation_networking_device- 5Fdrivers_marvell_octeontx2.rst&d=DwIBaQ&c=nKjWec2b6R0mOyPaz7xtfQ&r=Fj 4OoD5hcKFpANhTWdwQzjT1Jpf7veC5263T47JVpnc&m=NJ9fKbMEy2o3y4ca5r- kkUR9gadv3CZqF3CJSDvXpnM&s=ScxKfEYpF9bGu2bsz15tQSKhM58NJpMe2- 7sxjT_yiI&e=
Quoted 20 lines
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_TESTSenabled andCRYPTO_DISABLE_TESTSdisabled.Quoted 8 lines
Changes since v7:
* Removed writable entries in debugfs.
* Dropped IPsec support.
Changes since v6:
* Removed driver version.
Changes since v4:
* Rebased the patches onto net-next tree with base 'commitbc081a693a56("Merge branch 'Offload-tc-vlan-mangle-to-mscc_ocelot-switch'")'
Quoted 50 lines
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 underinclude/linux/soc/
Changes since v1:
* MovedMakefilechanges from patch4 to patch2 and patch3.Srujana Challa (12):
octeontx2-pf: move lmt flush toinclude/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 virtual function driver support
crypto: octeontx2: add support to process the crypto request
crypto: octeontx2: register with linux crypto frameworkMAINTAINERS | 2 + drivers/crypto/marvell/Kconfig | 14 + drivers/crypto/marvell/Makefile | 1 + drivers/crypto/marvell/octeontx2/Makefile | 10 + .../marvell/octeontx2/otx2_cpt_common.h | 123 ++ .../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 | 52 + .../marvell/octeontx2/otx2_cptpf_main.c | 570 ++++++ .../marvell/octeontx2/otx2_cptpf_mbox.c | 331 ++++ .../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 | 401 ++++ .../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 | 33 + .../net/ethernet/marvell/octeontx2/af/rvu.c | 2 +- .../net/ethernet/marvell/octeontx2/af/rvu.h | 2 + .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 229 +++ .../marvell/octeontx2/af/rvu_debugfs.c | 304 +++Quoted 8 lines
.../ethernet/marvell/octeontx2/af/rvu_reg.h | 63 +- .../marvell/octeontx2/nic/otx2_common.h | 13 +- include/linux/soc/marvell/octeontx2/asm.h | 29 + 30 files changed, 8038 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.cQuoted 8 lines
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.hQuoted 8 lines
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.hFor netdrv review. I don't have a lot of detailed feedback. Overall it looks sensible to me.
It is obviously a big beast of a patchset. Looking at previous review comments, the documentation is now a lot better, which helps follow the thread.
The point about parsing tar files remains open. In general error-prone parsing is better left to userspace. In practice this is not a lot of code, nor terribly complex.
Quoted 7 lines
The other point is that some files are very close to their oncteontx counterparts. With minor cleanups, such as using in-place
cpu_to_be64sswap. Those cleanups probably make sense to the older device, too. One option would be to apply them there first, then copy the files and use coccinelle for mass renaming. But frankly that is a lot of extra work to arrive at the same state. I just used --color-words=. --no-index to perform an iterative review, which works well enough.
Thank you for the suggestion. The 2 devices have different capabilities and our intent is to keep both the drivers separate without having a mutual code dependency.
And our future hardware version will deviate even more, which reduces the amount of common code.