From patchwork Tue Jan 11 11:28:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578386 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=eHFD7jVJ; 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 4JY7lz4Cc0z9s9c for ; Tue, 11 Jan 2022 22:30:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 578A383105; Tue, 11 Jan 2022 12:29:43 +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="eHFD7jVJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7D2BD831B3; Tue, 11 Jan 2022 12:29:40 +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,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0620.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::620]) (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 F182983102 for ; Tue, 11 Jan 2022 12:29:36 +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=B2K0+RXafLDzXS+mu9wyHaFrrHD23usJt2Alora6wCqH3FITq8v7tQ7PSRu6RH+CoyoqYdGyW0jvSQv21SUJ10EZIEHIOL26AHemqPKL0XeEMuzYraT1OTUn2jux49dIEKFpPxO8Zdv4PVBa4BOeFSdxXrLOyWWIhNn4NHllLPxlcitz7bj9TdWtA9BsYJ6/Nn0kDk1A6vM/1iwQyf5m4TqtywO7AjNDnd+ZGDkHCcnuqNhg1Lwlj37QLeq53uUOO6gF6DIV0BQsDbak66kMS1R0pL2Pu+sNRuZwhz5PgtL5y3YsQJpYbH9fnFihesqbGlaGdrK6a0jofatFyiWalg== 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=QFoJrJS8AHgNQTPkLR7CHWQhFSlUTlqRP+S/zOosMU8=; b=oaz6gzxaFWTICDLD7AX80FIsFGJaZq0+MhiqlYIfobjvijwLG6WPk+2x2XcYumf9yqrZVSjA6jXuZ02B2ifbaCnp9fDeZq5dawQ4NXcfteyztHEjztgfWbrXesEe5kryHvRathVPLcgZp4HrZ2Ar2diK2Dx9Qk2U3IYpKfzlKOZIfiY6fhJd7ShQWtemdIMSBG1m/8aUtB4964KwnRhY4+SrkjwANtrmy3Jh0zt6ggASKNJUVZ+yC+C7EJhuNfcg+NoKxpn+iTjF3QRvmQJ9VoJU+LvRY3cOUtKWIWVtdY3i3vzDD+KljGe3zMD7K8gniOLwjVCeQ98Hczw6HgMWZg== 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=QFoJrJS8AHgNQTPkLR7CHWQhFSlUTlqRP+S/zOosMU8=; b=eHFD7jVJ2VX611WHGQZkRgpLmDwdQVxgvOkl0B5ZWCDc078sXWuqSizjq+gm0VPpO8R4ijJGAahV6KYv3u6yUpbwJE+OuTu0qjfzw0iOQuTDNy69l5myTO6za07o6uQaamnGsv1aBbcMef3SrmqJ18ufp757fjuTUAr48KSHuTs= 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:29:35 +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:29:35 +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 09/14] crypto/fsl: i.MX8: Enable Job ring driver model. Date: Tue, 11 Jan 2022 16:58:00 +0530 Message-Id: <20220111112805.3566-10-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> 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: c7306c9b-735e-4349-1b5d-08d9d4f5a545 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: O00iH9hd7FmqCmcFE/4sJGOPijbjfNlVXrINd1FpEBMqRQ9UZX9vGpNjQ5mFG2/vSw8lEA9nNuP6jEy+a/CHmxmlfXwGNNBQdDv3rLFVwxO6TnpBHdI9e2QhJOI65b8XFQ1jlQmFJaHTvZG3B6FLaj5fcwaqDA5L6xVjLCFwd/P4IVM0o8tW/SMlvYFp0MYteqiibo1WY9HlRHh4U1sXmW3AeS5d5rUH/aybLVEqkbq5C5KHYFsIE/dJAJtFMNZkAj90LzS3zyfp9erRHl/3wKqTsm0VcYw/L9b3Zn/IQYKtO8psjIrjc3rBpdkulQXm2vrnbX5qbsYw4fqIHFL50aTWm9+rvnpml/oym7oEIb9p7dmVw6y9xsQI11aVXhv26Z1Ga7bNfd4BIB+2WDEc43azZzZaA5lEsgRD+MLwNE/eITvvTdbJ1WWFx2z5c4CZSkxtT3FkV5ZnG//+U8gIFfG2Yz5KpEKeeXXirxlPm+0QiKww/CxfPY/MWCq9OGccZ044Jr+F5tfENVUbfaQ27Z9N6YZZc8hXndIwsLwSeOSCtyKLUBRS5YXO1i6/UHhQXEuxJyiN64fNR7ZInJ/Wi3aqlvsinLdU+ZYsB+tIHzSElQAxFbezqkee//1BX5bAErLu0pr2wLJ3CJSH66Fi0vuBru0KROFVWfpigSbpz5Bf4K6td+mrkv4pmeqf1pnx1jYnzsDMsNn0R5ogswZY1g== 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: =?utf-8?q?bcF9wFMp2/NomlRQ61Qkwb31bRlx?= =?utf-8?q?Se7Lq9Qecxj4Z81Z/pKTmEHAeThoHiaLBJuPkvPRzLPHeHZyit8oNTzTgSjw2LCNu?= =?utf-8?q?Pw95bwCFqdgl7zZv6zo2YcPB7pDdl9wLovOEDNR52DeSr/ynlgji5ePr6COXey0gk?= =?utf-8?q?W8EB1Qzxt0bErU23gOINSNkvwUzV3ZxDKzjX/eUPMHhnbEzE8NpR2rh3n8V85wVoZ?= =?utf-8?q?pRskECsQPqekPWeI8qJHRtQU/58IR9CT20H+UsLBiBjB8J/eZEQyrP/nKbzFRUMKn?= =?utf-8?q?PcXioTiScuBXHjRvqnVTD2ZQkCa/CNeq2WitL58dCO3endZwQ12OcMB06mUk5lowZ?= =?utf-8?q?7F1yd7lPnyntYrGOFkPZDMy9so5VTndAcbvIpW9Tv0joz72tR6Oj+qd3Vnysxrsq2?= =?utf-8?q?Nuc89j9Rk9xTEpw9TiDhFvF5bmfw0nNrcU78DE2tErbEcYoixEzhcEbxHhISJsQlM?= =?utf-8?q?WADGUf0o2whuV+DQqixkh7fekNPQPCwMWah5UXIJWKAxuyp4zdOCo/w9AXvx4HvZT?= =?utf-8?q?PWcYCunvTY0IMD85qalAXbZvQImag3VjU5F2cBb+szeV1JZM+kb9392tegiueTT8V?= =?utf-8?q?xcYPcd31u3nOjSAEW4MBPOPEMiiS0Xy3HttdCj+1i7EtGZKa56+yxeXiJ54Uf124L?= =?utf-8?q?44YiZ6yxT33M7TFGqkLXVIv5FTWibfoT+MkGEIjg+mN/ZE2qPMrkbSmOu59Xul+XT?= =?utf-8?q?B6Xw2eYFB5ZUePT8bwadzBOWY2CZet3ako2eWkfEtIiPD8g23s2nc+tdKVWahDnt1?= =?utf-8?q?zodPURZ8Pfu7may01O0q+mjrEo8/BKrz26MAwZffsZl+8ysICHIfRItFYauZv92as?= =?utf-8?q?soITtx2LCk52ghME6rziSLc1yfc2nKGSS6DRtwVJOAMVEPzwszmq3tq1YkebZ0F0s?= =?utf-8?q?/J3/NF2tYBQDVWjZL8pG4+HrT0zX55ziteQYP7xJhmGnTklREySPpphtpY8IHHpL8?= =?utf-8?q?3v6PB13ls6O3BPMgRmF97AxBKH5C9hZiz2hX/VicCZgUyfQFtZ7n+m+qP1VOSgP71?= =?utf-8?q?+33Ineq7/XVWBrdxmt830vMpzEndK9NPW9kRD+xu6BblXNv6xUFUD1FQByIptMJm/?= =?utf-8?q?PpHLQ55XllFcXa6eqnswubAbHrP0fuEnqeND+b6dGiko4FlPiCAVFGViZNjb4dZwo?= =?utf-8?q?nPUNbVHeGJwd20kv28zptB3OCYcfyTv58lg1YhmeSxE3lQavfTW3Q3gk6K58vwd63?= =?utf-8?q?YVgaIdRBhJZM1F3qgmi0W//pHLdzSzHMK+d81mMb3GfNaXCENLGEezk+QMsbRDFDg?= =?utf-8?q?R2iMxC7FdTFPcejw+rTU9+l6eHgjNp5PXBlWxR8YpHUOlP38KrqlFVtDMPEuUROAC?= =?utf-8?q?Mzbkt7Qb+xgENa+R+UStQ8fsXi396HE+si9523zQXXhzrj3fD0CUQWkZuP+l1oPag?= =?utf-8?q?daegQUuekh1hqs002TjtGXOXGjDHr9pnopuwpSIZXC2mPMoEgFTTKXQSij6chXmmx?= =?utf-8?q?23f/ph7gDP3skrf2G889ONMxKdFDZdiyxx608dTm1tOdPTCgFk8FL69Y9FXPot40A?= =?utf-8?q?bJR/hv5Hiv+2zQOiFq9J4MbyHzsLbGsWpmD5qxvtX+lV07F1wxA1wh0=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7306c9b-735e-4349-1b5d-08d9d4f5a545 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:29:35.6200 (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: luX3edsvp9JSOgl5FFDrwxOFRKqIA1T9RCGTn6B597dSP1Orc7832YDK9sYo0x2wX+8W+5aUHx5TdUiYTdRF4w== 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.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 5e3c2ed3eb..dd01856b3e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -809,6 +809,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 231eb00b5f..e03fcdd9c7 100644 --- a/drivers/crypto/fsl/Kconfig +++ b/drivers/crypto/fsl/Kconfig @@ -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 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 */