From patchwork Mon Jan 10 12:27:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577874 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=g8dMedVl; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JXY6c19QHz9s9c for ; Mon, 10 Jan 2022 23:29:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C30C5831EF; Mon, 10 Jan 2022 13:28:54 +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="g8dMedVl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6615083107; Mon, 10 Jan 2022 13:28:52 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20626.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::626]) (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 908E183178 for ; Mon, 10 Jan 2022 13:28:48 +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=oNxZsTiwXG1hUSGeV6m4M0dxA1SXKIgfafxfLlQpYXLTIPB90QCXxF9ZMxsFy/u+QPuKaB0+4cKd0XFfIo0TFOcVnww7x/GFVnjrNBGbTNK7MaOj/Uo/nTbJkj2y/IKagPWle3Rbqzz0zwWiZm54himUrYm7NeCg+gsWvgUwacifCiR4nf9D2PCag+QGGGWidz5CatZfZ5pdiFpuMhjMbwsaufkHNkclPEwgT2og+Ilo+kTQ2Fq63FseRHjJaLQwSRJCkqozAB67Qn4EYdAqTDm0ZBMkaMEeY2b7tgY2Z2zx0dItRO9ZheikBwINXsdpqLMHyJ/aeoax5YBnks8zqA== 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=UrjJSGynFJoHK4hx1iVsPHFD52IfkzDlW6IWX8sIbzE=; b=ZuPc52sJyFUebRn++QDfvpN5ep50PHUIrBTV9OcLNn2wq/dmNIDpdmMQBPXGZj+VG9WynxnqNCaWOJ4epHTpiTXtLlx2FyTjc2MQGTGZgDu4Askje20BSdQq7IQUP9Qd4lypHJIgeU+cE8mZut1fdQIaFXf4aoTdW4dc5BFFTRpBh8L9QkaTh/G20IMMfienO1eBUyFhq+e0vIFT9V95WZZCPWQpfxQb6uwv3XI/dqOao37p7rm/4h+8Eq4NN1tXG2Zyc5j7ZNBozkEkdMdx5KEKfG+iSjTC0R7H+Sk2Bg96Knlmp11lSm4eX/xfz/yDcVXobK69ZTZZmtljhAkXfw== 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=UrjJSGynFJoHK4hx1iVsPHFD52IfkzDlW6IWX8sIbzE=; b=g8dMedVlYlaE8+WLz/nF1VqD1HKzuEi0cXBn16OF/+U62gux26v94NJavmU9G6bFFoebCNU6jLsDCT/fOIZCMfIWqdxh/o7S3hLkHgK0qgN82ja8DHWOVgZpkNy7mpryLyVAUNE2vPIaR2Xvle8EH23YMlg7fBxfYIu3F5nSynU= 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 VI1PR04MB4221.eurprd04.prod.outlook.com (2603:10a6:803:3e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 12:28:46 +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; Mon, 10 Jan 2022 12:28:46 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , 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 v8 09/15] crypto/fsl: i.MX8: Enable Job ring driver model. Date: Mon, 10 Jan 2022 17:57:08 +0530 Message-Id: <20220110122714.20744-10-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: d516ad19-3652-4e54-8907-08d9d434bf55 X-MS-TrafficTypeDiagnostic: VI1PR04MB4221:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:16; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dRdWXF8So3/0bfAYPEHH4HIdT8fuYws49DH04dP7urcXpKaSNd2S7ja6VV5A6QhytqMYk1mYtcDIa/O/2ZtuQ10Gs+Y3lmTskrRPNC6H/grIvDh9Cc8iteGrmYPPFd90ZRk30+ETnPdNW9c5uLoAbOlDk5Y0VJ6ekRqjW127KHlZGYJ7xRxohsGzRDa6QMkuISis9M7d+Eq/Uieg6LUykv73aARi9iSQBbEwwQbkTcBfKGchaUmItRHRR1DU3y+2vb1VJmJMck1pGSgUAb+On8FJMXTqRlMhKr+D1hpSE0sJNCmYLSF0nV2Nd7q/dcUM1bU5nk8HRTUvmiDBtQOPFwEcgq5uckEpWstxNznPC6yvUFlj6Wo74V6F70BPObRPctoGPiPrjwt0D4y8+yPpMUdRvUYvqyhjB/oUrdEtXdtxs27AJv8VG3urI0pQL5r8A1/iCxhhtYmmP9oXPZmJ/WNgJ7PH3tz6rnyunR2Rd5LaUprwXkWqLtQcLVTJx1I2QUet41IAEdxQ5YjrByJH+7awqdflpkU3R5g7kRd+P+T/EVovSJOyOZTaGyzzYahLnuyEjptV9hcQSsaY6POv6OwdvR7j5s3nJ844xhFe0VE/5ZzxRvGJhSj0Rd5XHhflOor3n2KNjri26PZAz/SnJtdPSLGWSo1JbyWS+4acWToPEORSEBor4DcIFTVU+nQXWtouWqsLZLcMaNwJzciKug== 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)(54906003)(6486002)(66946007)(83380400001)(55236004)(2616005)(508600001)(6512007)(2906002)(8676002)(1076003)(66556008)(316002)(86362001)(5660300002)(4326008)(6506007)(66476007)(36756003)(44832011)(8936002)(52116002)(38350700002)(186003)(38100700002)(6666004)(26005)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?BvAwTTj7XSePLI6PbRBGkQbUqXtJ?= =?utf-8?q?ossgjADuH5+JZ/qCXWv8aqYLcKAfStVbFFc1h+QeGd2L9fxYpKPOtHC0HHczzH/2H?= =?utf-8?q?Gl+8qYsqqlvhB8OyIy515lH8hMWWSqHN2pzaIFR2CILimkUBorjLzRf6m3t/mGq5L?= =?utf-8?q?XzQAk9raZpuA4bmjTmNiI8Wxs21ry5jVv3oI3udS48z/qWacOMxi60ObnfO7jOKLn?= =?utf-8?q?524ecsvdWnixw15ITPjgdDTMqpZZzYTqgr7Cp+Am05aAiLpgGvO9hR6837uJVpb4v?= =?utf-8?q?yx9HxFzOo+3Cjoxd4bEFo5LIPto5cCkmutTqWSZuVVaqfnLsTcPyXELsJdFeT2E/8?= =?utf-8?q?Ek4UkxeJERGajC8gZK2euLGmnK9V5+rsLlWwXUU5Y9ArUJaT77JxR13z9lpvZ9k7p?= =?utf-8?q?eSSnAOh29BA1G/qcc/3u8Qu5SmSLekd6JAuqv9e8jYpkdaCsEKMw5M66Vf9w4ta7s?= =?utf-8?q?VbKJcBIi6Krozs7P+umiJIu+l2YBrL5hNDkf4mKhLUhrFml9UeMz9mgYqRNaPVpmG?= =?utf-8?q?37Kyh09iSTjkCNJGanMXXGA+6M6s+1jOtbkv+sNOp5gRAmdBUZBogkMWZ/LLKVi5/?= =?utf-8?q?ukjsx5wpXBmwiK85SxKDX5W7jAUpTWfjHrWzcV7krA+nT1iUTOel6VgAvL0SY+kvz?= =?utf-8?q?12yLRUBSWFwfsP5EDlK1Y3dwNWNksqPe+U1qYNi4Oks3ZpkufyV4yCu1E9ddH/mme?= =?utf-8?q?4PLg383o0mXNapN7j9//hJp0K1MDlXnQpwkyUkUx2MRyUMJhV3DcMUI25tiMzmkBU?= =?utf-8?q?UegKOFsx/OIUeX5HZ/BK79bwr8eyEv+cOzAhUhHoXSV/orViDQixIOyJzM8YbiqSZ?= =?utf-8?q?3OkMLwoDDKam/A2SsqQCdEJi5PQIqMYWl4cNqHWAmHF96l1nodJodL+gk0dFcx/62?= =?utf-8?q?mRsQX37YqoXN+zWw8ASmnr/++byedCmY/RA/MMDHuk9kr/hfY81fL55Cek+ibKMLC?= =?utf-8?q?R+OSAzCGr3duCxrtUZ+iiTKWQM+FRmsBltmdiI9irQMRwq/yn9HkBBKkNhkgoRuBB?= =?utf-8?q?lysxfGx7AynxZ13jAk1DqUi+VOOsHN4QIf2ou3GNjVJnHxXu9nm9KpDT9AuNKSk3y?= =?utf-8?q?c6FIaW7JQGebjtzqHou8kxTR/bBOdVtgUGUmxLrPY5zC3XO3GqNOqrnSDvlywjsW9?= =?utf-8?q?eJTHRfgTf/IderY/NjkK80yPIGTeGqV+kZl+/KAA6fEPvrEakwMcqZnAx89lMjJBH?= =?utf-8?q?s+X6XpgEvIWFvXQslZPUdT9wr0bAYDQkIfq4vqI3mzOX/EcZbM0Nkbgtgox+7GEHp?= =?utf-8?q?R3sjQ1/eiqKdTcwOXWV1dnslLXTLRwrT/fCv9MV5nrJJN/MAX6UI6EZh7m0jRPjs6?= =?utf-8?q?ppHhoPMVgnVMoJrcCKxhO2wVwbTs5cKRk+N0b2CCpc2HRjckmueAA2z+VkfYU5oLV?= =?utf-8?q?jh0e39eBQ8CRSf2i+idwcUUR3auKayvCyfXXnBL/V/3J6mURgASdKN4qdXM/irLP0?= =?utf-8?q?fBZ4miNZHhvG2QW7/RryWHnAq/eigoDzZC5ei8kh/RyDTKI71Hb74DamjTSsNliOG?= =?utf-8?q?G3sv9OykTTOCIlnqpIEP3RXI0L9aawSD6/e1J1WTn+nMcAoqcXTqdcI=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d516ad19-3652-4e54-8907-08d9d434bf55 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:46.6046 (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: dR13mbv8jNfWCXGcf/j6rfdWT/eJvlkeQyd51Uaau7nc+cUQ5yHqGNFD2nv2pU7grJKZmqqpE6Fztl5TmlXkkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4221 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.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 Signed-off-by: Horia Geantă Reviewed-by: Ye Li --- 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 | 16 +++++++- 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, 89 insertions(+), 16 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 524a2204eb..7ce2bbc954 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -804,6 +804,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 diff --git a/arch/arm/include/asm/arch-imx8/imx-regs.h b/arch/arm/include/asm/arch-imx8/imx-regs.h index ed6e05e556..2d64b0604b 100644 --- a/arch/arm/include/asm/arch-imx8/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8/imx-regs.h @@ -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__ */ diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index 89da89c51d..04c4b20a84 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index b43739e5c6..f969833bab 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -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 diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index ee5cc47903..5140c93a37 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #include @@ -89,6 +89,20 @@ int arch_cpu_init_dm(void) return 0; } +#if defined(CONFIG_ARCH_MISC_INIT) +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); + + return 0; +} +#endif + int print_bootinfo(void) { enum boot_device bt_dev = get_boot_device(); diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c index 944ba745c0..332a662dee 100644 --- a/board/freescale/imx8qm_mek/spl.c +++ b/board/freescale/imx8qm_mek/spl.c @@ -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 @@ -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)) { diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c index ae6b64ff6e..2fa6840056 100644 --- a/board/freescale/imx8qxp_mek/spl.c +++ b/board/freescale/imx8qxp_mek/spl.c @@ -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 @@ -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)) { diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig index 94ff540111..82f929c294 100644 --- a/drivers/crypto/fsl/Kconfig +++ b/drivers/crypto/fsl/Kconfig @@ -11,7 +11,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 diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 4e7accfb89..a84440ab10 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "jr.h" #include "jobdesc.h" #include "desc_constr.h" @@ -121,7 +122,9 @@ static void jr_initregs(uint8_t sec_idx, struct caam_regs *caam) static int jr_init(uint8_t sec_idx, struct caam_regs *caam) { struct jobring *jr = &caam->jr[sec_idx]; - +#if CONFIG_IS_ENABLED(OF_CONTROL) + ofnode scu_node = ofnode_by_compatible(ofnode_null(), "fsl,imx8-mu"); +#endif memset(jr, 0, sizeof(struct jobring)); jr->jq_id = caam->jrid; @@ -146,7 +149,11 @@ static int jr_init(uint8_t sec_idx, struct caam_regs *caam) memset(jr->input_ring, 0, JR_SIZE * sizeof(caam_dma_addr_t)); memset(jr->output_ring, 0, jr->op_size); +#if CONFIG_IS_ENABLED(OF_CONTROL) + if (!ofnode_valid(scu_node)) +#endif start_jr(caam); + jr_initregs(sec_idx, caam); return 0; @@ -681,6 +688,13 @@ int sec_init_idx(uint8_t sec_idx) caam_st.jrid = JR_ID; caam = &caam_st; #endif +#if CONFIG_IS_ENABLED(OF_CONTROL) + ofnode scu_node = ofnode_by_compatible(ofnode_null(), "fsl,imx8-mu"); + + if (ofnode_valid(scu_node)) + goto init; +#endif + ccsr_sec_t *sec = caam->sec; uint32_t mcr = sec_in32(&sec->mcfgr); #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_IMX8M) @@ -742,12 +756,19 @@ int sec_init_idx(uint8_t sec_idx) liodn_ns = (liodnr & JRNSLIODN_MASK) >> JRNSLIODN_SHIFT; liodn_s = (liodnr & JRSLIODN_MASK) >> JRSLIODN_SHIFT; #endif +#endif +#if CONFIG_IS_ENABLED(OF_CONTROL) +init: #endif ret = jr_init(sec_idx, caam); if (ret < 0) { printf("SEC%u: initialization failed\n", sec_idx); return -1; } +#if CONFIG_IS_ENABLED(OF_CONTROL) + if (ofnode_valid(scu_node)) + return ret; +#endif #ifdef CONFIG_FSL_CORENET ret = sec_config_pamu_table(liodn_ns, liodn_s); @@ -781,6 +802,23 @@ int sec_init(void) } #if CONFIG_IS_ENABLED(DM) +static int jr_power_on(ofnode node) +{ +#if CONFIG_IS_ENABLED(POWER_DOMAIN) + struct udevice __maybe_unused jr_dev; + struct power_domain pd; + + dev_set_ofnode(&jr_dev, node); + + /* Power on Job Ring before access it */ + if (!power_domain_get(&jr_dev, &pd)) { + if (power_domain_on(&pd)) + return -EINVAL; + } +#endif + return 0; +} + static int caam_jr_ioctl(struct udevice *dev, unsigned long request, void *buf) { if (request != CAAM_JR_RUN_DESC) @@ -793,7 +831,7 @@ static int caam_jr_probe(struct udevice *dev) { struct caam_regs *caam = dev_get_priv(dev); fdt_addr_t addr; - ofnode node; + ofnode node, scu_node; unsigned int jr_node = 0; caam_dev = dev; @@ -818,6 +856,11 @@ static int caam_jr_probe(struct udevice *dev) jr_node = jr_node >> 4; caam->jrid = jr_node - 1; + scu_node = ofnode_by_compatible(ofnode_null(), "fsl,imx8-mu"); + if (ofnode_valid(scu_node)) { + if (jr_power_on(node)) + return -EINVAL; + } break; } } diff --git a/include/fsl_sec.h b/include/fsl_sec.h index c4121696f8..7b6e3e2c20 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -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 */