From patchwork Tue Dec 7 07:41:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564521 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=nAF1425q; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4J7XP40nkrz9t1r for ; Tue, 7 Dec 2021 18:44:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C54EC830FB; Tue, 7 Dec 2021 08:43:09 +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="nAF1425q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EB608830DD; Tue, 7 Dec 2021 08:43:05 +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=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::61e]) (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 2E354830F4 for ; Tue, 7 Dec 2021 08:42:59 +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=XRJPyLwDDgjMLyZTHmg53K3wiA2MqyoezjNdzgDuFrOEPJKKIsOEs0Kdsj1GBzr5VmBEyBYkSKgoqptOx26kGGBLIMV7MMa9Z6vt4IJ5vJhCwJOMr03huqx3mk1P3FWiTP0EfrqlLqVBdhj+ASeVKhBbctO1hIVu77SwbTaQ7Lfc5/YhdYPbRIz0rNEw9oYqFEJgsqF/jjciTXLkfUHdW2lrJZcOTbXgE0EQ32BqT4EHdnng7Yva6I5E394bbWVu5oEKeHzzd9e91m9mHjzgZrui59utueHE+IWgpEahhKpzyAp4ZymJ3vjGtMdtWAOmhlXHlE8lYUzrs09cXW/k4Q== 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=QTLT7DzgL5x+kr3/Ud0aWcpeCuJ95T8dvUqmUoLxCTs=; b=WoY9+614uJe8PbB7B0gSpsubrawq0E8t/qN8bsynBUsgL+IM9N51etKrAdjhK3BapW5vU4u1sYhYj9KJIAIGiUft3PsHt87X+S1T63CYFNwdxxObY+JScJV2FWPR/hAxjV1+39FiPsXxX137cOGDRL2Cre9Nfl0evRwfdyXS/8p7/7Y+F0RYVaZCLaq3FkI1R8DZVCxj4VS55Di0CKgE+jcmbg1Hx0MupcDP/JWN9Vm8O46vHI77pOA/2IPgj6ftEjTm98EC8LgeRGgalzUgM68ZK8Jd2+exkDFwzRpjlxdh4Nzg+nfNQ3m5paBYQGYRx5wphmQdhLPhZhFwuuxYSA== 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=QTLT7DzgL5x+kr3/Ud0aWcpeCuJ95T8dvUqmUoLxCTs=; b=nAF1425qRfWBOvHnD7O6PcTloFlbLOb2DvnZwqlLjD8l4TWtAoqhm48iNqoAMCApi2xF3iiHzaYT3OpT9QJhVfpg7WKFihd2rj6MsXn13rHNIdm47HupBFIA1WO1EvjtF3VTPK+9Ws3EBcfxgNV2foWQwcMk/SxRLXKHw/ddeQ0= 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 VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:57 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42:57 +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 v7 09/15] crypto/fsl: i.MX8: Enable Job ring driver model in SPL and U-Boot. Date: Tue, 7 Dec 2021 13:11:23 +0530 Message-Id: <20211207074129.10955-10-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a311da56-ef83-4fc6-524d-08d9b9552fae X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QllQrxfalcV80xnyc+eF9km2O7rJke1d/HgQf5KjLzzG+yyWv1En71YPZV2iO7URzeO5mGhlNjMbdEfEHamU7T5hKUHQ2O8g1KNSfZWfbhKEYXAsWg6EuG7dse+MQJDVDEFPueaM2oJDiej78eZChejybh/jDJ7ovbK+gcihgLiEKgCHiiiVnLN8kzu9Lhg+S9CiUSh/9+U2whd7fz3CQkGw+t1dw1HsBMzRkYUqn5AQZjUpemFS8RUPjCGyl9UF5N/OAUHEgXSfN4NRJJcYeOzMjmPAZ7CC7fizME+ZPdZsV8oMkLBCjvt2ktdtV03NW5S58JnAX621vZ/o2pcaU7JQg1cDPbjMUyZcwrg6IONjldR5fBIUlFSgwDnXUjOmJuhBOzXKMSWBh3kcwdF42Y1+9tTS/P3bp9Q7Tg2dVGKwunFomPfdRPe8Lt2hmvRq1XMKH2Hatwm7qa0FrVI0nflSZspIUZ9hcBc1aFuJV/pit6lXteoTWwkaMElJ8PUpuz2QPIs79Ck+OD+zDxfCKUUHEuxzunqw7y6dQ7bkTS65iCUAphd0pjWdGKAUQz63NMcd8E/LgwGFznWcTONzKCFpjkIonJ1DTLbFibTu6cnbR27ZQxe5qH3fz1xLid+Pn2ph8wQBAYMBClD+E83KN8QdifM8zDEyttcDs38XZ2+pZ59AZ6nfSMA6v6WOWUAZlWpIAps5x+EXyhn9ttVwR+n+R8GTuftvc8HtHcJgoooQd8TWi35pfAPDct0XGwuW 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)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(6666004)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?fZ5LuUOH4PAM3GMizB4Q5CABmhFW?= =?utf-8?q?Hav99lzl/xuhK4QD0J5Be5DKtQQ2Huy2u6Vv4l9RCHJYnOskrgO56teYlpMVeS9hl?= =?utf-8?q?JFpFjKnyD8aun9hT5+YPN0WVTDy7vhgYXT772B07IjRXOZbc1wXTN6QSYvJpbkszQ?= =?utf-8?q?GZ1pnzCFt1qHpGGT7CBeFo6/R+YVabN5AUvZBo1dRod+XAnM3bZiUmgbGJUiuBfng?= =?utf-8?q?k5VRl6S8UvTJkmk7uyCysmDjcpC4na6KTa6DYYY0iYAS0xZiYhN1wBRPNAErg6S3p?= =?utf-8?q?EnXgWzPCKHRsJISWg59hQGlE2+VrOKBPbpc/JiDZ+7WZ7HupWQBpHTZyiOIYliTfs?= =?utf-8?q?ZE1PgRWGe9xwDfkI1wuXah9qa6pMZwcKzS60R8mNJt/XyuSqGgllLmqqLTDl6E3sC?= =?utf-8?q?leuYVFSl6eTXMH64+TNzl3mNhMitjDA9Wap1wp304q5lt9W+dONnUDGWEl23tJ+kO?= =?utf-8?q?iaQJ+C3jLSfYgASfDvvHN22VJ8AkimE4pgmXEtSvOF/ve32PqB16yRKoz/kNL2LZt?= =?utf-8?q?CoEjLVUidXusV0tYjYtwvGdfehghw3DyZAv0JzE75vJje08gkBQ35rsM5cKIkKQPw?= =?utf-8?q?80c/d4FQT2CZdF2N62zpMr8jCc0B1YJ0hiJxUhJQxos3WOrsiGLrTPys1QiHsF8nw?= =?utf-8?q?DT3PPUrNfN6FZzO4ABRXuZygY+t0wph7/Lc1JBKyrdPCSGs5KmeCA8TxJ4JC311Ko?= =?utf-8?q?3zLCkE8lo7KqIP3NWuaQC5MfoWl8zmX/1Pnpi4XbrXVJuClvn29KrjfYpeC33BuB+?= =?utf-8?q?bjfSj8Xmza9YeqL/lOTjlqLDMpYjuiXIQyhuSLHtLKd+VTQ1rv+UgAU/u1RZvS09G?= =?utf-8?q?UCSbYJJIS+2bLOzLo6AkOOWCzPEv0DSIademxhy5B52Do6+AS4+uAiS1akmtUHVkH?= =?utf-8?q?qVzBvWHlzBSZi2cH2ETCsTlB3axhs4L7Lnh1rcPDcSeEUZxNblf/l2VGBRxCi4bp9?= =?utf-8?q?YkDdrpssfWpx3l5MzcFM3LxCwg6n01gUyYZzuw6iczA7aNMI1yEzNTg/su2D5+/rE?= =?utf-8?q?sN1fZICHQ8qp7BPAcfhZYEvvnYayIyMAeukxbgtA5u3rQBxIoZVmr0eWd3nGBZbJ+?= =?utf-8?q?Y6BHimCa0ACmeV5vvH/Y6RRyi+0qnFiUgWPY19UylyGNY5u0LOeSNmWL0C/1p1J55?= =?utf-8?q?T4Fcnk9D5Ohh0VjeRI6hRs6/NeL+i5UzXAxYKwQQEfTIavCU3AUo3LEk8/HJky+eM?= =?utf-8?q?GKac0UhOYJU9tt5ymafJvRZDI5QuQaip0ZDAlC2un4oLU0rAN3VbOt+gWCNAQ1Dsq?= =?utf-8?q?SkWzNgNHKicVQFb89UG5ITyBp5O+m9/jtAnvJCg9pFPmjiM4smf0SH2LxmJJ/oUxi?= =?utf-8?q?1ykgIh/BzO8xCfDb0Ch/gEtRS1UzcSHZH5+ew8t+ncQH0n6ZoVHSHPVKU+Z+wlSz+?= =?utf-8?q?i8cpt3GBmC6UIWE1s3AAqWHyWde3RaKzy20OXxlNasbnx8FXoJ7iFpzRWWCbGcxry?= =?utf-8?q?4dBRq106uk5weJUPpBKepV/72CL1uBNhPJAOdOCConU6coYsNWDKz8bp4Qnl73OhN?= =?utf-8?q?z8+3CO0BkfnN9JKaWz/ZPGc6N0c2bKrXk5bwlU8hFX2TbEuUUoWRbqc=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a311da56-ef83-4fc6-524d-08d9b9552fae X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:57.5146 (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: 9GBTti8JERhuEymbp0cANJCrIPnxVygKOk7ev6zusuDiKQkNBetYxE9RkHxG0B/ZYkf3epzaIxSALTXApH0lHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 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 9379b86955..084a61c684 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -25,6 +25,7 @@ #include #include #include +#include #define CIRC_CNT(head, tail, size) (((head) - (tail)) & (size - 1)) #define CIRC_SPACE(head, tail, size) CIRC_CNT((tail), (head) + 1, (size)) @@ -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 */