Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 357AFC433EF for ; Tue, 11 Jan 2022 11:29:15 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 72C6883107; Tue, 11 Jan 2022 12:29:06 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="pJ1VpGnE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D765830EA; Tue, 11 Jan 2022 12:29:03 +0100 (CET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20617.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::617]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4CFC882FF5 for ; Tue, 11 Jan 2022 12:28:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AHfvJRkkmV32z1vTvGHeLlHge+mMCwN8+xAKMyK3N2eB4P0QKBC2Fo0WfYmrl1pwhXxK+Y4OWA6/Nh8iUuLD3R/jMtjVbhTXAlORCy5wuC7SoGITB6xaicZrZ/jjZPoofESZUbVL5wPt2ugPKpgVUfCavdMf58WsxVgemtfM1F9YxObPi5VTvWkbBu/CC4pT0bzYI7PbToa2TPWyireBR+WZAs+nsvh7gal44130Liu/QOtwcno3iPrk359ViKbZt5cOGZzjdvi+PuE0oPRwtfIkCjZsMlFBZu3hZp/ZpooN3Amr/V1fXFa3qcdUzO+RfBeeNQ+5OUO9sIfD8jGe1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OxzoaQuIYvGb3OcqtlqdBxjq4H6pu0DA50ypgn1QOmg=; b=BKwRTroBl+9H08R5nyVU1KEWXPNCW04gjbnvJWB34WJFWQnWxB+YiYBNhSjJd5hjLvo02fPgR/+Fs7jFXkJxurPIKXBYvoYANfsQgE1QDp2H7dm/mlOsVRt2hNIBSrfPo0OvPKPAexiwg6OmmSrZLaEF55B6KjLnINkbOGAQd2cLBlzYOyg19SPnwypN31zn1Li8rNuiQzsYBkkb/FVAbeW7/fahcEXfJyBTXlRslJPtIEVUuN5yjYgzdFkRXqf0J726Cb0aA1FymcaJyTyhc99c0MjGQMmZn3zBOoxsh1QbM2I/ePK2SskY6boF7W8d32SmyLRf+1XlU+wwOeJ5Qg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OxzoaQuIYvGb3OcqtlqdBxjq4H6pu0DA50ypgn1QOmg=; b=pJ1VpGnEkBjgo+Jx039zeWbpY2il3OjA1lMRm9PiUQDt0z6dCa3Vhf+pO6b5awtc/zVgnLVeFA5CWgYfaUyTZGGC6YiZ+/5Vd2M5gbgkLlO+kpXD2Ij9fBJ9D1l85q4qKCNnCCn2VklvKIdhfZ2q4aH0V/Jb/w95OojGmeI8AWU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:28:57 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:28:57 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 03/14] crypto/fsl: i.MX8M: Enable Job ring driver model. Date: Tue, 11 Jan 2022 16:57:54 +0530 Message-Id: <20220111112805.3566-4-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> Content-Type: text/plain X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5175695f-8a4a-4bc9-7dca-08d9d4f58e50 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:43; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LcJ0oKYv8D7AnerYniQQO5RDIqLsg3UGwqj+87XahIuXpnHrMkTVHNpJH3S8WHFLCJujRo21uC+SQA3yv1AYxJfwdmrzznwf+uN1L0+kSV/09MOLqmRCWqyJo1NTCvXcMO0u1EHCX2DA79Z+utEiu2+02+CgHPmxy5SIRbJc58wezF+UglVNQYfitINW3eEmNkNNVG2lL894YVdA4jrFw9RZvcUMbh2+BVVflrzB0pRhah4kKq/i5ePyhxdpU4v/wedFkzvJFRbIULh5A9Oi6VxSa5uRp/pdOzGJyWWrTXrbSeVYf1EqUVNmbwCFltgEC3j+CUGLpwZfbtQCvyJHhOf9BBDlzKRjqkPdbr5/zISiVx3lmopWjEryi4jOqzEJOy7s1SaqyepfiDAORMy3zTgNNrE3mELBFnE2rwU/Z4uUaC8JNf4cGXAPUczQPaCkAawav5XMHwe+qK8iJeErDl88i+LNT+/km6owPJBFVmtd51P7N47pBRH2KFlN2adPDde5Pt86VWEgjtrFl+uOxaNbQ4te42v9vYHQr5Lo9i6zWAKLP/LzQI3eS0QG8HhT8I6iT86gFhbkRMet4VibeCRZKI4S78dg8/UQ28t9Pm67JvONpw8ijWWzWxI+phcptTiY1SHQY9LqMOnAGfsNefzYVndjA9UK4XUlaBqCiXwzBU8GgmbPh/BzK+uuTla5c/AkEbyfFrtaVLmEqTBF6w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+cdAJkgyz0SbcRG7+mcTCbG07nwDVaHe03i3WWDj5BmFOsg/4wPi8ZYUc870?= =?us-ascii?Q?QPSAoZJ63ZglCL0PPI+CwR36yZ1eueSlOCRyNy7GOtVy+maEHjlcbC4KB2ad?= =?us-ascii?Q?0askLp7pYSLv2Z8nyvkuD/VNqHw2/bHuTHJBXLNeGL38unxLfp96mRClKmfV?= =?us-ascii?Q?0SyZausPGRSmZHkgP57a7jUlsjTGFnREqcmaOU0gg9hKbQ3usmmH2FPC+5u7?= =?us-ascii?Q?rXZWFlGi0RJh0PzQlF5Q6J6Y9Vq+nIqLRHuA3B8NfyTVPT+DqDwi58RFEOXg?= =?us-ascii?Q?aCtp08t1JMQRyO5WbgOfMaZXbDHPRr2M5Zetwcr+0PCBiIqOm87B59S9iyFd?= =?us-ascii?Q?WjzxySY8L/rkU33Jiw8VtkRX47Tilpv0Hxm7UMfgbwQC9qn0dMze1Cp41WFn?= =?us-ascii?Q?JhOlkI0OS+6TDoHUTgDKJu4xGX2iHJ4PmUZID9GR1M7OF06BF7bEOGvP5HqW?= =?us-ascii?Q?tuNdKK44RBugtJ1aT2lDKzZ02jYr7QajFe2t8+7vcTF8tm0L2Q+m5I+DB+xt?= =?us-ascii?Q?QUddctZNhlaUXoEwngyR9Iv5gpNC4rutullOEELUkro7hBCJYWoHRqHPBhIG?= =?us-ascii?Q?J858kgnAn7xL+UiooAwHcMk0RVybL+600xhuoqgwLlO4elu+4GN+RuP4UMwK?= =?us-ascii?Q?3Tw7l1/h8N8lNEXldkBJX2h2mglbQapLRICEIT2a85naDhq+N4gA/mcssJqA?= =?us-ascii?Q?e5KpwwwWHuCtna9dXu2lEc2aninqAaYfJmKheG2LKPxVz3DPZl9J9nbwfFzm?= =?us-ascii?Q?zN+Fd4m5P/dee5mrLXGoaY35/JwqtB700SVdE91AkQ8Gj4XWJ6M/nQ7btVmj?= =?us-ascii?Q?YMRfEWWu7eROqz1XKlhkL7klNtn2hzXTlNlxYEBBEbFRwYMV4FF8zCnp4PVG?= =?us-ascii?Q?vVjIBIfigBKrwTqkTPORk1xFqSY6XJlB2RUseK0WapWcUTQ/o8MJGpxCfN9r?= =?us-ascii?Q?Xyuh9M5j366lzBrnty+A1+aAI9dBLFuPRpUg/Yg8zODCbFOZbFPx7bktEof5?= =?us-ascii?Q?h721jy0wvvE/9P3OGixY+IPyrC1Kl+f4bjYMZBqpnWT08H2ejj8JBnA7ZvEO?= =?us-ascii?Q?DPCrcnByleyAoqg8vK62sr/6B0I++5XpIqXkaSUAtSK+vxUFmlZcXWBCXUZF?= =?us-ascii?Q?/ORFJ6rThIm2/JoftxGeMxOdO0qsNPADr39vmxhEA6okw56clUxt8UAiWCl1?= =?us-ascii?Q?oXTLqVORPXlmcBb5UIDL7ebwwncf5ExdTu7WtzT8VQicLuwnx2TkEUhqEvRG?= =?us-ascii?Q?V+xvvbmZLIU68lTVDKDOtRAwjYmWs5HFJ+1rJjMAA4HB048Qc84C6xhraN3v?= =?us-ascii?Q?d9oEox8IVGlQvuZcgOX+jo/SsVyQa0fYHg9vS4H5/7lgl43rjsepmTb3YVxE?= =?us-ascii?Q?OlmhOTVPXICxRZ9GR5p4ZsbJLFIe9LSSEJvuouILY7OpRBrMyE9P+q24Ginp?= =?us-ascii?Q?f1s4xhL8LWG7U+cpk1lsCt/B9qN+BxmtGx3nIWqfq4xX+Cd1jMQH9vKXusWy?= =?us-ascii?Q?lvcVeWHKzbZnT7fIbC19vB8bVhU60Fw++/3WpAu4CNr8xGC4c6tStqiXXacV?= =?us-ascii?Q?022T1l/e1tYvQ3bCmsZjXouVIsymMka7TU1gIdtS9x/7q1Mtkj4Zlqsnta9y?= =?us-ascii?Q?k658HVBFrdIMHtfSPN/8bx8=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5175695f-8a4a-4bc9-7dca-08d9d4f58e50 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:28:57.0914 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 5eLmVctTGxYtEtJ3Kr9ZmmGNLQSL6VN55q5MIhcBAr0MUKHJr4tVfybwaVW0wFdRyInkHbiar1IKfIAZbEQisg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 Reviewed-by: Ye Li --- arch/arm/Kconfig | 2 +- arch/arm/include/asm/arch-imx8m/imx-regs.h | 1 + arch/arm/mach-imx/imx8m/Kconfig | 13 +++++++++++++ arch/arm/mach-imx/imx8m/soc.c | 10 +++++++++- board/freescale/imx8mm_evk/spl.c | 9 ++++++++- board/freescale/imx8mn_evk/spl.c | 8 ++++++-- board/freescale/imx8mp_evk/spl.c | 13 +++++++++++-- board/freescale/imx8mq_evk/spl.c | 9 +++++++-- drivers/crypto/fsl/jr.c | 14 +++++++++++--- scripts/config_whitelist.txt | 1 + 10 files changed, 68 insertions(+), 12 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7264d72bde..67f6805b13 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -820,7 +820,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 diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h index b800da13a1..ff8de53f67 100644 --- a/arch/arm/include/asm/arch-imx8m/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h @@ -72,6 +72,7 @@ #define CONFIG_SYS_FSL_SEC_ADDR (CAAM_IPS_BASE_ADDR + \ CONFIG_SYS_FSL_SEC_OFFSET) #define CONFIG_SYS_FSL_JR0_OFFSET (0x1000) +#define CONFIG_SYS_FSL_JR1_OFFSET (0x2000) #define CONFIG_SYS_FSL_JR0_ADDR (CONFIG_SYS_FSL_SEC_ADDR + \ CONFIG_SYS_FSL_JR0_OFFSET) #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index d6a869068a..f3713529da 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -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_IMX8MP_EVK bool "imx8mp LPDDR4 EVK board" @@ -105,6 +115,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" diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 863508776d..0f9bd77354 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2019 NXP + * Copyright 2017-2019, 2021 NXP * * Peng Fan */ @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -1197,6 +1198,13 @@ static void acquire_buildinfo(void) int arch_misc_init(void) { + 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; diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c index 4ef7f6f180..c81128f442 100644 --- a/board/freescale/imx8mm_evk/spl.c +++ b/board/freescale/imx8mm_evk/spl.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -51,6 +51,13 @@ static void spl_dram_init(void) void spl_board_init(void) { + 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"); } diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c index 03f2a56e80..ab19dabf7b 100644 --- a/board/freescale/imx8mn_evk/spl.c +++ b/board/freescale/imx8mn_evk/spl.c @@ -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 @@ -49,6 +49,10 @@ void spl_board_init(void) 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"); ret = uclass_get_device_by_name(UCLASS_CLK, diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c index eca42c756e..bcef96caa3 100644 --- a/board/freescale/imx8mp_evk/spl.c +++ b/board/freescale/imx8mp_evk/spl.c @@ -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 @@ -20,6 +20,8 @@ #include #include #include +#include +#include DECLARE_GLOBAL_DATA_PTR; @@ -35,6 +37,13 @@ void spl_dram_init(void) void spl_board_init(void) { + 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 diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c index 67d069b2b0..8a47dd01a5 100644 --- a/board/freescale/imx8mq_evk/spl.c +++ b/board/freescale/imx8mq_evk/spl.c @@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP * - * SPDX-License-Identifier: GPL-2.0+ */ #include @@ -22,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -199,6 +199,11 @@ int power_init_board(void) void spl_board_init(void) { +#ifdef CONFIG_FSL_CAAM + if (sec_init()) + printf("\nsec_init failed!\n"); + +#endif puts("Normal Boot\n"); } diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 8103987425..4e7accfb89 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -43,9 +43,17 @@ struct udevice *caam_dev; #define SEC_ADDR(idx) \ (ulong)((CONFIG_SYS_FSL_SEC_ADDR + sec_offset[idx])) -#define SEC_JR0_ADDR(idx) \ +#ifndef CONFIG_IMX8M +#define SEC_JR_ADDR(idx) \ (ulong)(SEC_ADDR(idx) + \ (CONFIG_SYS_FSL_JR0_OFFSET - CONFIG_SYS_FSL_SEC_OFFSET)) +#define JR_ID 0 +#else +#define SEC_JR_ADDR(idx) \ + (ulong)(SEC_ADDR(idx) + \ + (CONFIG_SYS_FSL_JR1_OFFSET - CONFIG_SYS_FSL_SEC_OFFSET)) +#define JR_ID 1 +#endif struct caam_regs caam_st; #endif @@ -669,8 +677,8 @@ int sec_init_idx(uint8_t sec_idx) 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_st.regs = (struct jr_regs *)SEC_JR_ADDR(sec_idx); + caam_st.jrid = JR_ID; caam = &caam_st; #endif ccsr_sec_t *sec = caam->sec; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 79f03d1636..98a4bf5aec 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1273,6 +1273,7 @@ CONFIG_SYS_FSL_IFC_LE CONFIG_SYS_FSL_ISBC_VER CONFIG_SYS_FSL_JR0_ADDR CONFIG_SYS_FSL_JR0_OFFSET +CONFIG_SYS_FSL_JR1_OFFSET CONFIG_SYS_FSL_LS1_CLK_ADDR CONFIG_SYS_FSL_LSCH3_SERDES_ADDR CONFIG_SYS_FSL_MAX_NUM_OF_SEC -- 2.17.1