Add Support for Marvell OcteonTX2 Cryptographic Acceleration Unit
Subsystems (6)
Srujana Challa
maintainerv9 cover Add Support for Marvell OcteonTX2 Cryptographic Acceleration Unit
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 v8:
* Load firmware files individually instead of tar.
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 | 429 +++++ drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 352 ++++ drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 52 + .../marvell/octeontx2/otx2_cptpf_main.c | 574 ++++++ .../marvell/octeontx2/otx2_cptpf_mbox.c | 331 ++++ .../marvell/octeontx2/otx2_cptpf_ucode.c | 1415 ++++++++++++++ .../marvell/octeontx2/otx2_cptpf_ucode.h | 162 ++ drivers/crypto/marvell/octeontx2/otx2_cptvf.h | 28 + .../marvell/octeontx2/otx2_cptvf_algs.c | 1664 +++++++++++++++++ .../marvell/octeontx2/otx2_cptvf_algs.h | 170 ++ .../marvell/octeontx2/otx2_cptvf_main.c | 405 ++++ .../marvell/octeontx2/otx2_cptvf_mbox.c | 139 ++ .../marvell/octeontx2/otx2_cptvf_reqmgr.c | 541 ++++++ .../ethernet/marvell/octeontx2/af/Makefile | 3 +- .../net/ethernet/marvell/octeontx2/af/mbox.h | 33 + .../net/ethernet/marvell/octeontx2/af/rvu.h | 1 + .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 233 +++ .../marvell/octeontx2/af/rvu_debugfs.c | 272 +++ .../ethernet/marvell/octeontx2/af/rvu_reg.h | 63 +- .../marvell/octeontx2/nic/otx2_common.h | 13 +- include/linux/soc/marvell/octeontx2/asm.h | 29 + 29 files changed, 7903 insertions(+), 19 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 v9 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
@@ -10466,6 +10466,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]>
@@ -10538,6 +10539,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"
@@ -423,21 +424,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 v9 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. It also adds hardware CPT AF register defines.
--- .../ethernet/marvell/octeontx2/af/Makefile | 3 +- .../net/ethernet/marvell/octeontx2/af/mbox.h | 33 +++ .../ethernet/marvell/octeontx2/af/rvu_cpt.c | 233 ++++++++++++++++++ .../ethernet/marvell/octeontx2/af/rvu_reg.h | 63 ++++- 4 files changed, 325 insertions(+), 7 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) \
@@ -898,4 +903,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_cpt.c new file +233 -0
233 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
Srujana Challa
maintainerPATCH v9 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 | 272 ++++++++++++++++++ 2 files changed, 273 insertions(+)
drivers/net/ethernet/marvell/octeontx2/af/rvu.h +1 -0
@@ -51,6 +51,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 +272 -0
290 lines not on this page · raw message
Signature · 1 line
2.28.0
Srujana Challa
maintainerPATCH v9 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 | 107 ++++ 7 files changed, 633 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 +107 -0
107 lines not on this page · raw message
Signature · 1 line
2.28.0
Srujana Challa
maintainerPATCH v9 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 | 102 +++++++++++++++++- .../marvell/octeontx2/otx2_cptpf_mbox.c | 80 ++++++++++++++ 6 files changed, 236 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 +101 -1
128 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
Jakub Kicinski
maintainerRe: [PATCH v9,net-next,05/12] crypto: octeontx2: add mailbox communication with AF
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c static int otx2_cptpf_probe(struct pci_dev *pdev, · line 152
Quoted 2 lines · On Mon, 9 Nov 2020 17:39:17 +0530 Srujana Challa wrote:
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c +2
-0+ err =pci_alloc_irq_vectors (pdev,RVU_PF_INT_VEC_CNT , +RVU_PF_INT_VEC_CNT ,PCI_IRQ_MSIX );
I don't see any pci_free_irq_vectors() in this patch
Srujana Challa
maintainerRE: [EXT] Re: [PATCH v9,net-next,05/12] crypto: octeontx2: add mailbox communication with AF
Quoted 5 lines · On Mon, 9 Nov 2020 17:39:17 +0530 Srujana Challa wrote:
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c static int otx2_cptpf_probe(struct pci_dev *pdev, · line 152
Quoted 2 lines
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c +2
-0+ err =pci_alloc_irq_vectors (pdev,RVU_PF_INT_VEC_CNT , +RVU_PF_INT_VEC_CNT ,PCI_IRQ_MSIX );I don't see any
pci_free_irq_vectors()in this patch
This will be handled by the devres managed PCI interface.
Copied code for reference:
static void pcim_release(struct device *gendev, void *res)
{
struct pci_dev *dev = to_pci_dev(gendev);
struct pci_devres *this = res;
int i;
if (dev->msi_enabled)
pci_disable_msi(dev);
if (dev->msix_enabled)
pci_disable_msix(dev);
....
}Jakub Kicinski
maintainerRe: [EXT] Re: [PATCH v9,net-next,05/12] crypto: octeontx2: add mailbox communication with AF
Quoted 7 lines · On Thu, 12 Nov 2020 07:07:34 +0000 Srujana Challa wrote:
Quoted 5 lines · On Mon, 9 Nov 2020 17:39:17 +0530 Srujana Challa wrote:
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c static int otx2_cptpf_probe(struct pci_dev *pdev, · line 152
Quoted 2 lines
drivers/crypto/marvell/octeontx2/otx2_cptpf_main.c +2
-0+ err =pci_alloc_irq_vectors (pdev,RVU_PF_INT_VEC_CNT , +RVU_PF_INT_VEC_CNT ,PCI_IRQ_MSIX );I don't see any
pci_free_irq_vectors()in this patchThis will be handled by the devres managed PCI interface.
All good by me then, please resend once you get a ack from someone on the crypto side.
Srujana Challa
maintainerPATCH v9 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 | 290 ++++++++++++++++++ .../marvell/octeontx2/otx2_cptpf_mbox.c | 172 ++++++++++- 4 files changed, 480 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 +290 -0
320 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 v9 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 | 72 + .../marvell/octeontx2/otx2_cptpf_mbox.c | 46 +- .../marvell/octeontx2/otx2_cptpf_ucode.c | 1254 +++++++++++++++++ .../marvell/octeontx2/otx2_cptpf_ucode.h | 161 +++ 8 files changed, 1655 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 +72 -0
104 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 +1254 -0
1,254 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 v9 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 | 429 ++++++++++++++++++ drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 283 ++++++++++++ drivers/crypto/marvell/octeontx2/otx2_cptpf.h | 2 + .../marvell/octeontx2/otx2_cptpf_mbox.c | 8 + 7 files changed, 783 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 +429 -0
429 lines not on this page · raw message
drivers/crypto/marvell/octeontx2/otx2_cptlf.h new file +283 -0
283 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 v9 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 | 161 ++++++++++++++++++ .../marvell/octeontx2/otx2_cptpf_ucode.h | 1 + 8 files changed, 350 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
@@ -410,6 +410,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 +161 -0
170 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 v9 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 | 196 ++++++++++++++++++ .../marvell/octeontx2/otx2_cptvf_mbox.c | 113 ++++++++++ 6 files changed, 373 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 +196 -0
196 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 v9 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 | 199 +++++++ .../marvell/octeontx2/otx2_cptvf_mbox.c | 26 + .../marvell/octeontx2/otx2_cptvf_reqmgr.c | 534 ++++++++++++++++++ 7 files changed, 915 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 */ };
@@ -334,6 +336,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 +199 -0
225 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 +534 -0
534 lines not on this page · raw message
Signature · 1 line
2.28.0
Srujana Challa
maintainerPATCH v9 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 | 1664 +++++++++++++++++ .../marvell/octeontx2/otx2_cptvf_algs.h | 170 ++ .../marvell/octeontx2/otx2_cptvf_main.c | 12 +- .../marvell/octeontx2/otx2_cptvf_reqmgr.c | 7 + 7 files changed, 1859 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 +1664 -0
1,664 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 +11 -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"
@@ -214,6 +215,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 */
@@ -273,9 +276,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
@@ -532,3 +532,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
Jakub Kicinski
maintainerRe: [PATCH v9,net-next,12/12] crypto: octeontx2: register with linux crypto framework
Quoted 4 lines · On Mon, 9 Nov 2020 17:39:24 +0530 Srujana Challa wrote:
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.
Quoted 13 lines
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)).
Herbert, could someone who knows about crypto take a look at this, if the intention is to merge this via net-next?
Herbert Xu
maintainerRe: [PATCH v9,net-next,12/12] crypto: octeontx2: register with linux crypto framework
Quoted 19 lines · Jakub Kicinski
Quoted 4 lines · On Mon, 9 Nov 2020 17:39:24 +0530 Srujana Challa wrote:
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.
Quoted 13 lines
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 2 lines
Herbert, could someone who knows about crypto take a look at this, if the intention is to merge this via net-next?
This patch seems to be quite large but it is self-contained. How about waiting a release cycle and then resubmitting it to linux-crypto on its own?
Thanks,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Jakub Kicinski
maintainerRe: [PATCH v9,net-next,12/12] crypto: octeontx2: register with linux crypto framework
Quoted 20 lines · On Fri, 13 Nov 2020 14:16:01 +1100 Herbert Xu wrote:
Quoted 19 lines · Jakub Kicinski
Quoted 17 lines · On Mon, 9 Nov 2020 17:39:24 +0530 Srujana Challa wrote:
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 6 lines
Quoted 2 lines
Herbert, could someone who knows about crypto take a look at this, if the intention is to merge this via net-next?
This patch seems to be quite large but it is self-contained. How about waiting a release cycle and then resubmitting it to linux-crypto on its own?
SGTM, actually everything starting from patch 4 is in drivers/crypto, so we can merge the first 3 into net-next and the rest via crypto?
Herbert Xu
maintainerRe: [PATCH v9,net-next,12/12] crypto: octeontx2: register with linux crypto framework
Quoted 3 lines · Jakub Kicinski
SGTM, actually everything starting from patch 4 is in
drivers/crypto, so we can merge the first 3 into net-next and the rest via crypto?
Yes of course.
Cheers,
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Srujana Challa
maintainerRE: [PATCH v9,net-next,12/12] crypto: octeontx2: register with linux crypto framework
Quoted 7 lines · Jakub Kicinski
Quoted 3 lines
SGTM, actually everything starting from patch 4 is in
drivers/crypto, so we can merge the first 3 into net-next and the rest via crypto?Yes of course.
Thanks I will resubmit patches 4-12 on crypto-2.6 in the next release cycle. Should I re-submit patches 1-3 on net-next now?
Jakub Kicinski
maintainerRe: [PATCH v9,net-next,12/12] crypto: octeontx2: register with linux crypto framework
Quoted 9 lines · On Tue, 17 Nov 2020 07:59:56 +0000 Srujana Challa wrote:
Quoted 7 lines · Jakub Kicinski
Quoted 3 lines
SGTM, actually everything starting from patch 4 is in
drivers/crypto, so we can merge the first 3 into net-next and the rest via crypto?Yes of course.
Thanks I will resubmit patches 4-12 on crypto-2.6 in the next release cycle. Should I re-submit patches 1-3 on net-next now?
Yes, please!