Add CAAM driver model support
Subsystems (5)
v11 cover Add CAAM driver model support
This patchset adds the support for following:
1) CAAM Driver model for all i.MX, layerscape, PPC platforms.
2) Added crypto node in device tree files.
3) fix build issue for mx6sabre: Remove SPL DTB related configs and SPL_OF_CONTROL.
i.MX platforms:
i.MX6, i.MX7, i.MX7ULP, i.MX8MM/MN/MP/MQ, i.MX8QM/QXP
Layerscape platforms:
LS1021, LS1012, LS1028, LS1043, LS1046, LS1088, LS2088, LX2160, LX2162
Powerpc platforms:
P3041, P4080, P5040, P2041, T1024, T1042, T2080, T4240
changes since v10:
- rebase to latest master
- iMX8M: removed JR0 disablement code for imx8m.
changes since v9:
- added IS_ENABLED(CONFIG_FSL_CAAM) check before probing CAAM driver.
- FSL_CAAM enablement is moved to defconfigs for layerscape, powerpc.
changes since v8:
- rebase to latest master
- removed patch "crypto/fsl: Improve hwrng performance in kernel".
- moved FSL_CAAM config to board defconfig for Layerscape platforms.
- moved MISC config select to "config FSL_CAAM" as "select MISC if DM".
changes since v7:
- rebase to latest master
- corrected the order of include files as per coding style in jr.c.
https://www.denx.de/wiki/U-Boot/CodingStyle
- added brackets around #defines for -ve number in jr.h
- added comments for struct caam_regs in jr.h
changes since v6:
- rebase to latest master
- added caam_jr_ioctl() operation which calls run_descriptor_jr().
- removed CONFIG_ARCH_IMX8 config from JR driver.
- removed FSL_BLOB config
changes since v5:
- rebase to latest master
- updated BIT() macro for JRDID in drivers/crypto/fsl/jr.h
- removed auto select FSL_BLOB from CMD_BLOB config.
- removed patch for blob key encryption key(bkek), random number generation.
- updated patch description for improving hwrng performance in kernel.
- removed sec_init() from kontron/sl28.
- for LS1028A architecture, enable CAAM only for LS1028AQDS and LS1028ARDB.
changes since v4:
- rebase to latest master
- updated caam_jr_probe() with livetree APIs.
- imx8m: moved jr0 disable code to *-uboot.dtsi files.
changes since v3:
- rebase to latest master
- fixed build error when new file arch/powerpc/include/asm/u-boot-ppc.h is included from assembly files.
- removed arch/arm/dts/fsl-ls1028a.dtsi as it is conflicting with the series
https://lore.kernel.org/u-boot/[email protected]/
Gaurav Jain (13):
crypto/fsl: Add support for CAAM Job ring driver model i.MX8M: crypto: updated device tree for supporting DM in SPL crypto/fsl: i.MX8M: Enable Job ring driver model. i.MX6: Enable Job ring driver model.
i.MX7: Enable Job ring driver model.
i.MX7ULP: Enable Job ring driver model.
i.MX8: Add crypto node in device tree
crypto/fsl: i.MX8: Enable Job ring driver model.
Layerscape: Add crypto node in device tree
Layerscape: Enable Job ring driver model.
PPC: Add crypto node in device tree
PPC: Enable Job ring driver model.
update CAAM MAINTAINER
Ye Li (1):
mx6sabre: Remove unnecessary SPL configs
MAINTAINERS | 6 + arch/arm/Kconfig | 9 +- arch/arm/cpu/armv7/ls102xa/cpu.c | 18 + arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 11 +- arch/arm/dts/fsl-imx8dx.dtsi | 61 ++- arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 34 +- arch/arm/dts/fsl-imx8qm.dtsi | 61 ++- arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 34 +- arch/arm/dts/fsl-ls1012a.dtsi | 46 ++- arch/arm/dts/fsl-ls1043a.dtsi | 45 ++- arch/arm/dts/fsl-ls1046a.dtsi | 44 +++ arch/arm/dts/fsl-ls1088a.dtsi | 39 ++ arch/arm/dts/fsl-ls2080a.dtsi | 39 ++ arch/arm/dts/fsl-lx2160a.dtsi | 41 +- arch/arm/dts/imx7ulp.dtsi | 24 ++ arch/arm/dts/imx8mm-evk-u-boot.dtsi | 18 +- arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 18 +- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 18 +- arch/arm/dts/ls1021a.dtsi | 40 ++ arch/arm/include/asm/arch-imx8/imx-regs.h | 5 +- arch/arm/mach-imx/cmd_dek.c | 1 + arch/arm/mach-imx/imx8/Kconfig | 7 + arch/arm/mach-imx/imx8/cpu.c | 18 +- arch/arm/mach-imx/imx8m/Kconfig | 13 + arch/arm/mach-imx/imx8m/soc.c | 11 +- arch/arm/mach-imx/mx6/Kconfig | 10 + arch/arm/mach-imx/mx6/soc.c | 13 +- arch/arm/mach-imx/mx7/Kconfig | 1 + arch/arm/mach-imx/mx7/soc.c | 12 +- arch/arm/mach-imx/mx7ulp/Kconfig | 2 + arch/arm/mach-imx/mx7ulp/soc.c | 18 + arch/powerpc/cpu/mpc85xx/cpu_init.c | 19 +- arch/powerpc/dts/p2041si-post.dtsi | 1 + arch/powerpc/dts/p3041si-post.dtsi | 1 + arch/powerpc/dts/p4080si-post.dtsi | 1 + arch/powerpc/dts/p5040si-post.dtsi | 1 + arch/powerpc/dts/qoriq-sec4.0-0.dtsi | 74 ++++ arch/powerpc/dts/qoriq-sec4.2-0.dtsi | 83 ++++ arch/powerpc/dts/qoriq-sec5.2-0.dtsi | 92 +++++ arch/powerpc/dts/t1023si-post.dtsi | 1 + arch/powerpc/dts/t1042si-post.dtsi | 1 + arch/powerpc/dts/t2080si-post.dtsi | 1 + arch/powerpc/dts/t4240si-post.dtsi | 1 + arch/powerpc/include/asm/u-boot-ppc.h | 17 + arch/powerpc/include/asm/u-boot.h | 1 + board/freescale/imx8mm_evk/spl.c | 10 +- board/freescale/imx8mn_evk/spl.c | 9 +- board/freescale/imx8mp_evk/spl.c | 14 +- board/freescale/imx8mq_evk/spl.c | 8 +- board/freescale/imx8qm_mek/spl.c | 6 +- board/freescale/imx8qxp_mek/spl.c | 6 +- board/freescale/ls1012afrdm/ls1012afrdm.c | 7 +- board/freescale/ls1012aqds/ls1012aqds.c | 6 +- board/freescale/ls1012ardb/ls1012ardb.c | 6 +- board/freescale/ls1021aiot/ls1021aiot.c | 6 +- board/freescale/ls1021aqds/ls1021aqds.c | 6 +- board/freescale/ls1021atsn/ls1021atsn.c | 7 +- board/freescale/ls1021atwr/ls1021atwr.c | 8 +- board/freescale/ls1028a/ls1028a.c | 6 +- board/freescale/ls1043ardb/ls1043ardb.c | 6 +- board/freescale/ls1046afrwy/ls1046afrwy.c | 7 +- board/freescale/ls1046aqds/ls1046aqds.c | 7 +- board/freescale/ls1046ardb/ls1046ardb.c | 6 +- board/freescale/ls1088a/ls1088a.c | 4 - board/freescale/ls2080aqds/ls2080aqds.c | 6 +- board/freescale/ls2080ardb/ls2080ardb.c | 9 +- board/freescale/lx2160a/lx2160a.c | 5 - board/kontron/sl28/sl28.c | 3 - configs/P2041RDB_NAND_defconfig | 1 + configs/P2041RDB_SDCARD_defconfig | 1 + configs/P2041RDB_SPIFLASH_defconfig | 1 + configs/P2041RDB_defconfig | 1 + configs/P3041DS_NAND_defconfig | 1 + configs/P3041DS_SDCARD_defconfig | 1 + configs/P3041DS_SPIFLASH_defconfig | 1 + configs/P3041DS_defconfig | 1 + configs/P4080DS_SDCARD_defconfig | 1 + configs/P4080DS_SPIFLASH_defconfig | 1 + configs/P4080DS_defconfig | 1 + configs/P5040DS_NAND_defconfig | 1 + configs/P5040DS_SDCARD_defconfig | 1 + configs/P5040DS_SPIFLASH_defconfig | 1 + configs/P5040DS_defconfig | 1 + configs/T1024RDB_NAND_defconfig | 1 + configs/T1024RDB_SDCARD_defconfig | 1 + configs/T1024RDB_SPIFLASH_defconfig | 1 + configs/T1024RDB_defconfig | 1 + configs/T1042D4RDB_NAND_defconfig | 1 + configs/T1042D4RDB_SDCARD_defconfig | 1 + configs/T1042D4RDB_SPIFLASH_defconfig | 1 + configs/T1042D4RDB_defconfig | 1 + configs/T2080QDS_NAND_defconfig | 1 + configs/T2080QDS_SDCARD_defconfig | 1 + configs/T2080QDS_SPIFLASH_defconfig | 1 + configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/T2080QDS_defconfig | 1 + configs/T2080RDB_NAND_defconfig | 1 + configs/T2080RDB_SDCARD_defconfig | 1 + configs/T2080RDB_SPIFLASH_defconfig | 1 + configs/T2080RDB_defconfig | 1 + configs/T2080RDB_revD_NAND_defconfig | 1 + configs/T2080RDB_revD_SDCARD_defconfig | 1 + configs/T2080RDB_revD_SPIFLASH_defconfig | 1 + configs/T2080RDB_revD_defconfig | 1 + configs/T4240RDB_SDCARD_defconfig | 1 + configs/T4240RDB_defconfig | 1 + configs/ls1021aiot_qspi_defconfig | 1 + configs/ls1021aiot_sdcard_defconfig | 1 + configs/ls1021aqds_ddr4_nor_defconfig | 1 + configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 + configs/ls1021aqds_nand_defconfig | 1 + configs/ls1021aqds_nor_defconfig | 1 + configs/ls1021aqds_nor_lpuart_defconfig | 1 + configs/ls1021aqds_qspi_defconfig | 1 + configs/ls1021aqds_sdcard_ifc_defconfig | 1 + configs/ls1021aqds_sdcard_qspi_defconfig | 1 + configs/ls1021atsn_qspi_defconfig | 1 + configs/ls1021atsn_sdcard_defconfig | 1 + configs/ls1021atwr_nor_defconfig | 1 + configs/ls1021atwr_nor_lpuart_defconfig | 1 + configs/ls1021atwr_qspi_defconfig | 1 + ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + configs/ls1021atwr_sdcard_ifc_defconfig | 1 + configs/ls1021atwr_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_defconfig | 1 + configs/ls1043aqds_lpuart_defconfig | 1 + configs/ls1043aqds_nand_defconfig | 1 + configs/ls1043aqds_nor_ddr3_defconfig | 1 + configs/ls1043aqds_qspi_defconfig | 1 + configs/ls1043aqds_sdcard_ifc_defconfig | 1 + configs/ls1043aqds_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_tfa_defconfig | 1 + configs/ls1043ardb_defconfig | 1 + configs/ls1043ardb_nand_defconfig | 1 + configs/ls1043ardb_sdcard_defconfig | 1 + configs/ls1043ardb_tfa_defconfig | 1 + configs/ls1046afrwy_tfa_defconfig | 1 + configs/ls1046aqds_defconfig | 1 + configs/ls1046aqds_lpuart_defconfig | 1 + configs/ls1046aqds_nand_defconfig | 1 + configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_sdcard_ifc_defconfig | 1 + configs/ls1046aqds_sdcard_qspi_defconfig | 1 + configs/ls1046aqds_tfa_defconfig | 1 + configs/ls1046ardb_emmc_defconfig | 1 + configs/ls1046ardb_qspi_defconfig | 1 + configs/ls1046ardb_qspi_spl_defconfig | 1 + configs/ls1046ardb_sdcard_defconfig | 1 + configs/ls1046ardb_tfa_defconfig | 1 + configs/mx6sabreauto_defconfig | 2 - configs/mx6sabresd_defconfig | 4 - drivers/crypto/fsl/Kconfig | 3 +- drivers/crypto/fsl/jr.c | 364 ++++++++++++------ drivers/crypto/fsl/jr.h | 31 +- include/fsl_sec.h | 12 +- 155 files changed, 1413 insertions(+), 253 deletions(-) create mode 100644 arch/powerpc/dts/qoriq-sec4.0-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-sec4.2-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-sec5.2-0.dtsi create mode 100644 arch/powerpc/include/asm/u-boot-ppc.h
Signature · 1 line
2.17.1
PATCH v11 1/14 crypto/fsl: Add support for CAAM Job ring driver model
added device tree support for job ring driver. sec is initialized based on job ring information processed from device tree.
--- drivers/crypto/fsl/Kconfig | 1 + drivers/crypto/fsl/jr.c | 323 ++++++++++++++++++++++++------------- drivers/crypto/fsl/jr.h | 31 +++- 3 files changed, 241 insertions(+), 114 deletions(-)
drivers/crypto/fsl/Kconfig +1 -0
@@ -2,6 +2,7 @@ config FSL_CAAM bool "Freescale Crypto Driver Support" select SHA_HW_ACCEL # hw_sha1() under drivers/crypto, and needed with SHA_HW_ACCEL + select MISC if DM imply SPL_CRYPTO if (ARM && SPL) imply CMD_HASH help
drivers/crypto/fsl/jr.c +212 -111
548 lines not on this page · raw message
drivers/crypto/fsl/jr.h +28 -3
@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. +* Copyright 2021 NXP * */
@@ -8,7 +9,9 @@#define __JR_H#include <linux/compiler.h> +#include "fsl_sec.h" #include "type.h" +#include <misc.h> #define JR_SIZE 4/* Timeout currently defined as 10 sec */
@@ -35,12 +38,21 @@#define JRSLIODN_SHIFT 0#define JRSLIODN_MASK 0x00000fff -#define JQ_DEQ_ERR -1 -#define JQ_DEQ_TO_ERR -2 -#define JQ_ENQ_ERR -3 +#define JRDID_MS_PRIM_DID BIT(0) +#define JRDID_MS_PRIM_TZ BIT(4) +#define JRDID_MS_TZ_OWN BIT(15) + +#define JQ_DEQ_ERR (-1) +#define JQ_DEQ_TO_ERR (-2) +#define JQ_ENQ_ERR (-3)#define RNG4_MAX_HANDLES 2 +enum { +/* Run caam jobring descriptor(in buf) */ +CAAM_JR_RUN_DESC , +}; +struct op_ring {caam_dma_addr_t desc;uint32_t status;
@@ -102,6 +114,19 @@ struct result {uint32_t status; }; +/* +* struct caam_regs - CAAM initialization register interface +* +* Interface to caam memory map, jobring register, jobring storage. +*/ +struct caam_regs { +ccsr_sec_t *sec;/*caam initialization registers*/ +struct jr_regs *regs;/*jobring configuration registers*/ +u8 jrid;/*id to identify a jobring*/ +/*Private sub-storage for a single JobR*/ +struct jobring jr[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +}; +void caam_jr_strstatus (u32 status);int run_descriptor_jr (uint32_t *desc);
Signature · 1 line
2.17.1
RE: [PATCH v11 01/14] crypto/fsl: Add support for CAAM Job ring driver model
Hello Stefano
Michael Trimarchi has shared the patch to fix imx6dl_mamoj spl size error. I have also shared the v11 for caam driver model after adding the final comments . Can you help to apply the series?
Regards
Gaurav Jain
Quoted 688 lines
-----Original Message-----
From: Gaurav Jain <[email protected]>
Sent: Thursday, March 24, 2022 11:50 AM
To: [email protected]; Stefano Babic <[email protected]>
Cc: Fabio Estevam <[email protected]>; Peng Fan <[email protected]>; Simon Glass <[email protected]>; Michael Walle <[email protected]>; Priyanka Jain <[email protected]>; Ye Li <[email protected]>; Horia Geanta <[email protected]>; Ji Luo <[email protected]>; Franck Lenormand <[email protected]>; Silvano Di Ninno <[email protected]>; Sahil Malhotra <[email protected]>; Pankaj Gupta <[email protected]>; Varun Sethi <[email protected]>; dl-uboot-imx <[email protected]>; Shengzhou Liu <[email protected]>; Mingkai Hu <[email protected]>; Rajesh Bhagat <[email protected]>; Meenakshi Aggarwal <[email protected]>; Wasim Khan <[email protected]>; Alison Wang <[email protected]>; Pramod Kumar <[email protected]>; Andy Tang <[email protected]>; Adrian Alonso <[email protected]>; Vladimir Oltean <[email protected]>; ZHIZHIKIN Andrey <[email protected]>; Michael Trimarchi <[email protected]>; Gaurav Jain <[email protected]>
Subject: [PATCH v11 01/14]crypto/fsl: Add support for CAAM Job ring driver modeladded device tree support for job ring driver.
sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>Reviewed-by Simon Glass <[email protected]>--- drivers/crypto/fsl/Kconfig | 1 + drivers/crypto/fsl/jr.c | 323 ++++++++++++++++++++++++------------- drivers/crypto/fsl/jr.h | 31 +++- 3 files changed, 241 insertions(+), 114 deletions(-)drivers/crypto/fsl/Kconfig index renamed from drivers/crypto/fsl/Kconfig +0
-0
94ff540111..231eb00b5f100644drivers/crypto/fsl/Kconfig +1
-0@@ -2,6 +2,7 @@ config FSL_CAAM bool "Freescale Crypto Driver Support" select SHA_HW_ACCEL # hw_sha1() under drivers/crypto, and needed with SHA_HW_ACCEL + select MISC if DM imply SPL_CRYPTO if (ARM && SPL) imply CMD_HASH helpdrivers/crypto/fsl/jr.c index renamed from drivers/crypto/fsl/jr.c +0
-022b649219e..8103987425 100644
drivers/crypto/fsl/jr.c +16
-5@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP * * Based on CAAM driver in drivers/crypto/caam in Linux */ @@ -11,7 +11,6 @@#include <linux/kernel.h> #include <log.h> #include <malloc.h> -#include "fsl_sec.h" #include "jr.h" #include "jobdesc.h" #include "desc_constr.h" @@ -21,7 +20,10 @@#include <asm/cache.h> #include <asm/fsl_pamu.h> #endif +#include <dm.h> #include <dm/lists.h> +#include <dm/root.h> +#include <dm/device-internal.h> #include <linux/delay.h> #define CIRC_CNT (head, tail, size) (((head) - (tail)) & (size - 1))@@ -35,20 +37,29 @@ uint32_t sec_offset[CONFIG_SYS_FSL_MAX_NUM_OF_SEC] = { #endif }; +#if CONFIG_IS_ENABLED (DM ) +struct udevice *caam_dev; +#else #define SEC_ADDR (idx) \ (ulong)((CONFIG_SYS_FSL_SEC_ADDR + sec_offset[idx]))#define SEC_JR0_ADDR (idx) \ (ulong)(SEC_ADDR(idx) + \ (CONFIG_SYS_FSL_JR0_OFFSET - CONFIG_SYS_FSL_SEC_OFFSET)) +struct caam_regs caam_st; +#endif -struct jobring jr0[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +static inline u32 jr_start_reg (u8 jrid) { +return (1 << jrid); +} -static inline void start_jr0 (uint8_t sec_idx) +static inline void start_jr (struct caam_regs *caam) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); +ccsr_sec_t *sec = caam->sec;u32 ctpr_ms =sec_in32 (&sec->ctpr_ms);u32 scfgr =sec_in32 (&sec->scfgr); +u32 jrstart =jr_start_reg (caam->jrid);if (ctpr_ms &SEC_CTPR_MS_VIRT_EN_INCL ) {/* VIRT_EN_INCL = 1 & VIRT_EN_POR = 1 or @@ -56,23 +67,16 @@ static inline void start_jr0(uint8_t sec_idx) */ drivers/crypto/fsl/jr.c +25
-70if ((ctpr_ms &SEC_CTPR_MS_VIRT_EN_POR ) || (scfgr &SEC_SCFGR_VIRT_EN )) -sec_out32 (&sec->jrstartr,CONFIG_JRSTARTR_JR0 ); +sec_out32 (&sec->jrstartr, jrstart); }else {/* VIRT_EN_INCL = 0 && VIRT_EN_POR_VALUE = 1 */ if (ctpr_ms &SEC_CTPR_MS_VIRT_EN_POR ) -sec_out32 (&sec->jrstartr,CONFIG_JRSTARTR_JR0 ); +sec_out32 (&sec->jrstartr, jrstart); } } -static inline void jr_reset_liodn (uint8_t sec_idx) +static inline void jr_disable_irq (struct jr_regs *regs) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); -sec_out32 (&sec->jrliodnr[0 ].ls,0 ); -} - -static inline void jr_disable_irq(uint8_t sec_idx) -{ -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx);uint32_t jrcfg =sec_in32 (®s->jrcfg1); jrcfg = jrcfg |JR_INTMASK ;@@ -80,10 +84,10 @@ static inline void jr_disable_irq(uint8_t sec_idx)sec_out32 (®s->jrcfg1, jrcfg); } -static void jr_initregs (uint8_t sec_idx) +static void jr_initregs (uint8_t sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];caam_dma_addr_t ip_base =virt_to_phys ((void *)jr->input_ring);caam_dma_addr_t op_base =virt_to_phys ((void *)jr->output_ring);@@ -103,16 +107,16 @@ static void jr_initregs(uint8_t sec_idx)sec_out32 (®s->irs,JR_SIZE );if (!jr->irq) -jr_disable_irq (sec_idx); +jr_disable_irq (regs); } -static int jr_init (uint8_t sec_idx) +static int jr_init (uint8_t sec_idx,struct caam_regs *caam) { -struct jobring *jr = &jr0[sec_idx]; +struct jobring *jr = &caam->jr[sec_idx];memset (jr,0 ,sizeof (struct jobring )); - jr->jq_id =DEFAULT_JR_ID ; + jr->jq_id = caam->jrid; jr->irq =DEFAULT_IRQ ;#ifdef CONFIG_FSL_CORENET @@ -134,53 +138,8 @@ static int jr_init(uint8_t sec_idx)memset (jr->input_ring,0 ,JR_SIZE *sizeof (caam_dma_addr_t));memset (jr->output_ring,0 , jr->op_size); -start_jr0 (sec_idx); - -jr_initregs (sec_idx); - -return 0 ; -} - -static int jr_sw_cleanup(uint8_t sec_idx) -{ -struct jobring *jr = &jr0[sec_idx]; - - jr->head =0 ; - jr->tail =0 ; - jr->read_idx =0 ; - jr->write_idx =0 ; -memset (jr->info,0 ,sizeof (jr->info)); -memset (jr->input_ring,0 , jr->size *sizeof (caam_dma_addr_t)); -memset (jr->output_ring,0 , jr->size *sizeof (struct op_ring )); - -return 0 ; -} - -static int jr_hw_reset(uint8_t sec_idx) -{ -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -uint32_t timeout =100000 ; -uint32_t jrint, jrcr; - -sec_out32 (®s->jrcr,JRCR_RESET ); -do { - jrint =sec_in32 (®s->jrint); - }while (((jrint &JRINT_ERR_HALT_MASK ) == -JRINT_ERR_HALT_INPROGRESS ) && --timeout); - - jrint =sec_in32 (®s->jrint); -if (((jrint &JRINT_ERR_HALT_MASK ) != -JRINT_ERR_HALT_INPROGRESS ) && timeout ==0 ) -return -1 ; - - timeout =100000 ; -sec_out32 (®s->jrcr,JRCR_RESET ); -do { - jrcr =sec_in32 (®s->jrcr); - }while ((jrcr &JRCR_RESET ) && --timeout); - -if (timeout ==0 ) -return -1 ; +start_jr (caam); +jr_initregs (sec_idx, caam);return 0 ; }@@ -188,10 +147,10 @@ static int jr_hw_reset(uint8_t sec_idx)/* -1 --- error, can't enqueue -- no space available */ static int jr_enqueue (uint32_t *desc_addr,void (*callback)(uint32_t status,void *arg), -void *arg,uint8_t sec_idx) +void *arg,uint8_t sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];int head = jr->head;uint32_t desc_word;int length =desc_len (desc_addr);@@ -263,10 +222,10 @@ static int jr_enqueue(uint32_t *desc_addr,return 0 ; } -static int jr_dequeue (int sec_idx) +static int jr_dequeue (int sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];int head = jr->head;int tail = jr->tail;int idx, i, found;@@ -349,14 +308,18 @@ static void desc_done(uint32_t status, void *arg) {struct result *x = arg; x->status = status; -#ifndef CONFIG_SPL_BUILD caam_jr_strstatus (status); -#endif x->done =1 ; }static inline int run_descriptor_jr_idx (uint32_t *desc,uint8_t sec_idx) { +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif unsigned long long timeval =0 ;unsigned long long timeout =CONFIG_USEC_DEQ_TIMEOUT ;struct result op;@@ -364,7 +327,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) memset(&op, 0, sizeof(op)); - ret =jr_enqueue (desc, desc_done, &op, sec_idx); + ret =jr_enqueue (desc, desc_done, &op, sec_idx, caam);if (ret) {debug ("Error in SEC enq\n" );drivers/crypto/fsl/jr.c +1
-1ret =JQ_ENQ_ERR ;@@ -375,7 +338,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) udelay(1); timeval +=1 ; - ret =jr_dequeue (sec_idx); + ret =jr_dequeue (sec_idx, caam);if (ret) {debug ("Error in SEC deq\n" );drivers/crypto/fsl/jr.c +62
-15ret =JQ_DEQ_ERR ;@@ -402,13 +365,62 @@ int run_descriptor_jr(uint32_t *desc)return run_descriptor_jr_idx (desc,0 ); } +static int jr_sw_cleanup (uint8_t sec_idx,struct caam_regs *caam) { +struct jobring *jr = &caam->jr[sec_idx]; + + jr->head =0 ; + jr->tail =0 ; + jr->read_idx =0 ; + jr->write_idx =0 ; +memset (jr->info,0 ,sizeof (jr->info)); +memset (jr->input_ring,0 , jr->size *sizeof (caam_dma_addr_t)); +memset (jr->output_ring,0 , jr->size *sizeof (struct op_ring )); + +return 0 ; +} + +static int jr_hw_reset (struct jr_regs *regs) { +uint32_t timeout =100000 ; +uint32_t jrint, jrcr; + +sec_out32 (®s->jrcr,JRCR_RESET ); +do { + jrint =sec_in32 (®s->jrint); + }while (((jrint &JRINT_ERR_HALT_MASK ) == +JRINT_ERR_HALT_INPROGRESS ) && --timeout); + + jrint =sec_in32 (®s->jrint); +if (((jrint &JRINT_ERR_HALT_MASK ) != +JRINT_ERR_HALT_INPROGRESS ) && timeout ==0 ) +return -1 ; + + timeout =100000 ; +sec_out32 (®s->jrcr,JRCR_RESET ); +do { + jrcr =sec_in32 (®s->jrcr); + }while ((jrcr &JRCR_RESET ) && --timeout); + +if (timeout ==0 ) +return -1 ; + +return 0 ; +} +static inline int jr_reset_sec (uint8_t sec_idx) { -if (jr_hw_reset (sec_idx) <0 ) +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif +if (jr_hw_reset (caam->regs) <0 )return -1 ;/* Clean up the jobring structure maintained by software */ -jr_sw_cleanup (sec_idx); +jr_sw_cleanup (sec_idx, caam);return 0 ; }@@ -418,9 +430,15 @@ int jr_reset(void)return jr_reset_sec (0 ); } -static inline int sec_reset_idx (uint8_t sec_idx) +int sec_reset (void ) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif +ccsr_sec_t *sec = caam->sec;uint32_t mcfgr =sec_in32 (&sec->mcfgr);uint32_t timeout =100000 ;@@ -446,11 +464,7 @@ static inline int sec_reset_idx(uint8_t sec_idx)return 0 ; } -int sec_reset (void ) -{ -return sec_reset_idx (0 ); -} -#ifndef CONFIG_SPL_BUILD +static int deinstantiate_rng (u8 sec_idx,int state_handle_mask) {u32 *desc;@@ -496,12 +510,11 @@ static int deinstantiate_rng(u8 sec_idx, int state_handle_mask)return ret; } -static int instantiate_rng (u8 sec_idx,int gen_sk) +static int instantiate_rng (uint8_t sec_idx,ccsr_sec_t *sec,int +gen_sk) {u32 *desc;u32 rdsta_val;int ret =0 , sh_idx, size; -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;@@ -554,9 +567,8 @@ static int instantiate_rng(u8 sec_idx, int gen_sk)return ret; } -static u8 get_rng_vid (uint8_t sec_idx) +static u8 get_rng_vid (ccsr_sec_t *sec) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx);u8 vid;if (caam_get_era () <10 ) {@@ -574,9 +586,8 @@ static u8 get_rng_vid(uint8_t sec_idx)* By default, the TRNG runs for 200 clocks per sample; * 1200 clocks per sample generates better entropy. */ -static void kick_trng (int ent_delay,uint8_t sec_idx) +static void kick_trng (int ent_delay,ccsr_sec_t *sec) { -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;drivers/crypto/fsl/jr.c +3
-4u32 val;@@ -603,10 +614,9 @@ static void kick_trng(int ent_delay, uint8_t sec_idx)sec_clrbits32 (&rng->rtmctl,RTMCTL_PRGM ); } -static int rng_init (uint8_t sec_idx) +static int rng_init (uint8_t sec_idx,ccsr_sec_t *sec) {int ret, gen_sk, ent_delay =RTSDCTL_ENT_DLY_MIN ; -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;u32 inst_handles;@@ -624,7 +634,7 @@ static int rng_init(uint8_t sec_idx)* the TRNG parameters. */ if (!inst_handles) { -kick_trng (ent_delay, sec_idx); +kick_trng (ent_delay, sec); ent_delay +=400 ; }/* @@ -634,7 +644,7 @@ static int rng_init(uint8_t sec_idx)* interval, leading to a sucessful initialization of * the RNG. */ - ret =instantiate_rng (sec_idx, gen_sk); + ret =instantiate_rng (sec_idx, sec, gen_sk); }while ((ret ==-1 ) && (ent_delay <RTSDCTL_ENT_DLY_MAX ));if (ret) { printf("SEC%u: Failed to instantiate RNG\n", sec_idx); @@ -646,13 +656,28 @@ static int
rng_init(uint8_t sec_idx)drivers/crypto/fsl/jr.c +64
-13return ret; } -#endif +int sec_init_idx (uint8_t sec_idx) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); -uint32_t mcr =sec_in32 (&sec->mcfgr);int ret =0 ; - +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) +if (!caam_dev) { +printf ("caam_jr: caam not found\n" ); +return -1 ; + } + caam =dev_get_priv (caam_dev); +#else + caam_st.sec = (void *)SEC_ADDR (sec_idx); + caam_st.regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); + caam_st.jrid =0 ; + caam = &caam_st; +#endif +ccsr_sec_t *sec = caam->sec; +uint32_t mcr =sec_in32 (&sec->mcfgr); +#if defined(CONFIG_SPL_BUILD ) && defined(CONFIG_IMX8M ) +uint32_t jrdid_ms =0 ; +#endif #ifdef CONFIG_FSL_CORENET uint32_t liodnr;uint32_t liodn_ns;@@ -682,6 +707,11 @@ int sec_init_idx(uint8_t sec_idx) mcr |= (1 <<MCFGR_PS_SHIFT );#endif sec_out32 (&sec->mcfgr, mcr); +#if defined(CONFIG_SPL_BUILD ) && defined(CONFIG_IMX8M ) + jrdid_ms =JRDID_MS_TZ_OWN |JRDID_MS_PRIM_TZ |JRDID_MS_PRIM_DID ; +sec_out32 (&sec->jrliodnr[caam->jrid].ms, jrdid_ms);#endif +jr_reset ();#ifdef CONFIG_FSL_CORENET #ifdef CONFIG_SPL_BUILD @@ -693,20 +723,19 @@ int sec_init_idx(uint8_t sec_idx) liodn_ns =CONFIG_SPL_JR0_LIODN_NS &JRNSLIODN_MASK ; liodn_s =CONFIG_SPL_JR0_LIODN_S &JRSLIODN_MASK ; - liodnr =sec_in32 (&sec->jrliodnr[0 ].ls) & + liodnr =sec_in32 (&sec->jrliodnr[caam->jrid].ls) & ~(JRNSLIODN_MASK |JRSLIODN_MASK ); liodnr = liodnr | (liodn_ns <<JRNSLIODN_SHIFT ) | (liodn_s <<JRSLIODN_SHIFT ); -sec_out32 (&sec->jrliodnr[0 ].ls, liodnr); +sec_out32 (&sec->jrliodnr[caam->jrid].ls, liodnr);#else - liodnr =sec_in32 (&sec->jrliodnr[0 ].ls); + liodnr =sec_in32 (&sec->jrliodnr[caam->jrid].ls); liodn_ns = (liodnr &JRNSLIODN_MASK ) >>JRNSLIODN_SHIFT ; liodn_s = (liodnr &JRSLIODN_MASK ) >>JRSLIODN_SHIFT ;#endif #endif - - ret =jr_init (sec_idx); + ret =jr_init (sec_idx, caam);if (ret <0 ) {printf ("SEC%u: initialization failed\n" , sec_idx);return -1 ;@@ -719,9 +748,9 @@ int sec_init_idx(uint8_t sec_idx)pamu_enable ();#endif -#ifndef CONFIG_SPL_BUILD -if (get_rng_vid (sec_idx) >=4 ) { -if (rng_init (sec_idx) <0 ) { + +if (get_rng_vid (caam->sec) >=4 ) { +if (rng_init (sec_idx, caam->sec) <0 ) {printf ("SEC%u: RNG instantiation failed\n" , sec_idx);return -1 ; }@@ -735,7 +764,6 @@ int sec_init_idx(uint8_t sec_idx)printf ("SEC%u: RNG instantiated\n" , sec_idx); } -#endif return ret; }@@ -743,3 +771,76 @@ int sec_init(void) {return sec_init_idx (0 ); } + +#if CONFIG_IS_ENABLED (DM ) +static int caam_jr_ioctl (struct udevice *dev,unsigned long request, +void *buf) { +if (request !=CAAM_JR_RUN_DESC ) +return -ENOSYS ; + +return run_descriptor_jr (buf); +} + +static int caam_jr_probe (struct udevice *dev) { +struct caam_regs *caam =dev_get_priv (dev); +fdt_addr_t addr; +ofnode node; +unsigned int jr_node =0 ; + + caam_dev = dev; + + addr =dev_read_addr (dev); +if (addr ==FDT_ADDR_T_NONE ) { +printf ("caam_jr: crypto not found\n" ); +return -EINVAL ; + } + caam->sec = (ccsr_sec_t *)(uintptr_t )addr; + caam->regs = (struct jr_regs *)caam->sec; + +/* Check for enabled job ring node */ +ofnode_for_each_subnode (node,dev_ofnode (dev)) { +if (!ofnode_is_available (node)) +continue ; + + jr_node =ofnode_read_u32_default (node,"reg" ,-1 ); +if (jr_node >0 ) { + caam->regs = (struct jr_regs *)((ulong)caam->sec +
jr_node);drivers/crypto/fsl/jr.c +37
-0+while (!(jr_node &0x0F )) + jr_node = jr_node >>4 ; + + caam->jrid = jr_node -1 ; + break; + } + } + +if (sec_init ()) +printf ("\nsec_init failed!\n" ); + +return 0 ; +} + +static int caam_jr_bind (struct udevice *dev) { +return 0 ; +} + +static const struct misc_ops caam_jr_ops = { + .ioctl = caam_jr_ioctl, +}; + +static const struct udevice_id caam_jr_match[] = { + { .compatible ="fsl,sec-v4.0" }, + { } +}; + +U_BOOT_DRIVER (caam_jr) = { + .name ="caam_jr" , + .id =UCLASS_MISC , + .of_match = caam_jr_match, + .ops = &caam_jr_ops, + .bind = caam_jr_bind, + .probe = caam_jr_probe, + .priv_auto =sizeof (struct caam_regs ), +}; +#endif drivers/crypto/fsl/jr.h index renamed from drivers/crypto/fsl/jr.h +0
-0
1047aa772c..3eb7be79da100644drivers/crypto/fsl/jr.h +3
-0@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. +* Copyright 2021 NXP * */ @@ -8,7 +9,9 @@#define __JR_H#include <linux/compiler.h> +#include "fsl_sec.h" #include "type.h" +#include <misc.h> #define JR_SIZE 4 /* Timeout currently defined as 10 sec */ @@ -35,12 +38,21 @@#define
JRSLIODN_SHIFT0
#defineJRSLIODN_MASK0x00000fffdrivers/crypto/fsl/jr.h +25
-4-#define JQ_DEQ_ERR -1 -#define JQ_DEQ_TO_ERR -2 -#define JQ_ENQ_ERR -3 +#define JRDID_MS_PRIM_DID BIT(0) +#define JRDID_MS_PRIM_TZ BIT(4) +#define JRDID_MS_TZ_OWN BIT(15) + +#define JQ_DEQ_ERR (-1) +#define JQ_DEQ_TO_ERR (-2) +#define JQ_ENQ_ERR (-3)#define RNG4_MAX_HANDLES 2 +enum { +/* Run caam jobring descriptor(in buf) */ +CAAM_JR_RUN_DESC , +}; +struct op_ring {caam_dma_addr_t desc;uint32_t status;@@ -102,6 +114,19 @@ struct result {uint32_t status; }; +/* +* struct caam_regs - CAAM initialization register interface +* +* Interface to caam memory map, jobring register, jobring storage. +*/ +struct caam_regs { +ccsr_sec_t *sec;/*caam initialization registers*/ +struct jr_regs *regs;/*jobring configuration registers*/ +u8 jrid;/*id to identify a jobring*/ +/*Private sub-storage for a single JobR*/ +struct jobring jr[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +}; +void caam_jr_strstatus (u32 status);int run_descriptor_jr (uint32_t *desc); --2.17.1
Re: [PATCH v11 01/14] crypto/fsl: Add support for CAAM Job ring driver model
Hi
Quoted 7 lines · Gaurav Jain
Hello Stefano
Michael Trimarchi has shared the patch to fix
imx6dl_mamojspl size error. I have also shared the v11 for caam driver model after adding the final comments . Can you help to apply the series?
My patch is already reviewed by Fabio, Gaurav sorry for the inconvenience and delay
Michael
Quoted 692 lines
Regards
Gaurav JainQuoted 688 lines
-----Original Message-----
From: Gaurav Jain <[email protected]>
Sent: Thursday, March 24, 2022 11:50 AM
To: [email protected]; Stefano Babic <[email protected]>
Cc: Fabio Estevam <[email protected]>; Peng Fan <[email protected]>; Simon Glass <[email protected]>; Michael Walle <[email protected]>; Priyanka Jain <[email protected]>; Ye Li <[email protected]>; Horia Geanta <[email protected]>; Ji Luo <[email protected]>; Franck Lenormand <[email protected]>; Silvano Di Ninno <[email protected]>; Sahil Malhotra <[email protected]>; Pankaj Gupta <[email protected]>; Varun Sethi <[email protected]>; dl-uboot-imx <[email protected]>; Shengzhou Liu <[email protected]>; Mingkai Hu <[email protected]>; Rajesh Bhagat <[email protected]>; Meenakshi Aggarwal <[email protected]>; Wasim Khan <[email protected]>; Alison Wang <[email protected]>; Pramod Kumar <[email protected]>; Andy Tang <[email protected]>; Adrian Alonso <[email protected]>; Vladimir Oltean <[email protected]>; ZHIZHIKIN Andrey <[email protected]>; Michael Trimarchi <[email protected]>; Gaurav Jain <[email protected]>
Subject: [PATCH v11 01/14]crypto/fsl: Add support for CAAM Job ring driver modeladded device tree support for job ring driver.
sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>Reviewed-by Simon Glass <[email protected]>--- drivers/crypto/fsl/Kconfig | 1 + drivers/crypto/fsl/jr.c | 323 ++++++++++++++++++++++++------------- drivers/crypto/fsl/jr.h | 31 +++- 3 files changed, 241 insertions(+), 114 deletions(-)drivers/crypto/fsl/Kconfig index renamed from drivers/crypto/fsl/Kconfig +0
-0
94ff540111..231eb00b5f100644drivers/crypto/fsl/Kconfig +1
-0@@ -2,6 +2,7 @@ config FSL_CAAM bool "Freescale Crypto Driver Support" select SHA_HW_ACCEL # hw_sha1() under drivers/crypto, and needed with SHA_HW_ACCEL + select MISC if DM imply SPL_CRYPTO if (ARM && SPL) imply CMD_HASH helpdrivers/crypto/fsl/jr.c index renamed from drivers/crypto/fsl/jr.c +0
-022b649219e..8103987425 100644
drivers/crypto/fsl/jr.c +16
-5@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP * * Based on CAAM driver in drivers/crypto/caam in Linux */ @@ -11,7 +11,6 @@#include <linux/kernel.h> #include <log.h> #include <malloc.h> -#include "fsl_sec.h" #include "jr.h" #include "jobdesc.h" #include "desc_constr.h" @@ -21,7 +20,10 @@#include <asm/cache.h> #include <asm/fsl_pamu.h> #endif +#include <dm.h> #include <dm/lists.h> +#include <dm/root.h> +#include <dm/device-internal.h> #include <linux/delay.h> #define CIRC_CNT (head, tail, size) (((head) - (tail)) & (size - 1))@@ -35,20 +37,29 @@ uint32_t sec_offset[CONFIG_SYS_FSL_MAX_NUM_OF_SEC] = { #endif }; +#if CONFIG_IS_ENABLED (DM ) +struct udevice *caam_dev; +#else #define SEC_ADDR (idx) \ (ulong)((CONFIG_SYS_FSL_SEC_ADDR + sec_offset[idx]))#define SEC_JR0_ADDR (idx) \ (ulong)(SEC_ADDR(idx) + \ (CONFIG_SYS_FSL_JR0_OFFSET - CONFIG_SYS_FSL_SEC_OFFSET)) +struct caam_regs caam_st; +#endif -struct jobring jr0[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +static inline u32 jr_start_reg (u8 jrid) { +return (1 << jrid); +} -static inline void start_jr0 (uint8_t sec_idx) +static inline void start_jr (struct caam_regs *caam) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); +ccsr_sec_t *sec = caam->sec;u32 ctpr_ms =sec_in32 (&sec->ctpr_ms);u32 scfgr =sec_in32 (&sec->scfgr); +u32 jrstart =jr_start_reg (caam->jrid);if (ctpr_ms &SEC_CTPR_MS_VIRT_EN_INCL ) {/* VIRT_EN_INCL = 1 & VIRT_EN_POR = 1 or @@ -56,23 +67,16 @@ static inline void start_jr0(uint8_t sec_idx) */ if ((
ctpr_ms&SEC_CTPR_MS_VIRT_EN_POR) ||
(scfgr &SEC_SCFGR_VIRT_EN))drivers/crypto/fsl/jr.c +25
-70-sec_out32 (&sec->jrstartr,CONFIG_JRSTARTR_JR0 ); +sec_out32 (&sec->jrstartr, jrstart); }else {/* VIRT_EN_INCL = 0 && VIRT_EN_POR_VALUE = 1 */ if (ctpr_ms &SEC_CTPR_MS_VIRT_EN_POR ) -sec_out32 (&sec->jrstartr,CONFIG_JRSTARTR_JR0 ); +sec_out32 (&sec->jrstartr, jrstart); } } -static inline void jr_reset_liodn (uint8_t sec_idx) +static inline void jr_disable_irq (struct jr_regs *regs) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); -sec_out32 (&sec->jrliodnr[0 ].ls,0 ); -} - -static inline void jr_disable_irq(uint8_t sec_idx) -{ -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx);uint32_t jrcfg =sec_in32 (®s->jrcfg1); jrcfg = jrcfg |JR_INTMASK ;@@ -80,10 +84,10 @@ static inline void jr_disable_irq(uint8_t sec_idx)sec_out32 (®s->jrcfg1, jrcfg); } -static void jr_initregs (uint8_t sec_idx) +static void jr_initregs (uint8_t sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];caam_dma_addr_t ip_base =virt_to_phys ((void *)jr->input_ring);caam_dma_addr_t op_base =virt_to_phys ((void *)jr->output_ring);@@ -103,16 +107,16 @@ static void jr_initregs(uint8_t sec_idx)sec_out32 (®s->irs,JR_SIZE );if (!jr->irq) -jr_disable_irq (sec_idx); +jr_disable_irq (regs); } -static int jr_init (uint8_t sec_idx) +static int jr_init (uint8_t sec_idx,struct caam_regs *caam) { -struct jobring *jr = &jr0[sec_idx]; +struct jobring *jr = &caam->jr[sec_idx];memset (jr,0 ,sizeof (struct jobring )); - jr->jq_id =DEFAULT_JR_ID ; + jr->jq_id = caam->jrid; jr->irq =DEFAULT_IRQ ;#ifdef CONFIG_FSL_CORENET @@ -134,53 +138,8 @@ static int jr_init(uint8_t sec_idx)memset (jr->input_ring,0 ,JR_SIZE *sizeof (caam_dma_addr_t));memset (jr->output_ring,0 , jr->op_size); -start_jr0 (sec_idx); - -jr_initregs (sec_idx); - -return 0 ; -} - -static int jr_sw_cleanup(uint8_t sec_idx) -{ -struct jobring *jr = &jr0[sec_idx]; - - jr->head =0 ; - jr->tail =0 ; - jr->read_idx =0 ; - jr->write_idx =0 ; -memset (jr->info,0 ,sizeof (jr->info)); -memset (jr->input_ring,0 , jr->size *sizeof (caam_dma_addr_t)); -memset (jr->output_ring,0 , jr->size *sizeof (struct op_ring )); - -return 0 ; -} - -static int jr_hw_reset(uint8_t sec_idx) -{ -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -uint32_t timeout =100000 ; -uint32_t jrint, jrcr; - -sec_out32 (®s->jrcr,JRCR_RESET ); -do { - jrint =sec_in32 (®s->jrint); - }while (((jrint &JRINT_ERR_HALT_MASK ) == -JRINT_ERR_HALT_INPROGRESS ) && --timeout); - - jrint =sec_in32 (®s->jrint); -if (((jrint &JRINT_ERR_HALT_MASK ) != -JRINT_ERR_HALT_INPROGRESS ) && timeout ==0 ) -return -1 ; - - timeout =100000 ; -sec_out32 (®s->jrcr,JRCR_RESET ); -do { - jrcr =sec_in32 (®s->jrcr); - }while ((jrcr &JRCR_RESET ) && --timeout); - -if (timeout ==0 ) -return -1 ; +start_jr (caam); +jr_initregs (sec_idx, caam);return 0 ; }@@ -188,10 +147,10 @@ static int jr_hw_reset(uint8_t sec_idx)/* -1 --- error, can't enqueue -- no space available */ static int jr_enqueue (uint32_t *desc_addr,void (*callback)(uint32_t status,void *arg), -void *arg,uint8_t sec_idx) +void *arg,uint8_t sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];int head = jr->head;uint32_t desc_word;int length =desc_len (desc_addr);@@ -263,10 +222,10 @@ static int jr_enqueue(uint32_t *desc_addr,return 0 ; } -static int jr_dequeue (int sec_idx) +static int jr_dequeue (int sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];int head = jr->head;int tail = jr->tail;int idx, i, found;@@ -349,14 +308,18 @@ static void desc_done(uint32_t status, void *arg) {struct result *x = arg; x->status = status; -#ifndef CONFIG_SPL_BUILD caam_jr_strstatus (status); -#endif x->done =1 ; }static inline int run_descriptor_jr_idx (uint32_t *desc,uint8_t sec_idx) { +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif unsigned long long timeval =0 ;unsigned long long timeout =CONFIG_USEC_DEQ_TIMEOUT ;struct result op;@@ -364,7 +327,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) memset(&op, 0, sizeof(op)); - ret =jr_enqueue (desc, desc_done, &op, sec_idx); + ret =jr_enqueue (desc, desc_done, &op, sec_idx, caam);if (ret) {debug ("Error in SEC enq\n" );ret = JQ_ENQ_ERR;drivers/crypto/fsl/jr.c +1
-1@@ -375,7 +338,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) udelay(1); timeval +=1 ; - ret =jr_dequeue (sec_idx); + ret =jr_dequeue (sec_idx, caam);if (ret) {debug ("Error in SEC deq\n" );ret = JQ_DEQ_ERR;drivers/crypto/fsl/jr.c +62
-15@@ -402,13 +365,62 @@ int run_descriptor_jr(uint32_t *desc)return run_descriptor_jr_idx (desc,0 ); } +static int jr_sw_cleanup (uint8_t sec_idx,struct caam_regs *caam) { +struct jobring *jr = &caam->jr[sec_idx]; + + jr->head =0 ; + jr->tail =0 ; + jr->read_idx =0 ; + jr->write_idx =0 ; +memset (jr->info,0 ,sizeof (jr->info)); +memset (jr->input_ring,0 , jr->size *sizeof (caam_dma_addr_t)); +memset (jr->output_ring,0 , jr->size *sizeof (struct op_ring )); + +return 0 ; +} + +static int jr_hw_reset (struct jr_regs *regs) { +uint32_t timeout =100000 ; +uint32_t jrint, jrcr; + +sec_out32 (®s->jrcr,JRCR_RESET ); +do { + jrint =sec_in32 (®s->jrint); + }while (((jrint &JRINT_ERR_HALT_MASK ) == +JRINT_ERR_HALT_INPROGRESS ) && --timeout); + + jrint =sec_in32 (®s->jrint); +if (((jrint &JRINT_ERR_HALT_MASK ) != +JRINT_ERR_HALT_INPROGRESS ) && timeout ==0 ) +return -1 ; + + timeout =100000 ; +sec_out32 (®s->jrcr,JRCR_RESET ); +do { + jrcr =sec_in32 (®s->jrcr); + }while ((jrcr &JRCR_RESET ) && --timeout); + +if (timeout ==0 ) +return -1 ; + +return 0 ; +} +static inline int jr_reset_sec (uint8_t sec_idx) { -if (jr_hw_reset (sec_idx) <0 ) +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif +if (jr_hw_reset (caam->regs) <0 )return -1 ;/* Clean up the jobring structure maintained by software */ -jr_sw_cleanup (sec_idx); +jr_sw_cleanup (sec_idx, caam);return 0 ; }@@ -418,9 +430,15 @@ int jr_reset(void)return jr_reset_sec (0 ); } -static inline int sec_reset_idx (uint8_t sec_idx) +int sec_reset (void ) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif +ccsr_sec_t *sec = caam->sec;uint32_t mcfgr =sec_in32 (&sec->mcfgr);uint32_t timeout =100000 ;@@ -446,11 +464,7 @@ static inline int sec_reset_idx(uint8_t sec_idx)return 0 ; } -int sec_reset (void ) -{ -return sec_reset_idx (0 ); -} -#ifndef CONFIG_SPL_BUILD +static int deinstantiate_rng (u8 sec_idx,int state_handle_mask) {u32 *desc;@@ -496,12 +510,11 @@ static int deinstantiate_rng(u8 sec_idx, int state_handle_mask)return ret; } -static int instantiate_rng (u8 sec_idx,int gen_sk) +static int instantiate_rng (uint8_t sec_idx,ccsr_sec_t *sec,int +gen_sk) {u32 *desc;u32 rdsta_val;int ret =0 , sh_idx, size; -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;@@ -554,9 +567,8 @@ static int instantiate_rng(u8 sec_idx, int gen_sk)return ret; } -static u8 get_rng_vid (uint8_t sec_idx) +static u8 get_rng_vid (ccsr_sec_t *sec) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx);u8 vid;if (caam_get_era () <10 ) {@@ -574,9 +586,8 @@ static u8 get_rng_vid(uint8_t sec_idx)* By default, the TRNG runs for 200 clocks per sample; * 1200 clocks per sample generates better entropy. */ -static void kick_trng (int ent_delay,uint8_t sec_idx) +static void kick_trng (int ent_delay,ccsr_sec_t *sec) { -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;u32 val;drivers/crypto/fsl/jr.c +3
-4@@ -603,10 +614,9 @@ static void kick_trng(int ent_delay, uint8_t sec_idx)sec_clrbits32 (&rng->rtmctl,RTMCTL_PRGM ); } -static int rng_init (uint8_t sec_idx) +static int rng_init (uint8_t sec_idx,ccsr_sec_t *sec) {int ret, gen_sk, ent_delay =RTSDCTL_ENT_DLY_MIN ; -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;u32 inst_handles;@@ -624,7 +634,7 @@ static int rng_init(uint8_t sec_idx)* the TRNG parameters. */ if (!inst_handles) { -kick_trng (ent_delay, sec_idx); +kick_trng (ent_delay, sec); ent_delay +=400 ; }/* @@ -634,7 +644,7 @@ static int rng_init(uint8_t sec_idx)* interval, leading to a sucessful initialization of * the RNG. */ - ret =instantiate_rng (sec_idx, gen_sk); + ret =instantiate_rng (sec_idx, sec, gen_sk); }while ((ret ==-1 ) && (ent_delay <RTSDCTL_ENT_DLY_MAX ));if (ret) { printf("SEC%u: Failed to instantiate RNG\n", sec_idx); @@ -646,13 +656,28 @@ static int
rng_init(uint8_t sec_idx)return ret;}
drivers/crypto/fsl/jr.c +64
-13-#endif +int sec_init_idx (uint8_t sec_idx) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); -uint32_t mcr =sec_in32 (&sec->mcfgr);int ret =0 ; - +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) +if (!caam_dev) { +printf ("caam_jr: caam not found\n" ); +return -1 ; + } + caam =dev_get_priv (caam_dev); +#else + caam_st.sec = (void *)SEC_ADDR (sec_idx); + caam_st.regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); + caam_st.jrid =0 ; + caam = &caam_st; +#endif +ccsr_sec_t *sec = caam->sec; +uint32_t mcr =sec_in32 (&sec->mcfgr); +#if defined(CONFIG_SPL_BUILD ) && defined(CONFIG_IMX8M ) +uint32_t jrdid_ms =0 ; +#endif #ifdef CONFIG_FSL_CORENET uint32_t liodnr;uint32_t liodn_ns;@@ -682,6 +707,11 @@ int sec_init_idx(uint8_t sec_idx) mcr |= (1 <<MCFGR_PS_SHIFT );#endif sec_out32 (&sec->mcfgr, mcr); +#if defined(CONFIG_SPL_BUILD ) && defined(CONFIG_IMX8M ) + jrdid_ms =JRDID_MS_TZ_OWN |JRDID_MS_PRIM_TZ |JRDID_MS_PRIM_DID ; +sec_out32 (&sec->jrliodnr[caam->jrid].ms, jrdid_ms);#endif +jr_reset ();#ifdef CONFIG_FSL_CORENET #ifdef CONFIG_SPL_BUILD @@ -693,20 +723,19 @@ int sec_init_idx(uint8_t sec_idx) liodn_ns =CONFIG_SPL_JR0_LIODN_NS &JRNSLIODN_MASK ; liodn_s =CONFIG_SPL_JR0_LIODN_S &JRSLIODN_MASK ; - liodnr =sec_in32 (&sec->jrliodnr[0 ].ls) & + liodnr =sec_in32 (&sec->jrliodnr[caam->jrid].ls) & ~(JRNSLIODN_MASK |JRSLIODN_MASK ); liodnr = liodnr | (liodn_ns <<JRNSLIODN_SHIFT ) | (liodn_s <<JRSLIODN_SHIFT ); -sec_out32 (&sec->jrliodnr[0 ].ls, liodnr); +sec_out32 (&sec->jrliodnr[caam->jrid].ls, liodnr);#else - liodnr =sec_in32 (&sec->jrliodnr[0 ].ls); + liodnr =sec_in32 (&sec->jrliodnr[caam->jrid].ls); liodn_ns = (liodnr &JRNSLIODN_MASK ) >>JRNSLIODN_SHIFT ; liodn_s = (liodnr &JRSLIODN_MASK ) >>JRSLIODN_SHIFT ;#endif #endif - - ret =jr_init (sec_idx); + ret =jr_init (sec_idx, caam);if (ret <0 ) {printf ("SEC%u: initialization failed\n" , sec_idx);return -1 ;@@ -719,9 +748,9 @@ int sec_init_idx(uint8_t sec_idx)pamu_enable ();#endif -#ifndef CONFIG_SPL_BUILD -if (get_rng_vid (sec_idx) >=4 ) { -if (rng_init (sec_idx) <0 ) { + +if (get_rng_vid (caam->sec) >=4 ) { +if (rng_init (sec_idx, caam->sec) <0 ) {printf ("SEC%u: RNG instantiation failed\n" , sec_idx);return -1 ; }@@ -735,7 +764,6 @@ int sec_init_idx(uint8_t sec_idx)printf ("SEC%u: RNG instantiated\n" , sec_idx); } -#endif return ret; }@@ -743,3 +771,76 @@ int sec_init(void) {return sec_init_idx (0 ); } + +#if CONFIG_IS_ENABLED (DM ) +static int caam_jr_ioctl (struct udevice *dev,unsigned long request, +void *buf) { +if (request !=CAAM_JR_RUN_DESC ) +return -ENOSYS ; + +return run_descriptor_jr (buf); +} + +static int caam_jr_probe (struct udevice *dev) { +struct caam_regs *caam =dev_get_priv (dev); +fdt_addr_t addr; +ofnode node; +unsigned int jr_node =0 ; + + caam_dev = dev; + + addr =dev_read_addr (dev); +if (addr ==FDT_ADDR_T_NONE ) { +printf ("caam_jr: crypto not found\n" ); +return -EINVAL ; + } + caam->sec = (ccsr_sec_t *)(uintptr_t )addr; + caam->regs = (struct jr_regs *)caam->sec; + +/* Check for enabled job ring node */ +ofnode_for_each_subnode (node,dev_ofnode (dev)) { +if (!ofnode_is_available (node)) +continue ; + + jr_node =ofnode_read_u32_default (node,"reg" ,-1 ); +if (jr_node >0 ) { + caam->regs = (struct jr_regs *)((ulong)caam->sec +
jr_node);drivers/crypto/fsl/jr.c +37
-0+while (!(jr_node &0x0F )) + jr_node = jr_node >>4 ; + + caam->jrid = jr_node -1 ; + break; + } + } + +if (sec_init ()) +printf ("\nsec_init failed!\n" ); + +return 0 ; +} + +static int caam_jr_bind (struct udevice *dev) { +return 0 ; +} + +static const struct misc_ops caam_jr_ops = { + .ioctl = caam_jr_ioctl, +}; + +static const struct udevice_id caam_jr_match[] = { + { .compatible ="fsl,sec-v4.0" }, + { } +}; + +U_BOOT_DRIVER (caam_jr) = { + .name ="caam_jr" , + .id =UCLASS_MISC , + .of_match = caam_jr_match, + .ops = &caam_jr_ops, + .bind = caam_jr_bind, + .probe = caam_jr_probe, + .priv_auto =sizeof (struct caam_regs ), +}; +#endif drivers/crypto/fsl/jr.h index renamed from drivers/crypto/fsl/jr.h +0
-0
1047aa772c..3eb7be79da100644drivers/crypto/fsl/jr.h +3
-0@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. +* Copyright 2021 NXP * */ @@ -8,7 +9,9 @@#define __JR_H#include <linux/compiler.h> +#include "fsl_sec.h" #include "type.h" +#include <misc.h> #define JR_SIZE 4 /* Timeout currently defined as 10 sec */ @@ -35,12 +38,21 @@#define
JRSLIODN_SHIFT0
#defineJRSLIODN_MASK0x00000fffdrivers/crypto/fsl/jr.h +25
-4-#define JQ_DEQ_ERR -1 -#define JQ_DEQ_TO_ERR -2 -#define JQ_ENQ_ERR -3 +#define JRDID_MS_PRIM_DID BIT(0) +#define JRDID_MS_PRIM_TZ BIT(4) +#define JRDID_MS_TZ_OWN BIT(15) + +#define JQ_DEQ_ERR (-1) +#define JQ_DEQ_TO_ERR (-2) +#define JQ_ENQ_ERR (-3)#define RNG4_MAX_HANDLES 2 +enum { +/* Run caam jobring descriptor(in buf) */ +CAAM_JR_RUN_DESC , +}; +struct op_ring {caam_dma_addr_t desc;uint32_t status;@@ -102,6 +114,19 @@ struct result {uint32_t status; }; +/* +* struct caam_regs - CAAM initialization register interface +* +* Interface to caam memory map, jobring register, jobring storage. +*/ +struct caam_regs { +ccsr_sec_t *sec;/*caam initialization registers*/ +struct jr_regs *regs;/*jobring configuration registers*/ +u8 jrid;/*id to identify a jobring*/ +/*Private sub-storage for a single JobR*/ +struct jobring jr[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +}; +void caam_jr_strstatus (u32 status);int run_descriptor_jr (uint32_t *desc); --2.17.1
Signature · 11 lines
Michael Nazzareno Trimarchi Co-Founder & Chief Executive Officer M. +39 347 913 2170 [email protected] __________________________________ Amarula Solutions BV Joop Geesinkweg 125, 1114 AB, Amsterdam, NL T. +31 (0)85 111 9172 [email protected] www.amarulasolutions.com
Re: [PATCH v11 01/14] crypto/fsl: Add support for CAAM Job ring driver model
In reply to Gaurav JainHi Gaurav,
I get breakage for some Layerscape boards after applying your V11 series:
aarch64: + ls1043ardb_sdcard_SECURE_BOOT
+===================== WARNING ======================
+This board does not use CONFIG_DM_SERIAL (Driver Model
+for Serial drivers). Please update the board to use
+CONFIG_DM_SERIAL before the v2023.04 release. Failure to
+update by the deadline may result in board removal.
+See doc/develop/driver-model/migration.rst for more info.
+====================================================
+aarch64-linux-ld.bfd: drivers/core/ofnode.o: in function `ofnode_read_u32_index':
+drivers/core/ofnode.c:60: undefined reference to `fdt_getprop'
+drivers/core/ofnode.c:60:(.text.ofnode_read_u32_index+0x24): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `fdt_getprop'
+aarch64-linux-ld.bfd: drivers/core/ofnode.o: in function `ofnode_is_available':
+drivers/core/ofnode.c:763: undefined reference to `fdtdec_get_is_enabled'
+drivers/core/ofnode.c:763:(.text.ofnode_is_available+0x10): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `fdtdec_get_is_enabled'
+aarch64-linux-ld.bfd: drivers/crypto/fsl/jr.o: in function `ofnode_first_subnode':
+include/dm/ofnode.h:413: undefined reference to `fdt_first_subnode'
+include/dm/ofnode.h:413:(.text.caam_jr_probe+0x68): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `fdt_first_subnode'
+aarch64-linux-ld.bfd: drivers/crypto/fsl/jr.o: in function `ofnode_next_subnode':
+include/dm/ofnode.h:423: undefined reference to `fdt_next_subnode'
+include/dm/ofnode.h:423:(.text.caam_jr_probe+0xf4): relocation truncated to fit: R_AARCH64_CALL26 against undefined symbol `fdt_next_subnode'
+make[2]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1
+make[1]: *** [Makefile:2105: spl/u-boot-spl] Error 2
+make: *** [Makefile:177: sub-make] Error 2
Strange enough, I do not remember this when I have tried a previous version. Can you check yourself and repost ?
Best regards,
Stefano
Quoted 672 lines · Gaurav Jain
added device tree support for job ring driver. sec is initialized based on job ring information processed from device tree.
Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>Reviewed-by Simon Glass <[email protected]>--- drivers/crypto/fsl/Kconfig | 1 + drivers/crypto/fsl/jr.c | 323 ++++++++++++++++++++++++------------- drivers/crypto/fsl/jr.h | 31 +++- 3 files changed, 241 insertions(+), 114 deletions(-)drivers/crypto/fsl/Kconfig +1
-0@@ -2,6 +2,7 @@ config FSL_CAAM bool "Freescale Crypto Driver Support" select SHA_HW_ACCEL # hw_sha1() under drivers/crypto, and needed with SHA_HW_ACCEL + select MISC if DM imply SPL_CRYPTO if (ARM && SPL) imply CMD_HASH helpdrivers/crypto/fsl/jr.c +212
-111@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP * * Based on CAAM driver in drivers/crypto/caam in Linux */ @@ -11,7 +11,6 @@#include <linux/kernel.h> #include <log.h> #include <malloc.h> -#include "fsl_sec.h" #include "jr.h" #include "jobdesc.h" #include "desc_constr.h" @@ -21,7 +20,10 @@#include <asm/cache.h> #include <asm/fsl_pamu.h> #endif +#include <dm.h> #include <dm/lists.h> +#include <dm/root.h> +#include <dm/device-internal.h> #include <linux/delay.h> #define CIRC_CNT (head, tail, size) (((head) - (tail)) & (size - 1))@@ -35,20 +37,29 @@ uint32_t sec_offset[CONFIG_SYS_FSL_MAX_NUM_OF_SEC] = {#endif }; +#if CONFIG_IS_ENABLED (DM ) +struct udevice *caam_dev; +#else #define SEC_ADDR (idx) \ (ulong)((CONFIG_SYS_FSL_SEC_ADDR + sec_offset[idx]))#define SEC_JR0_ADDR (idx) \ (ulong)(SEC_ADDR(idx) + \ (CONFIG_SYS_FSL_JR0_OFFSET - CONFIG_SYS_FSL_SEC_OFFSET)) +struct caam_regs caam_st; +#endif -struct jobring jr0[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +static inline u32 jr_start_reg (u8 jrid) +{ +return (1 << jrid); +} -static inline void start_jr0 (uint8_t sec_idx) +static inline void start_jr (struct caam_regs *caam) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); +ccsr_sec_t *sec = caam->sec;u32 ctpr_ms =sec_in32 (&sec->ctpr_ms);u32 scfgr =sec_in32 (&sec->scfgr); +u32 jrstart =jr_start_reg (caam->jrid);if (ctpr_ms &SEC_CTPR_MS_VIRT_EN_INCL ) {/* VIRT_EN_INCL = 1 & VIRT_EN_POR = 1 or @@ -56,23 +67,16 @@ static inline void start_jr0(uint8_t sec_idx)*/ if ((ctpr_ms &SEC_CTPR_MS_VIRT_EN_POR ) || (scfgr &SEC_SCFGR_VIRT_EN )) -sec_out32 (&sec->jrstartr,CONFIG_JRSTARTR_JR0 ); +sec_out32 (&sec->jrstartr, jrstart); }else {/* VIRT_EN_INCL = 0 && VIRT_EN_POR_VALUE = 1 */ if (ctpr_ms &SEC_CTPR_MS_VIRT_EN_POR ) -sec_out32 (&sec->jrstartr,CONFIG_JRSTARTR_JR0 ); +sec_out32 (&sec->jrstartr, jrstart); } } -static inline void jr_reset_liodn (uint8_t sec_idx) +static inline void jr_disable_irq (struct jr_regs *regs) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); -sec_out32 (&sec->jrliodnr[0 ].ls,0 ); -} - -static inline void jr_disable_irq (uint8_t sec_idx) -{ -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx);uint32_t jrcfg =sec_in32 (®s->jrcfg1); jrcfg = jrcfg |JR_INTMASK ;@@ -80,10 +84,10 @@ static inline void jr_disable_irq(uint8_t sec_idx)sec_out32 (®s->jrcfg1, jrcfg); } -static void jr_initregs (uint8_t sec_idx) +static void jr_initregs (uint8_t sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];caam_dma_addr_t ip_base =virt_to_phys ((void *)jr->input_ring);caam_dma_addr_t op_base =virt_to_phys ((void *)jr->output_ring);@@ -103,16 +107,16 @@ static void jr_initregs(uint8_t sec_idx)sec_out32 (®s->irs,JR_SIZE );if (!jr->irq) -jr_disable_irq (sec_idx); +jr_disable_irq (regs); } -static int jr_init (uint8_t sec_idx) +static int jr_init (uint8_t sec_idx,struct caam_regs *caam) { -struct jobring *jr = &jr0[sec_idx]; +struct jobring *jr = &caam->jr[sec_idx];memset (jr,0 ,sizeof (struct jobring )); - jr->jq_id =DEFAULT_JR_ID ; + jr->jq_id = caam->jrid; jr->irq =DEFAULT_IRQ ;#ifdef CONFIG_FSL_CORENET @@ -134,53 +138,8 @@ static int jr_init(uint8_t sec_idx)memset (jr->input_ring,0 ,JR_SIZE *sizeof (caam_dma_addr_t));memset (jr->output_ring,0 , jr->op_size); -start_jr0 (sec_idx); - -jr_initregs (sec_idx); - -return 0 ; -} - -static int jr_sw_cleanup (uint8_t sec_idx) -{ -struct jobring *jr = &jr0[sec_idx]; - - jr->head =0 ; - jr->tail =0 ; - jr->read_idx =0 ; - jr->write_idx =0 ; -memset (jr->info,0 ,sizeof (jr->info)); -memset (jr->input_ring,0 , jr->size *sizeof (caam_dma_addr_t)); -memset (jr->output_ring,0 , jr->size *sizeof (struct op_ring )); - -return 0 ; -} - -static int jr_hw_reset (uint8_t sec_idx) -{ -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -uint32_t timeout =100000 ; -uint32_t jrint, jrcr; - -sec_out32 (®s->jrcr,JRCR_RESET ); -do { - jrint =sec_in32 (®s->jrint); - }while (((jrint &JRINT_ERR_HALT_MASK ) == -JRINT_ERR_HALT_INPROGRESS ) && --timeout); - - jrint =sec_in32 (®s->jrint); -if (((jrint &JRINT_ERR_HALT_MASK ) != -JRINT_ERR_HALT_INPROGRESS ) && timeout ==0 ) -return -1 ; - - timeout =100000 ; -sec_out32 (®s->jrcr,JRCR_RESET ); -do { - jrcr =sec_in32 (®s->jrcr); - }while ((jrcr &JRCR_RESET ) && --timeout); - -if (timeout ==0 ) -return -1 ; +start_jr (caam); +jr_initregs (sec_idx, caam);return 0 ; }@@ -188,10 +147,10 @@ static int jr_hw_reset(uint8_t sec_idx)/* -1 --- error, can't enqueue -- no space available */ static int jr_enqueue (uint32_t *desc_addr,void (*callback)(uint32_t status,void *arg), -void *arg,uint8_t sec_idx) +void *arg,uint8_t sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];int head = jr->head;uint32_t desc_word;int length =desc_len (desc_addr);@@ -263,10 +222,10 @@ static int jr_enqueue(uint32_t *desc_addr,return 0 ; } -static int jr_dequeue (int sec_idx) +static int jr_dequeue (int sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];int head = jr->head;int tail = jr->tail;int idx, i, found;@@ -349,14 +308,18 @@ static void desc_done(uint32_t status, void *arg) {struct result *x = arg; x->status = status; -#ifndef CONFIG_SPL_BUILD caam_jr_strstatus (status); -#endif x->done =1 ; }static inline int run_descriptor_jr_idx (uint32_t *desc,uint8_t sec_idx) { +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif unsigned long long timeval =0 ;unsigned long long timeout =CONFIG_USEC_DEQ_TIMEOUT ;struct result op;@@ -364,7 +327,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx)memset (&op,0 ,sizeof (op)); - ret =jr_enqueue (desc, desc_done, &op, sec_idx); + ret =jr_enqueue (desc, desc_done, &op, sec_idx, caam);if (ret) {debug ("Error in SEC enq\n" ); ret =JQ_ENQ_ERR ;@@ -375,7 +338,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx)udelay (1 ); timeval +=1 ; - ret =jr_dequeue (sec_idx); + ret =jr_dequeue (sec_idx, caam);if (ret) {debug ("Error in SEC deq\n" ); ret =JQ_DEQ_ERR ;@@ -402,13 +365,62 @@ int run_descriptor_jr(uint32_t *desc)return run_descriptor_jr_idx (desc,0 ); } +static int jr_sw_cleanup (uint8_t sec_idx,struct caam_regs *caam) +{ +struct jobring *jr = &caam->jr[sec_idx]; + + jr->head =0 ; + jr->tail =0 ; + jr->read_idx =0 ; + jr->write_idx =0 ; +memset (jr->info,0 ,sizeof (jr->info)); +memset (jr->input_ring,0 , jr->size *sizeof (caam_dma_addr_t)); +memset (jr->output_ring,0 , jr->size *sizeof (struct op_ring )); + +return 0 ; +} + +static int jr_hw_reset (struct jr_regs *regs) +{ +uint32_t timeout =100000 ; +uint32_t jrint, jrcr; + +sec_out32 (®s->jrcr,JRCR_RESET ); +do { + jrint =sec_in32 (®s->jrint); + }while (((jrint &JRINT_ERR_HALT_MASK ) == +JRINT_ERR_HALT_INPROGRESS ) && --timeout); + + jrint =sec_in32 (®s->jrint); +if (((jrint &JRINT_ERR_HALT_MASK ) != +JRINT_ERR_HALT_INPROGRESS ) && timeout ==0 ) +return -1 ; + + timeout =100000 ; +sec_out32 (®s->jrcr,JRCR_RESET ); +do { + jrcr =sec_in32 (®s->jrcr); + }while ((jrcr &JRCR_RESET ) && --timeout); + +if (timeout ==0 ) +return -1 ; + +return 0 ; +} +static inline int jr_reset_sec (uint8_t sec_idx) { -if (jr_hw_reset (sec_idx) <0 ) +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif +if (jr_hw_reset (caam->regs) <0 )return -1 ;/* Clean up the jobring structure maintained by software */ -jr_sw_cleanup (sec_idx); +jr_sw_cleanup (sec_idx, caam);return 0 ; }@@ -418,9 +430,15 @@ int jr_reset(void)return jr_reset_sec (0 ); } -static inline int sec_reset_idx (uint8_t sec_idx) +int sec_reset (void ) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif +ccsr_sec_t *sec = caam->sec;uint32_t mcfgr =sec_in32 (&sec->mcfgr);uint32_t timeout =100000 ;@@ -446,11 +464,7 @@ static inline int sec_reset_idx(uint8_t sec_idx)return 0 ; } -int sec_reset (void ) -{ -return sec_reset_idx (0 ); -} -#ifndef CONFIG_SPL_BUILD +static int deinstantiate_rng (u8 sec_idx,int state_handle_mask) {u32 *desc;@@ -496,12 +510,11 @@ static int deinstantiate_rng(u8 sec_idx, int state_handle_mask)return ret; } -static int instantiate_rng (u8 sec_idx,int gen_sk) +static int instantiate_rng (uint8_t sec_idx,ccsr_sec_t *sec,int gen_sk) {u32 *desc;u32 rdsta_val;int ret =0 , sh_idx, size; -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR (sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;@@ -554,9 +567,8 @@ static int instantiate_rng(u8 sec_idx, int gen_sk)return ret; } -static u8 get_rng_vid (uint8_t sec_idx) +static u8 get_rng_vid (ccsr_sec_t *sec) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx);u8 vid;if (caam_get_era () <10 ) {@@ -574,9 +586,8 @@ static u8 get_rng_vid(uint8_t sec_idx)* By default, the TRNG runs for 200 clocks per sample; * 1200 clocks per sample generates better entropy. */ -static void kick_trng (int ent_delay,uint8_t sec_idx) +static void kick_trng (int ent_delay,ccsr_sec_t *sec) { -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR (sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;u32 val;@@ -603,10 +614,9 @@ static void kick_trng(int ent_delay, uint8_t sec_idx)sec_clrbits32 (&rng->rtmctl,RTMCTL_PRGM ); } -static int rng_init (uint8_t sec_idx) +static int rng_init (uint8_t sec_idx,ccsr_sec_t *sec) {int ret, gen_sk, ent_delay =RTSDCTL_ENT_DLY_MIN ; -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR (sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;u32 inst_handles;@@ -624,7 +634,7 @@ static int rng_init(uint8_t sec_idx)* the TRNG parameters. */ if (!inst_handles) { -kick_trng (ent_delay, sec_idx); +kick_trng (ent_delay, sec); ent_delay +=400 ; }/* @@ -634,7 +644,7 @@ static int rng_init(uint8_t sec_idx)* interval, leading to a sucessful initialization of * the RNG. */ - ret =instantiate_rng (sec_idx, gen_sk); + ret =instantiate_rng (sec_idx, sec, gen_sk); }while ((ret ==-1 ) && (ent_delay <RTSDCTL_ENT_DLY_MAX ));if (ret) {printf ("SEC%u: Failed to instantiate RNG\n" , sec_idx);@@ -646,13 +656,28 @@ static int rng_init(uint8_t sec_idx)return ret; } -#endif +int sec_init_idx (uint8_t sec_idx) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); -uint32_t mcr =sec_in32 (&sec->mcfgr);int ret =0 ; - +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) +if (!caam_dev) { +printf ("caam_jr: caam not found\n" ); +return -1 ; + } + caam =dev_get_priv (caam_dev); +#else + caam_st.sec = (void *)SEC_ADDR (sec_idx); + caam_st.regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); + caam_st.jrid =0 ; + caam = &caam_st; +#endif +ccsr_sec_t *sec = caam->sec; +uint32_t mcr =sec_in32 (&sec->mcfgr); +#if defined(CONFIG_SPL_BUILD ) && defined(CONFIG_IMX8M ) +uint32_t jrdid_ms =0 ; +#endif #ifdef CONFIG_FSL_CORENET uint32_t liodnr;uint32_t liodn_ns;@@ -682,6 +707,11 @@ int sec_init_idx(uint8_t sec_idx) mcr |= (1 <<MCFGR_PS_SHIFT );#endif sec_out32 (&sec->mcfgr, mcr); +#if defined(CONFIG_SPL_BUILD ) && defined(CONFIG_IMX8M ) + jrdid_ms =JRDID_MS_TZ_OWN |JRDID_MS_PRIM_TZ |JRDID_MS_PRIM_DID ; +sec_out32 (&sec->jrliodnr[caam->jrid].ms, jrdid_ms); +#endif +jr_reset ();#ifdef CONFIG_FSL_CORENET #ifdef CONFIG_SPL_BUILD @@ -693,20 +723,19 @@ int sec_init_idx(uint8_t sec_idx) liodn_ns =CONFIG_SPL_JR0_LIODN_NS &JRNSLIODN_MASK ; liodn_s =CONFIG_SPL_JR0_LIODN_S &JRSLIODN_MASK ; - liodnr =sec_in32 (&sec->jrliodnr[0 ].ls) & + liodnr =sec_in32 (&sec->jrliodnr[caam->jrid].ls) & ~(JRNSLIODN_MASK |JRSLIODN_MASK ); liodnr = liodnr | (liodn_ns <<JRNSLIODN_SHIFT ) | (liodn_s <<JRSLIODN_SHIFT ); -sec_out32 (&sec->jrliodnr[0 ].ls, liodnr); +sec_out32 (&sec->jrliodnr[caam->jrid].ls, liodnr);#else - liodnr =sec_in32 (&sec->jrliodnr[0 ].ls); + liodnr =sec_in32 (&sec->jrliodnr[caam->jrid].ls); liodn_ns = (liodnr &JRNSLIODN_MASK ) >>JRNSLIODN_SHIFT ; liodn_s = (liodnr &JRSLIODN_MASK ) >>JRSLIODN_SHIFT ;#endif #endif - - ret =jr_init (sec_idx); + ret =jr_init (sec_idx, caam);if (ret <0 ) {printf ("SEC%u: initialization failed\n" , sec_idx);return -1 ;@@ -719,9 +748,9 @@ int sec_init_idx(uint8_t sec_idx)pamu_enable ();#endif -#ifndef CONFIG_SPL_BUILD -if (get_rng_vid (sec_idx) >=4 ) { -if (rng_init (sec_idx) <0 ) { + +if (get_rng_vid (caam->sec) >=4 ) { +if (rng_init (sec_idx, caam->sec) <0 ) {printf ("SEC%u: RNG instantiation failed\n" , sec_idx);return -1 ; }@@ -735,7 +764,6 @@ int sec_init_idx(uint8_t sec_idx)printf ("SEC%u: RNG instantiated\n" , sec_idx); } -#endif return ret; }@@ -743,3 +771,76 @@ int sec_init(void) {return sec_init_idx (0 ); } + +#if CONFIG_IS_ENABLED (DM ) +static int caam_jr_ioctl (struct udevice *dev,unsigned long request,void *buf) +{ +if (request !=CAAM_JR_RUN_DESC ) +return -ENOSYS ; + +return run_descriptor_jr (buf); +} + +static int caam_jr_probe (struct udevice *dev) +{ +struct caam_regs *caam =dev_get_priv (dev); +fdt_addr_t addr; +ofnode node; +unsigned int jr_node =0 ; + + caam_dev = dev; + + addr =dev_read_addr (dev); +if (addr ==FDT_ADDR_T_NONE ) { +printf ("caam_jr: crypto not found\n" ); +return -EINVAL ; + } + caam->sec = (ccsr_sec_t *)(uintptr_t )addr; + caam->regs = (struct jr_regs *)caam->sec; + +/* Check for enabled job ring node */ +ofnode_for_each_subnode (node,dev_ofnode (dev)) { +if (!ofnode_is_available (node)) +continue ; + + jr_node =ofnode_read_u32_default (node,"reg" ,-1 ); +if (jr_node >0 ) { + caam->regs = (struct jr_regs *)((ulong )caam->sec + jr_node); +while (!(jr_node &0x0F )) + jr_node = jr_node >>4 ; + + caam->jrid = jr_node -1 ; +break ; + } + } + +if (sec_init ()) +printf ("\nsec_init failed!\n" ); + +return 0 ; +} + +static int caam_jr_bind (struct udevice *dev) +{ +return 0 ; +} + +static const struct misc_ops caam_jr_ops = { + .ioctl = caam_jr_ioctl, +}; + +static const struct udevice_id caam_jr_match[] = { + { .compatible ="fsl,sec-v4.0" }, + { } +}; + +U_BOOT_DRIVER (caam_jr) = { + .name ="caam_jr" , + .id =UCLASS_MISC , + .of_match = caam_jr_match, + .ops = &caam_jr_ops, + .bind = caam_jr_bind, + .probe = caam_jr_probe, + .priv_auto =sizeof (struct caam_regs ), +}; +#endif drivers/crypto/fsl/jr.h +28
-3@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. +* Copyright 2021 NXP * */ @@ -8,7 +9,9 @@#define __JR_H#include <linux/compiler.h> +#include "fsl_sec.h" #include "type.h" +#include <misc.h> #define JR_SIZE 4/* Timeout currently defined as 10 sec */ @@ -35,12 +38,21 @@#define JRSLIODN_SHIFT 0#define JRSLIODN_MASK 0x00000fff -#define JQ_DEQ_ERR -1 -#define JQ_DEQ_TO_ERR -2 -#define JQ_ENQ_ERR -3 +#define JRDID_MS_PRIM_DID BIT(0) +#define JRDID_MS_PRIM_TZ BIT(4) +#define JRDID_MS_TZ_OWN BIT(15) + +#define JQ_DEQ_ERR (-1) +#define JQ_DEQ_TO_ERR (-2) +#define JQ_ENQ_ERR (-3)#define RNG4_MAX_HANDLES 2 +enum { +/* Run caam jobring descriptor(in buf) */ +CAAM_JR_RUN_DESC , +}; +struct op_ring {caam_dma_addr_t desc;uint32_t status;@@ -102,6 +114,19 @@ struct result {uint32_t status; }; +/* +* struct caam_regs - CAAM initialization register interface +* +* Interface to caam memory map, jobring register, jobring storage. +*/ +struct caam_regs { +ccsr_sec_t *sec;/*caam initialization registers*/ +struct jr_regs *regs;/*jobring configuration registers*/ +u8 jrid;/*id to identify a jobring*/ +/*Private sub-storage for a single JobR*/ +struct jobring jr[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +}; +void caam_jr_strstatus (u32 status);int run_descriptor_jr (uint32_t *desc);
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
RE: [EXT] Re: [PATCH v11 01/14] crypto/fsl: Add support for CAAM Job ring driver model
Hi Stefano
Kshitiz has already a posted a patch which fixes the reported failure and merged by Priyanka.
http://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
So I think v11 can be applied?
Regards
Gaurav Jain
Quoted 771 lines
-----Original Message-----
From: Stefano Babic <[email protected]>
Sent: Tuesday, April 12, 2022 12:13 AM
To: Gaurav Jain <[email protected]>; [email protected]; Stefano Babic <[email protected]>
Cc: Fabio Estevam <[email protected]>; Peng Fan <[email protected]>; Simon Glass <[email protected]>; Michael Walle <[email protected]>; Priyanka Jain <[email protected]>; Ye Li <[email protected]>; Horia Geanta <[email protected]>; Ji Luo <[email protected]>; Franck Lenormand <[email protected]>; Silvano Di Ninno <[email protected]>; Sahil Malhotra <[email protected]>; Pankaj Gupta <[email protected]>; Varun Sethi <[email protected]>; dl-uboot-imx <[email protected]>; Shengzhou Liu <[email protected]>; Mingkai Hu <[email protected]>; Rajesh Bhagat <[email protected]>; Meenakshi Aggarwal <[email protected]>; Wasim Khan <[email protected]>; Alison Wang <[email protected]>; Pramod Kumar <[email protected]>; Andy Tang <[email protected]>; Adrian Alonso <[email protected]>; Vladimir Oltean <[email protected]>; ZHIZHIKIN Andrey <andrey.zhizhikin@leica- geosystems.com>; Michael Trimarchi <[email protected]>
Subject: [EXT] Re: [PATCH v11 01/14]crypto/fsl: Add support for CAAM Job ring driver modelCaution: EXT Email
Hi Gaurav,
I get breakage for some Layerscape boards after applying your V11 series:
aarch64: + ls1043ardb_sdcard_SECURE_BOOT+===================== WARNING ======================
(quoted diff) +7
-0+This board does not use CONFIG_DM_SERIAL (Driver Model +for Serial drivers). Please update the board to use +CONFIG_DM_SERIAL before the v2023.04 release. Failure to +update by the deadline may result in board removal. +See doc/develop/driver-model/migration.rst for more info. +==================================================== +aarch64-linux-ld.bfd: drivers/core/ofnode.o: in function`ofnode_read_u32_index':
(quoted diff) +2
-0+drivers/core/ofnode.c:60: undefined reference to `fdt_getprop' +drivers/core/ofnode.c:60:(.text.ofnode_read_u32_index+0x24): relocationtruncated to fit:
R_AARCH64_CALL26against undefined symbol `fdt_getprop'+aarch64-linux-ld.bfd:
drivers/core/ofnode.o: in function `ofnode_is_available':(quoted diff) +2
-0+drivers/core/ofnode.c:763: undefined reference to `fdtdec_get_is_enabled' +drivers/core/ofnode.c:763:(.text.ofnode_is_available+0x10): relocationtruncated to fit:
R_AARCH64_CALL26against undefined symbol `fdtdec_get_is_enabled'+aarch64-linux-ld.bfd:
drivers/crypto/fsl/jr.o: in function `ofnode_first_subnode':(quoted diff) +2
-0+include/dm/ofnode.h:413: undefined reference to `fdt_first_subnode' +include/dm/ofnode.h:413:(.text.caam_jr_probe+0x68): relocationtruncated to fit:
R_AARCH64_CALL26against undefined symbol `fdt_first_subnode'+aarch64-linux-ld.bfd:
drivers/crypto/fsl/jr.o: in function `ofnode_next_subnode':(quoted diff) +2
-0+include/dm/ofnode.h:423: undefined reference to `fdt_next_subnode' +include/dm/ofnode.h:423:(.text.caam_jr_probe+0xf4): relocationtruncated to fit:
R_AARCH64_CALL26against undefined symbol `fdt_next_subnode'(quoted diff) +3
-0+make[2]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1 +make[1]: *** [Makefile:2105: spl/u-boot-spl] Error 2 +make: *** [Makefile:177: sub-make] Error 2Strange enough, I do not remember this when I have tried a previous version. Can you check yourself and repost ?
Best regards,
Stefanodrivers/crypto/fsl/jr.c uint32_t
Quoted 58 lines · Gaurav Jain
added device tree support for job ring driver.
sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>Reviewed-by Simon Glass <[email protected]>--- drivers/crypto/fsl/Kconfig | 1 + drivers/crypto/fsl/jr.c | 323 ++++++++++++++++++++++++------------- drivers/crypto/fsl/jr.h | 31 +++- 3 files changed, 241 insertions(+), 114 deletions(-)drivers/crypto/fsl/Kconfig +1
-0@@ -2,6 +2,7 @@ config FSL_CAAM bool "Freescale Crypto Driver Support" select SHA_HW_ACCEL # hw_sha1() under drivers/crypto, and needed with SHA_HW_ACCEL + select MISC if DM imply SPL_CRYPTO if (ARM && SPL) imply CMD_HASH helpdrivers/crypto/fsl/jr.c index renamed from drivers/crypto/fsl/jr.c +0
-022b649219e..8103987425 100644
drivers/crypto/fsl/jr.c +4
-2@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP * * Based on CAAM driver in drivers/crypto/caam in Linux */ @@ -11,7 +11,6 @@#include <linux/kernel.h> #include <log.h> #include <malloc.h> -#include "fsl_sec.h" #include "jr.h" #include "jobdesc.h" #include "desc_constr.h" @@ -21,7 +20,10 @@#include <asm/cache.h> #include <asm/fsl_pamu.h> #endif +#include <dm.h> #include <dm/lists.h> +#include <dm/root.h> +#include <dm/device-internal.h> #include <linux/delay.h> #define CIRC_CNT (head, tail, size) (((head) - (tail)) & (size - 1))@@ -35,20 +37,29 @@ uint32_tsec_offset[CONFIG_SYS_FSL_MAX_NUM_OF_SEC] = {
drivers/crypto/fsl/jr.c static inline int run_descriptor_jr_idx(uint32_t *desc,
Quoted 206 lines
drivers/crypto/fsl/jr.c +12
-3#endif }; +#if CONFIG_IS_ENABLED (DM ) +struct udevice *caam_dev; +#else #define SEC_ADDR (idx) \ (ulong)((CONFIG_SYS_FSL_SEC_ADDR + sec_offset[idx]))#define SEC_JR0_ADDR (idx) \ (ulong)(SEC_ADDR(idx) + \ (CONFIG_SYS_FSL_JR0_OFFSET - CONFIG_SYS_FSL_SEC_OFFSET)) +struct caam_regs caam_st; +#endif -struct jobring jr0[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +static inline u32 jr_start_reg (u8 jrid) { +return (1 << jrid); +} -static inline void start_jr0 (uint8_t sec_idx) +static inline void start_jr (struct caam_regs *caam) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); +ccsr_sec_t *sec = caam->sec;u32 ctpr_ms =sec_in32 (&sec->ctpr_ms);u32 scfgr =sec_in32 (&sec->scfgr); +u32 jrstart =jr_start_reg (caam->jrid);if (ctpr_ms &SEC_CTPR_MS_VIRT_EN_INCL ) {/* VIRT_EN_INCL = 1 & VIRT_EN_POR = 1 or @@ -56,23 +67,16 @@ static inline void start_jr0(uint8_t sec_idx) */ if ((ctpr_ms & SEC_CTPR_MS_VIRT_EN_POR) || (scfgr & SEC_SCFGR_VIRT_EN))drivers/crypto/fsl/jr.c +15
-64-sec_out32 (&sec->jrstartr,CONFIG_JRSTARTR_JR0 ); +sec_out32 (&sec->jrstartr, jrstart); }else {/* VIRT_EN_INCL = 0 && VIRT_EN_POR_VALUE = 1 */ if (ctpr_ms &SEC_CTPR_MS_VIRT_EN_POR ) -sec_out32 (&sec->jrstartr,CONFIG_JRSTARTR_JR0 ); +sec_out32 (&sec->jrstartr, jrstart); } } -static inline void jr_reset_liodn (uint8_t sec_idx) +static inline void jr_disable_irq (struct jr_regs *regs) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); -sec_out32 (&sec->jrliodnr[0 ].ls,0 ); -} - -static inline void jr_disable_irq(uint8_t sec_idx) -{ -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx);uint32_t jrcfg =sec_in32 (®s->jrcfg1); jrcfg = jrcfg |JR_INTMASK ;@@ -80,10 +84,10 @@ static inline void jr_disable_irq(uint8_t sec_idx)sec_out32 (®s->jrcfg1, jrcfg); } -static void jr_initregs (uint8_t sec_idx) +static void jr_initregs (uint8_t sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];caam_dma_addr_t ip_base =virt_to_phys ((void *)jr->input_ring);caam_dma_addr_t op_base =virt_to_phys ((void *)jr->output_ring);@@ -103,16 +107,16 @@ static void jr_initregs(uint8_t sec_idx)sec_out32 (®s->irs,JR_SIZE );if (!jr->irq) -jr_disable_irq (sec_idx); +jr_disable_irq (regs); } -static int jr_init (uint8_t sec_idx) +static int jr_init (uint8_t sec_idx,struct caam_regs *caam) { -struct jobring *jr = &jr0[sec_idx]; +struct jobring *jr = &caam->jr[sec_idx];memset (jr,0 ,sizeof (struct jobring )); - jr->jq_id =DEFAULT_JR_ID ; + jr->jq_id = caam->jrid; jr->irq =DEFAULT_IRQ ;#ifdef CONFIG_FSL_CORENET @@ -134,53 +138,8 @@ static int jr_init(uint8_t sec_idx)memset (jr->input_ring,0 ,JR_SIZE *sizeof (caam_dma_addr_t));memset (jr->output_ring,0 , jr->op_size); -start_jr0 (sec_idx); - -jr_initregs (sec_idx); - -return 0 ; -} - -static int jr_sw_cleanup(uint8_t sec_idx) -{ -struct jobring *jr = &jr0[sec_idx]; - - jr->head =0 ; - jr->tail =0 ; - jr->read_idx =0 ; - jr->write_idx =0 ; -memset (jr->info,0 ,sizeof (jr->info)); -memset (jr->input_ring,0 , jr->size *sizeof (caam_dma_addr_t)); -memset (jr->output_ring,0 , jr->size *sizeof (struct op_ring )); - -return 0 ; -} - -static int jr_hw_reset(uint8_t sec_idx) -{ -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -uint32_t timeout =100000 ; -uint32_t jrint, jrcr; - -sec_out32 (®s->jrcr,JRCR_RESET ); -do { - jrint =sec_in32 (®s->jrint); - }while (((jrint &JRINT_ERR_HALT_MASK ) == -JRINT_ERR_HALT_INPROGRESS ) && --timeout); - - jrint =sec_in32 (®s->jrint); -if (((jrint &JRINT_ERR_HALT_MASK ) != -JRINT_ERR_HALT_INPROGRESS ) && timeout ==0 ) -return -1 ; - - timeout =100000 ; -sec_out32 (®s->jrcr,JRCR_RESET ); -do { - jrcr =sec_in32 (®s->jrcr); - }while ((jrcr &JRCR_RESET ) && --timeout); - -if (timeout ==0 ) -return -1 ; +start_jr (caam); +jr_initregs (sec_idx, caam);return 0 ; }@@ -188,10 +147,10 @@ static int jr_hw_reset(uint8_t sec_idx)/* -1 --- error, can't enqueue -- no space available */ static int jr_enqueue (uint32_t *desc_addr,void (*callback)(uint32_t status,void *arg), -void *arg,uint8_t sec_idx) +void *arg,uint8_t sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];int head = jr->head;uint32_t desc_word; int length = desc_len(desc_addr); @@ -263,10 +222,10 @@ staticint jr_enqueue(uint32_t
*desc_addr,return 0;}
drivers/crypto/fsl/jr.c +10
-6-static int jr_dequeue (int sec_idx) +static int jr_dequeue (int sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];int head = jr->head;int tail = jr->tail;int idx, i, found;@@ -349,14 +308,18 @@ static void desc_done(uint32_t status, void *arg) {struct result *x = arg; x->status = status; -#ifndef CONFIG_SPL_BUILD caam_jr_strstatus (status); -#endif x->done =1 ; }static inline int run_descriptor_jr_idx (uint32_t *desc,uint8_t sec_idx) { +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif unsigned long long timeval =0 ;unsigned long long timeout =CONFIG_USEC_DEQ_TIMEOUT ;struct result op;@@ -364,7 +327,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx)memset (&op,0 ,sizeof (op)); - ret =jr_enqueue (desc, desc_done, &op, sec_idx); + ret =jr_enqueue (desc, desc_done, &op, sec_idx, caam);if (ret) {debug ("Error in SEC enq\n" );ret = JQ_ENQ_ERR;drivers/crypto/fsl/jr.c +0
-0@@ -375,7 +338,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc,
uint8_tsec_idx)drivers/crypto/fsl/jr.c static int deinstantiate_rng(u8 sec_idx, int
Quoted 103 lines
drivers/crypto/fsl/jr.c +1
-1udelay (1 ); timeval +=1 ; - ret =jr_dequeue (sec_idx); + ret =jr_dequeue (sec_idx, caam);if (ret) {debug ("Error in SEC deq\n" ); ret = JQ_DEQ_ERR; @@ -402,13 +365,62 @@ int
run_descriptor_jr(uint32_t *desc)return run_descriptor_jr_idx(desc, 0);}
drivers/crypto/fsl/jr.c +58
-9+static int jr_sw_cleanup (uint8_t sec_idx,struct caam_regs *caam) { +struct jobring *jr = &caam->jr[sec_idx]; + + jr->head =0 ; + jr->tail =0 ; + jr->read_idx =0 ; + jr->write_idx =0 ; +memset (jr->info,0 ,sizeof (jr->info)); +memset (jr->input_ring,0 , jr->size *sizeof (caam_dma_addr_t)); +memset (jr->output_ring,0 , jr->size *sizeof (struct op_ring )); + +return 0 ; +} + +static int jr_hw_reset (struct jr_regs *regs) { +uint32_t timeout =100000 ; +uint32_t jrint, jrcr; + +sec_out32 (®s->jrcr,JRCR_RESET ); +do { + jrint =sec_in32 (®s->jrint); + }while (((jrint &JRINT_ERR_HALT_MASK ) == +JRINT_ERR_HALT_INPROGRESS ) && --timeout); + + jrint =sec_in32 (®s->jrint); +if (((jrint &JRINT_ERR_HALT_MASK ) != +JRINT_ERR_HALT_INPROGRESS ) && timeout ==0 ) +return -1 ; + + timeout =100000 ; +sec_out32 (®s->jrcr,JRCR_RESET ); +do { + jrcr =sec_in32 (®s->jrcr); + }while ((jrcr &JRCR_RESET ) && --timeout); + +if (timeout ==0 ) +return -1 ; + +return 0 ; +} +static inline int jr_reset_sec (uint8_t sec_idx) { -if (jr_hw_reset (sec_idx) <0 ) +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif +if (jr_hw_reset (caam->regs) <0 )return -1 ;/* Clean up the jobring structure maintained by software */ -jr_sw_cleanup (sec_idx); +jr_sw_cleanup (sec_idx, caam);return 0 ; }@@ -418,9 +430,15 @@ int jr_reset(void)return jr_reset_sec (0 ); } -static inline int sec_reset_idx (uint8_t sec_idx) +int sec_reset (void ) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif +ccsr_sec_t *sec = caam->sec;uint32_t mcfgr =sec_in32 (&sec->mcfgr);uint32_t timeout =100000 ;@@ -446,11 +464,7 @@ static inline int sec_reset_idx(uint8_t sec_idx)return 0 ; } -int sec_reset (void ) -{ -return sec_reset_idx (0 ); -} -#ifndef CONFIG_SPL_BUILD +static int deinstantiate_rng (u8 sec_idx,int state_handle_mask) {u32 *desc;@@ -496,12 +510,11 @@ static int deinstantiate_rng(u8 sec_idx, int
state_handle_mask)Quoted 100 lines
drivers/crypto/fsl/jr.c +26
-14return ret; } -static int instantiate_rng (u8 sec_idx,int gen_sk) +static int instantiate_rng (uint8_t sec_idx,ccsr_sec_t *sec,int +gen_sk) {u32 *desc;u32 rdsta_val;int ret =0 , sh_idx, size; -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR (sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;@@ -554,9 +567,8 @@ static int instantiate_rng(u8 sec_idx, int gen_sk)return ret; } -static u8 get_rng_vid (uint8_t sec_idx) +static u8 get_rng_vid (ccsr_sec_t *sec) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx);u8 vid;if (caam_get_era () <10 ) {@@ -574,9 +586,8 @@ static u8 get_rng_vid(uint8_t sec_idx)* By default, the TRNG runs for 200 clocks per sample; * 1200 clocks per sample generates better entropy. */ -static void kick_trng (int ent_delay,uint8_t sec_idx) +static void kick_trng (int ent_delay,ccsr_sec_t *sec) { -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR (sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;u32 val;@@ -603,10 +614,9 @@ static void kick_trng(int ent_delay, uint8_t sec_idx)sec_clrbits32 (&rng->rtmctl,RTMCTL_PRGM ); } -static int rng_init (uint8_t sec_idx) +static int rng_init (uint8_t sec_idx,ccsr_sec_t *sec) {int ret, gen_sk, ent_delay =RTSDCTL_ENT_DLY_MIN ; -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR (sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;u32 inst_handles;@@ -624,7 +634,7 @@ static int rng_init(uint8_t sec_idx)* the TRNG parameters. */ if (!inst_handles) { -kick_trng (ent_delay, sec_idx); +kick_trng (ent_delay, sec); ent_delay +=400 ; }/* @@ -634,7 +644,7 @@ static int rng_init(uint8_t sec_idx)* interval, leading to a sucessful initialization of * the RNG. */ - ret =instantiate_rng (sec_idx, gen_sk); + ret =instantiate_rng (sec_idx, sec, gen_sk); }while ((ret ==-1 ) && (ent_delay <RTSDCTL_ENT_DLY_MAX ));if (ret) {printf ("SEC%u: Failed to instantiate RNG\n" , sec_idx);@@ -646,13 +656,28 @@ static int rng_init(uint8_t sec_idx)return ret; } -#endif +int sec_init_idx (uint8_t sec_idx) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); -uint32_t mcr =sec_in32 (&sec->mcfgr);int ret =0 ; - +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) +if (!caam_dev) { +printf ("caam_jr: caam not found\n" ); +return -1 ; + } + caam =dev_get_priv (caam_dev); +#else + caam_st.sec = (void *)SEC_ADDR (sec_idx); + caam_st.regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); + caam_st.jrid =0 ; + caam = &caam_st; +#endif +ccsr_sec_t *sec = caam->sec; +uint32_t mcr =sec_in32 (&sec->mcfgr);#if +defined(CONFIG_SPL_BUILD ) && defined(CONFIG_IMX8M ) +uint32_t jrdid_ms =0 ; +#endif #ifdef CONFIG_FSL_CORENET uint32_t liodnr;uint32_t liodn_ns;drivers/crypto/fsl/jr.c int sec_init_idx(uint8_t sec_idx) · line 711
Quoted 5 lines
drivers/crypto/fsl/jr.c +2
-0@@ -682,6 +707,11 @@ int sec_init_idx(uint8_t sec_idx) mcr |= (1 <<MCFGR_PS_SHIFT );#endif sec_out32 (&sec->mcfgr, mcr); +#if defined(CONFIG_SPL_BUILD ) && defined(CONFIG_IMX8M ) + jrdid_ms = JRDID_MS_TZ_OWN | JRDID_MS_PRIM_TZ |
JRDID_MS_PRIM_DID;Quoted 182 lines
drivers/crypto/fsl/jr.c +80
-9+sec_out32 (&sec->jrliodnr[caam->jrid].ms, jrdid_ms);#endif +jr_reset ();#ifdef CONFIG_FSL_CORENET #ifdef CONFIG_SPL_BUILD @@ -693,20 +723,19 @@ int sec_init_idx(uint8_t sec_idx) liodn_ns =CONFIG_SPL_JR0_LIODN_NS &JRNSLIODN_MASK ; liodn_s =CONFIG_SPL_JR0_LIODN_S &JRSLIODN_MASK ; - liodnr =sec_in32 (&sec->jrliodnr[0 ].ls) & + liodnr =sec_in32 (&sec->jrliodnr[caam->jrid].ls) & ~(JRNSLIODN_MASK |JRSLIODN_MASK ); liodnr = liodnr | (liodn_ns <<JRNSLIODN_SHIFT ) | (liodn_s <<JRSLIODN_SHIFT ); -sec_out32 (&sec->jrliodnr[0 ].ls, liodnr); +sec_out32 (&sec->jrliodnr[caam->jrid].ls, liodnr);#else - liodnr =sec_in32 (&sec->jrliodnr[0 ].ls); + liodnr =sec_in32 (&sec->jrliodnr[caam->jrid].ls); liodn_ns = (liodnr &JRNSLIODN_MASK ) >>JRNSLIODN_SHIFT ; liodn_s = (liodnr &JRSLIODN_MASK ) >>JRSLIODN_SHIFT ;#endif #endif - - ret =jr_init (sec_idx); + ret =jr_init (sec_idx, caam);if (ret <0 ) {printf ("SEC%u: initialization failed\n" , sec_idx);return -1 ;@@ -719,9 +748,9 @@ int sec_init_idx(uint8_t sec_idx)pamu_enable ();#endif -#ifndef CONFIG_SPL_BUILD -if (get_rng_vid (sec_idx) >=4 ) { -if (rng_init (sec_idx) <0 ) { + +if (get_rng_vid (caam->sec) >=4 ) { +if (rng_init (sec_idx, caam->sec) <0 ) {printf ("SEC%u: RNG instantiation failed\n" , sec_idx);return -1 ; }@@ -735,7 +764,6 @@ int sec_init_idx(uint8_t sec_idx)printf ("SEC%u: RNG instantiated\n" , sec_idx); } -#endif return ret; }@@ -743,3 +771,76 @@ int sec_init(void) {return sec_init_idx (0 ); } + +#if CONFIG_IS_ENABLED (DM ) +static int caam_jr_ioctl (struct udevice *dev,unsigned long request, +void *buf) { +if (request !=CAAM_JR_RUN_DESC ) +return -ENOSYS ; + +return run_descriptor_jr (buf); +} + +static int caam_jr_probe (struct udevice *dev) { +struct caam_regs *caam =dev_get_priv (dev); +fdt_addr_t addr; +ofnode node; +unsigned int jr_node =0 ; + + caam_dev = dev; + + addr =dev_read_addr (dev); +if (addr ==FDT_ADDR_T_NONE ) { +printf ("caam_jr: crypto not found\n" ); +return -EINVAL ; + } + caam->sec = (ccsr_sec_t *)(uintptr_t )addr; + caam->regs = (struct jr_regs *)caam->sec; + +/* Check for enabled job ring node */ +ofnode_for_each_subnode (node,dev_ofnode (dev)) { +if (!ofnode_is_available (node)) +continue ; + + jr_node =ofnode_read_u32_default (node,"reg" ,-1 ); +if (jr_node >0 ) { + caam->regs = (struct jr_regs *)((ulong )caam->sec + jr_node); +while (!(jr_node &0x0F )) + jr_node = jr_node >>4 ; + + caam->jrid = jr_node -1 ; +break ; + } + } + +if (sec_init ()) +printf ("\nsec_init failed!\n" ); + +return 0 ; +} + +static int caam_jr_bind (struct udevice *dev) { +return 0 ; +} + +static const struct misc_ops caam_jr_ops = { + .ioctl = caam_jr_ioctl, +}; + +static const struct udevice_id caam_jr_match[] = { + { .compatible ="fsl,sec-v4.0" }, + { } +}; + +U_BOOT_DRIVER (caam_jr) = { + .name ="caam_jr" , + .id =UCLASS_MISC , + .of_match = caam_jr_match, + .ops = &caam_jr_ops, + .bind = caam_jr_bind, + .probe = caam_jr_probe, + .priv_auto =sizeof (struct caam_regs ), +}; +#endif drivers/crypto/fsl/jr.h index renamed from drivers/crypto/fsl/jr.h +0
-0
1047aa772c..3eb7be79da100644drivers/crypto/fsl/jr.h +3
-0@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. +* Copyright 2021 NXP * */ @@ -8,7 +9,9 @@#define __JR_H#include <linux/compiler.h> +#include "fsl_sec.h" #include "type.h" +#include <misc.h> #define JR_SIZE 4 /* Timeout currently defined as 10 sec */ @@ -35,12 +38,21 @@#define JRSLIODN_SHIFT 0 #define JRSLIODN_MASK 0x00000fffdrivers/crypto/fsl/jr.h +18
-3-#define JQ_DEQ_ERR -1 -#define JQ_DEQ_TO_ERR -2 -#define JQ_ENQ_ERR -3 +#define JRDID_MS_PRIM_DID BIT(0) +#define JRDID_MS_PRIM_TZ BIT(4) +#define JRDID_MS_TZ_OWN BIT(15) + +#define JQ_DEQ_ERR (-1) +#define JQ_DEQ_TO_ERR (-2) +#define JQ_ENQ_ERR (-3)#define RNG4_MAX_HANDLES 2 +enum { +/* Run caam jobring descriptor(in buf) */ +CAAM_JR_RUN_DESC , +}; +struct op_ring {caam_dma_addr_t desc;uint32_t status;@@ -102,6 +114,19 @@ struct result {uint32_t status; }; +/* +* struct caam_regs - CAAM initialization register interface +* +* Interface to caam memory map, jobring register, jobring storage. +*/ +struct caam_regs {drivers/crypto/fsl/jr.h struct result { · line 132
Quoted 10 lines
drivers/crypto/fsl/jr.h +7
-0+ccsr_sec_t *sec;/*caam initialization registers*/ +struct jr_regs *regs;/*jobring configuration registers*/ +u8 jrid;/*id to identify a jobring*/ +/*Private sub-storage for a single JobR*/ +struct jobring jr[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +}; +void caam_jr_strstatus (u32 status);int run_descriptor_jr (uint32_t *desc);--
=================================================================
====
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=================================================================
====
Re: [EXT] Re: [PATCH v11 01/14] crypto/fsl: Add support for CAAM Job ring driver model
Hi Gaurav,
Quoted 5 lines · Gaurav Jain
Hi Stefano
Kshitiz has already a posted a patch which fixes the reported failure and merged by Priyanka.
http://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
Thanks for link, I will pick up Kshitiz's and try again.
Quoted 2 lines
So I think v11 can be applied?
I hope so.
Regards,
Stefano
Quoted 774 lines
Regards
Gaurav JainQuoted 771 lines
-----Original Message-----
From: Stefano Babic <[email protected]>
Sent: Tuesday, April 12, 2022 12:13 AM
To: Gaurav Jain <[email protected]>; [email protected]; Stefano Babic <[email protected]>
Cc: Fabio Estevam <[email protected]>; Peng Fan <[email protected]>; Simon Glass <[email protected]>; Michael Walle <[email protected]>; Priyanka Jain <[email protected]>; Ye Li <[email protected]>; Horia Geanta <[email protected]>; Ji Luo <[email protected]>; Franck Lenormand <[email protected]>; Silvano Di Ninno <[email protected]>; Sahil Malhotra <[email protected]>; Pankaj Gupta <[email protected]>; Varun Sethi <[email protected]>; dl-uboot-imx <[email protected]>; Shengzhou Liu <[email protected]>; Mingkai Hu <[email protected]>; Rajesh Bhagat <[email protected]>; Meenakshi Aggarwal <[email protected]>; Wasim Khan <[email protected]>; Alison Wang <[email protected]>; Pramod Kumar <[email protected]>; Andy Tang <[email protected]>; Adrian Alonso <[email protected]>; Vladimir Oltean <[email protected]>; ZHIZHIKIN Andrey <andrey.zhizhikin@leica- geosystems.com>; Michael Trimarchi <[email protected]>
Subject: [EXT] Re: [PATCH v11 01/14]crypto/fsl: Add support for CAAM Job ring driver modelCaution: EXT Email
Hi Gaurav,
I get breakage for some Layerscape boards after applying your V11 series:
aarch64: + ls1043ardb_sdcard_SECURE_BOOT+===================== WARNING ======================
(quoted diff) +7
-0+This board does not use CONFIG_DM_SERIAL (Driver Model +for Serial drivers). Please update the board to use +CONFIG_DM_SERIAL before the v2023.04 release. Failure to +update by the deadline may result in board removal. +See doc/develop/driver-model/migration.rst for more info. +==================================================== +aarch64-linux-ld.bfd: drivers/core/ofnode.o: in function`ofnode_read_u32_index':
(quoted diff) +2
-0+drivers/core/ofnode.c:60: undefined reference to `fdt_getprop' +drivers/core/ofnode.c:60:(.text.ofnode_read_u32_index+0x24): relocationtruncated to fit:
R_AARCH64_CALL26against undefined symbol `fdt_getprop'+aarch64-linux-ld.bfd:
drivers/core/ofnode.o: in function `ofnode_is_available':(quoted diff) +2
-0+drivers/core/ofnode.c:763: undefined reference to `fdtdec_get_is_enabled' +drivers/core/ofnode.c:763:(.text.ofnode_is_available+0x10): relocationtruncated to fit:
R_AARCH64_CALL26against undefined symbol `fdtdec_get_is_enabled'+aarch64-linux-ld.bfd:
drivers/crypto/fsl/jr.o: in function `ofnode_first_subnode':(quoted diff) +2
-0+include/dm/ofnode.h:413: undefined reference to `fdt_first_subnode' +include/dm/ofnode.h:413:(.text.caam_jr_probe+0x68): relocationtruncated to fit:
R_AARCH64_CALL26against undefined symbol `fdt_first_subnode'+aarch64-linux-ld.bfd:
drivers/crypto/fsl/jr.o: in function `ofnode_next_subnode':(quoted diff) +2
-0+include/dm/ofnode.h:423: undefined reference to `fdt_next_subnode' +include/dm/ofnode.h:423:(.text.caam_jr_probe+0xf4): relocationtruncated to fit:
R_AARCH64_CALL26against undefined symbol `fdt_next_subnode'(quoted diff) +3
-0+make[2]: *** [scripts/Makefile.spl:512: spl/u-boot-spl] Error 1 +make[1]: *** [Makefile:2105: spl/u-boot-spl] Error 2 +make: *** [Makefile:177: sub-make] Error 2Strange enough, I do not remember this when I have tried a previous version. Can you check yourself and repost ?
Best regards,
Stefanodrivers/crypto/fsl/jr.c uint32_t
Quoted 58 lines · Gaurav Jain
added device tree support for job ring driver.
sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>Reviewed-by Simon Glass <[email protected]>--- drivers/crypto/fsl/Kconfig | 1 + drivers/crypto/fsl/jr.c | 323 ++++++++++++++++++++++++------------- drivers/crypto/fsl/jr.h | 31 +++- 3 files changed, 241 insertions(+), 114 deletions(-)drivers/crypto/fsl/Kconfig +1
-0@@ -2,6 +2,7 @@ config FSL_CAAM bool "Freescale Crypto Driver Support" select SHA_HW_ACCEL # hw_sha1() under drivers/crypto, and needed with SHA_HW_ACCEL + select MISC if DM imply SPL_CRYPTO if (ARM && SPL) imply CMD_HASH helpdrivers/crypto/fsl/jr.c index renamed from drivers/crypto/fsl/jr.c +0
-022b649219e..8103987425 100644
drivers/crypto/fsl/jr.c +4
-2@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP * * Based on CAAM driver in drivers/crypto/caam in Linux */ @@ -11,7 +11,6 @@#include <linux/kernel.h> #include <log.h> #include <malloc.h> -#include "fsl_sec.h" #include "jr.h" #include "jobdesc.h" #include "desc_constr.h" @@ -21,7 +20,10 @@#include <asm/cache.h> #include <asm/fsl_pamu.h> #endif +#include <dm.h> #include <dm/lists.h> +#include <dm/root.h> +#include <dm/device-internal.h> #include <linux/delay.h> #define CIRC_CNT (head, tail, size) (((head) - (tail)) & (size - 1))@@ -35,20 +37,29 @@ uint32_tsec_offset[CONFIG_SYS_FSL_MAX_NUM_OF_SEC] = {
drivers/crypto/fsl/jr.c static inline int run_descriptor_jr_idx(uint32_t *desc,
Quoted 206 lines
drivers/crypto/fsl/jr.c +12
-3#endif }; +#if CONFIG_IS_ENABLED (DM ) +struct udevice *caam_dev; +#else #define SEC_ADDR (idx) \ (ulong)((CONFIG_SYS_FSL_SEC_ADDR + sec_offset[idx]))#define SEC_JR0_ADDR (idx) \ (ulong)(SEC_ADDR(idx) + \ (CONFIG_SYS_FSL_JR0_OFFSET - CONFIG_SYS_FSL_SEC_OFFSET)) +struct caam_regs caam_st; +#endif -struct jobring jr0[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +static inline u32 jr_start_reg (u8 jrid) { +return (1 << jrid); +} -static inline void start_jr0 (uint8_t sec_idx) +static inline void start_jr (struct caam_regs *caam) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); +ccsr_sec_t *sec = caam->sec;u32 ctpr_ms =sec_in32 (&sec->ctpr_ms);u32 scfgr =sec_in32 (&sec->scfgr); +u32 jrstart =jr_start_reg (caam->jrid);if (ctpr_ms &SEC_CTPR_MS_VIRT_EN_INCL ) {/* VIRT_EN_INCL = 1 & VIRT_EN_POR = 1 or @@ -56,23 +67,16 @@ static inline void start_jr0(uint8_t sec_idx) */ if ((ctpr_ms & SEC_CTPR_MS_VIRT_EN_POR) || (scfgr & SEC_SCFGR_VIRT_EN))drivers/crypto/fsl/jr.c +15
-64-sec_out32 (&sec->jrstartr,CONFIG_JRSTARTR_JR0 ); +sec_out32 (&sec->jrstartr, jrstart); }else {/* VIRT_EN_INCL = 0 && VIRT_EN_POR_VALUE = 1 */ if (ctpr_ms &SEC_CTPR_MS_VIRT_EN_POR ) -sec_out32 (&sec->jrstartr,CONFIG_JRSTARTR_JR0 ); +sec_out32 (&sec->jrstartr, jrstart); } } -static inline void jr_reset_liodn (uint8_t sec_idx) +static inline void jr_disable_irq (struct jr_regs *regs) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); -sec_out32 (&sec->jrliodnr[0 ].ls,0 ); -} - -static inline void jr_disable_irq(uint8_t sec_idx) -{ -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx);uint32_t jrcfg =sec_in32 (®s->jrcfg1); jrcfg = jrcfg |JR_INTMASK ;@@ -80,10 +84,10 @@ static inline void jr_disable_irq(uint8_t sec_idx)sec_out32 (®s->jrcfg1, jrcfg); } -static void jr_initregs (uint8_t sec_idx) +static void jr_initregs (uint8_t sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];caam_dma_addr_t ip_base =virt_to_phys ((void *)jr->input_ring);caam_dma_addr_t op_base =virt_to_phys ((void *)jr->output_ring);@@ -103,16 +107,16 @@ static void jr_initregs(uint8_t sec_idx)sec_out32 (®s->irs,JR_SIZE );if (!jr->irq) -jr_disable_irq (sec_idx); +jr_disable_irq (regs); } -static int jr_init (uint8_t sec_idx) +static int jr_init (uint8_t sec_idx,struct caam_regs *caam) { -struct jobring *jr = &jr0[sec_idx]; +struct jobring *jr = &caam->jr[sec_idx];memset (jr,0 ,sizeof (struct jobring )); - jr->jq_id =DEFAULT_JR_ID ; + jr->jq_id = caam->jrid; jr->irq =DEFAULT_IRQ ;#ifdef CONFIG_FSL_CORENET @@ -134,53 +138,8 @@ static int jr_init(uint8_t sec_idx)memset (jr->input_ring,0 ,JR_SIZE *sizeof (caam_dma_addr_t));memset (jr->output_ring,0 , jr->op_size); -start_jr0 (sec_idx); - -jr_initregs (sec_idx); - -return 0 ; -} - -static int jr_sw_cleanup(uint8_t sec_idx) -{ -struct jobring *jr = &jr0[sec_idx]; - - jr->head =0 ; - jr->tail =0 ; - jr->read_idx =0 ; - jr->write_idx =0 ; -memset (jr->info,0 ,sizeof (jr->info)); -memset (jr->input_ring,0 , jr->size *sizeof (caam_dma_addr_t)); -memset (jr->output_ring,0 , jr->size *sizeof (struct op_ring )); - -return 0 ; -} - -static int jr_hw_reset(uint8_t sec_idx) -{ -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -uint32_t timeout =100000 ; -uint32_t jrint, jrcr; - -sec_out32 (®s->jrcr,JRCR_RESET ); -do { - jrint =sec_in32 (®s->jrint); - }while (((jrint &JRINT_ERR_HALT_MASK ) == -JRINT_ERR_HALT_INPROGRESS ) && --timeout); - - jrint =sec_in32 (®s->jrint); -if (((jrint &JRINT_ERR_HALT_MASK ) != -JRINT_ERR_HALT_INPROGRESS ) && timeout ==0 ) -return -1 ; - - timeout =100000 ; -sec_out32 (®s->jrcr,JRCR_RESET ); -do { - jrcr =sec_in32 (®s->jrcr); - }while ((jrcr &JRCR_RESET ) && --timeout); - -if (timeout ==0 ) -return -1 ; +start_jr (caam); +jr_initregs (sec_idx, caam);return 0 ; }@@ -188,10 +147,10 @@ static int jr_hw_reset(uint8_t sec_idx)/* -1 --- error, can't enqueue -- no space available */ static int jr_enqueue (uint32_t *desc_addr,void (*callback)(uint32_t status,void *arg), -void *arg,uint8_t sec_idx) +void *arg,uint8_t sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];int head = jr->head;uint32_t desc_word; int length = desc_len(desc_addr); @@ -263,10 +222,10 @@ staticint jr_enqueue(uint32_t
*desc_addr,return 0;}
drivers/crypto/fsl/jr.c +10
-6-static int jr_dequeue (int sec_idx) +static int jr_dequeue (int sec_idx,struct caam_regs *caam) { -struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); -struct jobring *jr = &jr0[sec_idx]; +struct jr_regs *regs = caam->regs; +struct jobring *jr = &caam->jr[sec_idx];int head = jr->head;int tail = jr->tail;int idx, i, found;@@ -349,14 +308,18 @@ static void desc_done(uint32_t status, void *arg) {struct result *x = arg; x->status = status; -#ifndef CONFIG_SPL_BUILD caam_jr_strstatus (status); -#endif x->done =1 ; }static inline int run_descriptor_jr_idx (uint32_t *desc,uint8_t sec_idx) { +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif unsigned long long timeval =0 ;unsigned long long timeout =CONFIG_USEC_DEQ_TIMEOUT ;struct result op;@@ -364,7 +327,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx)memset (&op,0 ,sizeof (op)); - ret =jr_enqueue (desc, desc_done, &op, sec_idx); + ret =jr_enqueue (desc, desc_done, &op, sec_idx, caam);if (ret) {debug ("Error in SEC enq\n" );ret = JQ_ENQ_ERR;drivers/crypto/fsl/jr.c +0
-0@@ -375,7 +338,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc,
uint8_tsec_idx)drivers/crypto/fsl/jr.c static int deinstantiate_rng(u8 sec_idx, int
Quoted 103 lines
drivers/crypto/fsl/jr.c +1
-1udelay (1 ); timeval +=1 ; - ret =jr_dequeue (sec_idx); + ret =jr_dequeue (sec_idx, caam);if (ret) {debug ("Error in SEC deq\n" ); ret = JQ_DEQ_ERR; @@ -402,13 +365,62 @@ int
run_descriptor_jr(uint32_t *desc)return run_descriptor_jr_idx(desc, 0);}
drivers/crypto/fsl/jr.c +58
-9+static int jr_sw_cleanup (uint8_t sec_idx,struct caam_regs *caam) { +struct jobring *jr = &caam->jr[sec_idx]; + + jr->head =0 ; + jr->tail =0 ; + jr->read_idx =0 ; + jr->write_idx =0 ; +memset (jr->info,0 ,sizeof (jr->info)); +memset (jr->input_ring,0 , jr->size *sizeof (caam_dma_addr_t)); +memset (jr->output_ring,0 , jr->size *sizeof (struct op_ring )); + +return 0 ; +} + +static int jr_hw_reset (struct jr_regs *regs) { +uint32_t timeout =100000 ; +uint32_t jrint, jrcr; + +sec_out32 (®s->jrcr,JRCR_RESET ); +do { + jrint =sec_in32 (®s->jrint); + }while (((jrint &JRINT_ERR_HALT_MASK ) == +JRINT_ERR_HALT_INPROGRESS ) && --timeout); + + jrint =sec_in32 (®s->jrint); +if (((jrint &JRINT_ERR_HALT_MASK ) != +JRINT_ERR_HALT_INPROGRESS ) && timeout ==0 ) +return -1 ; + + timeout =100000 ; +sec_out32 (®s->jrcr,JRCR_RESET ); +do { + jrcr =sec_in32 (®s->jrcr); + }while ((jrcr &JRCR_RESET ) && --timeout); + +if (timeout ==0 ) +return -1 ; + +return 0 ; +} +static inline int jr_reset_sec (uint8_t sec_idx) { -if (jr_hw_reset (sec_idx) <0 ) +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif +if (jr_hw_reset (caam->regs) <0 )return -1 ;/* Clean up the jobring structure maintained by software */ -jr_sw_cleanup (sec_idx); +jr_sw_cleanup (sec_idx, caam);return 0 ; }@@ -418,9 +430,15 @@ int jr_reset(void)return jr_reset_sec (0 ); } -static inline int sec_reset_idx (uint8_t sec_idx) +int sec_reset (void ) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) + caam =dev_get_priv (caam_dev); +#else + caam = &caam_st; +#endif +ccsr_sec_t *sec = caam->sec;uint32_t mcfgr =sec_in32 (&sec->mcfgr);uint32_t timeout =100000 ;@@ -446,11 +464,7 @@ static inline int sec_reset_idx(uint8_t sec_idx)return 0 ; } -int sec_reset (void ) -{ -return sec_reset_idx (0 ); -} -#ifndef CONFIG_SPL_BUILD +static int deinstantiate_rng (u8 sec_idx,int state_handle_mask) {u32 *desc;@@ -496,12 +510,11 @@ static int deinstantiate_rng(u8 sec_idx, int
state_handle_mask)Quoted 100 lines
drivers/crypto/fsl/jr.c +26
-14return ret; } -static int instantiate_rng (u8 sec_idx,int gen_sk) +static int instantiate_rng (uint8_t sec_idx,ccsr_sec_t *sec,int +gen_sk) {u32 *desc;u32 rdsta_val;int ret =0 , sh_idx, size; -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR (sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;@@ -554,9 +567,8 @@ static int instantiate_rng(u8 sec_idx, int gen_sk)return ret; } -static u8 get_rng_vid (uint8_t sec_idx) +static u8 get_rng_vid (ccsr_sec_t *sec) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx);u8 vid;if (caam_get_era () <10 ) {@@ -574,9 +586,8 @@ static u8 get_rng_vid(uint8_t sec_idx)* By default, the TRNG runs for 200 clocks per sample; * 1200 clocks per sample generates better entropy. */ -static void kick_trng (int ent_delay,uint8_t sec_idx) +static void kick_trng (int ent_delay,ccsr_sec_t *sec) { -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR (sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;u32 val;@@ -603,10 +614,9 @@ static void kick_trng(int ent_delay, uint8_t sec_idx)sec_clrbits32 (&rng->rtmctl,RTMCTL_PRGM ); } -static int rng_init (uint8_t sec_idx) +static int rng_init (uint8_t sec_idx,ccsr_sec_t *sec) {int ret, gen_sk, ent_delay =RTSDCTL_ENT_DLY_MIN ; -ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR (sec_idx);struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng;u32 inst_handles;@@ -624,7 +634,7 @@ static int rng_init(uint8_t sec_idx)* the TRNG parameters. */ if (!inst_handles) { -kick_trng (ent_delay, sec_idx); +kick_trng (ent_delay, sec); ent_delay +=400 ; }/* @@ -634,7 +644,7 @@ static int rng_init(uint8_t sec_idx)* interval, leading to a sucessful initialization of * the RNG. */ - ret =instantiate_rng (sec_idx, gen_sk); + ret =instantiate_rng (sec_idx, sec, gen_sk); }while ((ret ==-1 ) && (ent_delay <RTSDCTL_ENT_DLY_MAX ));if (ret) {printf ("SEC%u: Failed to instantiate RNG\n" , sec_idx);@@ -646,13 +656,28 @@ static int rng_init(uint8_t sec_idx)return ret; } -#endif +int sec_init_idx (uint8_t sec_idx) { -ccsr_sec_t *sec = (void *)SEC_ADDR (sec_idx); -uint32_t mcr =sec_in32 (&sec->mcfgr);int ret =0 ; - +struct caam_regs *caam; +#if CONFIG_IS_ENABLED (DM ) +if (!caam_dev) { +printf ("caam_jr: caam not found\n" ); +return -1 ; + } + caam =dev_get_priv (caam_dev); +#else + caam_st.sec = (void *)SEC_ADDR (sec_idx); + caam_st.regs = (struct jr_regs *)SEC_JR0_ADDR (sec_idx); + caam_st.jrid =0 ; + caam = &caam_st; +#endif +ccsr_sec_t *sec = caam->sec; +uint32_t mcr =sec_in32 (&sec->mcfgr);#if +defined(CONFIG_SPL_BUILD ) && defined(CONFIG_IMX8M ) +uint32_t jrdid_ms =0 ; +#endif #ifdef CONFIG_FSL_CORENET uint32_t liodnr;uint32_t liodn_ns;drivers/crypto/fsl/jr.c int sec_init_idx(uint8_t sec_idx) · line 711
Quoted 5 lines
drivers/crypto/fsl/jr.c +2
-0@@ -682,6 +707,11 @@ int sec_init_idx(uint8_t sec_idx) mcr |= (1 <<MCFGR_PS_SHIFT );#endif sec_out32 (&sec->mcfgr, mcr); +#if defined(CONFIG_SPL_BUILD ) && defined(CONFIG_IMX8M ) + jrdid_ms = JRDID_MS_TZ_OWN | JRDID_MS_PRIM_TZ |
JRDID_MS_PRIM_DID;Quoted 182 lines
drivers/crypto/fsl/jr.c +80
-9+sec_out32 (&sec->jrliodnr[caam->jrid].ms, jrdid_ms);#endif +jr_reset ();#ifdef CONFIG_FSL_CORENET #ifdef CONFIG_SPL_BUILD @@ -693,20 +723,19 @@ int sec_init_idx(uint8_t sec_idx) liodn_ns =CONFIG_SPL_JR0_LIODN_NS &JRNSLIODN_MASK ; liodn_s =CONFIG_SPL_JR0_LIODN_S &JRSLIODN_MASK ; - liodnr =sec_in32 (&sec->jrliodnr[0 ].ls) & + liodnr =sec_in32 (&sec->jrliodnr[caam->jrid].ls) & ~(JRNSLIODN_MASK |JRSLIODN_MASK ); liodnr = liodnr | (liodn_ns <<JRNSLIODN_SHIFT ) | (liodn_s <<JRSLIODN_SHIFT ); -sec_out32 (&sec->jrliodnr[0 ].ls, liodnr); +sec_out32 (&sec->jrliodnr[caam->jrid].ls, liodnr);#else - liodnr =sec_in32 (&sec->jrliodnr[0 ].ls); + liodnr =sec_in32 (&sec->jrliodnr[caam->jrid].ls); liodn_ns = (liodnr &JRNSLIODN_MASK ) >>JRNSLIODN_SHIFT ; liodn_s = (liodnr &JRSLIODN_MASK ) >>JRSLIODN_SHIFT ;#endif #endif - - ret =jr_init (sec_idx); + ret =jr_init (sec_idx, caam);if (ret <0 ) {printf ("SEC%u: initialization failed\n" , sec_idx);return -1 ;@@ -719,9 +748,9 @@ int sec_init_idx(uint8_t sec_idx)pamu_enable ();#endif -#ifndef CONFIG_SPL_BUILD -if (get_rng_vid (sec_idx) >=4 ) { -if (rng_init (sec_idx) <0 ) { + +if (get_rng_vid (caam->sec) >=4 ) { +if (rng_init (sec_idx, caam->sec) <0 ) {printf ("SEC%u: RNG instantiation failed\n" , sec_idx);return -1 ; }@@ -735,7 +764,6 @@ int sec_init_idx(uint8_t sec_idx)printf ("SEC%u: RNG instantiated\n" , sec_idx); } -#endif return ret; }@@ -743,3 +771,76 @@ int sec_init(void) {return sec_init_idx (0 ); } + +#if CONFIG_IS_ENABLED (DM ) +static int caam_jr_ioctl (struct udevice *dev,unsigned long request, +void *buf) { +if (request !=CAAM_JR_RUN_DESC ) +return -ENOSYS ; + +return run_descriptor_jr (buf); +} + +static int caam_jr_probe (struct udevice *dev) { +struct caam_regs *caam =dev_get_priv (dev); +fdt_addr_t addr; +ofnode node; +unsigned int jr_node =0 ; + + caam_dev = dev; + + addr =dev_read_addr (dev); +if (addr ==FDT_ADDR_T_NONE ) { +printf ("caam_jr: crypto not found\n" ); +return -EINVAL ; + } + caam->sec = (ccsr_sec_t *)(uintptr_t )addr; + caam->regs = (struct jr_regs *)caam->sec; + +/* Check for enabled job ring node */ +ofnode_for_each_subnode (node,dev_ofnode (dev)) { +if (!ofnode_is_available (node)) +continue ; + + jr_node =ofnode_read_u32_default (node,"reg" ,-1 ); +if (jr_node >0 ) { + caam->regs = (struct jr_regs *)((ulong )caam->sec + jr_node); +while (!(jr_node &0x0F )) + jr_node = jr_node >>4 ; + + caam->jrid = jr_node -1 ; +break ; + } + } + +if (sec_init ()) +printf ("\nsec_init failed!\n" ); + +return 0 ; +} + +static int caam_jr_bind (struct udevice *dev) { +return 0 ; +} + +static const struct misc_ops caam_jr_ops = { + .ioctl = caam_jr_ioctl, +}; + +static const struct udevice_id caam_jr_match[] = { + { .compatible ="fsl,sec-v4.0" }, + { } +}; + +U_BOOT_DRIVER (caam_jr) = { + .name ="caam_jr" , + .id =UCLASS_MISC , + .of_match = caam_jr_match, + .ops = &caam_jr_ops, + .bind = caam_jr_bind, + .probe = caam_jr_probe, + .priv_auto =sizeof (struct caam_regs ), +}; +#endif drivers/crypto/fsl/jr.h index renamed from drivers/crypto/fsl/jr.h +0
-0
1047aa772c..3eb7be79da100644drivers/crypto/fsl/jr.h +3
-0@@ -1,6 +1,7 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. +* Copyright 2021 NXP * */ @@ -8,7 +9,9 @@#define __JR_H#include <linux/compiler.h> +#include "fsl_sec.h" #include "type.h" +#include <misc.h> #define JR_SIZE 4 /* Timeout currently defined as 10 sec */ @@ -35,12 +38,21 @@#define JRSLIODN_SHIFT 0 #define JRSLIODN_MASK 0x00000fffdrivers/crypto/fsl/jr.h +18
-3-#define JQ_DEQ_ERR -1 -#define JQ_DEQ_TO_ERR -2 -#define JQ_ENQ_ERR -3 +#define JRDID_MS_PRIM_DID BIT(0) +#define JRDID_MS_PRIM_TZ BIT(4) +#define JRDID_MS_TZ_OWN BIT(15) + +#define JQ_DEQ_ERR (-1) +#define JQ_DEQ_TO_ERR (-2) +#define JQ_ENQ_ERR (-3)#define RNG4_MAX_HANDLES 2 +enum { +/* Run caam jobring descriptor(in buf) */ +CAAM_JR_RUN_DESC , +}; +struct op_ring {caam_dma_addr_t desc;uint32_t status;@@ -102,6 +114,19 @@ struct result {uint32_t status; }; +/* +* struct caam_regs - CAAM initialization register interface +* +* Interface to caam memory map, jobring register, jobring storage. +*/ +struct caam_regs {drivers/crypto/fsl/jr.h struct result { · line 132
Quoted 10 lines
drivers/crypto/fsl/jr.h +7
-0+ccsr_sec_t *sec;/*caam initialization registers*/ +struct jr_regs *regs;/*jobring configuration registers*/ +u8 jrid;/*id to identify a jobring*/ +/*Private sub-storage for a single JobR*/ +struct jobring jr[CONFIG_SYS_FSL_MAX_NUM_OF_SEC ]; +}; +void caam_jr_strstatus (u32 status);int run_descriptor_jr (uint32_t *desc);--
=================================================================
====
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=================================================================
====
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 1/14 crypto/fsl: Add support for CAAM Job ring driver model
In reply to Gaurav JainQuoted 6 lines
added device tree support for job ring driver. sec is initialized based on job ring information processed from device tree.
Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
A message that is not in the archive (sent off-list or not yet received): 7d0648b0-338d-4b01-9da5-269c7cea0031@VE1EUR01FT051.eop-EUR01.prod.protection.outlook.com
RE: [EXT] [PATCH v11 01/14] crypto/fsl: Add support for CAAM Job ring driver model
Hi Priyanka
Stefano has applied the patches for imx.
Please help to apply the layerscape patches.
Regards
Gaurav Jain
Quoted 28 lines
-----Original Message-----
From: [email protected] <[email protected]>
Sent: Tuesday, April 12, 2022 7:05 PM
To: Gaurav Jain <[email protected]>; [email protected]
Subject: [EXT] [PATCH v11 01/14]crypto/fsl: Add support for CAAM Job ring driver modelCaution: EXT Email
Quoted 6 lines
added device tree support for job ring driver.
sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>Reviewed-by Simon Glass <[email protected]>Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic--
================================================================
=====
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
================================================================
=====
Re: [EXT] [PATCH v11 01/14] crypto/fsl: Add support for CAAM Job ring driver model
Hi Gaurav, Priyanka,
Quoted 5 lines · Gaurav Jain
Hi Priyanka
Stefano has applied the patches for imx.
Please help to apply the layerscape patches.
Kshitiz's patch is already applied, else I could not build my tree, you do not need to bother about it:
http://patchwork.ozlabs.org/project/uboot/patch/[email protected]/
Regards,
Stefano
Quoted 31 lines
Regards
Gaurav JainQuoted 28 lines
-----Original Message-----
From: [email protected] <[email protected]>
Sent: Tuesday, April 12, 2022 7:05 PM
To: Gaurav Jain <[email protected]>; [email protected]
Subject: [EXT] [PATCH v11 01/14]crypto/fsl: Add support for CAAM Job ring driver modelCaution: EXT Email
Quoted 6 lines
added device tree support for job ring driver.
sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>Reviewed-by Simon Glass <[email protected]>Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic--
================================================================
=====
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
================================================================
=====
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 2/14 i.MX8M: crypto: updated device tree for supporting DM in SPL
In reply to Gaurav Jain--- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 18 +++++++++++++++++- arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 18 +++++++++++++++++- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 18 +++++++++++++++++- 3 files changed, 51 insertions(+), 3 deletions(-)
arch/arm/dts/imx8mm-evk-u-boot.dtsi +17 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include "imx8mm-u-boot.dtsi"
@@ -68,6 +68,22 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &usdhc1 { u-boot,dm-spl; };
arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +17 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ / {
@@ -104,6 +104,22 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &usdhc1 { u-boot,dm-spl; };
arch/arm/dts/imx8mp-evk-u-boot.dtsi +17 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include "imx8mp-u-boot.dtsi"
@@ -67,6 +67,22 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &i2c1 { u-boot,dm-spl; };
Signature · 1 line
2.17.1
PATCH v11 2/14 i.MX8M: crypto: updated device tree for supporting DM in SPL
Quoted 2 lines
Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 3/14 crypto/fsl: i.MX8M: Enable Job ring driver model.
In reply to Gaurav Jaini.MX8MM/MN/MP/MQ - added support for JR driver model. sec is initialized based on job ring information processed from device tree.
--- arch/arm/Kconfig | 2 +- arch/arm/mach-imx/imx8m/Kconfig | 13 +++++++++++++ arch/arm/mach-imx/imx8m/soc.c | 11 ++++++++++- board/freescale/imx8mm_evk/spl.c | 10 +++++++++- board/freescale/imx8mn_evk/spl.c | 9 +++++++-- board/freescale/imx8mp_evk/spl.c | 14 ++++++++++++-- board/freescale/imx8mq_evk/spl.c | 8 ++++++-- 7 files changed, 58 insertions(+), 9 deletions(-)
arch/arm/Kconfig +1 -1
@@ -817,7 +817,7 @@ config ARCH_IMX8M select ARM64 select GPIO_EXTRA_HEADER select MACH_IMX - select SYS_FSL_HAS_SEC if IMX_HAB + select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select SYS_I2C_MXC
arch/arm/mach-imx/imx8m/Kconfig +13 -0
@@ -39,6 +39,9 @@ config TARGET_IMX8MQ_EVK select BINMAN select IMX8MQ select IMX8M_LPDDR4 + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MQ_PHANBELL bool "imx8mq_phanbell"
@@ -52,6 +55,9 @@ config TARGET_IMX8MM_EVK select IMX8MM select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MM_ICORE_MX8MM bool "Engicam i.Core MX8M Mini SOM"
@@ -91,6 +97,8 @@ config TARGET_IMX8MN_EVK select IMX8MN select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select SPL_CRYPTO if SPL config TARGET_IMX8MN_DDR4_EVK bool "imx8mn DDR4 EVK board"
@@ -98,6 +106,8 @@ config TARGET_IMX8MN_DDR4_EVK select IMX8MN select SUPPORT_SPL select IMX8M_DDR4 + select FSL_CAAM + select SPL_CRYPTO if SPL config TARGET_IMX8MN_VENICE bool "Support Gateworks Venice iMX8M Nano module"
@@ -112,6 +122,9 @@ config TARGET_IMX8MP_EVK select IMX8MP select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_PICO_IMX8MQ bool "Support Technexion Pico iMX8MQ"
arch/arm/mach-imx/imx8m/soc.c +10 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2017-2019 NXP +* Copyright 2017-2019, 2021 NXP * * Peng Fan <[email protected]> */
@@ -20,6 +20,7 @@#include <asm/ptrace.h> #include <asm/armv8/mmu.h> #include <dm/uclass.h> +#include <dm/device.h> #include <efi_loader.h> #include <env.h> #include <env_internal.h>
@@ -1210,6 +1211,14 @@ static void acquire_buildinfo(void)int arch_misc_init (void ) { +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + }acquire_buildinfo ();return 0 ;
board/freescale/imx8mm_evk/spl.c +9 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2019 NXP +* Copyright 2019, 2021 NXP */ #include <common.h>
@@ -51,6 +51,14 @@ static void spl_dram_init(void)void spl_board_init (void ) { +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + }puts ("Normal Boot\n" ); }
board/freescale/imx8mn_evk/spl.c +7 -2
@@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* Copyright 2018-2019 NXP +* Copyright 2018-2019, 2021 NXP * -* SPDX-License-Identifier: GPL-2.0+ */ #include <common.h>
@@ -49,6 +49,11 @@ void spl_board_init(void)struct udevice *dev;int ret; +if (IS_ENABLED (CONFIG_FSL_CAAM )) { + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + }puts ("Normal Boot\n" ); ret = uclass_get_device_by_name(UCLASS_CLK,
board/freescale/imx8mp_evk/spl.c +12 -2
@@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* Copyright 2018-2019 NXP +* Copyright 2018-2019, 2021 NXP * -* SPDX-License-Identifier: GPL-2.0+ */ #include <common.h>
@@ -20,6 +20,8 @@#include <asm/arch/ddr.h> #include <power/pmic.h> #include <power/pca9450.h> +#include <dm/uclass.h> +#include <dm/device.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -35,6 +37,14 @@ void spl_dram_init(void)void spl_board_init (void ) { +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + }/* * Set GIC clock to 500Mhz for OD VDD_SOC. Kernel driver does * not allow to change it. Should set the clock after PMIC
board/freescale/imx8mq_evk/spl.c +6 -2
@@ -1,8 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP * -* SPDX-License-Identifier: GPL-2.0+ */ #include <common.h>
@@ -22,6 +21,7 @@#include <asm/mach-imx/gpio.h> #include <asm/mach-imx/mxc_i2c.h> #include <fsl_esdhc_imx.h> +#include <fsl_sec.h> #include <mmc.h> #include <linux/delay.h> #include <power/pmic.h>
@@ -199,6 +199,10 @@ int power_init_board(void)void spl_board_init (void ) { +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +if (sec_init ()) +printf ("\nsec_init failed!\n" ); + }puts ("Normal Boot\n" ); }
Signature · 1 line
2.17.1
PATCH v11 3/14 crypto/fsl: i.MX8M: Enable Job ring driver model.
Quoted 5 lines
i.MX8MM/MN/MP/MQ - added support for JR driver model. sec is initialized based on job ring information processed from device tree.
Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 4/14 mx6sabre: Remove unnecessary SPL configs
In reply to Gaurav JainFrom: Ye Li <[email protected]>
Because we don't use SPL_DM on mx6sabresd and mx6sabreauto, so it is unnecessary to have SPL DTB related configs and SPL_OF_CONTROL enabled.
--- configs/mx6sabreauto_defconfig | 2 -- configs/mx6sabresd_defconfig | 4 ---- 2 files changed, 6 deletions(-)
configs/mx6sabreauto_defconfig +0 -2
@@ -62,10 +62,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="imx6dl-sabreauto imx6q-sabreauto imx6qp-sabreauto" CONFIG_MULTI_DTB_FIT=y -CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
configs/mx6sabresd_defconfig +0 -4
@@ -65,12 +65,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="imx6q-sabresd imx6qp-sabresd imx6dl-sabresd" CONFIG_MULTI_DTB_FIT=y -CONFIG_SPL_MULTI_DTB_FIT=y -CONFIG_SPL_OF_LIST="imx6dl-sabresd imx6q-sabresd imx6qp-sabresd" -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y
Signature · 1 line
2.17.1
PATCH v11 4/14 mx6sabre: Remove unnecessary SPL configs
Quoted 6 lines
From: Ye Li <[email protected]>
Because we don't useSPL_DMon mx6sabresd and mx6sabreauto, so it is unnecessary to have SPL DTB related configs andSPL_OF_CONTROLenabled.Signed-off-by Ye Li <[email protected]>Reviewed-by Fabio Estevam <[email protected]>Reviewed-by Gaurav Jain <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 5/14 i.MX6: Enable Job ring driver model.
In reply to Gaurav Jaini.MX6,i.MX6SX,i.MX6UL - added support for JR driver model.
removed sec_init() call, sec is initialized based on job ring information processed from device tree.
--- arch/arm/mach-imx/mx6/Kconfig | 10 ++++++++++ arch/arm/mach-imx/mx6/soc.c | 13 +++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-)
arch/arm/mach-imx/mx6/Kconfig +10 -0
@@ -354,6 +354,8 @@ config TARGET_MX6SABREAUTO select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select ARCH_MISC_INIT config TARGET_MX6SABRESD bool "mx6sabresd"
@@ -364,6 +366,8 @@ config TARGET_MX6SABRESD select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select ARCH_MISC_INIT config TARGET_MX6SLEVK bool "mx6slevk"
@@ -386,6 +390,8 @@ config TARGET_MX6SXSABRESD select DM select DM_THERMAL select SUPPORT_SPL + select FSL_CAAM + select ARCH_MISC_INIT config TARGET_MX6SXSABREAUTO bool "mx6sxsabreauto"
@@ -404,6 +410,8 @@ config TARGET_MX6UL_9X9_EVK select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select ARCH_MISC_INIT config TARGET_MX6UL_14X14_EVK bool "mx6ul_14x14_evk"
@@ -413,6 +421,8 @@ config TARGET_MX6UL_14X14_EVK select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select ARCH_MISC_INIT config TARGET_MX6UL_ENGICAM bool "Support Engicam GEAM6UL/Is.IoT"
arch/arm/mach-imx/mx6/soc.c +9 -4
@@ -4,6 +4,7 @@* Sascha Hauer, Pengutronix * * (C) Copyright 2009 Freescale Semiconductor, Inc. +* Copyright 2021 NXP */ #include <common.h>
@@ -23,7 +24,6 @@#include <asm/arch/mxc_hdmi.h> #include <asm/arch/crm_regs.h> #include <dm.h> -#include <fsl_sec.h> #include <imx_thermal.h> #include <mmc.h>
@@ -738,9 +738,14 @@ static void setup_serial_number(void)int arch_misc_init (void ) { -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + }setup_serial_number ();return 0 ; }
Signature · 1 line
2.17.1
PATCH v11 5/14 i.MX6: Enable Job ring driver model.
Quoted 5 lines
i.MX6,i.MX6SX,i.MX6UL - added support for JR driver model. removed
sec_init()call, sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 6/14 i.MX7: Enable Job ring driver model.
In reply to Gaurav Jaini.MX7D - added support for JR driver model.
removed sec_init() call, sec is initialized based on job ring information processed from device tree.
--- arch/arm/Kconfig | 2 +- arch/arm/mach-imx/mx7/Kconfig | 1 + arch/arm/mach-imx/mx7/soc.c | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-)
arch/arm/Kconfig +1 -1
@@ -885,7 +885,7 @@ config ARCH_MX7 select CPU_V7A select GPIO_EXTRA_HEADER select MACH_IMX - select SYS_FSL_HAS_SEC if IMX_HAB + select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE imply BOARD_EARLY_INIT_F
arch/arm/mach-imx/mx7/Kconfig +1 -0
@@ -68,6 +68,7 @@ config TARGET_MX7DSABRESD select DM_THERMAL select MX7D imply CMD_DM + select FSL_CAAM config TARGET_PICO_IMX7D bool "pico-imx7d"
arch/arm/mach-imx/mx7/soc.c +8 -4
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. +* Copyright 2021 NXP */ #include <common.h>
@@ -20,7 +21,6 @@#include <dm.h> #include <env.h> #include <imx_thermal.h> -#include <fsl_sec.h> #include <asm/setup.h> #include <linux/delay.h>
@@ -356,9 +356,13 @@ int arch_misc_init(void)env_set ("serial#" , serial_string);#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +struct udevice *dev; +int ret; + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + }return 0 ; }
Signature · 1 line
2.17.1
PATCH v11 6/14 i.MX7: Enable Job ring driver model.
Quoted 5 lines
i.MX7D - added support for JR driver model. removed
sec_init()call, sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 7/14 i.MX7ULP: Enable Job ring driver model.
In reply to Gaurav Jainadded crypto node in device tree.
sec is initialized based on job ring information processed from device tree.
--- arch/arm/Kconfig | 2 +- arch/arm/dts/imx7ulp.dtsi | 24 ++++++++++++++++++++++++ arch/arm/mach-imx/mx7ulp/Kconfig | 2 ++ arch/arm/mach-imx/mx7ulp/soc.c | 18 ++++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-)
arch/arm/Kconfig +1 -1
@@ -872,7 +872,7 @@ config ARCH_MX7ULP select CPU_V7A select GPIO_EXTRA_HEADER select MACH_IMX - select SYS_FSL_HAS_SEC if IMX_HAB + select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select ROM_UNIFIED_SECTIONS
arch/arm/dts/imx7ulp.dtsi +24 -0
@@ -1,5 +1,6 @@ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -198,6 +199,29 @@ }; }; + crypto: crypto@40240000 { + compatible = "fsl,sec-v4.0"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x40240000 0x10000>; + ranges = <0 0x40240000 0x10000>; + clocks = <&clks IMX7ULP_CLK_CAAM>, + <&clks IMX7ULP_CLK_NIC1_BUS_DIV>; + clock-names = "aclk", "ipg"; + + sec_jr0: jr@1000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>; + }; + + sec_jr1: jr@2000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>; + }; + }; + tpm5: tpm@40260000 { compatible = "fsl,imx7ulp-tpm"; reg = <0x40260000 0x1000>;
arch/arm/mach-imx/mx7ulp/Kconfig +2 -0
@@ -40,6 +40,8 @@ config TARGET_MX7ULP_EVK bool "Support mx7ulp EVK board" select MX7ULP select SYS_ARCH_TIMER + select FSL_CAAM + select ARCH_MISC_INIT endchoice
arch/arm/mach-imx/mx7ulp/soc.c +18 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. +* Copyright 2021 NXP */ #include <common.h>
@@ -16,6 +17,7 @@#include <asm/mach-imx/sys_proto.h> #include <asm/setup.h> #include <linux/bitops.h> +#include <dm.h> #define PMC0_BASE_ADDR 0x410a1000#define PMC0_CTRL 0x28
@@ -82,6 +84,22 @@ int arch_cpu_init(void)return 0 ; } +#if defined(CONFIG_ARCH_MISC_INIT ) +int arch_misc_init (void ) +{ +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + } + +return 0 ; +} +#endif +#ifdef CONFIG_BOARD_POSTCLK_INIT int board_postclk_init (void ) {
Signature · 1 line
2.17.1
PATCH v11 7/14 i.MX7ULP: Enable Job ring driver model.
Quoted 5 lines
added crypto node in device tree.
sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 8/14 i.MX8: Add crypto node in device tree
In reply to Gaurav Jaini.MX8(QM/QXP) - updated device tree for supporting DM in SPL.
disabled use of JR1 in SPL and uboot, as JR1 is reserved for SECO FW.
--- arch/arm/dts/fsl-imx8dx.dtsi | 61 +++++++++++++++++++++++- arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 34 ++++++++++++- arch/arm/dts/fsl-imx8qm.dtsi | 61 +++++++++++++++++++++++- arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 34 ++++++++++++- 4 files changed, 186 insertions(+), 4 deletions(-)
arch/arm/dts/fsl-imx8dx.dtsi +60 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -261,6 +261,30 @@ power-domains = <&pd_dma>; }; }; + + pd_caam: PD_CAAM { + compatible = "nxp,imx8-pd"; + reg = <SC_R_NONE>; + #power-domain-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; + + pd_caam_jr1: PD_CAAM_JR1 { + reg = <SC_R_CAAM_JR1>; + #power-domain-cells = <0>; + power-domains = <&pd_caam>; + }; + pd_caam_jr2: PD_CAAM_JR2 { + reg = <SC_R_CAAM_JR2>; + #power-domain-cells = <0>; + power-domains = <&pd_caam>; + }; + pd_caam_jr3: PD_CAAM_JR3 { + reg = <SC_R_CAAM_JR3>; + #power-domain-cells = <0>; + power-domains = <&pd_caam>; + }; + }; }; i2c0: i2c@5a800000 {
@@ -609,6 +633,41 @@ }; }; }; + + crypto: caam@0x31400000 { + compatible = "fsl,sec-v4.0"; + reg = <0 0x31400000 0 0x400000>; + interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x31400000 0x400000>; + fsl,first-jr-index = <2>; + fsl,sec-era = <9>; + + sec_jr1: jr1@0x20000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x1000>; + interrupts = <GIC_SPI 452 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&pd_caam_jr1>; + status = "disabled"; + }; + + sec_jr2: jr2@30000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x1000>; + interrupts = <GIC_SPI 453 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&pd_caam_jr2>; + status = "okay"; + }; + + sec_jr3: jr3@40000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x1000>; + interrupts = <GIC_SPI 454 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&pd_caam_jr3>; + status = "okay"; + }; + }; }; &A35_0 {
arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi +33 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ &{/imx8qm-pm} {
@@ -80,6 +80,22 @@ u-boot,dm-spl; }; +&pd_caam { + u-boot,dm-spl; +}; + +&pd_caam_jr1 { + u-boot,dm-spl; +}; + +&pd_caam_jr2 { + u-boot,dm-spl; +}; + +&pd_caam_jr3 { + u-boot,dm-spl; +}; + &gpio0 { u-boot,dm-spl; };
@@ -126,3 +142,19 @@ sd-uhs-sdr104; sd-uhs-ddr50; }; + +&crypto { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + +&sec_jr3 { + u-boot,dm-spl; +};
arch/arm/dts/fsl-imx8qm.dtsi +60 -1
78 lines not on this page · raw message
arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi +33 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ &{/imx8qx-pm} {
@@ -80,6 +80,22 @@ u-boot,dm-spl; }; +&pd_caam { + u-boot,dm-spl; +}; + +&pd_caam_jr1 { + u-boot,dm-spl; +}; + +&pd_caam_jr2 { + u-boot,dm-spl; +}; + +&pd_caam_jr3 { + u-boot,dm-spl; +}; + &gpio0 { u-boot,dm-spl; };
@@ -126,3 +142,19 @@ sd-uhs-sdr104; sd-uhs-ddr50; }; + +&crypto { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + +&sec_jr3 { + u-boot,dm-spl; +};
Signature · 1 line
2.17.1
PATCH v11 8/14 i.MX8: Add crypto node in device tree
Quoted 5 lines
i.MX8(QM/QXP)- updated device tree for supporting DM in SPL. disabled use of JR1 in SPL and uboot, as JR1 is reserved for SECO FW.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Ye Li <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 9/14 crypto/fsl: i.MX8: Enable Job ring driver model.
In reply to Gaurav Jaini.MX8(QM/QXP) - added support for JR driver model. sec is initialized based on job ring information processed from device tree.
--- arch/arm/Kconfig | 3 ++ arch/arm/include/asm/arch-imx8/imx-regs.h | 5 ++- arch/arm/mach-imx/cmd_dek.c | 1 + arch/arm/mach-imx/imx8/Kconfig | 7 ++++ arch/arm/mach-imx/imx8/cpu.c | 18 ++++++++- board/freescale/imx8qm_mek/spl.c | 6 ++- board/freescale/imx8qxp_mek/spl.c | 6 ++- drivers/crypto/fsl/Kconfig | 2 +- drivers/crypto/fsl/jr.c | 47 ++++++++++++++++++++++- include/fsl_sec.h | 12 +++--- 10 files changed, 91 insertions(+), 16 deletions(-)
arch/arm/Kconfig +3 -0
@@ -806,6 +806,9 @@ config ARCH_LPC32XX config ARCH_IMX8 bool "NXP i.MX8 platform" select ARM64 + select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_COMPAT_4 + select SYS_FSL_SEC_LE select DM select GPIO_EXTRA_HEADER select MACH_IMX
arch/arm/include/asm/arch-imx8/imx-regs.h +4 -1
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0+ */ /* -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP */ #ifndef __ASM_ARCH_IMX8_REGS_H__
@@ -47,4 +47,7 @@#define USB_BASE_ADDR 0x5b0d0000#define USB_PHY0_BASE_ADDR 0x5b100000 +#define CONFIG_SYS_FSL_SEC_ADDR (0x31400000) +#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 +#endif /* __ASM_ARCH_IMX8_REGS_H__ */
arch/arm/mach-imx/cmd_dek.c +1 -0
@@ -9,6 +9,7 @@#include <command.h> #include <log.h> #include <malloc.h> +#include <memalign.h> #include <asm/byteorder.h> #include <linux/compiler.h> #include <fsl_sec.h>
arch/arm/mach-imx/imx8/Kconfig +7 -0
@@ -8,6 +8,7 @@ config AHAB_BOOT config IMX8 bool + select HAS_CAAM config MU_BASE_SPL hex "MU base address used in SPL"
@@ -72,6 +73,9 @@ config TARGET_IMX8QM_MEK bool "Support i.MX8QM MEK board" select BOARD_LATE_INIT select IMX8QM + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_CONGA_QMX8 bool "Support congatec conga-QMX8 board"
@@ -89,6 +93,9 @@ config TARGET_IMX8QXP_MEK bool "Support i.MX8QXP MEK board" select BOARD_LATE_INIT select IMX8QXP + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL endchoice
arch/arm/mach-imx/imx8/cpu.c +17 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP */ #include <common.h>
@@ -89,6 +89,22 @@ int arch_cpu_init_dm(void)return 0 ; } +#if defined(CONFIG_ARCH_MISC_INIT ) +int arch_misc_init (void ) +{ +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + } + +return 0 ; +} +#endif +int print_bootinfo (void ) {enum boot_device bt_dev =get_boot_device ();
board/freescale/imx8qm_mek/spl.c +4 -2
@@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP * -* SPDX-License-Identifier: GPL-2.0+ */ #include <common.h>
@@ -24,6 +24,8 @@ void spl_board_init(void) {struct udevice *dev; +uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (imx8_scu), &dev); +uclass_find_first_device (UCLASS_MISC , &dev);for (; dev;uclass_find_next_device (&dev)) {
board/freescale/imx8qxp_mek/spl.c +4 -2
@@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP * -* SPDX-License-Identifier: GPL-2.0+ */ #include <common.h>
@@ -39,6 +39,8 @@ void spl_board_init(void) {struct udevice *dev; +uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (imx8_scu), &dev); +uclass_find_first_device (UCLASS_MISC , &dev);for (; dev;uclass_find_next_device (&dev)) {
drivers/crypto/fsl/Kconfig +1 -1
@@ -12,7 +12,7 @@ config FSL_CAAM config CAAM_64BIT bool - default y if PHYS_64BIT && !ARCH_IMX8M + default y if PHYS_64BIT && !ARCH_IMX8M && !ARCH_IMX8 help Select Crypto driver for 64 bits CAAM version
drivers/crypto/fsl/jr.c +45 -2
102 lines not on this page · raw message
include/fsl_sec.h +5 -7
@@ -3,7 +3,7 @@* Common internal memory map for some Freescale SoCs * * Copyright 2014 Freescale Semiconductor, Inc. -* Copyright 2018 NXP +* Copyright 2018, 2021 NXP */ #ifndef __FSL_SEC_H
@@ -194,12 +194,10 @@ typedef struct ccsr_sec {#define SEC_CHAVID_LS_RNG_SHIFT 16#define SEC_CHAVID_RNG_LS_MASK 0x000f0000 -#define CONFIG_JRSTARTR_JR0 0x00000001 -struct jr_regs {#if defined(CONFIG_SYS_FSL_SEC_LE ) && \ !(defined(CONFIG_MX6 ) || defined(CONFIG_MX7 ) || \ - defined(CONFIG_MX7ULP ) || defined(CONFIG_IMX8M )) + defined(CONFIG_MX7ULP ) || defined(CONFIG_IMX8M ) || defined(CONFIG_IMX8 ))u32 irba_l;u32 irba_h;#else
@@ -214,7 +212,7 @@ struct jr_regs {u32 irja;#if defined(CONFIG_SYS_FSL_SEC_LE ) && \ !(defined(CONFIG_MX6 ) || defined(CONFIG_MX7 ) || \ - defined(CONFIG_MX7ULP ) || defined(CONFIG_IMX8M )) + defined(CONFIG_MX7ULP ) || defined(CONFIG_IMX8M ) || defined(CONFIG_IMX8 ))u32 orba_l;u32 orba_h;#else
@@ -248,7 +246,7 @@ struct jr_regs {struct sg_entry {#if defined(CONFIG_SYS_FSL_SEC_LE ) && \ !(defined(CONFIG_MX6 ) || defined(CONFIG_MX7 ) || \ - defined(CONFIG_MX7ULP ) || defined(CONFIG_IMX8M )) + defined(CONFIG_MX7ULP ) || defined(CONFIG_IMX8M ) || defined(CONFIG_IMX8 ))uint32_t addr_lo;/* Memory Address - lo */ uint32_t addr_hi;/* Memory Address of start of buffer - hi */ #else
@@ -268,7 +266,7 @@ struct sg_entry { };#if defined(CONFIG_MX6 ) || defined(CONFIG_MX7 ) || \ - defined(CONFIG_MX7ULP ) || defined(CONFIG_IMX8M ) + defined(CONFIG_MX7ULP ) || defined(CONFIG_IMX8M ) || defined(CONFIG_IMX8 )/* Job Ring Base Address */ #define JR_BASE_ADDR (x) (CONFIG_SYS_FSL_SEC_ADDR + 0x1000 * (x + 1))/* Secure Memory Offset varies accross versions */
Signature · 1 line
2.17.1
PATCH v11 9/14 crypto/fsl: i.MX8: Enable Job ring driver model.
Quoted 6 lines
i.MX8(QM/QXP)- added support for JR driver model. sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Signed-off-by Horia Geantă <[email protected]>Reviewed-by Ye Li <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 10/14 Layerscape: Add crypto node in device tree
In reply to Gaurav JainLS(1021/1012/1028/1043/1046/1088/2088), LX2160 - updated device tree
--- arch/arm/dts/fsl-ls1012a.dtsi | 46 ++++++++++++++++++++++++++++++++++- arch/arm/dts/fsl-ls1043a.dtsi | 45 +++++++++++++++++++++++++++++++++- arch/arm/dts/fsl-ls1046a.dtsi | 44 +++++++++++++++++++++++++++++++++ arch/arm/dts/fsl-ls1088a.dtsi | 39 +++++++++++++++++++++++++++++ arch/arm/dts/fsl-ls2080a.dtsi | 39 +++++++++++++++++++++++++++++ arch/arm/dts/fsl-lx2160a.dtsi | 41 ++++++++++++++++++++++++++++++- arch/arm/dts/ls1021a.dtsi | 40 ++++++++++++++++++++++++++++++ 7 files changed, 291 insertions(+), 3 deletions(-)
arch/arm/dts/fsl-ls1012a.dtsi +45 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ OR X11 /* - * Copyright 2020 NXP + * Copyright 2020-2021 NXP * Copyright 2016 Freescale Semiconductor */
@@ -71,6 +71,50 @@ bus-width = <4>; }; + crypto: crypto@1700000 { + compatible = "fsl,sec-v5.4", "fsl,sec-v5.0", + "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x1700000 0x100000>; + reg = <0x00 0x1700000 0x0 0x100000>; + interrupts = <0 75 0x4>; + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <0 71 0x4>; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <0 72 0x4>; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <0 73 0x4>; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <0 74 0x4>; + }; + }; + gpio0: gpio@2300000 { compatible = "fsl,qoriq-gpio"; reg = <0x0 0x2300000 0x0 0x10000>;
arch/arm/dts/fsl-ls1043a.dtsi +44 -1
57 lines not on this page · raw message
arch/arm/dts/fsl-ls1046a.dtsi +44 -0
56 lines not on this page · raw message
arch/arm/dts/fsl-ls1088a.dtsi +39 -0
@@ -174,6 +174,45 @@ dr_mode = "host"; }; + crypto: crypto@8000000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x8000000 0x100000>; + reg = <0x00 0x8000000 0x0 0x100000>; + interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>; + }; + }; + pcie1: pcie@3400000 { compatible = "fsl,ls-pcie", "snps,dw-pcie"; reg = <0x00 0x03400000 0x0 0x80000 /* dbi registers */
arch/arm/dts/fsl-ls2080a.dtsi +39 -0
@@ -239,6 +239,45 @@ status = "disabled"; }; + crypto: crypto@8000000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x8000000 0x100000>; + reg = <0x00 0x8000000 0x0 0x100000>; + interrupts = <0 139 0x4>; /* Level high type */ + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <0 140 0x4>; /* Level high type */ + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <0 141 0x4>; /* Level high type */ + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <0 142 0x4>; /* Level high type */ + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <0 143 0x4>; /* Level high type */ + }; + }; + fsl_mc: fsl-mc@80c000000 { compatible = "fsl,qoriq-mc", "simple-mfd"; reg = <0x00000008 0x0c000000 0 0x40>, /* MC portal base */
arch/arm/dts/fsl-lx2160a.dtsi +40 -1
53 lines not on this page · raw message
arch/arm/dts/ls1021a.dtsi +40 -0
@@ -3,6 +3,7 @@ * Freescale ls1021a SOC common device tree source * * Copyright 2013-2015 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include "skeleton.dtsi"
@@ -144,6 +145,45 @@ big-endian; }; + crypto: crypto@1700000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <7>; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x1700000 0x100000>; + ranges = <0x0 0x1700000 0x100000>; + interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>; + }; + + }; + clockgen: clocking@1ee1000 { #address-cells = <1>; #size-cells = <1>;
Signature · 1 line
2.17.1
PATCH v11 10/14 Layerscape: Add crypto node in device tree
Quoted 3 lines
LS(1021/1012/1028/1043/1046/1088/2088), LX2160 - updated device tree
Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Priyanka Jain <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 11/14 Layerscape: Enable Job ring driver model.
In reply to Gaurav JainLS(1021/1012/1028/1043/1046/1088/2088), LX2160, LX2162 platforms are enabled with JR driver model.
removed sec_init() call from board files.
sec is initialized based on job ring information processed from device tree.
--- arch/arm/cpu/armv7/ls102xa/cpu.c | 18 ++++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 11 ++++++++++- board/freescale/ls1012afrdm/ls1012afrdm.c | 7 +------ board/freescale/ls1012aqds/ls1012aqds.c | 6 +----- board/freescale/ls1012ardb/ls1012ardb.c | 6 +----- board/freescale/ls1021aiot/ls1021aiot.c | 6 ++---- board/freescale/ls1021aqds/ls1021aqds.c | 6 +----- board/freescale/ls1021atsn/ls1021atsn.c | 7 ++----- board/freescale/ls1021atwr/ls1021atwr.c | 8 ++------ board/freescale/ls1028a/ls1028a.c | 6 +----- board/freescale/ls1043ardb/ls1043ardb.c | 6 +----- board/freescale/ls1046afrwy/ls1046afrwy.c | 7 +------ board/freescale/ls1046aqds/ls1046aqds.c | 7 +------ board/freescale/ls1046ardb/ls1046ardb.c | 6 +----- board/freescale/ls1088a/ls1088a.c | 4 ---- board/freescale/ls2080aqds/ls2080aqds.c | 6 +----- board/freescale/ls2080ardb/ls2080ardb.c | 9 +-------- board/freescale/lx2160a/lx2160a.c | 5 ----- board/kontron/sl28/sl28.c | 3 --- configs/ls1021aiot_qspi_defconfig | 1 + configs/ls1021aiot_sdcard_defconfig | 1 + configs/ls1021aqds_ddr4_nor_defconfig | 1 + configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 1 + configs/ls1021aqds_nand_defconfig | 1 + configs/ls1021aqds_nor_defconfig | 1 + configs/ls1021aqds_nor_lpuart_defconfig | 1 + configs/ls1021aqds_qspi_defconfig | 1 + configs/ls1021aqds_sdcard_ifc_defconfig | 1 + configs/ls1021aqds_sdcard_qspi_defconfig | 1 + configs/ls1021atsn_qspi_defconfig | 1 + configs/ls1021atsn_sdcard_defconfig | 1 + configs/ls1021atwr_nor_defconfig | 1 + configs/ls1021atwr_nor_lpuart_defconfig | 1 + configs/ls1021atwr_qspi_defconfig | 1 + ...ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + configs/ls1021atwr_sdcard_ifc_defconfig | 1 + configs/ls1021atwr_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_defconfig | 1 + configs/ls1043aqds_lpuart_defconfig | 1 + configs/ls1043aqds_nand_defconfig | 1 + configs/ls1043aqds_nor_ddr3_defconfig | 1 + configs/ls1043aqds_qspi_defconfig | 1 + configs/ls1043aqds_sdcard_ifc_defconfig | 1 + configs/ls1043aqds_sdcard_qspi_defconfig | 1 + configs/ls1043aqds_tfa_defconfig | 1 + configs/ls1043ardb_defconfig | 1 + configs/ls1043ardb_nand_defconfig | 1 + configs/ls1043ardb_sdcard_defconfig | 1 + configs/ls1043ardb_tfa_defconfig | 1 + configs/ls1046afrwy_tfa_defconfig | 1 + configs/ls1046aqds_defconfig | 1 + configs/ls1046aqds_lpuart_defconfig | 1 + configs/ls1046aqds_nand_defconfig | 1 + configs/ls1046aqds_qspi_defconfig | 1 + configs/ls1046aqds_sdcard_ifc_defconfig | 1 + configs/ls1046aqds_sdcard_qspi_defconfig | 1 + configs/ls1046aqds_tfa_defconfig | 1 + configs/ls1046ardb_emmc_defconfig | 1 + configs/ls1046ardb_qspi_defconfig | 1 + configs/ls1046ardb_qspi_spl_defconfig | 1 + configs/ls1046ardb_sdcard_defconfig | 1 + configs/ls1046ardb_tfa_defconfig | 1 + 62 files changed, 88 insertions(+), 89 deletions(-)
arch/arm/cpu/armv7/ls102xa/cpu.c +18 -0
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. +* Copyright 2021 NXP */ #include <common.h>
@@ -20,6 +21,7 @@#include <config.h> #include <fsl_wdog.h> #include <linux/delay.h> +#include <dm.h> #include "fsl_epu.h"
@@ -397,3 +399,19 @@ void arch_preboot_os(void) ctrl &= ~ARCH_TIMER_CTRL_ENABLE ; asm("mcr p15, 0, %0, c14, c2, 1" : :"r" (ctrl)); } + +#ifdef CONFIG_ARCH_MISC_INIT +int arch_misc_init (void ) +{ +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + } + +return 0 ; +} +#endif
arch/arm/cpu/armv8/fsl-layerscape/cpu.c +10 -1
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2017-2020 NXP +* Copyright 2017-2021 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. */
@@ -49,6 +49,7 @@#endif #endif #include <linux/mii.h> +#include <dm.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -1650,6 +1651,14 @@ __weak int serdes_misc_init(void)int arch_misc_init (void ) { +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + }serdes_misc_init ();return 0 ;
board/freescale/ls1012afrdm/ls1012afrdm.c +1 -6
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2017-2018 NXP +* Copyright 2017-2018, 2021 NXP */ #include <common.h>
@@ -22,7 +22,6 @@#include <env_internal.h> #include <fsl_mmdc.h> #include <netdev.h> -#include <fsl_sec.h> #include <net/pfe_eth/pfe/pfe_hw.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -172,10 +171,6 @@ int board_init(void)if (current_el () ==3 )out_le32 (&cci->ctrl_ord,CCI400_CTRLORD_EN_BARRIER ); -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif -#ifdef CONFIG_FSL_LS_PPA ppa_init ();#endif
board/freescale/ls1012aqds/ls1012aqds.c +1 -5
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. +* Copyright 2021 NXP */ #include <common.h>
@@ -28,7 +29,6 @@#include <fsl_mmdc.h> #include <spl.h> #include <netdev.h> -#include <fsl_sec.h> #include "../common/qixis.h" #include "ls1012aqds_qixis.h" #include "ls1012aqds_pfe.h"
@@ -150,10 +150,6 @@ int board_init(void)erratum_a010315 ();#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif -#ifdef CONFIG_FSL_LS_PPA ppa_init ();#endif
board/freescale/ls1012ardb/ls1012ardb.c +1 -5
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. +* Copyright 2021 NXP */ #include <common.h>
@@ -27,7 +28,6 @@#include <env_internal.h> #include <fsl_mmdc.h> #include <netdev.h> -#include <fsl_sec.h> #include <net/pfe_eth/pfe/pfe_hw.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -173,10 +173,6 @@ int board_init(void)erratum_a010315 ();#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif -#ifdef CONFIG_FSL_LS_PPA ppa_init ();#endif
board/freescale/ls1021aiot/ls1021aiot.c +2 -4
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. +* Copyright 2021 NXP */ #include <common.h>
@@ -209,10 +210,7 @@ int misc_init_r(void)device_disable (devdis_tbl,ARRAY_SIZE (devdis_tbl));#endif - -#ifdef CONFIG_FSL_CAAM -return sec_init (); -#endif + return 0; }#endif
board/freescale/ls1021aqds/ls1021aqds.c +1 -5
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. -* Copyright 2019 NXP +* Copyright 2019, 2021 NXP */ #include <common.h>
@@ -20,7 +20,6 @@#include <mmc.h> #include <fsl_csu.h> #include <fsl_ifc.h> -#include <fsl_sec.h> #include <spl.h> #include <fsl_devdis.h> #include <fsl_validate.h>
@@ -388,9 +387,6 @@ int misc_init_r(void)#ifdef CONFIG_FSL_DEVICE_DISABLE device_disable (devdis_tbl,ARRAY_SIZE (devdis_tbl)); -#endif -#ifdef CONFIG_FSL_CAAM -return sec_init ();#endif return 0 ; }
board/freescale/ls1021atsn/ls1021atsn.c +2 -5
@@ -1,5 +1,5 @@// SPDX-License-Identifier: GPL-2.0 -/* Copyright 2016-2019 NXP +/* Copyright 2016-2019, 2021 NXP */ #include <common.h> #include <clock_legacy.h>
@@ -238,10 +238,7 @@ int misc_init_r(void)#ifdef CONFIG_FSL_DEVICE_DISABLE device_disable (devdis_tbl,ARRAY_SIZE (devdis_tbl));#endif - -#ifdef CONFIG_FSL_CAAM -return sec_init (); -#endif + return 0; }#endif
board/freescale/ls1021atwr/ls1021atwr.c +2 -6
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. -* Copyright 2019 NXP +* Copyright 2019, 2021 NXP */ #include <common.h>
@@ -26,7 +26,6 @@#include <netdev.h> #include <fsl_mdio.h> #include <tsec.h> -#include <fsl_sec.h> #include <fsl_devdis.h> #include <spl.h> #include <linux/delay.h>
@@ -555,10 +554,7 @@ int misc_init_r(void)#if !defined(CONFIG_QSPI_BOOT ) && !defined(CONFIG_SD_BOOT_QSPI )config_board_mux ();#endif - -#ifdef CONFIG_FSL_CAAM -return sec_init (); -#endif + return 0; }#endif
board/freescale/ls1028a/ls1028a.c +1 -5
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2019 NXP +* Copyright 2019, 2021 NXP */ #include <common.h>
@@ -73,10 +73,6 @@ u32 get_lpuart_clk(void)int board_init (void ) { -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif -#ifdef CONFIG_FSL_LS_PPA ppa_init ();#endif
board/freescale/ls1043ardb/ls1043ardb.c +1 -5
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. +* Copyright 2021 NXP */ #include <common.h>
@@ -20,7 +21,6 @@#include <fm_eth.h> #include <fsl_esdhc.h> #include <fsl_ifc.h> -#include <fsl_sec.h> #include "cpld.h" #ifdef CONFIG_U_QE #include <fsl_qe.h>
@@ -211,10 +211,6 @@ int board_init(void)out_le32 (SMMU_NSCR0 , val);#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif -#ifdef CONFIG_FSL_LS_PPA ppa_init ();#endif
board/freescale/ls1046afrwy/ls1046afrwy.c +1 -6
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0+ /* -* Copyright 2019 NXP +* Copyright 2019, 2021 NXP */ #include <common.h>
@@ -20,7 +20,6 @@#include <fm_eth.h> #include <fsl_csu.h> #include <fsl_esdhc.h> -#include <fsl_sec.h> #include <fsl_dspi.h> #include "../common/i2c_mux.h"
@@ -135,10 +134,6 @@ val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK);out_le32 (SMMU_NSCR0 , val);#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif -select_i2c_ch_pca9547 (I2C_MUX_CH_DEFAULT ,0 );return 0 ; }
board/freescale/ls1046aqds/ls1046aqds.c +1 -6
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. -* Copyright 2019-2020 NXP +* Copyright 2019-2021 NXP */ #include <common.h>
@@ -28,7 +28,6 @@#include <fsl_csu.h> #include <fsl_esdhc.h> #include <fsl_ifc.h> -#include <fsl_sec.h> #include <spl.h> #include "../common/i2c_mux.h"
@@ -421,10 +420,6 @@ int board_init(void)out_le32 (SMMU_NSCR0 , val);#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif -return 0 ; }
board/freescale/ls1046ardb/ls1046ardb.c +1 -5
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. +* Copyright 2021 NXP */ #include <common.h>
@@ -23,7 +24,6 @@#include <fsl_esdhc.h> #include <power/mc34vr500_pmic.h> #include "cpld.h" -#include <fsl_sec.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -85,10 +85,6 @@ int board_init(void)out_le32 (SMMU_NSCR0 , val);#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif -#ifdef CONFIG_FSL_LS_PPA ppa_init ();#endif
board/freescale/ls1088a/ls1088a.c +0 -4
@@ -13,7 +13,6 @@#include <netdev.h> #include <fsl_ifc.h> #include <fsl_ddr.h> -#include <fsl_sec.h> #include <asm/global_data.h> #include <asm/io.h> #include <fdt_support.h>
@@ -820,9 +819,6 @@ int board_init(void)out_le32 (irq_ccsr +IRQCR_OFFSET /4 ,AQR105_IRQ_MASK );#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif #ifdef CONFIG_FSL_LS_PPA ppa_init ();#endif
board/freescale/ls2080aqds/ls2080aqds.c +1 -5
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor +* Copyright 2021 NXP */ #include <common.h> #include <clock_legacy.h>
@@ -21,7 +22,6 @@#include <rtc.h> #include <asm/arch/soc.h> #include <hwconfig.h> -#include <fsl_sec.h> #include <asm/arch/ppa.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> #include "../common/i2c_mux.h"
@@ -222,10 +222,6 @@ int board_init(void)#endif #endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif -#ifdef CONFIG_FSL_LS_PPA ppa_init ();#endif
board/freescale/ls2080ardb/ls2080ardb.c +1 -8
@@ -1,7 +1,7 @@// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor -* Copyright 2017 NXP +* Copyright 2017, 2021 NXP */ #include <common.h> #include <clock_legacy.h>
@@ -24,7 +24,6 @@#include <asm/arch/mmu.h> #include <asm/arch/soc.h> #include <asm/arch/ppa.h> -#include <fsl_sec.h> #include <asm/arch-fsl-layerscape/fsl_icid.h> #include "../common/i2c_mux.h"
@@ -288,9 +287,6 @@ int board_init(void)QIXIS_WRITE (rst_ctl,QIXIS_RST_CTL_RESET_EN );#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif #ifdef CONFIG_FSL_LS_PPA ppa_init ();#endif
@@ -299,9 +295,6 @@ int board_init(void)/* invert AQR405 IRQ pins polarity */ out_le32 (irq_ccsr +IRQCR_OFFSET /4 ,AQR405_IRQ_MASK );#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif #if !defined(CONFIG_SYS_EARLY_PCI_INIT ) && defined(CONFIG_DM_ETH )pci_init ();
board/freescale/lx2160a/lx2160a.c +0 -5
@@ -14,7 +14,6 @@#include <errno.h> #include <netdev.h> #include <fsl_ddr.h> -#include <fsl_sec.h> #include <asm/io.h> #include <fdt_support.h> #include <linux/bitops.h>
@@ -593,10 +592,6 @@ int board_init(void)out_le32 (irq_ccsr +IRQCR_OFFSET /4 ,AQR107_IRQ_MASK );#endif -#ifdef CONFIG_FSL_CAAM -sec_init (); -#endif -#if !defined(CONFIG_SYS_EARLY_PCI_INIT ) && defined(CONFIG_DM_ETH )pci_init ();#endif
board/kontron/sl28/sl28.c +0 -3
@@ -31,9 +31,6 @@ int board_early_init_f(void)int board_init (void ) { -if (CONFIG_IS_ENABLED (FSL_CAAM )) -sec_init (); -return 0 ; }
configs/ls1021aiot_qspi_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
configs/ls1021aiot_sdcard_defconfig +1 -0
@@ -57,6 +57,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
configs/ls1021aqds_ddr4_nor_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1021aqds_ddr4_nor_lpuart_defconfig +1 -0
@@ -54,6 +54,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1021aqds_nand_defconfig +1 -0
@@ -74,6 +74,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y
configs/ls1021aqds_nor_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y
configs/ls1021aqds_nor_lpuart_defconfig +1 -0
@@ -54,6 +54,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y
configs/ls1021aqds_qspi_defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1021aqds_sdcard_ifc_defconfig +1 -0
@@ -71,6 +71,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y
configs/ls1021aqds_sdcard_qspi_defconfig +1 -0
@@ -69,6 +69,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1021atsn_qspi_defconfig +1 -0
@@ -38,6 +38,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
configs/ls1021atsn_sdcard_defconfig +1 -0
@@ -54,6 +54,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
configs/ls1021atwr_nor_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y
configs/ls1021atwr_nor_lpuart_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y
configs/ls1021atwr_qspi_defconfig +1 -0
@@ -48,6 +48,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y
configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +1 -0
@@ -62,6 +62,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SPL_DM=y +CONFIG_SPL_OF_CONTROL=y # CONFIG_SPL_BLK is not set CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y
configs/ls1021atwr_sdcard_ifc_defconfig +1 -0
@@ -65,6 +65,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y
configs/ls1021atwr_sdcard_qspi_defconfig +1 -0
@@ -65,6 +65,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y
configs/ls1043aqds_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1043aqds_lpuart_defconfig +1 -0
@@ -54,6 +54,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1043aqds_nand_defconfig +1 -0
@@ -73,6 +73,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1043aqds_nor_ddr3_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y
configs/ls1043aqds_qspi_defconfig +1 -0
@@ -54,6 +54,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1043aqds_sdcard_ifc_defconfig +1 -0
@@ -72,6 +72,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1043aqds_sdcard_qspi_defconfig +1 -0
@@ -71,6 +71,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1043aqds_tfa_defconfig +1 -0
@@ -61,6 +61,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1043ardb_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x60300000 CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y # CONFIG_DDR_SPD is not set CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/ls1043ardb_nand_defconfig +1 -0
@@ -60,6 +60,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y
configs/ls1043ardb_sdcard_defconfig +1 -0
@@ -59,6 +59,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y
configs/ls1043ardb_tfa_defconfig +1 -0
@@ -43,6 +43,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_ADDR=0x60500000 CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y # CONFIG_DDR_SPD is not set CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/ls1046afrwy_tfa_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y # CONFIG_DDR_SPD is not set CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y
configs/ls1046aqds_defconfig +1 -0
@@ -54,6 +54,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1046aqds_lpuart_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1046aqds_nand_defconfig +1 -0
@@ -73,6 +73,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1046aqds_qspi_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1046aqds_sdcard_ifc_defconfig +1 -0
@@ -74,6 +74,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1046aqds_sdcard_qspi_defconfig +1 -0
@@ -73,6 +73,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1046aqds_tfa_defconfig +1 -0
@@ -62,6 +62,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/ls1046ardb_emmc_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/ls1046ardb_qspi_defconfig +1 -0
@@ -49,6 +49,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/ls1046ardb_qspi_spl_defconfig +1 -0
@@ -68,6 +68,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/ls1046ardb_sdcard_defconfig +1 -0
@@ -62,6 +62,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
configs/ls1046ardb_tfa_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_DM=y CONFIG_SATA=y CONFIG_SATA_CEVA=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_MPC8XXX_GPIO=y
Signature · 1 line
2.17.1
PATCH v11 11/14 Layerscape: Enable Job ring driver model.
Quoted 8 lines
LS(1021/1012/1028/1043/1046/1088/2088), LX2160, LX2162 platforms are enabled with JR driver model. removed
sec_init()call from board files.
sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Priyanka Jain <[email protected]>Reviewed-by Michael Walle <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 12/14 PPC: Add crypto node in device tree
In reply to Gaurav Jaindevice tree imported from linux kernel.c500bee1c5b2 (tag: v5.14-rc4) Linux 5.14-rc4
--- arch/powerpc/dts/p2041si-post.dtsi | 1 + arch/powerpc/dts/p3041si-post.dtsi | 1 + arch/powerpc/dts/p4080si-post.dtsi | 1 + arch/powerpc/dts/p5040si-post.dtsi | 1 + arch/powerpc/dts/qoriq-sec4.0-0.dtsi | 74 ++++++++++++++++++++++ arch/powerpc/dts/qoriq-sec4.2-0.dtsi | 83 +++++++++++++++++++++++++ arch/powerpc/dts/qoriq-sec5.2-0.dtsi | 92 ++++++++++++++++++++++++++++ arch/powerpc/dts/t1023si-post.dtsi | 1 + arch/powerpc/dts/t1042si-post.dtsi | 1 + arch/powerpc/dts/t2080si-post.dtsi | 1 + arch/powerpc/dts/t4240si-post.dtsi | 1 + 11 files changed, 257 insertions(+) create mode 100644 arch/powerpc/dts/qoriq-sec4.0-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-sec4.2-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-sec5.2-0.dtsi
arch/powerpc/dts/p2041si-post.dtsi +1 -0
@@ -11,6 +11,7 @@ /include/ "qoriq-clockgen1.dtsi" /include/ "qoriq-gpio-0.dtsi" +/include/ "qoriq-sec4.2-0.dtsi" /* include used FMan blocks */ /include/ "qoriq-fman-0.dtsi"
arch/powerpc/dts/p3041si-post.dtsi +1 -0
@@ -11,6 +11,7 @@ /include/ "qoriq-clockgen1.dtsi" /include/ "qoriq-gpio-0.dtsi" +/include/ "qoriq-sec4.2-0.dtsi" /* include used FMan blocks */ /include/ "qoriq-fman-0.dtsi"
arch/powerpc/dts/p4080si-post.dtsi +1 -0
@@ -11,6 +11,7 @@ /include/ "qoriq-clockgen1.dtsi" /include/ "qoriq-gpio-0.dtsi" +/include/ "qoriq-sec4.0-0.dtsi" /* include used FMan blocks */ /include/ "qoriq-fman-0.dtsi"
arch/powerpc/dts/p5040si-post.dtsi +1 -0
@@ -11,6 +11,7 @@ /include/ "qoriq-clockgen1.dtsi" /include/ "qoriq-gpio-0.dtsi" +/include/ "qoriq-sec5.2-0.dtsi" /* include used FMan blocks */ /include/ "qoriq-fman-0.dtsi"
arch/powerpc/dts/qoriq-sec4.0-0.dtsi new file +74 -0
74 lines not on this page · raw message
arch/powerpc/dts/qoriq-sec4.2-0.dtsi new file +83 -0
83 lines not on this page · raw message
arch/powerpc/dts/qoriq-sec5.2-0.dtsi new file +92 -0
92 lines not on this page · raw message
arch/powerpc/dts/t1023si-post.dtsi +1 -0
@@ -14,6 +14,7 @@ /include/ "qoriq-gpio-1.dtsi" /include/ "qoriq-gpio-2.dtsi" /include/ "qoriq-gpio-3.dtsi" +/include/ "qoriq-sec5.0-0.dtsi" /* include used FMan blocks */ /include/ "qoriq-fman3l-0.dtsi"
arch/powerpc/dts/t1042si-post.dtsi +1 -0
@@ -12,6 +12,7 @@ /include/ "qoriq-gpio-1.dtsi" /include/ "qoriq-gpio-2.dtsi" /include/ "qoriq-gpio-3.dtsi" +/include/ "qoriq-sec5.0-0.dtsi" /include/ "qoriq-fman3l-0.dtsi" /include/ "qoriq-fman3-0-1g-0.dtsi"
arch/powerpc/dts/t2080si-post.dtsi +1 -0
@@ -13,6 +13,7 @@ /include/ "qoriq-gpio-1.dtsi" /include/ "qoriq-gpio-2.dtsi" /include/ "qoriq-gpio-3.dtsi" +/include/ "qoriq-sec5.2-0.dtsi" /include/ "qoriq-fman3-0.dtsi" /include/ "qoriq-fman3-0-10g-0-best-effort.dtsi"
arch/powerpc/dts/t4240si-post.dtsi +1 -0
@@ -12,6 +12,7 @@ /include/ "qoriq-gpio-1.dtsi" /include/ "qoriq-gpio-2.dtsi" /include/ "qoriq-gpio-3.dtsi" +/include/ "qoriq-sec5.0-0.dtsi" /include/ "qoriq-fman3-0.dtsi" /include/ "qoriq-fman3-0-1g-0.dtsi"
Signature · 1 line
2.17.1
PATCH v11 12/14 PPC: Add crypto node in device tree
Quoted 4 lines
device tree imported from linux kernel.
c500bee1c5b2(tag: v5.14-rc4) Linux 5.14-rc4Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Priyanka Jain <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 13/14 PPC: Enable Job ring driver model.
In reply to Gaurav Jainremoved sec_init() call from board files.
sec is initialized based on job ring information processed from device tree.
--- arch/powerpc/cpu/mpc85xx/cpu_init.c | 19 +++++++++++++++++-- arch/powerpc/include/asm/u-boot-ppc.h | 17 +++++++++++++++++ arch/powerpc/include/asm/u-boot.h | 1 + configs/P2041RDB_NAND_defconfig | 1 + configs/P2041RDB_SDCARD_defconfig | 1 + configs/P2041RDB_SPIFLASH_defconfig | 1 + configs/P2041RDB_defconfig | 1 + configs/P3041DS_NAND_defconfig | 1 + configs/P3041DS_SDCARD_defconfig | 1 + configs/P3041DS_SPIFLASH_defconfig | 1 + configs/P3041DS_defconfig | 1 + configs/P4080DS_SDCARD_defconfig | 1 + configs/P4080DS_SPIFLASH_defconfig | 1 + configs/P4080DS_defconfig | 1 + configs/P5040DS_NAND_defconfig | 1 + configs/P5040DS_SDCARD_defconfig | 1 + configs/P5040DS_SPIFLASH_defconfig | 1 + configs/P5040DS_defconfig | 1 + configs/T1024RDB_NAND_defconfig | 1 + configs/T1024RDB_SDCARD_defconfig | 1 + configs/T1024RDB_SPIFLASH_defconfig | 1 + configs/T1024RDB_defconfig | 1 + configs/T1042D4RDB_NAND_defconfig | 1 + configs/T1042D4RDB_SDCARD_defconfig | 1 + configs/T1042D4RDB_SPIFLASH_defconfig | 1 + configs/T1042D4RDB_defconfig | 1 + configs/T2080QDS_NAND_defconfig | 1 + configs/T2080QDS_SDCARD_defconfig | 1 + configs/T2080QDS_SPIFLASH_defconfig | 1 + configs/T2080QDS_SRIO_PCIE_BOOT_defconfig | 1 + configs/T2080QDS_defconfig | 1 + configs/T2080RDB_NAND_defconfig | 1 + configs/T2080RDB_SDCARD_defconfig | 1 + configs/T2080RDB_SPIFLASH_defconfig | 1 + configs/T2080RDB_defconfig | 1 + configs/T2080RDB_revD_NAND_defconfig | 1 + configs/T2080RDB_revD_SDCARD_defconfig | 1 + configs/T2080RDB_revD_SPIFLASH_defconfig | 1 + configs/T2080RDB_revD_defconfig | 1 + configs/T4240RDB_SDCARD_defconfig | 1 + configs/T4240RDB_defconfig | 1 + 41 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 arch/powerpc/include/asm/u-boot-ppc.h
arch/powerpc/cpu/mpc85xx/cpu_init.c +17 -2
@@ -56,6 +56,7 @@#ifdef CONFIG_U_QE #include <fsl_qe.h> #endif +#include <dm.h> #ifdef CONFIG_SYS_FSL_SINGLE_SOURCE_CLK /*
@@ -974,8 +975,6 @@ int cpu_init_r(void)#endif #ifdef CONFIG_FSL_CAAM -sec_init (); -#if defined(CONFIG_ARCH_C29X )if ((SVR_SOC_VER (svr) ==SVR_C292 ) || (SVR_SOC_VER (svr) ==SVR_C293 ))
@@ -1014,6 +1013,22 @@ int cpu_init_r(void)return 0 ; } +#ifdef CONFIG_ARCH_MISC_INIT +int arch_misc_init (void ) +{ +if (IS_ENABLED (CONFIG_FSL_CAAM )) { +struct udevice *dev; +int ret; + + ret =uclass_get_device_by_driver (UCLASS_MISC ,DM_DRIVER_GET (caam_jr), &dev); +if (ret) +printf ("Failed to initialize %s: %d\n" , dev->name, ret); + } + +return 0 ; +} +#endif +void arch_preboot_os (void ) {u32 msr;
arch/powerpc/include/asm/u-boot-ppc.h new file +17 -0
@@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright 2021 NXP +* +* Gaurav Jain <[email protected]> +*/ + +#ifndef _U_BOOT_PPC_H_ +#define _U_BOOT_PPC_H_ + +#ifndef __ASSEMBLY__ + +int arch_misc_init (void ); + +#endif /* __ASSEMBLY__ */ + +#endif /* _U_BOOT_PPC_H_ */
arch/powerpc/include/asm/u-boot.h +1 -0
@@ -21,5 +21,6 @@/* Use the generic board which requires a unified bd_info */ #include <asm-generic/u-boot.h> #include <asm/ppc.h> +#include <asm/u-boot-ppc.h> #endif /* __U_BOOT_H__ */
configs/P2041RDB_NAND_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xFFA00C21 CONFIG_SYS_OR0_PRELIM=0xFFFC0796
configs/P2041RDB_SDCARD_defconfig +1 -0
@@ -43,6 +43,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xE8001001 CONFIG_SYS_OR0_PRELIM=0xF8000F85
configs/P2041RDB_SPIFLASH_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xE8001001 CONFIG_SYS_OR0_PRELIM=0xF8000F85
configs/P2041RDB_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xE8001001 CONFIG_SYS_OR0_PRELIM=0xF8000F85
configs/P3041DS_NAND_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/P3041DS_SDCARD_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/P3041DS_SPIFLASH_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/P3041DS_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/P4080DS_SDCARD_defconfig +1 -0
@@ -40,6 +40,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/P4080DS_SPIFLASH_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/P4080DS_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/P5040DS_NAND_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/P5040DS_SDCARD_defconfig +1 -0
@@ -41,6 +41,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/P5040DS_SPIFLASH_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/P5040DS_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y
configs/T1024RDB_NAND_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T1024RDB_SDCARD_defconfig +1 -0
@@ -62,6 +62,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T1024RDB_SPIFLASH_defconfig +1 -0
@@ -64,6 +64,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T1024RDB_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T1042D4RDB_NAND_defconfig +1 -0
@@ -54,6 +54,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T1042D4RDB_SDCARD_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T1042D4RDB_SPIFLASH_defconfig +1 -0
@@ -55,6 +55,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T1042D4RDB_defconfig +1 -0
@@ -38,6 +38,7 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080QDS_NAND_defconfig +1 -0
@@ -58,6 +58,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080QDS_SDCARD_defconfig +1 -0
@@ -57,6 +57,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080QDS_SPIFLASH_defconfig +1 -0
@@ -59,6 +59,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080QDS_SRIO_PCIE_BOOT_defconfig +1 -0
@@ -39,6 +39,7 @@ CONFIG_ENV_ADDR=0xFFE20000 CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080QDS_defconfig +1 -0
@@ -42,6 +42,7 @@ CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080RDB_NAND_defconfig +1 -0
@@ -62,6 +62,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080RDB_SDCARD_defconfig +1 -0
@@ -61,6 +61,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080RDB_SPIFLASH_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080RDB_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080RDB_revD_NAND_defconfig +1 -0
@@ -63,6 +63,7 @@ CONFIG_ENV_IS_IN_NAND=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080RDB_revD_SDCARD_defconfig +1 -0
@@ -62,6 +62,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080RDB_revD_SPIFLASH_defconfig +1 -0
@@ -64,6 +64,7 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T2080RDB_revD_defconfig +1 -0
@@ -47,6 +47,7 @@ CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T4240RDB_SDCARD_defconfig +1 -0
@@ -53,6 +53,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=133333333 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
configs/T4240RDB_defconfig +1 -0
@@ -38,6 +38,7 @@ CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y CONFIG_SYS_SATA_MAX_DEVICE=2 CONFIG_FSL_CAAM=y +CONFIG_ARCH_MISC_INIT=y CONFIG_DDR_CLK_FREQ=133333333 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
Signature · 1 line
2.17.1
PATCH v11 13/14 PPC: Enable Job ring driver model.
Quoted 5 lines
removed
sec_init()call from board files.
sec is initialized based on job ring information processed from device tree.Signed-off-by Gaurav Jain <[email protected]>Reviewed-by Priyanka Jain <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================
PATCH v11 14/14 update CAAM MAINTAINER
In reply to Gaurav Jainupdated CAAM driver files maintainer.
--- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -1376,3 +1376,9 @@ T: git https://source.denx.de/u-boot/u-boot.git F: configs/tools-only_defconfig F: * F: */ + +CAAM +M: Gaurav Jain <[email protected]> +S: Maintained +F: drivers/crypto/fsl/ +F: include/fsl_sec.h
Signature · 1 line
2.17.1
PATCH v11 14/14 update CAAM MAINTAINER
Quoted 2 lines
updated CAAM driver files maintainer.
Signed-off-by Gaurav Jain <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected] =====================================================================