From patchwork Wed Jun 8 13:34:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1640525 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=rZagoBEY; 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 (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LJ7W70h2sz9sFk for ; Wed, 8 Jun 2022 23:34:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2C7C984307; Wed, 8 Jun 2022 15:34:34 +0200 (CEST) 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="rZagoBEY"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BAAE9842E4; Wed, 8 Jun 2022 15:34:31 +0200 (CEST) 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_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::622]) (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 82C808431E for ; Wed, 8 Jun 2022 15:34:28 +0200 (CEST) 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=Wj72u4FooNk1OZGXwlIkdPBgHnbp8kGMyIXw64+2VyW+iS1tKbRJy2kI5QoiZsRrS/gf6jZfoz2wa8FUuPn2Y5J83yQ4DgdOb70EAc2sNakNyaEIQHmqDt/Cur136tMnOwcw2ZVdPVtGGdXF+lb4maB7oz1TEzLZVeoyaCu3j1QB9SgZILtkC4/fWX23O6M8vxtzUiixk6MeY6woCqcr1PnaIMcsgMncxJRCYWNlc/T7q2466FleJZJHGkSx8hgu2Dh9sRxoYqYWIXlwSpHy2Pzh+BeazgAv9+VnsU9h62j5yaPgJ3F+kul3fTujGHjLzBNCP9u/YmTrVnirM+tXmw== 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=X3m2E7DsbFvhGM4uPXNsd2iiCqipIVz6wnRou/d0RDQ=; b=jlS9GypjXD4KK8wOI3JY3ojdeGO9ldzPTaFu1bNle9VVr5NBd5wCTtr8KnqvBrc/Xf5wyI2p+SkQ3qksepq8DC0yPSUNc0v5eqezZcIx3Ci+zUNvHFXYcD26fCNMN2nJXEccQ/i8rGQJbsvX6q+eratHcwbV/6U0LchelajTJPuhybaecfgWJNKfFyQ5y3RPhiffnLxbgXUH+f2e/L5rYyNTT5WlCh7Qpt4zRt7GwvOyWicAZOTi53PIJ+MkZc9+SMLxY3ReMlt2/08MTZFm85O00mDlKKo8Eds4Js2MMS1WHGMM7Ch9S0C7d9Cl4w8AzfdB2pjPJuis6+2F1QGEaw== 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=X3m2E7DsbFvhGM4uPXNsd2iiCqipIVz6wnRou/d0RDQ=; b=rZagoBEYeCP47pcrj+G9lw+E7O7ErWEgnD3koTdT2z4dPRP8nsYkMXU3UNPnszm+QYZOUKWSN7LB0tml1AJaFTnu25lWAB6zwBkVx7g2gTOCUab72l5x0CjpgqZh5qymFfETiMOrc4tsaWM27km912R8sDJ8IN6w5fj3xs6EqX8= 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 AM0PR04MB6979.eurprd04.prod.outlook.com (2603:10a6:208:18b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.12; Wed, 8 Jun 2022 13:34:25 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7099:6180:68a5:384c]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7099:6180:68a5:384c%6]) with mapi id 15.20.5332.012; Wed, 8 Jun 2022 13:34:25 +0000 From: Gaurav Jain To: u-boot@lists.denx.de, Stefano Babic , Fabio Estevam , Tommaso Merciai , Andrey Zhizhikin , Michael Trimarchi , Marek Vasut , Simon Glass , Patrick Delaunay , Stefan Roese , Horia Geanta , Pankaj Gupta , Varun Sethi , Ye Li Cc: "NXP i . MX U-Boot Team" , Gaurav Jain Subject: [PATCH] i.MX8M: crypto: disable JR0 in SPL, U-Boot Date: Wed, 8 Jun 2022 19:04:01 +0530 Message-Id: <20220608133401.1396622-1-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.25.1 X-ClientProxiedBy: SI2PR06CA0001.apcprd06.prod.outlook.com (2603:1096:4:186::21) 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: 82c14260-2322-47c1-977b-08da49539a08 X-MS-TrafficTypeDiagnostic: AM0PR04MB6979:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BTdA9dDN+LLbvNBcSzJJXEPEKRz49fZOql7HC1iDsEzpgAD6oTGGUNRKXXe+Wg1r7Z5wdeOBUZNdUP5Zr9pMT8CFB0rfcfUmUH/397CjIr8cHWEcp4mNJcn0GPmiALDOlfUVansy5x1IftaA78o5UU2pWMv8O2NQWrcnnKSla80TCo5HhcQS7RkRtvgnHAh/kQ4DQcsjT6eh2blP3R1M6gPDxzrqvTIUiFbdS/dctixpgKm7bvivSuCuiyouhmBbxLTwGY+/3wBdymsnVHxeSTmonK8k64VfF6ylRY1HqP1w5bEF6BcTnbHtN17uGfiaoIlcBsSLWL4IYceXzO6EM0Ll9dzWqynbbsHtZMOKbKoxUHfHTeLOG8d6tE6wouSSnHMg+MdCKR9bjBsmpgUEDcwI1AVNyV+Un6/nd9uIpsuk4OB7hptv/R8RJmCsQ7h6NRY5Kj4Hn5nNADWTGhdjwTzdVL+Ucd8HmGnDUjM06VsK54TY1Z79SkYm8OWexMN25TI+gRu6VnaUCLYQZloZhydmecCdI/uNrC7b8m+PhR13fP9TCqqKkgU1saDNr13Gde/G8/IxlmKoA48RdtdFOfPWJgT0Ay7gncdeTB3nqRaV20KsajR/rs1d+biPLndZ6GFqJbkhrsMrvwKOkOR2WFdyKeZ/BzhXBM4RuCbuzNAsXD18SBxNLe6FAOArbeh4xOZQ3Y7CuIcYsHXsRtziSEmCyIzWPmb0FblsGhbe41A= 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:(13230001)(4636009)(366004)(66556008)(66946007)(38350700002)(2906002)(6666004)(38100700002)(110136005)(36756003)(54906003)(4326008)(316002)(6636002)(6486002)(8676002)(66476007)(6512007)(186003)(1076003)(508600001)(86362001)(2616005)(26005)(44832011)(83380400001)(55236004)(921005)(5660300002)(7416002)(6506007)(8936002)(52116002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hdhTXZEeaAYZQ6DzkW/X+v/5sQLmneQYRssZ3Qhlqgr0U00gjilto5RZIU/ZI2TTCBxuBbbzuHm9cDZmm3TV4IUbT+bY2TjK1HjcRf/E/blg/wbbD3uvvJxZN81kf1b2JNDOuPSwV/FGEMd5SqZ47y6QcjSmoKELrl9Z6f7pgUgjNHaxI9wMs0nbhEM772BHkX8l0jtKkccuafb9UnyRkbXjWItGxxii2LQm2D4lulbFdh/6j5rrYDlMiA5UKMtLhbPzGLaOIhPKv/w62g6tLXX9NDziB0N/xhdJIFOHmODnaTTAcoG3OZcc/w0XRLyeNV2B59edP0f5pofBLq3w97kCwGuNtTSMHy+LUO8KvgUMy2UdoaGxxMSc+CV8hRMwETzgd5+YT7gmcq++26ExHn9AI73rro3yeoWvmoLPR05hNpwB59JFk4t91YpEV9wXCsqZP8yvGK8lPov6liRZDRYTwipbENAti1WAdgK6ORJgSZS7T2DVfi05b8Nhh3xee8T/P4ZOziYQEa6r6k3hO8HxSnK6HMl5LIzRGqWCdt+3i/nzg/iC0HZRGsMliRhYP6cfUi1Lv54QnOUc1YXYAod0eZ+j11kRzP+peYkQHBvNoEm2Y1kDBfUYYHw1KTpk+PEvqfgboeOZraFV9PM507ROZZvw9NRcF353GmJsSWh7uCnLcBplwZMUltilmVAn+g38pJGEbMLwp0wgzKixkAIbqAM47glrQLxpxI909vQZm2dgpYzgCk/f54hDEI43Mvnmit4ktVcC89oO9Ox24ibWbTIUA/zR+Vbm6650TSrevUB9xn9KcckqBYDNyQ9CeOFbPd6YeqX1K7jlrQlOEhqqpOs3ZbalhlxTRtHa8CtKDRIqXxH9qB3PeEFPbnd+zoxtiK8I3+XlWuAo4FRgg7ryFtZ8X61TsFIvCLo/eBC9CftxYnkUwN+R9YXgsLs3d/B9Cl72BnpuMxl8hjc5saAO/73KIoJRL7qhM9AcGbTeqGIZUlpQs/L2QD9DksBCJiQGgZlvtdfgAEy9WxGxC766a/kKiQkkcCF1IcvI0cOTX2NrbyKXBOlmVKlUzg57KfLPiqXuIb7v8k7wlf30gdDqgiTxkoD0ZN55h1di4LxLjjKVRiamhMFYt5eikbjH20Qs7EwngrDWHLZStuvNjrgQY7xFhOSF5rilwC1fIpLY9cvsCrOM+kp8ntcHtPxm3R6yZXTiEmrPBAUCCbWtCkulsUtAK0jnXiEY4kXCLN+1iWnU0/zz9tOyqvMOscM9UD+AXpKVbOpBxiJF0yvcBLc0yFOmIft1y3OrYN7SZYx0obaKFU5czX9Ydj8YK9PS1lnKerZnFwprGD1rUv6vridwOXdJTfdWmny4rQYunb14WBOQPJh7Kqiln3nLGoIwwQqGm8YCxPVwpgCEYtnuLgrfp7L81t48TpP3yCfNjhEGabxJxY9TjZl4rN23WyOKvabd3QyKn+7+ggPpjeYQ0IrU9ShYgEEMK4mOYBqHYulM5X+8htg0060ktQbSb4d8AXZLvW2KDPoPSDlCTeYwgPmDbLwWvZZ7u3Q05ebzpUO3EKhCfAE66Y3RZED9y09ZHO9Nv8QY6HUIcLi4N8Tc7Sq1Pu0HW8sqblg+il9nq+4/FDJO3agwudhZ2wd0EBrYJ0JThPKDLw1SJIqwKGTK5RP2qxGGrRWX8dZ/woXPHxaWTuyfKxnlvgEmx8TrI97vWgl+5tqXY/QD8CdIESQPbQ== X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 82c14260-2322-47c1-977b-08da49539a08 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2022 13:34:24.9526 (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: zCyTJzPRMeFnOakqd1+h3Dl8+go67RH6zD2t956ZMjP457RjgnnUVc3vnePch+ziKyMeJJLrp1HIDho5s0DSjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB6979 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.5 at phobos.denx.de X-Virus-Status: Clean disabled use of JR0 in SPL and uboot, as JR0 is reserved for HAB in TF-A. Signed-off-by: Gaurav Jain Tested-by: Fabio Estevam --- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 1 + arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 1 + arch/arm/dts/imx8mp-evk-u-boot.dtsi | 1 + arch/arm/dts/imx8mq-evk-u-boot.dtsi | 4 ++++ arch/arm/include/asm/arch-imx8m/imx-regs.h | 1 + drivers/crypto/fsl/jr.c | 14 +++++++++++--- scripts/config_whitelist.txt | 1 + 7 files changed, 20 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi index e9fbf7b802..8cd37b5205 100644 --- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi @@ -74,6 +74,7 @@ &sec_jr0 { u-boot,dm-spl; + status = "disabled"; }; &sec_jr1 { diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi index 4d0ecb07d4..0c31f2737a 100644 --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi @@ -114,6 +114,7 @@ &sec_jr0 { u-boot,dm-spl; + status = "disabled"; }; &sec_jr1 { diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi index f43eb6238d..28dce55fb9 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -77,6 +77,7 @@ &sec_jr0 { u-boot,dm-spl; + status = "disabled"; }; &sec_jr1 { diff --git a/arch/arm/dts/imx8mq-evk-u-boot.dtsi b/arch/arm/dts/imx8mq-evk-u-boot.dtsi index 67da69a2eb..37364eb6b4 100644 --- a/arch/arm/dts/imx8mq-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-evk-u-boot.dtsi @@ -18,3 +18,7 @@ &uart1 { u-boot,dm-spl; }; + +&sec_jr0 { + status = "disabled"; +}; diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h index 1da75528d4..e6e2974df3 100644 --- a/arch/arm/include/asm/arch-imx8m/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h @@ -89,6 +89,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/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index acd29924f7..66dd9cf365 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -44,9 +44,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 @@ -685,8 +693,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 #if CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cecdda6781..b99aeacbc4 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1040,6 +1040,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