From patchwork Tue Nov 30 10:40:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561507 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=HDjKN/xH; 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 4J3JgF2Qpqz9sWJ for ; Tue, 30 Nov 2021 21:41:45 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0DBCD83093; Tue, 30 Nov 2021 11:41:35 +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="HDjKN/xH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6EDDE8307C; Tue, 30 Nov 2021 11:41:32 +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 EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0605.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::605]) (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 4E18A80934 for ; Tue, 30 Nov 2021 11:41:26 +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=m+/yMXNp76zK6BnZ1u1EEx/Tg9AobWmVWF8EMbPry/0rr54MqEH6wZigYn3CIoQsRFtvIyPjexdLbxpaRV1AY5HiBebp7pxoXz9uwu3AuNiHSkcLjVuozQGVz0xoLdTO+XIXe0i5RnpICeVKlNcbL4SfxcND1Flsm0DBBOr7wpVlBWrzURMV6chOgc7M4kweuBkfo9kljxqWs4IdDLYL2mZyONbqDF+ZRgzR0WfD9+IhjRSSWFzbq7aDIGH2+8UD/G7DG874IrJJ3rMtxIer51CtxGUnz3IV8N6viZChrzZRe6oOTR6UUajnqCr1gXXrs/zT3wmDx5dyWBoh52uMGA== 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=Ok9Pcf5YusXf3zEpB7zgGMJEA/8FRCesVBMZuuWUHEY=; b=eKvZI7rnjBdtsu2+SOtdqLV5DwsIXKpRrUv+UwxsZ3k1vaz9ml6msgJunn0bJv7YLQLR1ezrlohAoVWxJ/rCqnW5jn3VsbdhQg+NsRpx5p8cqjTUVlfkJ7qb2Hs8GXvNycr/q0qEau+GwLdNlakN5K2cytJHKJ2XnJVl+ARqcBiAIpEVCeHW//sbGJyEX+OqhOKBR7+ImpE2HJnlGMHowStZKwhGuUSMzSS/c92SoafniqXgMOmwPEQOhl0P4saFDW9byTN09jlI5MbeF7hXHXuTN349KaavwEIgPPYwJie+oiIGsCbc1A9c6K80hAc1/r5feia/05hcWx5dXyWzvw== 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=Ok9Pcf5YusXf3zEpB7zgGMJEA/8FRCesVBMZuuWUHEY=; b=HDjKN/xHmxthdaHxLdUUgHcyOumFE79HBeL5Q6dpcORPDKEUCzzDW84NY25FVGXHTp4dej+5pAkZ+/vUBqUp1/DRt8Q/xKyibYv/gK8VKxvFLzUpOU74kQyIgsuMWrOPX6+cC0YikkIx0Y6RWf0XN385Trdqx+o2WAIc0T2Qr+s= 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 VE1PR04MB7327.eurprd04.prod.outlook.com (2603:10a6:800:1ac::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 30 Nov 2021 10:41:25 +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.4734.024; Tue, 30 Nov 2021 10:41:24 +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 v6 01/15] crypto/fsl: Add support for CAAM Job ring driver model Date: Tue, 30 Nov 2021 16:10:34 +0530 Message-Id: <20211130104048.6207-2-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:41:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a3d37aa3-e04a-46e6-12a6-08d9b3edf4c8 X-MS-TrafficTypeDiagnostic: VE1PR04MB7327: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:158; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x+iTV+C7VWaDcrfViS+f8DHnoCNDXmZcYbCcBxfCCrjrcExZJi8ZfAMDpiouSHf9FXROOhcNPm5DovlIuTrvAqsmM2PowQNXcF1SuYAfz0FO9MbLVdbkd9L1IPgO/niVC7Pn/++Cvs8/nuQDLaYgHaIMMQP8OzIxAZ9uVbWCP5K9h5WRVfsPB9G4Kyoz5z2q5lB/H7njOJHZn6k1yi5eD+BRKePCOVvYtl7XAFjuCUp0/A6pePSyj4T3clYFhGFCXEeg6X/2Dp0SLy3GqCYT53ByMlSKAd68ANRloUC5fzNSBkqY89pqSn6i+e3Q3sgOgIb3dQc9e/o7MZ+cghqQ7yWy3iB0ss7UX4+7nJ3kAcSZ6r6dm5o0av172zkl3Opn15vugajZu40U1588QeUvyKiVnK4/ujNbiWO3376SJLjcRZRJG63YF0RKxZ3JtMk4bWmMxLFGMvJT9K0a2bmNqmPsGXqUmSKCXzvsxsEirkDEf/2yjLwx6iF0/uu8jVXdDaCA/+9sAqcZfwm+489XwFGlO6jnAwZjlvJhHgQQ38Wxv2NEJgSzihNArwG2rwHl+sNz6F/7soIQuIJ8nfR1sMtth6BOoHvBFTBtNorrE+iyXNzcUPkTEB6xqYAM+YWNMaexKNMgrcw7eE06uGyWgGaNk8RTnMzdRhzvls60zlZQ9gDm0JwgVkfY7CHwWhvxiwp0/PbgEv7lGNkBPoG53po5Ve90G9/zkqTXSG5iUhH5ZNHCHs45Wt8SefSadXh3 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)(36756003)(4326008)(5660300002)(54906003)(1076003)(2906002)(7696005)(52116002)(508600001)(26005)(316002)(186003)(30864003)(8936002)(6486002)(8676002)(86362001)(956004)(83380400001)(44832011)(2616005)(1006002)(6666004)(55236004)(66946007)(66476007)(66556008)(6916009)(38100700002)(38350700002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ifJpCPGCojkTgdCD9E9LrtarWkPnGj7cZnehyyProjGtVa6YB8VOzNfAW88f1OTLxGE4jgSMZDAE537uqD3P7tY42z/JCPeDNZSA6dFlM8sS/CeXAmehrhojD26oAQvagOry7hWE/wYXU0cKCL3nhMQ/UOHIggeA0z2m3no3g614siLKYgcisRXQUv4Xgv+2cBZtqvg3NEbwvKZ7m/iXKNvQUZlJj7zFhojPDIwcGRgYrl1krWrSviYW8//VOcO4N9xxvwmcV7N3K7tS5UYkB6aVV3o9vxk2kaOoON6i87hnW76wOZSHQXdBwoXtSwQjoUR/PDAyM2EIrX29PCLtW1XyczMOGevvCskA6W734aCnNqXQJBCOrMxvV+iN5NQhHsSib0NFv0cvox/FSw5hBOM/G5QTjrb9uunV0hEcLjsLuGMXzihriCSve77b5uVVbKd7yE7fErRnSaMVsR9dX3v1xzM6cjl70C/mvuRhdJWyDVlPtxdEJBAXM1snnrwhr3c+g9wb8z65ZWy39BqGEKj18uWQS4BdOCtYxDY0dtQKb1azGhL6IdGefH+OqnGgEMmv/WlA1+ARMstYSeJEbiU3ZGfkYi2yTLwfuQzZJoMEX7iHJtEFd/FOXerPeeFiPJkMWe4j+m3GrNSyKNz3orJOnlB8HITHH8lPJk2SC7gF5oGrm58cY1hUT8CpNyTcDIFGB3/lM/IYkXEu+zc9kLa8rLGh2YUHhSNjnUkm2aoR2EeLf7m9o9FG+plHx+kMl/HFVNBn94VZh8uoVMOQ9/FE/5QWkPe4yxo2c+US/CNWQWyLCCWSvPgmFRC/areaInoP+7mn/5bIcJv9Cw+W3m3g/DoFQ2qHcnqlGKF0REIqQFuTgre4cQEMLbFdUyh8JgnYZKTdSY5WGBv+g4VU4QYA90r4sITXPGeo7ASarpffFjy86zlRn0K78gg993Y1mGfLPFD9nkI7i3O3sutpM85xrlcG3Icw0odPcRab+W1kPLzYlt2MFniOK6nOUa1UIsVBF/VTb7LMbTskEHZoD1JOKrVDtwZn/hDdfgH8C3w4UHaWd2c3bZJfqzdTFMqtXkYSsUfOFINstK1OIRyYQOizOFpTUq7Fwhgq0pHoWKktNT6VA6cvA5D0mzHdZZiGrw9s/fDcO54vfJFtFwXLrKM44QolhXnA8mgIIs75+IlL6dbW7XWBoCq6OYoSc1rzgJiTxVXY67+qgno84oapLdetMhyFpISrF7hb4galO6nJRqdaJy5jnCdr5KFNujpx/vIlplHXZKNffQSSMwoeKobfBQ46cjfaEwz7mS+QJ1yZIRUm3ahDk7v+hQ98oK96qnMMz1Oz6Q5aJ3t1KMJVHzeIjtXfmpcDPG9oEaFQbnGJF6sf2Uv380TGMhtuQ1bJhP6Ixt7mRQ+RzDdrSg4SXGyjqlanS7y78kC/5HYWC349KSUSynDLIlAlJ0e1Xo1l6c4dzDww7iIsu3u2k0PiF/ZSKtHP2FWJhaesuRLqM1KNE1KJzF2UrtKaCqEz5qbAatXxFnZeeoJkiWg4mx7a/Gg1uAgHbs26E8HTaW+U2U8aMhSq0QXTB+ZChSOeVNnd6a8zkaLwJ6O/572KmYw0MBuR/zXUfrLXJZUhplphX/c= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a3d37aa3-e04a-46e6-12a6-08d9b3edf4c8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:41:24.7867 (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: BvcXIsnF7ix/NdP5FwGWI3e2Cx4gvP86hnQuWnOKGDXa71DQ2vjiMp8uQpR9DYv1yaAoX6gzC1RONhWWcb63qg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7327 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 added device tree support for job ring driver. sec is initialized based on job ring information processed from device tree. Signed-off-by: Gaurav Jain Reviewed-by: Ye Li --- drivers/crypto/fsl/Kconfig | 7 + drivers/crypto/fsl/Makefile | 2 + drivers/crypto/fsl/jobdesc.c | 4 +- drivers/crypto/fsl/jr.c | 316 +++++++++++++++++++++++------------ drivers/crypto/fsl/jr.h | 14 ++ 5 files changed, 232 insertions(+), 111 deletions(-) diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig index 94ff540111..249a37f5a7 100644 --- a/drivers/crypto/fsl/Kconfig +++ b/drivers/crypto/fsl/Kconfig @@ -66,4 +66,11 @@ config FSL_CAAM_RNG using the prediction resistance flag which means the DRGB is reseeded from the TRNG every time random data is generated. +config FSL_BLOB + bool "Enable Blob Encap/Decap, Blob KEK support" + help + Enable support for the hardware based crytographic blob encap/decap + module of the CAAM. blobs can be safely placed into non-volatile + storage. blobs can only be decapsulated by the SoC that created it. + Enable support for blob key encryption key generation. endif diff --git a/drivers/crypto/fsl/Makefile b/drivers/crypto/fsl/Makefile index f9c3ccecfc..567ab6a821 100644 --- a/drivers/crypto/fsl/Makefile +++ b/drivers/crypto/fsl/Makefile @@ -1,10 +1,12 @@ # SPDX-License-Identifier: GPL-2.0+ # # Copyright 2014 Freescale Semiconductor, Inc. +# Copyright 2021 NXP obj-y += sec.o obj-$(CONFIG_FSL_CAAM) += jr.o fsl_hash.o jobdesc.o error.o obj-$(CONFIG_CMD_BLOB)$(CONFIG_IMX_CAAM_DEK_ENCAP) += fsl_blob.o +obj-$(CONFIG_FSL_BLOB) += fsl_blob.o obj-$(CONFIG_RSA_FREESCALE_EXP) += fsl_rsa.o obj-$(CONFIG_FSL_CAAM_RNG) += rng.o obj-$(CONFIG_FSL_MFGPROT) += fsl_mfgprot.o diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c index c350b32856..f200de686b 100644 --- a/drivers/crypto/fsl/jobdesc.c +++ b/drivers/crypto/fsl/jobdesc.c @@ -207,7 +207,7 @@ void inline_cnstr_jobdesc_hash(uint32_t *desc, append_store(desc, dma_addr_out, storelen, LDST_CLASS_2_CCB | LDST_SRCDST_BYTE_CONTEXT); } -#ifndef CONFIG_SPL_BUILD + void inline_cnstr_jobdesc_blob_encap(uint32_t *desc, uint8_t *key_idnfr, uint8_t *plain_txt, uint8_t *enc_blob, uint32_t in_sz) @@ -255,7 +255,7 @@ void inline_cnstr_jobdesc_blob_decap(uint32_t *desc, uint8_t *key_idnfr, append_operation(desc, OP_TYPE_DECAP_PROTOCOL | OP_PCLID_BLOB); } -#endif + /* * Descriptor to instantiate RNG State Handle 0 in normal mode and * load the JDKEK, TDKEK and TDSK registers diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 22b649219e..eea2225a1e 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP * * Based on CAAM driver in drivers/crypto/caam in Linux */ @@ -11,7 +11,6 @@ #include #include #include -#include "fsl_sec.h" #include "jr.h" #include "jobdesc.h" #include "desc_constr.h" @@ -21,8 +20,11 @@ #include #include #endif +#include #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)) @@ -35,20 +37,30 @@ uint32_t sec_offset[CONFIG_SYS_FSL_MAX_NUM_OF_SEC] = { #endif }; +#if CONFIG_IS_ENABLED(DM) +struct udevice *caam_dev; +#else #define SEC_ADDR(idx) \ (ulong)((CONFIG_SYS_FSL_SEC_ADDR + sec_offset[idx])) #define SEC_JR0_ADDR(idx) \ (ulong)(SEC_ADDR(idx) + \ (CONFIG_SYS_FSL_JR0_OFFSET - CONFIG_SYS_FSL_SEC_OFFSET)) +struct caam_regs caam_st; +#endif -struct jobring jr0[CONFIG_SYS_FSL_MAX_NUM_OF_SEC]; +static inline u32 jr_start_reg(u8 jrid) +{ + return (1 << jrid); +} -static inline void start_jr0(uint8_t sec_idx) +#ifndef CONFIG_ARCH_IMX8 +static inline void start_jr(struct caam_regs *caam) { - ccsr_sec_t *sec = (void *)SEC_ADDR(sec_idx); + ccsr_sec_t *sec = caam->sec; u32 ctpr_ms = sec_in32(&sec->ctpr_ms); u32 scfgr = sec_in32(&sec->scfgr); + u32 jrstart = jr_start_reg(caam->jrid); if (ctpr_ms & SEC_CTPR_MS_VIRT_EN_INCL) { /* VIRT_EN_INCL = 1 & VIRT_EN_POR = 1 or @@ -56,23 +68,17 @@ static inline void start_jr0(uint8_t sec_idx) */ if ((ctpr_ms & SEC_CTPR_MS_VIRT_EN_POR) || (scfgr & SEC_SCFGR_VIRT_EN)) - sec_out32(&sec->jrstartr, CONFIG_JRSTARTR_JR0); + sec_out32(&sec->jrstartr, jrstart); } else { /* VIRT_EN_INCL = 0 && VIRT_EN_POR_VALUE = 1 */ if (ctpr_ms & SEC_CTPR_MS_VIRT_EN_POR) - sec_out32(&sec->jrstartr, CONFIG_JRSTARTR_JR0); + sec_out32(&sec->jrstartr, jrstart); } } +#endif -static inline void jr_reset_liodn(uint8_t sec_idx) -{ - ccsr_sec_t *sec = (void *)SEC_ADDR(sec_idx); - sec_out32(&sec->jrliodnr[0].ls, 0); -} - -static inline void jr_disable_irq(uint8_t sec_idx) +static inline void jr_disable_irq(struct jr_regs *regs) { - struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR(sec_idx); uint32_t jrcfg = sec_in32(®s->jrcfg1); jrcfg = jrcfg | JR_INTMASK; @@ -80,10 +86,10 @@ static inline void jr_disable_irq(uint8_t sec_idx) sec_out32(®s->jrcfg1, jrcfg); } -static void jr_initregs(uint8_t sec_idx) +static void jr_initregs(uint8_t sec_idx, struct caam_regs *caam) { - struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR(sec_idx); - struct jobring *jr = &jr0[sec_idx]; + struct jr_regs *regs = caam->regs; + struct jobring *jr = &caam->jr[sec_idx]; caam_dma_addr_t ip_base = virt_to_phys((void *)jr->input_ring); caam_dma_addr_t op_base = virt_to_phys((void *)jr->output_ring); @@ -103,16 +109,16 @@ static void jr_initregs(uint8_t sec_idx) sec_out32(®s->irs, JR_SIZE); if (!jr->irq) - jr_disable_irq(sec_idx); + jr_disable_irq(regs); } -static int jr_init(uint8_t sec_idx) +static int jr_init(uint8_t sec_idx, struct caam_regs *caam) { - struct jobring *jr = &jr0[sec_idx]; + struct jobring *jr = &caam->jr[sec_idx]; memset(jr, 0, sizeof(struct jobring)); - jr->jq_id = DEFAULT_JR_ID; + jr->jq_id = caam->jrid; jr->irq = DEFAULT_IRQ; #ifdef CONFIG_FSL_CORENET @@ -134,53 +140,10 @@ static int jr_init(uint8_t sec_idx) memset(jr->input_ring, 0, JR_SIZE * sizeof(caam_dma_addr_t)); memset(jr->output_ring, 0, jr->op_size); - start_jr0(sec_idx); - - jr_initregs(sec_idx); - - return 0; -} - -static int jr_sw_cleanup(uint8_t sec_idx) -{ - struct jobring *jr = &jr0[sec_idx]; - - jr->head = 0; - jr->tail = 0; - jr->read_idx = 0; - jr->write_idx = 0; - memset(jr->info, 0, sizeof(jr->info)); - memset(jr->input_ring, 0, jr->size * sizeof(caam_dma_addr_t)); - memset(jr->output_ring, 0, jr->size * sizeof(struct op_ring)); - - return 0; -} - -static int jr_hw_reset(uint8_t sec_idx) -{ - struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR(sec_idx); - uint32_t timeout = 100000; - uint32_t jrint, jrcr; - - sec_out32(®s->jrcr, JRCR_RESET); - do { - jrint = sec_in32(®s->jrint); - } while (((jrint & JRINT_ERR_HALT_MASK) == - JRINT_ERR_HALT_INPROGRESS) && --timeout); - - jrint = sec_in32(®s->jrint); - if (((jrint & JRINT_ERR_HALT_MASK) != - JRINT_ERR_HALT_INPROGRESS) && timeout == 0) - return -1; - - timeout = 100000; - sec_out32(®s->jrcr, JRCR_RESET); - do { - jrcr = sec_in32(®s->jrcr); - } while ((jrcr & JRCR_RESET) && --timeout); - - if (timeout == 0) - return -1; +#ifndef CONFIG_ARCH_IMX8 + start_jr(caam); +#endif + jr_initregs(sec_idx, caam); return 0; } @@ -188,10 +151,10 @@ static int jr_hw_reset(uint8_t sec_idx) /* -1 --- error, can't enqueue -- no space available */ static int jr_enqueue(uint32_t *desc_addr, void (*callback)(uint32_t status, void *arg), - void *arg, uint8_t sec_idx) + void *arg, uint8_t sec_idx, struct caam_regs *caam) { - struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR(sec_idx); - struct jobring *jr = &jr0[sec_idx]; + struct jr_regs *regs = caam->regs; + struct jobring *jr = &caam->jr[sec_idx]; int head = jr->head; uint32_t desc_word; int length = desc_len(desc_addr); @@ -263,10 +226,10 @@ static int jr_enqueue(uint32_t *desc_addr, return 0; } -static int jr_dequeue(int sec_idx) +static int jr_dequeue(int sec_idx, struct caam_regs *caam) { - struct jr_regs *regs = (struct jr_regs *)SEC_JR0_ADDR(sec_idx); - struct jobring *jr = &jr0[sec_idx]; + struct jr_regs *regs = caam->regs; + struct jobring *jr = &caam->jr[sec_idx]; int head = jr->head; int tail = jr->tail; int idx, i, found; @@ -349,14 +312,18 @@ static void desc_done(uint32_t status, void *arg) { struct result *x = arg; x->status = status; -#ifndef CONFIG_SPL_BUILD caam_jr_strstatus(status); -#endif x->done = 1; } static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) { + struct caam_regs *caam; +#if CONFIG_IS_ENABLED(DM) + caam = dev_get_priv(caam_dev); +#else + caam = &caam_st; +#endif unsigned long long timeval = 0; unsigned long long timeout = CONFIG_USEC_DEQ_TIMEOUT; struct result op; @@ -364,7 +331,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) memset(&op, 0, sizeof(op)); - ret = jr_enqueue(desc, desc_done, &op, sec_idx); + ret = jr_enqueue(desc, desc_done, &op, sec_idx, caam); if (ret) { debug("Error in SEC enq\n"); ret = JQ_ENQ_ERR; @@ -375,7 +342,7 @@ static inline int run_descriptor_jr_idx(uint32_t *desc, uint8_t sec_idx) udelay(1); timeval += 1; - ret = jr_dequeue(sec_idx); + ret = jr_dequeue(sec_idx, caam); if (ret) { debug("Error in SEC deq\n"); ret = JQ_DEQ_ERR; @@ -402,13 +369,63 @@ int run_descriptor_jr(uint32_t *desc) return run_descriptor_jr_idx(desc, 0); } +#ifndef CONFIG_ARCH_IMX8 +static int jr_sw_cleanup(uint8_t sec_idx, struct caam_regs *caam) +{ + struct jobring *jr = &caam->jr[sec_idx]; + + jr->head = 0; + jr->tail = 0; + jr->read_idx = 0; + jr->write_idx = 0; + memset(jr->info, 0, sizeof(jr->info)); + memset(jr->input_ring, 0, jr->size * sizeof(caam_dma_addr_t)); + memset(jr->output_ring, 0, jr->size * sizeof(struct op_ring)); + + return 0; +} + +static int jr_hw_reset(struct jr_regs *regs) +{ + uint32_t timeout = 100000; + uint32_t jrint, jrcr; + + sec_out32(®s->jrcr, JRCR_RESET); + do { + jrint = sec_in32(®s->jrint); + } while (((jrint & JRINT_ERR_HALT_MASK) == + JRINT_ERR_HALT_INPROGRESS) && --timeout); + + jrint = sec_in32(®s->jrint); + if (((jrint & JRINT_ERR_HALT_MASK) != + JRINT_ERR_HALT_INPROGRESS) && timeout == 0) + return -1; + + timeout = 100000; + sec_out32(®s->jrcr, JRCR_RESET); + do { + jrcr = sec_in32(®s->jrcr); + } while ((jrcr & JRCR_RESET) && --timeout); + + if (timeout == 0) + return -1; + + return 0; +} + static inline int jr_reset_sec(uint8_t sec_idx) { - if (jr_hw_reset(sec_idx) < 0) + struct caam_regs *caam; +#if CONFIG_IS_ENABLED(DM) + caam = dev_get_priv(caam_dev); +#else + caam = &caam_st; +#endif + if (jr_hw_reset(caam->regs) < 0) return -1; /* Clean up the jobring structure maintained by software */ - jr_sw_cleanup(sec_idx); + jr_sw_cleanup(sec_idx, caam); return 0; } @@ -418,9 +435,15 @@ int jr_reset(void) return jr_reset_sec(0); } -static inline int sec_reset_idx(uint8_t sec_idx) +int sec_reset(void) { - ccsr_sec_t *sec = (void *)SEC_ADDR(sec_idx); + struct caam_regs *caam; +#if CONFIG_IS_ENABLED(DM) + caam = dev_get_priv(caam_dev); +#else + caam = &caam_st; +#endif + ccsr_sec_t *sec = caam->sec; uint32_t mcfgr = sec_in32(&sec->mcfgr); uint32_t timeout = 100000; @@ -446,11 +469,7 @@ static inline int sec_reset_idx(uint8_t sec_idx) return 0; } -int sec_reset(void) -{ - return sec_reset_idx(0); -} -#ifndef CONFIG_SPL_BUILD + static int deinstantiate_rng(u8 sec_idx, int state_handle_mask) { u32 *desc; @@ -496,12 +515,11 @@ static int deinstantiate_rng(u8 sec_idx, int state_handle_mask) return ret; } -static int instantiate_rng(u8 sec_idx, int gen_sk) +static int instantiate_rng(uint8_t sec_idx, ccsr_sec_t *sec, int gen_sk) { u32 *desc; u32 rdsta_val; int ret = 0, sh_idx, size; - ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx); struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng; @@ -554,9 +572,8 @@ static int instantiate_rng(u8 sec_idx, int gen_sk) return ret; } -static u8 get_rng_vid(uint8_t sec_idx) +static u8 get_rng_vid(ccsr_sec_t *sec) { - ccsr_sec_t *sec = (void *)SEC_ADDR(sec_idx); u8 vid; if (caam_get_era() < 10) { @@ -574,9 +591,8 @@ static u8 get_rng_vid(uint8_t sec_idx) * By default, the TRNG runs for 200 clocks per sample; * 1200 clocks per sample generates better entropy. */ -static void kick_trng(int ent_delay, uint8_t sec_idx) +static void kick_trng(int ent_delay, ccsr_sec_t *sec) { - ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx); struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng; u32 val; @@ -603,10 +619,9 @@ static void kick_trng(int ent_delay, uint8_t sec_idx) sec_clrbits32(&rng->rtmctl, RTMCTL_PRGM); } -static int rng_init(uint8_t sec_idx) +static int rng_init(uint8_t sec_idx, ccsr_sec_t *sec) { int ret, gen_sk, ent_delay = RTSDCTL_ENT_DLY_MIN; - ccsr_sec_t __iomem *sec = (ccsr_sec_t __iomem *)SEC_ADDR(sec_idx); struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng; u32 inst_handles; @@ -624,7 +639,7 @@ static int rng_init(uint8_t sec_idx) * the TRNG parameters. */ if (!inst_handles) { - kick_trng(ent_delay, sec_idx); + kick_trng(ent_delay, sec); ent_delay += 400; } /* @@ -634,7 +649,7 @@ static int rng_init(uint8_t sec_idx) * interval, leading to a sucessful initialization of * the RNG. */ - ret = instantiate_rng(sec_idx, gen_sk); + ret = instantiate_rng(sec_idx, sec, gen_sk); } while ((ret == -1) && (ent_delay < RTSDCTL_ENT_DLY_MAX)); if (ret) { printf("SEC%u: Failed to instantiate RNG\n", sec_idx); @@ -647,12 +662,29 @@ static int rng_init(uint8_t sec_idx) return ret; } #endif + int sec_init_idx(uint8_t sec_idx) { - ccsr_sec_t *sec = (void *)SEC_ADDR(sec_idx); - uint32_t mcr = sec_in32(&sec->mcfgr); int ret = 0; - + struct caam_regs *caam; +#if CONFIG_IS_ENABLED(DM) + if (caam_dev == NULL) { + printf("caam_jr: caam not found\n"); + return -1; + } + 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 = &caam_st; +#endif +#ifndef CONFIG_ARCH_IMX8 + ccsr_sec_t *sec = caam->sec; + uint32_t mcr = sec_in32(&sec->mcfgr); +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_IMX8M) + uint32_t jrdid_ms = 0; +#endif #ifdef CONFIG_FSL_CORENET uint32_t liodnr; uint32_t liodn_ns; @@ -682,6 +714,11 @@ int sec_init_idx(uint8_t sec_idx) mcr |= (1 << MCFGR_PS_SHIFT); #endif sec_out32(&sec->mcfgr, mcr); +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_IMX8M) + jrdid_ms = JRDID_MS_TZ_OWN | JRDID_MS_PRIM_TZ | JRDID_MS_PRIM_DID; + sec_out32(&sec->jrliodnr[caam->jrid].ms, jrdid_ms); +#endif + jr_reset(); #ifdef CONFIG_FSL_CORENET #ifdef CONFIG_SPL_BUILD @@ -693,25 +730,26 @@ int sec_init_idx(uint8_t sec_idx) liodn_ns = CONFIG_SPL_JR0_LIODN_NS & JRNSLIODN_MASK; liodn_s = CONFIG_SPL_JR0_LIODN_S & JRSLIODN_MASK; - liodnr = sec_in32(&sec->jrliodnr[0].ls) & + liodnr = sec_in32(&sec->jrliodnr[caam->jrid].ls) & ~(JRNSLIODN_MASK | JRSLIODN_MASK); liodnr = liodnr | (liodn_ns << JRNSLIODN_SHIFT) | (liodn_s << JRSLIODN_SHIFT); - sec_out32(&sec->jrliodnr[0].ls, liodnr); + sec_out32(&sec->jrliodnr[caam->jrid].ls, liodnr); #else - liodnr = sec_in32(&sec->jrliodnr[0].ls); + liodnr = sec_in32(&sec->jrliodnr[caam->jrid].ls); liodn_ns = (liodnr & JRNSLIODN_MASK) >> JRNSLIODN_SHIFT; liodn_s = (liodnr & JRSLIODN_MASK) >> JRSLIODN_SHIFT; #endif #endif - - ret = jr_init(sec_idx); +#endif + ret = jr_init(sec_idx, caam); if (ret < 0) { printf("SEC%u: initialization failed\n", sec_idx); return -1; } +#ifndef CONFIG_ARCH_IMX8 #ifdef CONFIG_FSL_CORENET ret = sec_config_pamu_table(liodn_ns, liodn_s); if (ret < 0) @@ -719,9 +757,9 @@ int sec_init_idx(uint8_t sec_idx) pamu_enable(); #endif -#ifndef CONFIG_SPL_BUILD - if (get_rng_vid(sec_idx) >= 4) { - if (rng_init(sec_idx) < 0) { + + if (get_rng_vid(caam->sec) >= 4) { + if (rng_init(sec_idx, caam->sec) < 0) { printf("SEC%u: RNG instantiation failed\n", sec_idx); return -1; } @@ -743,3 +781,63 @@ int sec_init(void) { return sec_init_idx(0); } + +#if CONFIG_IS_ENABLED(DM) +static int caam_jr_probe(struct udevice *dev) +{ + struct caam_regs *caam = dev_get_priv(dev); + fdt_addr_t addr; + ofnode node; + unsigned int jr_node = 0; + + caam_dev = dev; + + addr = dev_read_addr(dev); + if (addr == FDT_ADDR_T_NONE) { + printf("caam_jr: crypto not found\n"); + return -EINVAL; + } + caam->sec = (ccsr_sec_t *)(uintptr_t)addr; + caam->regs = (struct jr_regs *)caam->sec; + + /* Check for enabled job ring node */ + ofnode_for_each_subnode(node, dev_ofnode(dev)) { + if (!ofnode_is_available(node)) { + continue; + } + jr_node = ofnode_read_u32_default(node, "reg", -1); + if (jr_node > 0) { + caam->regs = (struct jr_regs *)((ulong)caam->sec + jr_node); + while (!(jr_node & 0x0F)) { + jr_node = jr_node >> 4; + } + caam->jrid = jr_node - 1; + break; + } + } + + if (sec_init()) + printf("\nsec_init failed!\n"); + + return 0; +} + +static int caam_jr_bind(struct udevice *dev) +{ + return 0; +} + +static const struct udevice_id caam_jr_match[] = { + { .compatible = "fsl,sec-v4.0" }, + { } +}; + +U_BOOT_DRIVER(caam_jr) = { + .name = "caam_jr", + .id = UCLASS_MISC, + .of_match = caam_jr_match, + .bind = caam_jr_bind, + .probe = caam_jr_probe, + .priv_auto = sizeof(struct caam_regs), +}; +#endif diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h index 1047aa772c..feb4ea57fb 100644 --- a/drivers/crypto/fsl/jr.h +++ b/drivers/crypto/fsl/jr.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * */ @@ -8,7 +9,9 @@ #define __JR_H #include +#include "fsl_sec.h" #include "type.h" +#include #define JR_SIZE 4 /* Timeout currently defined as 10 sec */ @@ -35,6 +38,10 @@ #define JRSLIODN_SHIFT 0 #define JRSLIODN_MASK 0x00000fff +#define JRDID_MS_PRIM_DID BIT(0) +#define JRDID_MS_PRIM_TZ BIT(4) +#define JRDID_MS_TZ_OWN BIT(15) + #define JQ_DEQ_ERR -1 #define JQ_DEQ_TO_ERR -2 #define JQ_ENQ_ERR -3 @@ -102,6 +109,13 @@ struct result { uint32_t status; }; +struct caam_regs { + ccsr_sec_t *sec; + struct jr_regs *regs; + u8 jrid; + struct jobring jr[CONFIG_SYS_FSL_MAX_NUM_OF_SEC]; +}; + void caam_jr_strstatus(u32 status); int run_descriptor_jr(uint32_t *desc); From patchwork Tue Nov 30 10:40:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561508 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=ojTaNfCD; 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 4J3JgR5xRYz9sWJ for ; Tue, 30 Nov 2021 21:41:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9929583088; Tue, 30 Nov 2021 11:41: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="ojTaNfCD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F36BD83088; Tue, 30 Nov 2021 11:41:37 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on060c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::60c]) (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 E923283088 for ; Tue, 30 Nov 2021 11:41:32 +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=cOzG8YHXljU7XIkZLBIDZNfyvRZSEUCqjKlg4Zm4UUZAKDh5HV/yAlIa1uVcoMLnalyJjb4F0ei0x6Prl8dtS6g5OzGSXXfVCiua1QXfVHmSqqKXWR10vaR6zPHQqzE7/wIcJOo9R5tHQI7069pqzP6UJr1GpsEYzfwunZ3aIfdUOS7xHHX2pQigy0q0CCoUPsqwG08PSZPrKhQUpTiOWsiqvZlVWJIYCgKeiOFpvf0+vugue3T90eGcnhO9NLZQaw934xJO93PAVHSmKw+4pU6PqOJ6L46y49gnEF7o8XK4BReEIa37QTNUebQVXcy94y5NDVVEt/CYzlg/8PO3OQ== 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=XrAhZz7JhrPI+hVRhkH+a0p4vQGGdYGMvPaRKDu5AXU=; b=gjGE9ZfjXtbudqAps8kmparEJpb6JTkRQah0wQ1+2XrRWkS2bsByrPQr74LWwxNtyghcBQIfT0t2ud5SGrggVunOg7kfOUCUV4E5npr+NcZgXDS6SPirSFH8ubfbYF5VbkukwhQMBJZApSxu2mHg/rfxDkRo00INDl3TGp08he7iDnnClL+cMn/Ia1CRxs0eYO1PSNi6VURgfXWb+vSXbl6MDmGbUt8e7uc5QLlzKgo5YYho1AEWAFYDlhMdbiLBHRvUekYpu8HT1xt/pZM4bBNpHLNlKzlQelfuGUbloaaKits31UHNLsMPsfo1TfKV7rwyl59LnrCNMGgJlnrjYw== 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=XrAhZz7JhrPI+hVRhkH+a0p4vQGGdYGMvPaRKDu5AXU=; b=ojTaNfCDmDPISXevQlUabcrb6Q2fqcppgDk9vGDRMupsm1YpE+atl0thXlpqHBBSzBIkRA8gFl/iP377/x9Tf6ezZxKvxWMDIhnyjhUqXfb5IztdlRNbIzVO7voRz8jpz7C6R2J7syrN2wiBg1dUB5ecxJO84TfJbLocfc443zE= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:41:31 +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.4734.024; Tue, 30 Nov 2021 10:41:31 +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 v6 02/15] i.MX8M: crypto: updated device tree for supporting DM in SPL Date: Tue, 30 Nov 2021 16:10:35 +0530 Message-Id: <20211130104048.6207-3-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:41:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e80d3e2f-e661-4467-f676-08d9b3edf88a X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:254; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: q88SSQGqyRVRQ7m0vktl7VXx4YHOkKyWyihoyG2uiy0DAXAmlBbeLZDcM55fpoRF8k9ExayHcmVjACbE33sAK3z1tvuTUo8yP2MIkRxNpHctnGNhFP0LbJGYkf1rf7wG07+hgmJucoqKpb/v3epPEupSwT6FWnxvn5qhQME4IAM+znV0Gadsow1LNWGS4QnuN5xsxLC9km8+vzznhRbd4YAedXZsnvO9wbFbQlKbn+05qMhqeQaarUFqmQiUkSzY/VH1esS05/1Rmydx4u01NTTdIojmnrhWWjT4UwCPr7WlfQy3W+1QSEJ4Jx9zJagK2YVLNKumxp00ssmSRZTjq2kgq5cbvd7E5qAe5QtpYZmkmuUlg+xNgb9nCeJP2Q7rnDBkACA8GEoqdgu3GDgfJy7atTlMWc5RTlWfMHelCdzfOCXp1C9ZX67PqoQuh7qNyR8kPLB+fh+2IFYiZcV2ZKwBsR8eRM4wxNT8JMuzYRcw/cNx3FBrw+iUi+LhYnqAAH0lX9esGHgVmtiUhD/kDGV5mVNNlFCC6FRrxCixgSobIX1ww5X823ObaKj0UxzqKcQUQmcyw5J1KVr1wX1cAqxQ2/prsvHhRrJTGyGd++f5JHaSwAzXAg9jY5aEIjB/NP+a1JEue4WqhAoGlJkSLS2lVRlv577Hkoj3rO00yPU5fz4Pu+QUKbIbXvis+4R4RuWYDBtQL1O9L5QCwTkZjWMXyB9yRsHHs4X3Ikq2acAVR9yWYxPHY/9Au5oGBKQR 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(6666004)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kBsJPTW9UrVkrts8zPj/Gqz3IPHB/rAhD8LdswlCUGd/H/WbgD9nP/+P/x7fjSSChCCyWaWjgwxqIcjhsG0PKY1Zsd/ZgYJHHieh2TIjcKyuXn0DLQ3pkjtY2AvD1D2Rv9LEXnWtiU9I4nZEZPSnS8W/8RZjBtxG8AWEX+RK8WTIcYONdw3Y0APOewYsqSWtfv04GfjscblcxK5ZSu198Vwhuw1ARf7NKk+1+ID1paLCJpGyplvHtiZBPO4m1ZroWGGy6OyRAQPuOvGF3DEj5Whd7MDNLWSnk2wl5UZ8hWt4TZNHks4cUqzMfVnFsTLvBOmMwx8conNxiHHGv6SLSEgnX0EK52JXV4QBMWANRPeiNn7sbj9g7JJXBOSEi1Xki2QMw4JS4rRzMOpcZacILBYe0S/wV7HMu+7yW+KTA39PkS+TbN8aJWH+a0YmYZO6viMua3P0bWKBSydFrIm4k3ae5ltq1v2ByL+kk/nOAevhNCtNG9PK+W+yokLumjzX/QsiIUOJmXGOQd7hwoTYdXhl3sWTcRLBwEzdWLi2d++Z6n049rcbmFX4UBDiFvrm9jFynOD3niJ9LAW9KQRd9L4a3Bq7kh3cxpZ7T8YtKvUunF/ucFWXgvCURrulYAS1s5SzLCm90N2se8bvfem88V1T6zNQ7wu1ctiJhEzWIJGIEhznWNs2vUrd+QaWLGCLQg/8WRZsGzEJLP0nqKsf3u067fljkzQzSv6X73J79s+xqi1kdnM5WZtXWiCfhTD8DYxv+7yLFghSngcgkyErogIPriado1RzV2XnJN6YnREV+5y9hKc4rgOuC2hs8gyrNGZPcNB5z2Pmje4j4j7Jk2L+SfnJlNQp4z3Mdm0+7SzNO2wbNJNdRyQ3T8Ao8FxKNkB7o7xbFRRhJwkMwyjBeDm8YbSw35EW6AVHeIO3jmBE1hQJpcW+uppOX9AQdIg6um2030EPCjcKZ5SXiPVn8vxFSyOFLviKyy1gSTsbrApuIl47UY/LYB2u2gI34GYCwzftv/3GGs/UwthVEUWUvT/DHs+Bz5KPlI/NG9YqCMA1vk6ACC8xriQ8k1R1vNAQnI6TSZNKMBPhJN8DlNUgQEmUXFLdslzmP3RStI67zcJ5lHJEX0HP+41TYq650bn+DFPa6ZBU9hbOF9u9EY19v2svQpkYKx/YCL5UUytCZagrNH6gIxyS6mhci2bWD8Suzo9G3ifatT0muDMZwxSOCg5gehnGs39YJBBZGMm4vOpOVOey7dwHp0OW2UGrsNqe2wLj+Oo1k+XDFr93/QbDMXoXSBKt0FWLX7Tbt7YP9UFc88TJZw1R4mvD9vNiEMy5UPkeKHCtfIPj/uza+cObV4soWdUtYdjs2RBV+vEMJ3fCZLsWv6ky5w9d47VR1uapRGFx/Qwa/cqGPvWDw9McCAr5b8K6dxc6dJArHPMKAL4neb1nozPV2aCVV86WgdM3XYN+Id0SKliGQNQn1BCv9z/PPRF7YWPo5bAEQZ53xldlVRsKm3KrG17yxZS8muh+1Cy/aO8Ijb57EUxU9VdWSbY4GNAvODt3FDDlYEMWmVvr43Dw2xN0SzdGFsSATsayNcOMI3H/y94GtZrcAB/SGjZ6JaFXcPj9ByqPt83pKQ0= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e80d3e2f-e661-4467-f676-08d9b3edf88a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:41:31.0811 (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: VJxFm9HJc8NrixkPFoOeHCzftOD/NF3Wy+oziXQutnirfyTgbqCCd3j5gREduRaXHOVV+BMPOK2aKIcunmizSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 disabled use of JR0 in SPL and uboot, as JR0 is reserved for secure boot. Signed-off-by: Gaurav Jain Reviewed-by: Ye Li --- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 19 ++++++++++++++++++- arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 19 ++++++++++++++++++- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 19 ++++++++++++++++++- arch/arm/dts/imx8mq-evk-u-boot.dtsi | 4 ++++ 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi index 3c75415e8f..83517de52b 100644 --- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include "imx8mm-u-boot.dtsi" @@ -72,6 +72,23 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; + status = "disabled"; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &usdhc1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi index 1d3844437d..d8df863083 100644 --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ / { @@ -104,6 +104,23 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; + status = "disabled"; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &usdhc1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi index ab849ebaac..f3f83ba303 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include "imx8mp-u-boot.dtsi" @@ -67,6 +67,23 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; + status = "disabled"; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &i2c1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mq-evk-u-boot.dtsi b/arch/arm/dts/imx8mq-evk-u-boot.dtsi index 2cfc12b7e0..23a3ffa18f 100644 --- a/arch/arm/dts/imx8mq-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-evk-u-boot.dtsi @@ -8,3 +8,7 @@ sd-uhs-sdr104; sd-uhs-ddr50; }; + +&sec_jr0 { + status = "disabled"; +}; From patchwork Tue Nov 30 10:40:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561509 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=a9ouODhF; 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 4J3Jgg6Y9vz9sWJ for ; Tue, 30 Nov 2021 21:42:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D089983094; Tue, 30 Nov 2021 11:41:50 +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="a9ouODhF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C60E182FB3; Tue, 30 Nov 2021 11:41:44 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0600.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::600]) (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 2E87682FB3 for ; Tue, 30 Nov 2021 11:41:39 +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=KSkNxpxljwsLUwrPLtNUddsc0mY8gMKWl32b23NYZJtolkQhZ2RqdFlhCa+oHRjZBfi9ZiWdhoXvdOy0XxzP0L7GsvZs6wBUefuQIs9hFtAA/PfBfPafJkt+6qVnBrn909g0bzpktpQIpMjIgPJbK70VJ387kA04E5SSHKYnhkwU19LJFYjjLYTmyylUNhW4Qg5bI43wR4A7bQbz3aZj0/yE/u+EtgOIpCKbFNbLsOfW+luRpZ0dwgqrjB3hM/bUy6kBHl3l4zNSz0rDZ25t8SqpVWwOOrLt/NaxWDmLhq/3VDprpNAeCuDMH7UVE9CnzZT+GU3dXF0+UUnSzJoB5A== 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=O7Nse7X9QxRK6vuMehmmwTLK7iHhyroZkdadyoUvWLM=; b=IouFQssjBz/fOFc49sdCLPh9EhtSJWnBPh30Ty78Y9VDeEiu+8Prt9xYEZWkNVBwZHdOq5o2OiR7hJFhMSk+r2P8JbvICXgbX2SKetsIQdmmZMvQCWGKFeYIApfZEPU1MWC0QQD6Du3nx8E4f3aSyD1Z/PY4poby+a9iT/86uzOuxO191i3vVT4XAcsN36EQhCY5wCHECOqyp9/hE+0jOoMlUeygCxbaQgRlXYO30QPyWZM9ahJAgD1++EDRIq12QaczfbtZ0WlaCaJMFsogVJQjjv5C1/0ukP98umDjnUiIdG3PJwCR//RxMJgvzKRuCuUML/cxKFGqvdKC4IF4oQ== 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=O7Nse7X9QxRK6vuMehmmwTLK7iHhyroZkdadyoUvWLM=; b=a9ouODhFT2iCYPzWP7bQEoUEvRuD4SFaMCgT5knVpRapG12K0uopZLJfca5FUKd5PfbXPla0ZnCBkaD79s/F78l9xJGoRMWQcmm5DZP1WEqu/Ejz64WwGDDtmsKDIJcYr/0LMyFPJezv5q/qs8UCDF6y1qDegvO9WNftI9EhRwk= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:41:37 +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.4734.024; Tue, 30 Nov 2021 10:41:37 +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 v6 03/15] crypto/fsl: i.MX8M: Enable Job ring driver model in SPL and U-Boot. Date: Tue, 30 Nov 2021 16:10:36 +0530 Message-Id: <20211130104048.6207-4-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:41:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ad55344b-e5bf-4d3c-6d90-08d9b3edfc52 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: 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: Y68Ka5leUvtW3uSgacHzF4kxP2ikwh7+URtuI2BsfsxpSve7dZgz+YfOa5IKM5yd53YzbM6x5C0viRQXfiwRQEV6UTECv5pm2v24SxaiGZ8BKcEiOicae5ZjvYjCHbPdFi9CInvfZjPUUXRRLM1liEFY7v9/WAoKusOBQbeOnYZs/ngs+Vh6G+gDfaNsAR3Yph+BCqILnXWtMkIahBInaOUKXsm8gTItx/ADOiRQURO4OyJmf4mTkyBW7OVvBgu4AS0BWvSbqXo4MNoF9gayEo8CUyv65BSMnFiK/WwfAYn8Z2VNcr5ywFn9o0DOPCodBnITWAcZza2NUps5OFpb0CWUFPzmDQCu85w7UgZkQfUPd1r1yUApMN5IRRSG4WgtD5KHfJej2P3MiYKGvQMOjRBhihO4L9YTHcKDlAvBDyOOt68UnQbvjwqjJ7qJHvZXoPseiQauqRxDrjBwb0HKNBvG9l/yPSE+pKYDvz/fq2Uk6bqSJGxjGFx6n/IG995ESujFUkcKd+X1GxCskHhIXUBlMrNAYPGl1jJ0hwBea9ogESC3I+x7IJD4A8m2DSpzIj6W3soYpPcH8DgaFfUeq6lMgpqcHRg0S+ZgHUyhr4nnh+PidihF97PZQgOTZjFe8OAykqqLLe5FuyPz010ZCx02V956vZ3/87Rqg6TVq/gYks1dWfbO/ndiThEqQXrOLS0vyoieERaDY37vjcg4JN5aj36wr47LwVcEd6UtrlbjLInxbuVN8XUOAvd1Mx7r 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Bbco9womY/Y0FhXDAf00qDs6pJbC7vDTHKA8VuZYn2ByyjeTBSIBM2W4N3pvY0jhX2wbZzA1xJPSQojNVn6ir5ckIhdLk2TuNAcldHmhHL5IQCGyT6tND7CB0C7Gq+m7Axx0x1WFAVp7gH1GCx7zrHyJj93959X0B56zqww0crKOvfSnP9EtTMHCkpC03pbfWRnGmVgeQUdn3P/3T6A63FEsh6cISrufHVdxjXZxTROmjQ/WP14RHxzYBmUvR3F92CihASlA/zZm/vSxtXvLqZrPRYrMPo3epgcJvVLS8YJBxuAf9IX5FXAPFkwplOxHDugnzFQdyqmrKZTWpIkWzfWjGb8g11r/3DPKEcRkzJZ+kO0PS6dx+HXGgRs0JPmrUPUWgybGkDd4WKFwW1LSrrC7NOWLXJJ88M3UjFOhrVFunhoXJFIrk9vo96plcohpo4UEULAVkeWcsOmqTzssq+bfRd2dfKFdpQtrji0PSB4Pgf23DXZTNqbCVwmUpFuxfNvgU3Pup5jnSNWG2E+2GljeSEJV/OTlSTpYrtANgKjZ+eokP23tvvxC9rZxrvFJqWJ1EVSjT4FARLFBdpE2mju74TfN6aEE9B/1sj0UL9YyotRJBTiZxMYkriBfI+U8IeVxVed6q8QXM43PsPnpaBMuu8Ddvrigl61QtXL3uDXLZN1qt6Zbd55q8Jrjj0zi6leXJbphPcEIaRdS3z28MWV5J3op/zk91KMa2bhMvfjhEzEA6qgnT9GMcK174JfgWCEH2dUpC4sQm7AnDFMwLHrKDQ5R90T1+w8IMw1WkVYe1ft8s/shHf69OxTM7XSKJ+RN6oBOrjWUPiEZ2d/J29LMORFodbbUT8d7i+wXl356N+tDr3/q/elqF8/Y2j2W2oWIcFjbkl4THXVUZ1Bx99blHnpfjxkxX5nn4RUEt4i28lpYonKo1bzr3MVptHk+O1ita4efWvWCZfdIpKOK+FXMjRtHCGY8ryYtIEM6+JrGA7JCyXHuEGy6cHsrGz2/dJLb52NHcXdRBaknJcfWtDSKDy5KG8Jtd1lYaqPzHw3wh6MIzxJEis1YBvL7z3JKdcxeKiMaOH0RaIGkIU5nzm+gdpDAB5Xs13LXqXoeyVXZXuWBxAo4nhCS+j5cJOdIah0hXn9W92twFwgAVGz053VYbd0PnM+Dc3+KCd0c1CWcMOJa6s5tVn3sMIw49PMYjr5K90c0pUqf0nknh9RvJAFc4wGWvZ8WWz38/WvHUhKQC7Fi2+5zgZXxYoC8Di3z3KsZK2C1ZmSdnOiTWdMrnMnySweQB4RUfz0Pd8hVh0PXh0tmSczGSMm+5WbdcJ9Fpn/hCWrKqNpSjNV4qf+IRXMBsOuxkxBDd4+G0+u6YZVt44NS5HgHQb52cbloct3X03qsXoMlaAKMt8fqASVlh6Y8BhkJwRcKG/cZ2cuYWyju4Kjd7YDsg2feqMbE7ZhR6o+r40pdKrvCaUE/EDNDtCQuTlY39ykbUytspeinVAG8MZKLCT+F4SzmJs/aPbC2JRPWjsllqfo9dMPLoO2MGfQXRGiHWksFkkNG30d3BY1F/4Ikobet3wk7Cdn5BUAhqyaYw7t90Zx/Jd8t3dMqDfxo/RjTy6eYXWxZf7mYgP8= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad55344b-e5bf-4d3c-6d90-08d9b3edfc52 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:41:37.4175 (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: p6w6Yb7E0MpOV80g3PP02BnqRqtzCK2pS4sW/jk675/ATjrKNq27MzAZaJ6N+qD36486dt6ZlhT1YAJDKMqvxA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 | 23 ++++++++++++++++++++++ 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, 78 insertions(+), 12 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f7f03837fe..550f884077 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -815,7 +815,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 276b8bd974..4988171d2b 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -38,6 +38,11 @@ config TARGET_IMX8MQ_EVK bool "imx8mq_evk" select IMX8MQ select IMX8M_LPDDR4 + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MQ_PHANBELL bool "imx8mq_phanbell" @@ -50,6 +55,11 @@ config TARGET_IMX8MM_EVK select IMX8MM select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MM_ICORE_MX8MM bool "Engicam i.Core MX8M Mini SOM" @@ -88,6 +98,10 @@ config TARGET_IMX8MN_EVK select IMX8MN select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select FSL_BLOB + select MISC + select SPL_CRYPTO if SPL config TARGET_IMX8MN_DDR4_EVK bool "imx8mn DDR4 EVK board" @@ -95,6 +109,10 @@ config TARGET_IMX8MN_DDR4_EVK select IMX8MN select SUPPORT_SPL select IMX8M_DDR4 + select FSL_CAAM + select FSL_BLOB + select MISC + select SPL_CRYPTO if SPL config TARGET_IMX8MP_EVK bool "imx8mp LPDDR4 EVK board" @@ -102,6 +120,11 @@ config TARGET_IMX8MP_EVK select IMX8MP select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select FSL_BLOB + select MISC + 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 eea2225a1e..a99792afbb 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 @@ -675,8 +683,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 #ifndef CONFIG_ARCH_IMX8 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b9c1c61e13..81de1a3793 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1848,6 +1848,7 @@ CONFIG_SYS_FSL_IFC_SIZE2 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 From patchwork Tue Nov 30 10:40:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561510 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=JWpCDySM; 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 4J3Jgy0lTJz9sWJ for ; Tue, 30 Nov 2021 21:42:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 51925830A0; Tue, 30 Nov 2021 11:41: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="JWpCDySM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 18711830A9; Tue, 30 Nov 2021 11:41:49 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0631.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::631]) (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 EF88A830A5 for ; Tue, 30 Nov 2021 11:41:44 +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=HR+He6tq+378EHCL+DJ0JmTO5OyksrWDl5m+dkqvDuI4sqXQJ7p8+55O5cHj1T601SQJ9xfbkVgQYNvCjv5nh3P7z6Qsn17aJXC2UPRx2CuQYi4KVUQpU5KUSlT1Oss77LxWX7pvbvnMt0uypQOR6BtWcj+RKIP10sbfdTGR/14by0s5vdvA/G3aixSaZCN6kR1YLQpsGia2K6eeFtchEopuGWPqghZUqY1LUZ/4qZbjFdmEhc241GeiDliyW0Crfq6GgNKPnjQD+k4bl5K56/YiMKlYUQ+ygaF9tJ1SI30acNgw8SuldFkBPJGAzdC6zuOHBDlWWIKDKMHGLH0/1A== 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=nUcyiC9wMchVcTPK7AEtTwgo/pKy8WbXdWospDEMVM8=; b=a6Xrjlg+uBWPQjxTp4zMfXgYDRxsZrXOdR9y35ZvihUsLccNW7Sp44DejsmWwNqRLqQho/pFlNmpQkv5qFi4MU28rTg/5cJ1ZDzNE+BVwQTW6NnIXFAr6fV59LGNTRgMcRAjZrOLRv2vyeQDvsJ9hxYgW2oiiVkGw+AFLBalyMAJoASPeb9zgr9H0TIRRG66bcczOP6BKOb6OdOHb6nOsb/rNs/djJ+Vtfp+LKi0gpiWsZyu4cGo68d1XI0wSgd4XM8UZulArVpaqiVp0WkgMfW8evGGPxopxQq1SNQU7fFs3o3kmBY6u7RedAYDeDrA62ASi6WwniY0ji43qMhDHQ== 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=nUcyiC9wMchVcTPK7AEtTwgo/pKy8WbXdWospDEMVM8=; b=JWpCDySMNbjxZ1lGmwANqNvsEhsKmJd+UBc8dOzU655JfXZjT906kfIoDy5yKRqDKhHhCMmespwqrLoAlr+Qpq6jJ/gu6LeaHj5JOc8igq4iGc2SCPPqZv9GRfL/5Rq55lgo2o6RBBa78zEQBAkSFIg/tOCyHbIe93iSaMd53q4= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:41:43 +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.4734.024; Tue, 30 Nov 2021 10:41:43 +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 Subject: [PATCH v6 04/15] mx6sabre: Remove unnecessary SPL configs Date: Tue, 30 Nov 2021 16:10:37 +0530 Message-Id: <20211130104048.6207-5-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:41:37 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 00c5fdce-ce99-4020-8ff6-08d9b3edfff9 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:139; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ZXNO8+luTvTRWKU4eH52+Lj+5CI0JK71FU++LxhvzwJ1cTPKhgtn2WG/NjLlxHLiF520rEXuh0l9WepU5UP/b4LgDkmxB77yw96qgUvkQOz3UwDokD/z2JSFArR7OMlxoAiVRhUxwM2km7MryKIIY+T6ld9gE2I+xczJiAMQ/7AizAhpCghwiRbJBbKsltoIM7TK6CNN3PrC6SkjNw57gi9tqlSdZA47h4cRnfxG7RL9akJ8FiJGWRXuNNb+m9u4V6uXgAwWw3GTSWUD4c8uaVlbot+crltpaiUExExZssVQUeoqUSw9fwNkIPne1t0OH9kg3V+H/IuScho32nfR70JGfwvJj/qgb1nLPPfm43a31JIh4hy2jk7xCHyynLsLST90Xx4eZ7lm2uZ0WUhIhRlcqu9RDBKD2Zrp4hDlmtP1XkoHqq6xOhkK6Erfmjh83zxDK9DjOVs7hH+w+x+pEpeEzIs8JDD4Gmc8SkMAJgz4S57l13cQ84PYRc+FaRTB0eRkvG0ewdP/gZiV7ZhDpSVdi4dwnZ0+XO/5Scv93j37xrw+W1Wj9fH4j67KHpYzavMLyXPlIZmVDW08A7YTPhEN733zR0pzyku41vlug04Y+hMB0btAkA5Jyi19vocJs+lNZBJj7y28JJd0aqU5LiOanU8fmaeIlI0pMSN9Oj8rM2JIGjXU39PGEeRXO9Q83st5WGFWmqMWAj2sukotzkwHD8uma53eUdd9Y/+hOzk5mFHcomLPvZxAC2tUGyZr6AcGWmILktqSYJ7EVbkchA== 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(110426009)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: l0mSGl4gEc8a1lLFUb+wnhrWkFXQm8cd8cQFOGkglxvyjaBzztV65lsZ/hqDTfHopQonB4jMVcgtyTSNpjW9gaTe7TIsUuttarEu1kZ9ywgLtiyf/zOhIhNQbfyv7HbG35tdPtKhG81h7g3/paNTw270Qccjb1vUvYDnlgZvY+Vp1q/+td2bRK8RtooeYVahfxCpcVCzRgI876iVhkU3SB3coGExSXRmrmfjQhZCZGFHppIStcCBeVsoSRde920bvpe1bLX9M+EF/ySNwDs2b3tv0cmr9jH4obDRz4bNP/7VNyKLomGT8BFt3ZnVN9ak1Z04xCTWhpEDKJJK9OcOFIb1j9Mg+LnamvYa6I9ZLNcTC7j3U27g7HvFe4eowv3tMEtkpIwGxuJ3mjrfR0HEKZFWd0CXhI6ruqwSe830OoB+jaEhn0REISMq+/DEAzfk45RggkRKFtVlQ5oV9eHuWjvaZfv+a1IXOfJVpZm+1dJ0oTGkb4OT9Mx7yBx0AZj8jCCEGbIL2C74wd8nUTQxUrkgbFBVpVSQcuoDV7ySEWsLopsR0AaSSaGqVXpT/JkjhYll5L+LTuh6TaahmGh3pyPqlfbGzkRx1qHnw0wuQ1Hq09dwmZhrLM8q2a7eS89L/4xKkKYvXtbZsU4+jmB+kj82gPK5xGms9McCL8YjO/sSj6gBm5d6/2RqiK+eBX8ZodXZbr/0F2zhILCRiOe8G59dyWv+MKpGHfomqJ0A6knQOXa3D2N5txPSnPPF46cnYlu70UZMUWLvsvCYKcqGTW+WVy4eAlZnbuMeIFbU2ZkVJsYWnNOuqbKxE3c8FAly1Ca5kBIBfGzhnu6PoCDH3gqVmZR1B1XGuLc9sJ7t/QJMOCi4c6cv6yFgSNkFoHxSf/5uKBGmUPhzQJhTAAoxHSRYmFck3BzwWSwv7a7bVffTw7KbH3ggwV2C2ad2CxcDg5mO93U1cw001Z4+wQTOBms3z3nt1xWCTCpaNmgi3dorOuZ5i4AiSPo8eM/FP9SkRdw8qbZSlfhkEX5iav11e7CKn33m51SIxAkGc8Z2p7MDLvDeLbT9xX5IP+0QCKlFwiBvs8o2g1xzpoeGac5pz9Nr2AyH8LlIDMxYfNAqMmQ0oJefjzpSix1FDMs1aVy3JqbjECPHk0+zU/WsEgo2xY/tRRTe9/acEy9g0cvGvKxjdMzAHghFwzcdYegVeSDQvJg6GIiEWWxfjJ+cUmONE0yolkSi9YxmWJ3Jra254R9Oe8mXjKNyw+C7rWaDSM78oV9UPg1PpOB8ZfXP7RlIckXiZ6KJGpC4UiSFrRDbOBWeeqpu4vpWBoZZDvotNmwxo5B2OU5WIqjhU/B52kGizxZh39UvdfAhwpB+W6FWraRCTiJXAjW+bL4gwhCESnyA9ZivT9jGYotLf0C/Jbg3TZVyHQxpH8OfYXyEc2MQW0a31dblCQTZAvAkS2EAUO0tfK6CFiprjhkAPHPHqwMgS62i/XPp8YxXR96h/DtOoQHTrqU81jnIplR87i6zgh+ER02YtqwIaeODIRQM3MJTHec4yfEuMQ8rmjEnIFZ8glU3C37X9gW0C1gRGvt4xl/txgQd8xRyX9xSrE9AbgpwTaXaKa0xIKR3A+mV4iCTk3o= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00c5fdce-ce99-4020-8ff6-08d9b3edfff9 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:41:43.5320 (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: O4F3RYoEDonojidb7pR5DtzRSM92DoewIxOUo1JbebHU9fbumGQLGeo3hJ0NVF6zuGkqEsTtKwzL8nr8gYma2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 From: Ye Li Because we don't use SPL_DM on mx6sabresd and mx6sabreauto, so it is unnecessary to have SPL DTB related configs and SPL_OF_CONTROL enabled. Signed-off-by: Ye Li Reviewed-by: Fabio Estevam Reviewed-by: Gaurav Jain --- configs/mx6sabreauto_defconfig | 2 -- configs/mx6sabresd_defconfig | 4 ---- 2 files changed, 6 deletions(-) diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index c5cdc3ac17..2b8b4f6b9f 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -60,10 +60,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="imx6dl-sabreauto imx6q-sabreauto imx6qp-sabreauto" CONFIG_MULTI_DTB_FIT=y -CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 6733038060..f40401d279 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -63,12 +63,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="imx6q-sabresd imx6qp-sabresd imx6dl-sabresd" CONFIG_MULTI_DTB_FIT=y -CONFIG_SPL_MULTI_DTB_FIT=y -CONFIG_SPL_OF_LIST="imx6dl-sabresd imx6q-sabresd imx6qp-sabresd" -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y From patchwork Tue Nov 30 10:40:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561512 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=sedzl/Zt; 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 4J3JhD74LBz9sWJ for ; Tue, 30 Nov 2021 21:42:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 85DC1830AE; Tue, 30 Nov 2021 11:42: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="sedzl/Zt"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7870F830AB; Tue, 30 Nov 2021 11:41:56 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on062a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::62a]) (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 5464C830AA for ; Tue, 30 Nov 2021 11:41:51 +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=CSufSUVsQw0Bs4G/qsYB5sq5Dgl1yFytXm3SfnwH03SZPtCeQ+cQSZIcbbWixIzwnS6tnrM69XAxOqzYrEW9M0zSIe+4QJvSerhcJUFi7/uMDyXQ+eiXtsLeqiJDU7IXRZmKSKZ9e2A5+RlzJyjxcG9/ieUEqh0LGZs49QO2LBse3F1tLW0ShT/tfOiQ/e6wnutFqyI0UXVB1V6++TSaEizXz9Sp6GE+Ces6bAQD7Ojc3FRPml83pn15FBo1pZmponu2aU1045IKANjtjF0Jyrx3IkaMO+wJ3Jx5ITrFGG/vPMH186C7Az55sRW1KC9jImJMt8OBYyAT3dHpcc3jhw== 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=Gv7bGrYat/WR/IhYkYQo54oLiCz50JdbS5e028ky8tU=; b=c1JQH3UsavSt6Gn0iumNqnxbRe6227I5OiRWjZMVZ/rFHY6cGpK2mutAOQrF/5U7WnNUaoqEQgwATrobrh5qNOfsXGPT2N5M2bHRXzOHMBrSynBsONdDzV5vYMV3e+MzvPIqjwbVznHCDVvS6sxhOVvoXzaBI06UufQO9olKE8oggw8jBp3pmkW/9CDdCUEw6J+eLJO+ZAZHzGKPDB93PQM1h+4tcn+TfqNJxRLqb7Fyr+XbWYETerruxlB3SS0IUfFCcYC8U7cA7ftW0g+i6Cof37cDm33Q6eXJQGNEbE1Nuc7K78qNpCUDnSZsfUIlzN7jug/sh1irjp2EUvPC0w== 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=Gv7bGrYat/WR/IhYkYQo54oLiCz50JdbS5e028ky8tU=; b=sedzl/Ztm9+HvZsgPWrknTcKf4ZGzU7ObxULDIGlNVZ2TNnWT3GROP0UsvybCesPMb2kY20AqYd/KlJ6JV3cUd+uDtz4OI+PSL8TfGd+1FcHKlflXBQO0mUEuVdWTWI76jOe8FocLii4YAcOrtjkZZlZrXS86cjYfaZ2HigP//8= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:41:50 +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.4734.024; Tue, 30 Nov 2021 10:41:50 +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 v6 05/15] i.MX6: Enable Job ring driver model in U-Boot. Date: Tue, 30 Nov 2021 16:10:38 +0530 Message-Id: <20211130104048.6207-6-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:41:43 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 49575a2f-a1fa-4ffe-dc15-08d9b3ee03b9 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:480; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: odujlfyTaRa80NY5/UyedtuMc5i+mWzrqBurvoT4egOI1+s2QrWsgIFzdIFVk0B6jNIm08qLLk6RrDytWMoFCSCjJZoV0NkvQbcV2666colzb1IGRFf0S2CNbij63VvWB+oQj+Ji+hn+qsGGsFYqrszuZYeBoDfigMCBxoQ7QRaX0mIxnRg894XjJozToydE+FHbc0ylxpq83Tw5jPTtcc8dwCeAAtvBrcS5dDH5FvUTQxV9qFE1sHeDgTnhff3TNaia1QnXpyFXWZwNc/CJtS+hvZi+ANmPMmZ0y2AsqNWnVTxJtfDJxLNlLc4deQ3xaw/GmYSdRmw5LyIeorfY/GNqTAf+OSjfTKU/5utWdZdDAhPTrClOvxWJ80d6Kq+Nwt+TXIV1sujiDjrWG+QdGMKYSi6swuVeWRQLlPdwrLnX8yvOHufqQ2eFktC69u24C2hbtyohcUZuVG587FU/J+uqMFJx4eItrMOe5UpJ+pbFgsGilwcyHeQzW5V1c+hhvy1P5iGj8OOqRv/eH788uA2LQkNUvAucWyD8dR3OIziuS05NsXPSIJqvP7M67h7vQF2W6P+CLTo1UXd7aLYsV/XA+5VQ/LEs8msRB41EuV7UW6+eZVUvh8cgFS6mAfCAAydXctr6wsQMON1ktJv24uHgMILNFd6+7r/cSBs7epTGB9OPv+WoFa5AggWpUEU+pLYZBLZ5wufI4ZdOnmrXFd+raC/LnyuzlTC0A6zFQJP7Bxu1NLkOgbliSqQMex9i 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(6666004)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UrdTZ4GEa+2RaivzbbF4J26VglMZoMQzy+u4aKnN3r9SCKMpfmE+Bdx9mW8JUlxK7/c12f35vrigSqJsaaNBV/egofmRtYRloTyoXAeOJqPy/84a2r65OCglLXM9DxXMK3jS5pEwmu5vGgu9xUpiOrB7JHpbwHkOgsr+b6uwwp6WtxTj41jUZ26XgmCK9ZJxanuoSYNEPK4St0jHq4qk8BIzXV6v7SEdqqG6AaTUZoXdO6lkk0LwpSMIXDNLwX/aeDxFff5Cruex4wAD5dnTvBmUJaYDe7XhbTkbkxNN/az4Pqblfu+OUbkFpTiBCqcWbBmiH0BY0SoQbai2I97j0wG5mIgrqRZY4TM+QDvKf+nV+JASrWga1k+rlbOh8bTR0naBD6feUo4xQj38uBJHCLHI9i0UAWodhPO2pVx7qaiq0fSkHptxCydplI5rjfwNxLItn1KpO9vtDdb1syGeFUfuXilWueGguV3Wuzx7utWNpDGxOwPWGQCIhluYHbsuYEP2zog/G9sQx3LKqAPp0PksuliQVER2S9esLYOduuwk3eKbhWi98dZ96kwNB+QakJ+YZEki3MBios+3JdK3DyceiJuESN+PZ38W3rhb+urFDX5iIOvKCh46IMGVk7ZJRaMeNsbUveoxfC7olgl96NB2i66Rufjw1EUkZNjecHpxpnyg70X1f/O3NL3V3Jm9ttW/HdYMyrXN4KivIGYIjdds2SQtHT2J//dGUVbNJGVzJTfJB2JuixTBRF5qiIAswUOkZn29H7uacoakP8NKfz8d8/C/Sw+3KvVYVNCfgFxtFb85CuMttfNiP/CcM0cEmYlaQ1xF2L0lqUbh6AUCdX5wiKQ6MJ+VMFi8ikJ10672LRbS6lOKSbubK4eXeOURkQjVQFIuKHuHSACIy7TutT6W+Lj9Yep6qwaD3mxH/eKEMPxR3Cxat7hvrHeI+NIFw5Md6+YyOwJKS1wNvT4ByGh29aHBEPuO9Zc/PMbzcrXZmV1JEj6JO5xqF7Of9UcRN+aHOdjcGMYOFPqvdL6d3hYTnayqIBf8+nO0xl8O4qf0ZdtzmZ2UEZ/Rndgm1poN2eW44Wboh4VEFXlkK+fhVxDw3/wtb8Ihdym1JV8I62AOpdrdnBVrNIl02FVGXwu2DN/3ifqCNGY9yE+yUI4Q8SEf2Y4oTQVknDqnbTs7+cbhI2gYqpXfehO7NQn1BfBA3rfwDABPlfsDanUz6YawJyYptrK77V0S6l8ixokM3zru0T1zXAPbFCkPUShstas1qB+TVWGQ8t3VFMIzUOkHb1Y3YeCrRuGDfEXnB9on3a7BjULOmb6DLXwt/EVJZA0byYY49afqId9uDFHe8B9FiRgw/ivSEGSaQEP83VQE86AnOygEEtl4BQRbQJhLmD8702jzvAnjAJaphOwSIHAA6cX3tl0HMdJN/7SQcDCEsJj9RZ+QSlmXwxaZZTqlXWVMU0eDyTjuhxlcmDtVWTKtGExk9l8ihCdHqM8oWoIBwjLOST+nAkKXlmZ4zQPSKh0dSEsZwCARdpOy0joZC5YxH53rvdmKyglIILaGT9CxbDxGqyoAW3Vc7XMXxoBtECPVXGq9GHlsuW96VBHtCd0tmnsWBacp5G03XvjvWBUyLIo= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 49575a2f-a1fa-4ffe-dc15-08d9b3ee03b9 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:41:49.8134 (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: WRxhwnXJ9In813zA4C0QIa9KAbjD8zSgayQ+i+8E7QM6njxU2HlvV8r/8rLEAQrNx3PxVbv1iMKSUY2GffTxxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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.MX6,i.MX6SX,i.MX6UL - added support for JR driver model. removed sec_init() call, sec is initialized based on job ring information processed from device tree. Signed-off-by: Gaurav Jain Reviewed-by: Ye Li --- arch/arm/mach-imx/mx6/Kconfig | 20 ++++++++++++++++++++ arch/arm/mach-imx/mx6/soc.c | 12 ++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 62de942a32..8b4f8a2098 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -354,6 +354,10 @@ config TARGET_MX6SABREAUTO select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT config TARGET_MX6SABRESD bool "mx6sabresd" @@ -364,6 +368,10 @@ config TARGET_MX6SABRESD select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT config TARGET_MX6SLEVK bool "mx6slevk" @@ -386,6 +394,10 @@ config TARGET_MX6SXSABRESD select DM select DM_THERMAL select SUPPORT_SPL + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT config TARGET_MX6SXSABREAUTO bool "mx6sxsabreauto" @@ -404,6 +416,10 @@ config TARGET_MX6UL_9X9_EVK select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT config TARGET_MX6UL_14X14_EVK bool "mx6ul_14x14_evk" @@ -413,6 +429,10 @@ config TARGET_MX6UL_14X14_EVK select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT config TARGET_MX6UL_ENGICAM bool "Support Engicam GEAM6UL/Is.IoT" diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index aacfc854a2..fa6c3778bb 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -4,6 +4,7 @@ * Sascha Hauer, Pengutronix * * (C) Copyright 2009 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -23,7 +24,6 @@ #include #include #include -#include #include #include @@ -734,9 +734,13 @@ static void setup_serial_number(void) int arch_misc_init(void) { -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif + 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); + setup_serial_number(); return 0; } From patchwork Tue Nov 30 10:40:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561513 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=lRaQiRKU; 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 4J3JhX4QX2z9sWJ for ; Tue, 30 Nov 2021 21:42:52 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2BC57830BE; Tue, 30 Nov 2021 11:42:12 +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="lRaQiRKU"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E48808309F; Tue, 30 Nov 2021 11:42:02 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0631.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::631]) (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 E05BA830AE for ; Tue, 30 Nov 2021 11:41:57 +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=CF+ndGgUsr1eQOEZnOiWa8xtW4Mqgg1/wrlE7GcYngakWwNDWKCQ3qIH0CbKe9e/t5x6JXH5lXZpSh3WD0/TO4zDIUmtOHUk0XvlncbagMygtcDX1T1iPDHjio0WbAloiwHJ0+PPQWgQyB/k2oCjb1M8RrLpsJv6PSWAgg7ADmNmTn7vT4vev9R/MaxcA0o5ssJtZWnDil8cZHcb9dX0sSwM75aB5YlRWh2dd9w+ZmMsiYBu12WQH11K2w/fFrFhyxGs2DyqRW97rdw9hdqWm+feDMMRr/lmCKUpVuU14aJHHjj4PnpWRSKhJmHLfFIYS2TL+eAtgSraCsLEt9CoXA== 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=FeHPkY+Nt8L+JXR2i6tfnHw9BXKFEGj/LMljgrf7ozE=; b=GZpfxX8Nnrq9IHGpzo8LWy/TySR4kb9L6DPh6CnQlZwur6cPpjRQIdFcmLIoKO5P5u0wfrn/nAWRHs9Mo5phYjbFdT2XX0KlPlQpBXmS7A5cm2qfbQQyk5com9/R0TTtRXm7DtIVMf/U9c53shhInwDHB92sWDRcPTnutPpaqHL0/kg/ytqL3OBi8Ks6dW77sYusPof9nakso3NJyQbjnpUOJuzQpnUJkZuDLVMjH8XMbvP6wZdK4/Fic/PmgrKAcgX6BSFr46/Sssx1lEeCvJmyRl0P11QRKmSp481GXr0MSzYRsPpaYiq94QEt7JttpcWF6sq2dr0Bl+FlK7kAFQ== 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=FeHPkY+Nt8L+JXR2i6tfnHw9BXKFEGj/LMljgrf7ozE=; b=lRaQiRKUEYYjr52gjbqyuZT9d7fyGRH4rDMZXgL/M9OfbiOpBuTd5AizzXdHE0XI0UHPUfPWd8GA3KVKX1S2oI36GFIwj5z0Rev80AoJ5CD5FXgjTzJTcijzFPxF9Lx6CRmLh6zDmuCfepOYFxsIPWRNzsqf9q4D4GvfswfMxog= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:41:56 +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.4734.024; Tue, 30 Nov 2021 10:41:56 +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 v6 06/15] i.MX7: Enable Job ring driver model in U-Boot. Date: Tue, 30 Nov 2021 16:10:39 +0530 Message-Id: <20211130104048.6207-7-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:41:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f79e9fe2-40cf-496c-f474-08d9b3ee07b3 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:480; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ce0CbRKMR6XcMBDlYYkKlGmDgYDj3vmZfbUrQyAnev/ZzY//3HJY1ZU+HjueBWaZlwBiz6TCIOX7NU/QbU4kmUgl4YZorfDnVp8c2g9eG8J0GnuHG9pVZPEeZyyokoQBlTdo6Lrlpj+UzkVeMLNSTD6r5UQlR4VG674FKB2HfW5i1fLUEiGZhZ4ftx7L4eeEggj+k1dC0mg+y2B4kqKWfwLLCx3uZ+2p7CuqShLbVh6N+US3JVWgSJxQ9e4rchjkwVx29PO+4YgVMhFuitRyAONxVnLqpfKDwr5fJ/1gzGWmDn2eGv11QtadGQKKBRByw6eJQ1HnzWFhndKVSMYdY9O/AX1JI7ctRDqnpHKoaRAhrvghVe6+n6QQGOudPvgzVLVTbDidsvqq++c8IvXpXHel+1qgxekRDUwcrjDif8vP/5cIh3NFhdOV2AmCLpA+TGQHKRsnAItonuwmHnhc+GeS4sVxLb8kWuECIohOosmKwEl+VJL7rugxogAOwIQg5ivckpiydip4Nlgk6NaPm3ZwRCwY8J28AnM6DOSykh4SicnjXtQvoUvu6tKSGHBcDs9rvLBCXCGBJZHVFpjqJkWBjEbc7npcwwAUwO2yYjeNzlRzGcToOXrG/gESLHy2ZPZ+hAJRzvO1ZTjd5acECzArjwpqlI6qrMee5GJrmTMufF4dcnTOwsiood0N963kXS+Rfwwi2fZKFwHEyBT8E5d0HRxtuVnayYwuhAiHcabj+pNP5zP74WwubO5hcQuv 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(6666004)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LRON1JmTzTTuzNSZ87XBQfHKqUVo2epuAQ5bfpBzunkdqPCy/ZfA5v7oKxjco5x2QCKAtNZLkoEXEgXKAR8q95hZAknlix2ZyCwC5rmRGpE791FD/jFDjajBrUwP1RntQuaK9rAKSlc6X2U0Jv+KrLu0933x6B22pWBUAoN43EdjmRqRPxCb/fLOHrTyAAvT2prv+b2NINmydXV3w5Fhwa/LyWjoXX9qBj/McEqkff3FyqWPa2GTxrLcNm141RnQ4uTww0V6nmgEJkMfWa6Zeiqt3J1+2oXrlOdJDFNgo8N5LtrVINRWnMLrCEi+ctjtYP/QbMzpZ1svqJKexipA7+h65Smk+WR0sUs47TLyhnxwU3uWq4FkX86R29cFp59uST2eyxobTwKl2npfxohzDZD4pqB9/7Er3d4kdmNN24WBvTYbuRJh0o1o6HHE2lUMMLEbP7PHNNHEp1a8BqcteA+JSyhxsxTUKzJX1iy8kTZDQ5MBXX23bDANybHU6upNw9b5xjaTw1eUe+g3QIjzxuY9S5UqIOd4tXWsNBvMEzQXQXJ8kE8FEk1WOEzJgWjWke66ciN3KzGmS/+EZY0EtvDHg8aKJEkFv7SfHy02pnpMO+sPNHoPqDbzkVT2wxH4dhQ+QdFZhRLJlZAydGtkLSvfFfbHwl6RDw1a0yk9kD0TwthinDnL2AHp/h5//hDqfun3g7brDZmgP7qbI9YmE0/vIjBBkboDLseFsSVPg+uTjH/7Nm9a6Kk9qODr3NW3rXHumSJCNSw6nzSiqNBPE577X4iiQEW6UOA/SGkDlZ48ZWqqmJQG504e6doaB/xkNnnCARCgAu3E7gBHR+t6SbBmezK8Pk33Hhn7UVESQqdxIu5kqHny/7RrRXCY5cgCAt1tY6thNitn5r/PavbEsEOROO4IyCg2b24JPNPaL99rXIVlp0/Y07EUzCl7Ux0OE90QVoM16ISNtKHx7J1qk655vJXafiL8sr3Gymwy4UmtipgIDCY00DubEmd0vWJSHsXZUg7ziUx7/EhLYdeKc80IEgZp2wPTFWcTo28ezVx7nXjIiEuvE7wym7qGCuIfUaNmukX/wiMt7VQ16nZPniGwXz91VafKRDmkdBT/hvLx7HyTsH4GXBeDm/XWZIkW7L7RfKmFQp04Lkt0Su4VTlO/sj2Tvg9/Uemb8vpumpPiixzBLtarIdz+tZjnn57qYZu4cJVp1WPFBv1tQ9qnnG4JT4cCLFfyJNmb4C+rVJF+XdsEJ2vmjbjFEaFkpoiHfcs2a7kkZJI2kDeLJXLcapiZYqOLV6wkpFlx94o5FEst3TSAMy484XQGGLodvjGTvD6JQiM1Jt81ZZJ5aTrbDkaBlD+tfwK/kSCitTlgmpX6nAEL3PA5G++zs5gqCLK1i16EO3cFTc/hzfa/qJKfrFSQwHHBuay69JokrpzLmHGXAhHJV3oKV1EEy2R56yx+9Ep7wSrEhc2GbfSTf5oAn5ozrAEbKhcxlGdEnLZJCSk9cqWfTBhR9xccSUapuVyshPJoZlhuu2Aay3+2bJRnIZfqGddONwPAsbK7EVIdfxrzXjZzmeCYeuK2Ja201Cbs7TlzMFTqNIpLLA2jIBRWJBvSpVx0fEwvcMoBoFHua54= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f79e9fe2-40cf-496c-f474-08d9b3ee07b3 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:41:56.5336 (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: LIYrQ8ZOqmTbMCo+zLS0wWv0ck3fcy+ix9DLqRz9MBvYgaaypunTKHvs/Ohs/5hs7MX8QKL/SisoXepKMwoILw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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.MX7D - added support for JR driver model. removed sec_init() call, 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/mach-imx/mx7/Kconfig | 3 +++ arch/arm/mach-imx/mx7/soc.c | 11 +++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 550f884077..516e1b5a8f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -883,7 +883,7 @@ config ARCH_MX7 select CPU_V7A 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 imply BOARD_EARLY_INIT_F diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 0cad825287..d8f748a544 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -68,6 +68,9 @@ config TARGET_MX7DSABRESD select DM_THERMAL select MX7D imply CMD_DM + select FSL_CAAM + select FSL_BLOB + select MISC config TARGET_PICO_IMX7D bool "pico-imx7d" diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 21690072e1..6c991a6cb1 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -19,7 +20,6 @@ #include #include #include -#include #include #include @@ -337,6 +337,9 @@ int arch_cpu_init(void) #ifdef CONFIG_ARCH_MISC_INIT int arch_misc_init(void) { + struct udevice *dev; + int ret; + #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG struct tag_serialnr serialnr; char serial_string[0x20]; @@ -353,9 +356,9 @@ int arch_misc_init(void) env_set("serial#", serial_string); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif + 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; } From patchwork Tue Nov 30 10:40:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561514 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=Sc1Gnly4; 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 4J3Jhr45Cdz9sWJ for ; Tue, 30 Nov 2021 21:43:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 74701830BA; Tue, 30 Nov 2021 11:42:20 +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="Sc1Gnly4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EF28883096; Tue, 30 Nov 2021 11:42:08 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0613.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::613]) (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 5C458830AE for ; Tue, 30 Nov 2021 11:42:04 +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=OAXFGnJmHdx7lYcm/jP3CVT7Gu6cQqx3UMBB1j2NgFEAlxVTH9ImkwiR5sSuRFdNu0GlwCWG9V4mxmPYY1jSf42p57umjxT31n3poOqVRXLASgnR/DYEq05oSpyc56en5pEH/xAVpvgCEzq09b2RloDvZKD53KNrm6fiv/RRr2BDy/a3Ywd44aEQIU0MGGtWPxBFSSWjOK/rvmsIiGfBpvX71aKshlTqd1bCEWdwtPXrlTiMyjB25XTNPMx1ekImXOrr1BIFHvWOinF4JDO5Dyu7GuHunnBmSdSB0WtOt1LvnvzGmit2XGAAtXRKdu0JDstguyrt4Fb1oxk3w68PrA== 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=v09nHGeRZoU1jSF/AodgCOOWB6C6ZV8gocVJlSdVtpk=; b=muAvNQYf8Itfc4sgP7FxahPehOu9X7tjSDfbpdK66uQ9j123UtSI+Asq5EjEOGtGnAw9he2UJlpSD+NdiErSZYrN+DamFG1KhJrOzgZc5VQEfaZvoXnQ5lBX+36CZDB1SnXwIgABKH8AWT1pffWLfO/Qog8EkJwZNssNReCR4ori7lt5bTlv68YEMVdOKJVgOMM+xKOR8DFtgfA5o8H2BtEwA7BcN1fThwJv+EflSNfAOWzBVDYfkJ9M0z9KpjA/rfQBm5j4IvAoiQGh1oKBdiDvd0HToE1Oy5/fs/S4ekiXxEekJpbK3C1yjaKRLCo2iispQOmcMiHIM6YrF/bk/w== 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=v09nHGeRZoU1jSF/AodgCOOWB6C6ZV8gocVJlSdVtpk=; b=Sc1Gnly4yQx2/HqGr/7H631ke82wPKMWosqYb3E7Xgh7PGEOwLcB/rMjLqCZ1RkSPYgAhQEmecjUMnF0QdmVl5gBo/Gr5qRi2QIYYnJ3ibOIoogaGbtE9WAr9Ns0jMOLFVlxoS0wK8V9bhHsHJg7djY9s5GrbPRbW41NySEesU4= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:42:03 +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.4734.024; Tue, 30 Nov 2021 10:42:03 +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 v6 07/15] i.MX7ULP: Enable Job ring driver model in U-Boot. Date: Tue, 30 Nov 2021 16:10:40 +0530 Message-Id: <20211130104048.6207-8-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:41:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a6a7a7cf-cf19-479c-8136-08d9b3ee0b7a X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F9mDyhWACRufdthmLk8dm6JTvPD0bQnrpAMnYnS/+66yJ/nCqZucYXtt2Ovnhmkp6x2PdTQSHlA+5z8JZ3c6hdgxGoq8OKG4vb3J74S9q7Us/X1deu6Rtb2zcWn7dfVm5B5KtctvAUEnjS6b/8WURHsTCG9RgGt3zwGp2NZRADD8qZWL+bVk4ypwpAD81NKw8Ha0BJ1AaRaf5gz9an2dqAK4ef7Q1xSKpiMGtlZnW+3DRVRLI0GLIabv1969Gjx1sGvUiwBDZYED3Y+m1zvP63LeTQW2VKvr9DsZDPOuD9oJtKtoPeA85WwPzNaMNRbxD1WU5H/LmfnFrwxNDfl2mBSeumn1A7HcSgHgCG0DtOrNtQpyCl047bcaSc0ABeWX+7hmC/cytT0tQ4XzpGgRZcrXtRzpiS6g+/wDqMQB+d29wo5Iy/43OplhCZwoZtt1chPeZaC9zZKH9LWI8hr+twWo+n24fsawwJvtY9aNz8xleCRmvnvxfdKdKDyL0x0PNAq03uDJkk+avOdw9fkJAXD3DfHyhAby0/Gi5OorrA7IDxLieEPiLV+RVP3io4eXatZmTmqeBv+OxYgwUPifRL8bhJB0CdJBs3qaJ467SETjs/GhbdRHsO2GLgKG2eIXQQHo6e0qK0WU48XY/hrQTfdTV0lDRBhgaS0CAM9t+S3t8JmhyfaJVyJ7bK1e5Q/ZtZnPm6GGrqM236d+zGnUpX9FeD5PUN3bsuP4ncjfGmYcKxvcVGHjwfmYSVnPjT5BPtA3QTagBcICiZYqOF2y4w== 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(6666004)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(110426009)(2004002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DMGrNqouzo7T30IstFMW+i6F3shJCJsFxiqq8cBjv04JJluVadpOomDFdL9uXP2yCOV0ajidhOJ0Ng3SsGQmBSrPvi5Zncv4C5Nn1C0EV2HjJY0K6IwOS7xr6sHP8+Tb/1AiDF/X1xNXgudeWa14UgecxlzSP26SrZhSwbTLTsrn73dBYTJESamRXIxrRhcTQdYEw//Oe24/EdpXkd7fv69goqmUn00cO4y/bT4/eCyTy1dCGeQrLcqiXK2ekhnsX9YHYS/S21lrLbHHv+i+uj2zdEJ+JpGD0DMlwY8Zohz/zCGxBEpbLf3nmXB6E7uw33bjNMx9lI9nWN5haHhe1v2T2JCxBUmfOZso17mNEcxZMaX3OGQY0p9gHqrrLqNAqUSNS0cGwaHBRcQhF+v6tDD1g0cdfxFE5D1ZffEtE3kT6BNizFUHGZg1ZZ5qnPMY6zuaYcBGnrvKLFM33UR9DpSsthvi0uOr7wgJevKO1iJ/hLQbdwIPHRrioJ5e3UP4FfM068iWklIrLuHvTm/y8Mw4CPWbMvaQt7E55jkBQjHl0eXnm9Rw7sxCWvrYNvJ7HSSpdPif5dO7nfNAdOBE94bO7+5GuDyDpyQ7wKkossXHsdF8yxRqQFzX7DVGPJalFYpqc2BHUhTh72Yg5X3dNIKFOmoeLZaEvU8q7RelKyBzQNRK6NjiGt8BfF5sNHUEhptqRXQaB+G3QWcJIlG2/HdwT1R9X4AQhU+khU+T0GtFrQwQC1qwzdrY081Xfsx8wCI7eg9d48nEIerNyHc+uW3YQHHnnpfkk8gYbIArhyyAp3OfUvRBaHr4JMvAEe9MXNqS1SDx1gTqwTysxydFi2qasD2D0MmaAP4Bu9UrjSHIfTftLYVWQCwLy7UqJihENQZ4JGrnO0d+SDDYS1FkSK4P4HayHg9hmikkeOlBbdKX/Yyz0Y85ryB7Xr5FtRK1tFEvd18ITjPCdM8nG09jSrckn1QCRaTt2jawowi/GaUovnuzQNhqXfaKzRTGbJW8ji2UbPGsmUME/1qJqHE9TvYHbRlHHPavYAHbRmNWydUTSSldw3yX2wFLWzrSaB5/8UuLfW7XVOc1k/pZIOgryX0nSjt9p7WJANcFj0E/EPv5DX9TnXgjpx55EeR6E8OT7vtEC4kH4Y5kHWrcvGi+KXCkZWFQAOSudUH472GdebguV9WXxh/goHQzd3EasYGuxBxdZwIsVXbOQ5l7d954sGk5stZHO+EGOHaDvt5nKdLdko9Elf59abMTyRqu/K+sKDZB3GAVp02g4IZ+flUsFL0iPgoa7GNm2Afve4TkfewqMicpjRZX5te2uwOhokV053roK05oo49gwNaeDGnM/lOQahw8dXNQ+OtSfbEJkzCMUvCmBXGE7hD5ZEC2F0K2eD8DrFtxzUqcpoXg+RwngbMDpyV/hYlus+01FIGrMIXnTndQYb++6utYMvA4L0okuDyG6zC+Sv88bXMv4LlVZOFGj0oxzlg4MnfDzRjgBjnPC7urrRnxJqqGe/oWJHn7Y77KZ6QDrWJfyryUoAQcP3SILOXGgJqwAF6+MyhCqikWQLJlRwFBxQI/LnN600vnQLznafUTvMVK+IkLD3ADO146wtifN2alS0JjSMJwFnk= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6a7a7cf-cf19-479c-8136-08d9b3ee0b7a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:42:02.8210 (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: /56pYFzW+fFcJ4Yp8XlZ8CzsY6C5hsk6sONscI55xB3Rd2JfCryeqerXPsm/Vl130Rub9fLpgHHoQV27PTomsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 added crypto node in device tree. 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/dts/imx7ulp.dtsi | 24 ++++++++++++++++++++++++ arch/arm/mach-imx/mx7ulp/Kconfig | 4 ++++ arch/arm/mach-imx/mx7ulp/soc.c | 16 ++++++++++++++++ 4 files changed, 45 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 516e1b5a8f..524a2204eb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -870,7 +870,7 @@ config ARCH_MX7ULP select CPU_V7A 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 ROM_UNIFIED_SECTIONS diff --git a/arch/arm/dts/imx7ulp.dtsi b/arch/arm/dts/imx7ulp.dtsi index 7bcd2cc346..494b9d98b2 100644 --- a/arch/arm/dts/imx7ulp.dtsi +++ b/arch/arm/dts/imx7ulp.dtsi @@ -1,5 +1,6 @@ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -198,6 +199,29 @@ }; }; + crypto: crypto@40240000 { + compatible = "fsl,sec-v4.0"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x40240000 0x10000>; + ranges = <0 0x40240000 0x10000>; + clocks = <&clks IMX7ULP_CLK_CAAM>, + <&clks IMX7ULP_CLK_NIC1_BUS_DIV>; + clock-names = "aclk", "ipg"; + + sec_jr0: jr@1000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = ; + }; + + sec_jr1: jr@2000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = ; + }; + }; + tpm5: tpm@40260000 { compatible = "fsl,imx7ulp-tpm"; reg = <0x40260000 0x1000>; diff --git a/arch/arm/mach-imx/mx7ulp/Kconfig b/arch/arm/mach-imx/mx7ulp/Kconfig index 2ffac9cf7c..0d9f8ffed9 100644 --- a/arch/arm/mach-imx/mx7ulp/Kconfig +++ b/arch/arm/mach-imx/mx7ulp/Kconfig @@ -25,6 +25,10 @@ config TARGET_MX7ULP_EVK bool "Support mx7ulp EVK board" select MX7ULP select SYS_ARCH_TIMER + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT endchoice diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index c90ce22404..c1e55e7260 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -15,6 +16,7 @@ #include #include #include +#include #define PMC0_BASE_ADDR 0x410a1000 #define PMC0_CTRL 0x28 @@ -80,6 +82,20 @@ int arch_cpu_init(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 + #ifdef CONFIG_BOARD_POSTCLK_INIT int board_postclk_init(void) { From patchwork Tue Nov 30 10:40:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561516 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=UDUFIwyS; 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 4J3Jj96Bmhz9sWJ for ; Tue, 30 Nov 2021 21:43:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D016D830AF; Tue, 30 Nov 2021 11:42:22 +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="UDUFIwyS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5E2B5830B3; Tue, 30 Nov 2021 11:42:17 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0629.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::629]) (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 8EAA0830B7 for ; Tue, 30 Nov 2021 11:42:10 +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=Lrt2JeW90C1SF/zXPt1hHAU4iQneqdiDvCijeJ5fmOp4Wwi76zhfKY739riSUWHffBDNETDAW+5myBULp7pX3E8Y0DdnVcHvFMS5uB8KaoodEn5wJON7AOM52wXpKQtX53AMRAyRcD7iCjMxM8uL0t/V0L4nOO/m7RKRclzS+wsMWT3BoDTXvvySerAg+AQnCbacMqk6pvkWGjrVxsLFHhcefBdI7jNuvpCTtxvf7gZ38zTsM8SLwqTB+RsiHR5KAv9ia7V0UjiHUMMGvgH26dC7tqroCAL9+tqcTVqBtDvUpvNEm/DwEQBvktLu2/zeVaydnGTscohcoyDbCQaFtA== 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=ps+YaHoRhL1M9ywQsUoKAbCLk1L6kZIJW8zmUAnRr58=; b=J4mLqQ4WaLj6flRcTSoKcpB5JM7RUiGxIlv/qM4AcFrrmUWVhJ0BLlsbxNOQmOnJF/QJVVlwZgE4mLzijHmNC2WMaFPCSMIlNrK96ps73XQC9AynJcvBQgKBQTqn9eOOIElS4m5c6A+iYSlFNejaAwbw5ltU+bYdVjRUpjWQqoDcGT0Bg7OGkhw5vPAVZ53I4LzeDi3UAk964WiSa5N7ydrcA0eSOeAvqGsgdBgQA+hBDoTptN4WStR8IDC2fLNCkiKymF/0NFh4GrNmqVEyt/vJozVVWym2vJl/z44X0cFOTFSi8QwSbyCpruRc6c8l5S8ZcdSEFHnvChqPIJAXCg== 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=ps+YaHoRhL1M9ywQsUoKAbCLk1L6kZIJW8zmUAnRr58=; b=UDUFIwySJh9Lj+bYiRnJ5JV/K+v7hj5Z006nAelTH3PDEsqvYKD5lQgUMVaW5QOI8hpBal9mXKicsVvb0jAljM6ta59kQ46wy6LzNijD6AX8BDW9YilEayNM1i2zAxV/K0vO2bRoyj5FPjK8V6Ai95pfj7i2YyFWW2FZyUFEVbI= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:42:09 +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.4734.024; Tue, 30 Nov 2021 10:42:09 +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 v6 08/15] i.MX8: Add crypto node in device tree Date: Tue, 30 Nov 2021 16:10:41 +0530 Message-Id: <20211130104048.6207-9-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:42:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 919c0b0e-6c20-4c27-dac0-08d9b3ee0f34 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:240; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qjTLGejfglJUlgKdvYfCHmQJ3Y6e9V91bawgAvvLiMUrDkVVbE3521CICsJ0ppSbyFEnX2rzHUmaguXO2+hcSU5Pkat5V9UtC81a9D3kOYyLhArTUo/7kn5zQgQE0uPWtc2LnurB4zeIfaV3naOxlvLM5gUVaK0ljllWyuDJ50edy5IxpM6DAA+OQhRJuyFCDaB8tKhseuwIl6nMoa+wh3Ymoolrs4xQT1HwkO4sveejZKsxBnXinMiz14Ny30w/I5JWMtqBW7TijbD9exAuR9jLkrA2uhmGk3hQg4KIgP6F6T6sAdgErLFD6AlWTOCQgbgAfAkwu+N1b4tdHVAuycD8mfMqg91EFW0cgRbDrO3EVJ7n0o6hMYRZ110ezfjOm2cRp3/H5mlCnBtirFTkzxO9puwhXmFyP4zoIJ18TPO9uoCLcscYBu5PGWsDSGJxzcfxbkMzhtNj/tGQ3lB/sSDwrzSLBarDLhLf7nTZhBQpOhKYu6Gk1zQ8ztovI7ZkrocaNfEm/CT4u9VgFAuYKLEDF2S4c+9ZzUNynK1HXNNwxOe2gjVRk3RZCsTAH047tHjTagbawbIoIs+aHEuqsxqviTYv58A9qXS6DWNQPUnK9ufOygYdGwKY6iaHHtLxQH4bbLY+ciQ4G5Y5S7D7B/pzDy2vQeS6AaSr7OHGEwK+vWJAbiV0gpYIiOeZ7Zll2ud3TQmZh0jnVqI2aEXOwzWVi0cjKBFM1KwV7Ekg48qtVwuRT0NRXpTuJGLozBiw 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(6666004)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: wEQWyRAU/7Jau276neT4ICHJsw1yNoL9LjSHc38WTsrDwiM21XJzFrs/ed6grXS4PvZKBqkw34SCGJ6xcU6oRKBESpTdxSq5CuXqCFMJsg8AubJKegd25sID+vn9x1Nv5sPvjWe5vibYuy8uC6ephyLKA0s0xYhYEoO/J8d8fHy+HGgvZua43gbyYduR9ahrQO2wy+O45QKUr9NVgKib7mTPPXQkKlG2jAfttG5/is85665o8Vix9qTKJyvnpiSxAVo4etMHDkbyeT8A26rsyrvKUve3CR/npMKKlOHbSVyuMGPxwIRuLQ10l6Le79DGOHGWaIn3t1tkoHEKJFGTB+CZXlyWFAV/8kTwXSMNy3u28/33DO7Be02slCqLTPEYtXLLTaHG2Lk2SBPMmohAkDCL3ieXVXKqBIOtftKxu62S2naI/IJpnTqL4o5bhtum1fQcqqbvvblH9hnyi9vVnTJvJDgxwaMDurQdUWcdEE1R6lkWEhlEPcSrUIJiurqhvfYgWuvTcvLutzx8nOvg7eB3pIxsCMOrc+6Zh5Ks6kDkB57o5+8tQ5OZ9yf/Mgr9UxutUeAsOAhr6bVbexn3tJNc9D/2ighiW54F+Gu8r6m5Q4UdUdLyJZWjwpbL9r07uLGQX31MYXQySKmsXXQav2lPpx4vm7AV4w88hJRi2vpqSG+22gEz6QX6dT/DKHxa1s9UAuvP7hfAM3Y2QHiLgMaRk/hCDcSzXhscxMYleTeVLKFtas3eOOxo7NA/1XF/pBrnzzBecsGHkdx976Q25Q/wGUyQ+CKKi+3NdpH/BPPl+96lLTcOO4WH1reZHlZyIXFNi2+FAFCsrh6CgvkgVCiI7q2b3qVYP66p9RxvvVnehpILjy4ZB9zMcTh1FTha9wNHU5fXmdnq6NHBZ3rw4JWDAFwTjTBvc/KCj+oV1fNaVxqScV1pwF67uedUBlc+O+79NqmcgcfjAwwbgH+RJOmx8ZoDdVtwh3zKe99mIr6bAQC23Aepit8EpwfxU71caMHJiy7IjOlHdCz4xlxIcWJnXtj2Va/IqafTP3RNVEhUCWLX6B34wcsWbkMQ6i/Cx5qWKWwID9LR/t/irVrvLQ5+F+anaKmY3i7jfXTHXF1cfMCoDoL2YWXY2ie2Gipyaqp8J9rciSjilSTq7FrHcVFC6AAR/mb3w2ye3y/JshEnPdcXHEox3U7l1UlDKqXUDE5jXS26EG0KJgOuG+Qw5mI2ieleTQ/0VT90zprMWe1qkNk1l6DnQVNcWHC11rAiaDpyJ9j3I24eM2q8qdu89AaIHT51I8YuLb2TZr8rJQ58aZHJZ/owe1eUPo4j53cqBRC2gnazagnGrM9bKwAO8HUXVaThWSAHJRS5+gVRiMvHNvpQR9YCdfBb/Z52dP14amc0AKvwxpTXvlHnxTozWA9iRBrZAgRyYfGoe6b6AMzNoo1/0wMG+PIz9gArZP7scAEtLXv6Xm35kC16ICAyO8UtTqUUPPZ5cHJNc3vaDylqHhBheVU+nt22G9FggN9uqQm0527fnBcdlHdOlZ4yyXpWs7wVFhkPLNPHjrRR0l9f+cDBTAytCahkpOLjAxS4alTA3h32PXuKY+0fgz3RD+tiEU70HZaNWMjQelGNX1M= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 919c0b0e-6c20-4c27-dac0-08d9b3ee0f34 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:42:09.0894 (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: JJDEagUxl3mOLjagYNjfhG3OD3ScK5zPXDMQVi5ZFOPAKt0dgpybrZbDOcesIoHm49yFfrZ1dQirCEwz0TlL8A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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) - updated device tree for supporting DM in SPL. disabled use of JR1 in SPL and uboot, as JR1 is reserved for SECO FW. Signed-off-by: Gaurav Jain Reviewed-by: Ye Li --- arch/arm/dts/fsl-imx8dx.dtsi | 61 +++++++++++++++++++++++- arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 34 ++++++++++++- arch/arm/dts/fsl-imx8qm.dtsi | 61 +++++++++++++++++++++++- arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 34 ++++++++++++- 4 files changed, 186 insertions(+), 4 deletions(-) diff --git a/arch/arm/dts/fsl-imx8dx.dtsi b/arch/arm/dts/fsl-imx8dx.dtsi index 7d95cf0b7d..63a56699b5 100644 --- a/arch/arm/dts/fsl-imx8dx.dtsi +++ b/arch/arm/dts/fsl-imx8dx.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #include @@ -261,6 +261,30 @@ power-domains = <&pd_dma>; }; }; + + pd_caam: PD_CAAM { + compatible = "nxp,imx8-pd"; + reg = ; + #power-domain-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; + + pd_caam_jr1: PD_CAAM_JR1 { + reg = ; + #power-domain-cells = <0>; + power-domains = <&pd_caam>; + }; + pd_caam_jr2: PD_CAAM_JR2 { + reg = ; + #power-domain-cells = <0>; + power-domains = <&pd_caam>; + }; + pd_caam_jr3: PD_CAAM_JR3 { + reg = ; + #power-domain-cells = <0>; + power-domains = <&pd_caam>; + }; + }; }; i2c0: i2c@5a800000 { @@ -609,6 +633,41 @@ }; }; }; + + crypto: caam@0x31400000 { + compatible = "fsl,sec-v4.0"; + reg = <0 0x31400000 0 0x400000>; + interrupts = ; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x31400000 0x400000>; + fsl,first-jr-index = <2>; + fsl,sec-era = <9>; + + sec_jr1: jr1@0x20000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x1000>; + interrupts = ; + power-domains = <&pd_caam_jr1>; + status = "disabled"; + }; + + sec_jr2: jr2@30000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x1000>; + interrupts = ; + power-domains = <&pd_caam_jr2>; + status = "okay"; + }; + + sec_jr3: jr3@40000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x1000>; + interrupts = ; + power-domains = <&pd_caam_jr3>; + status = "okay"; + }; + }; }; &A35_0 { diff --git a/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi index 9e0d264b71..a95209e141 100644 --- a/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ &{/imx8qm-pm} { @@ -80,6 +80,22 @@ u-boot,dm-spl; }; +&pd_caam { + u-boot,dm-spl; +}; + +&pd_caam_jr1 { + u-boot,dm-spl; +}; + +&pd_caam_jr2 { + u-boot,dm-spl; +}; + +&pd_caam_jr3 { + u-boot,dm-spl; +}; + &gpio0 { u-boot,dm-spl; }; @@ -126,3 +142,19 @@ sd-uhs-sdr104; sd-uhs-ddr50; }; + +&crypto { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + +&sec_jr3 { + u-boot,dm-spl; +}; diff --git a/arch/arm/dts/fsl-imx8qm.dtsi b/arch/arm/dts/fsl-imx8qm.dtsi index 88aeaf65b3..517fb13cad 100644 --- a/arch/arm/dts/fsl-imx8qm.dtsi +++ b/arch/arm/dts/fsl-imx8qm.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #include @@ -235,6 +235,30 @@ wakeup-irq = <349>; }; }; + + pd_caam: PD_CAAM { + compatible = "nxp,imx8-pd"; + reg = ; + #power-domain-cells = <0>; + #address-cells = <1>; + #size-cells = <0>; + + pd_caam_jr1: PD_CAAM_JR1 { + reg = ; + #power-domain-cells = <0>; + power-domains = <&pd_caam>; + }; + pd_caam_jr2: PD_CAAM_JR2 { + reg = ; + #power-domain-cells = <0>; + power-domains = <&pd_caam>; + }; + pd_caam_jr3: PD_CAAM_JR3 { + reg = ; + #power-domain-cells = <0>; + power-domains = <&pd_caam>; + }; + }; }; i2c0: i2c@5a800000 { @@ -556,6 +580,41 @@ power-domains = <&pd_conn_enet1>; status = "disabled"; }; + + crypto: caam@0x31400000 { + compatible = "fsl,sec-v4.0"; + reg = <0 0x31400000 0 0x400000>; + interrupts = ; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0 0 0x31400000 0x400000>; + fsl,first-jr-index = <2>; + fsl,sec-era = <9>; + + sec_jr1: jr1@0x20000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x1000>; + interrupts = ; + power-domains = <&pd_caam_jr1>; + status = "disabled"; + }; + + sec_jr2: jr2@30000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x1000>; + interrupts = ; + power-domains = <&pd_caam_jr2>; + status = "okay"; + }; + + sec_jr3: jr3@40000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x1000>; + interrupts = ; + power-domains = <&pd_caam_jr3>; + status = "okay"; + }; + }; }; &A53_0 { diff --git a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi index 701af4434d..ae037c7550 100644 --- a/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ &{/imx8qx-pm} { @@ -80,6 +80,22 @@ u-boot,dm-spl; }; +&pd_caam { + u-boot,dm-spl; +}; + +&pd_caam_jr1 { + u-boot,dm-spl; +}; + +&pd_caam_jr2 { + u-boot,dm-spl; +}; + +&pd_caam_jr3 { + u-boot,dm-spl; +}; + &gpio0 { u-boot,dm-spl; }; @@ -126,3 +142,19 @@ sd-uhs-sdr104; sd-uhs-ddr50; }; + +&crypto { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + +&sec_jr3 { + u-boot,dm-spl; +}; From patchwork Tue Nov 30 10:40:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561517 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=Xuf4z54D; 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 4J3JjW5RkWz9sWJ for ; Tue, 30 Nov 2021 21:43:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 12461830C8; Tue, 30 Nov 2021 11:42:34 +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="Xuf4z54D"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 36A14830B9; Tue, 30 Nov 2021 11:42:21 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0619.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::619]) (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 0D01D83096 for ; Tue, 30 Nov 2021 11:42:17 +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=HSEy/H8Bkm07s0UhX2fbTYpQ4UqksE9KDqNgVNV9OjmDdw+yPloCnbeGy7NjXdbM+MCeDGmf9YROiJZlq6Co2znMGUZs6gMSIfMPljMMjBVSvPIZZoAptSpQNZ9qKheg/Fk72Pe/I2J0z3bkFJyYMdyIYYdE6nv7EJCp5NprCTcsqYpIVF4UBFf5dysWlf5iZiOrqKRYIq07+PfLP9b6oT2++4r9ic7sGoqJnYwCQbTxU6zkSSSzLA3HP4DQVDv2GMrwTaP6P/e7Quq14rzoZENGm/EbxpQUawN1CE/Mq5ZqQRm1fHXnSPbya8B3Pv8oKPoXh/R4osMAhQnpAYveMw== 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=DH+1W/DbVEkBs5a9mtKBalEuAnxn2cvpuaZwJpatKjY=; b=Rab86BVpH/nPkDtg2XucnweKvPOtzKHEu9bDCpzZP/gztCl+WNX1Uht5w1Ve7nFcXRr/wcK9qyNJAU/oC0qcTUdXj0pAg1bSivd7EyLyYnz42f+UiCpsxtpmjsBF4+nyqk4B0p9HHa8hlQZyf7R3T+l8kjfKQJ9AJh5J69b+pslGWFuUGGH2ZWA+qqwb3j/8JSjmjCntMaRWeSW7uwtwgRSkbkkn/3yfQjyWEaV6nn4XicjHW4v93Vl+TBUg0Ee7eWnUCeVoWmwKaZjSuvqTCsATjlGDiDqTpxmRi3zjdVQ8KCka/Mr83JNKf1Nxj8JvuuPUzf5lRDXyEAdIK9LDwg== 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=DH+1W/DbVEkBs5a9mtKBalEuAnxn2cvpuaZwJpatKjY=; b=Xuf4z54DSxI7ktRz2p5m7Rd+Y/Vy8Xt6I7wSIfv0mD6hO2jna9pc6AdYxmA0M19tQ3382Z+ThPmipkmxO928bWdpa+rdlRUTCr6tEOQMZyzJuXSKGwPG6/nyanW2Ub+DZx2Yt97OgXxixuf36xe2TEudHGpLbeQJsPIX1VdnBgI= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:42:15 +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.4734.024; Tue, 30 Nov 2021 10:42:15 +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 v6 09/15] crypto/fsl: i.MX8: Enable Job ring driver model in SPL and U-Boot. Date: Tue, 30 Nov 2021 16:10:42 +0530 Message-Id: <20211130104048.6207-10-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:42:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cac25c50-fb58-46ab-796d-08d9b3ee12f3 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:118; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tsBiK2Jt6pEgVNKbSHJaBn4PUFs18w9Bvu+ge9M0n2mIUoeZ2fGCmlJ3e+pCMSmEouNME8BTJeZuYxvBiFVNbMxoI6Bj41og37n0RJWvkScQ/tWouPS33AoNWzwC6uKD9KxYNCh97vL2MS/4Jey6BgU3cfrTpHxVwNZXLYIaQkNjJvm3FZkTedXPibMdrEmjcAnHR50TtTGMdUlSy8D23Av0M7Fe+cc7KlA+/nWx+UA6+yDYC7Q6rcoTysmGbbThVDM/qmZOIm6zo5US2YrrJMPA0jyGkxZL3nO8n/n+hxARek/fFYB3wiS9w4qdToCKjRXy8Uj7pUVodvkDbuTblWlQixq1/brXnDK4ELmAyscG3a/F4XkQLB7mQxQ0OKilcGf2MITvwn8LoXJ0dwK23tbhSZP/sBKVhUQd4brD3Zf0juswkkpCtzZkh6C+pyqYT4cxHqlcmKMpw4iR5f7RPr+XPVRjkMKg5bQJLHK2RCqUIVVMk1aV2DE7cSnGo3rq0TN+4OTjVdRbeC7UHvQOpAmBTrig9PxwEqmDR8OZVOZ+ZeYHSKFQ44K5z9HemO8oEUqb1Sm1DBxBsBRJui36e4MabQGpxiyXu4wSEyka3lhLB5V0j2EEbSsRbem7FMPNd6Sk1bVtl89wvL5kbunlIgf2G7/L83Al6Y6Nmqoivh7YTGD9iiEwoPABvrJNCDdBwOEKMi2rfyNX614FvaUDfkvGhwOpxd6pzg1Hqytf4po= 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(6666004)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?OcHfmjP3e3zYtj5PZUiXtYdAEplf?= =?utf-8?q?d4/M2bou9atOehAZAcobuizvXj6wUzlUEXiaq7/Y0HrV3zcQqemAS2UXlQ3Fb9w6P?= =?utf-8?q?uZ+b3YRnG5mMUEzylFGRROP8+zXmu/4BLTRaF7JmUZTgghtonWWcY2PqweZXBNV2o?= =?utf-8?q?Gg/f2T/JtpDEZvSshwOJ7kdLh9bF2ey6sxdZdOXYZ5xNDaGPftAuos1O6D+ozbcgu?= =?utf-8?q?Tt/4YjzpcbyQbbb9NyECxgvfcdAq4fqZsM7b7EonhtZ0IkbLoQa6pcQyndB8S/xrW?= =?utf-8?q?gIaSzUbxzq2YTnUqN/ukS1Rsvr4k+iR4PmSmkL23BUZxZER31C0blPYuEcK+arNhi?= =?utf-8?q?fiAzVR0OzQn9c701lWHld1yy8zTauSDsFg7y2suEOIQUa8nQyMbo05JBF+LwugNZm?= =?utf-8?q?uOyBSxmz8UeLp0b0TU2fuxeWeBqGxziF94SUIhvxW7Oe95i6L5pcC1Q1NH54ohFyY?= =?utf-8?q?Qe8AUw2Nb59U4tQgnS1HhrvNwkm4BP8l2zpKxLq/SmCwBtx80T3y4N606HvM0DnHO?= =?utf-8?q?cYiLFTJTyokDe2GZ4sFtzw2jvOHR2K7woSCSWU6kgF7SCfw1t2T/10nO+5paj7kQl?= =?utf-8?q?aiavDoqDKLvGxr+6aotIlqdc4mOUXZuR6JOXM2SxOxo5aj/09ikfU46WeD3w7Nh+V?= =?utf-8?q?vs4nmNhRBkW6706siAGi3GQmlsfQgPHO4tHC7TgY0259DrRvSWQb2nE6vOmrm6dw1?= =?utf-8?q?+0ga1ENHfe+XpNfZiBK4VtJEShWWd5lvHQ/jHmeV1Ir5z81rygyfJXwylEMysBDQU?= =?utf-8?q?X4aykKfizR0UxI4fia1O1eJ8LQ8N7Rx6yE/A0kKfALAk8EfvBKwjQ4F1nd3cOXdTc?= =?utf-8?q?V8HLF9DmlOLAzoWRaxyrvGXADxG6uxG9eLw7dNr63CjHmZ9fWA9HCg90pcqekXhae?= =?utf-8?q?MMFTdGFWE7B4xPZvqBf4Ju2PoMvzGJrTkemcUEdrHYztGD2pRdeaEsT5tyQZa6ZjD?= =?utf-8?q?l8lzMCtcYzDhKaFErMyBFNgdvrlaPCWP5n1C76d+DiB2N2rBv/jRb1fkMqHZ8nSOH?= =?utf-8?q?4dWPpDvYNzaqprOlyy67l/3xZGxeB9DOuXd4tTu4nGA+gafKcln0RdyIk+pFK4x+m?= =?utf-8?q?nlBA3yw9VpDsLnqr16EkaLB1DqCoXnQiV9UJ3re8bndJEGn89iOVVamWq26/QeFJf?= =?utf-8?q?8IZ02GrNsAi3BhwNrrTZT/cRWOVmOzwmMEwWfsPmFROf8uOTARi6OwtAGlfjExuXj?= =?utf-8?q?T3QuTTpomuIoJUDfEOKevi/gzBLniUPUnQxDG/YIf2qGWNXmo4rwgmA82WThJmiC8?= =?utf-8?q?qrrR0ZN+I6GSM8WT0K9eTVelcD+tKu4C6FK8Yd/YvWMqE1aUrp1EZQpF3QUP/spuI?= =?utf-8?q?S47y8h2tkwufkeqPpHejkFvZ1FfbkkAJT3WeN3XDU/25XzhaVf8LECjW3t6vgcabU?= =?utf-8?q?cjlqS2L4wm04A6Oejz8yh+ZEIHF/87Vy8DUv1rNeDd64EduoeI6T4EKhXgFJ8cmMI?= =?utf-8?q?UKBWSahPSSzTSVAt4aDiVc+lv2CNI2dXfLrzqNjF7Mn+z74lmWmdyeoVXX7CGeP0D?= =?utf-8?q?W7Kzy0a38tt15MyFXo7ER0wFc0gd9WJuxdJwWQ5Ggug7YnBuq8Y4Qdo=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: cac25c50-fb58-46ab-796d-08d9b3ee12f3 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:42:15.3658 (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: Tn2NLtGq3zE5CBkaAKQiEDHWHF0rVFcpnxondNhasvCQ6sxTRsOXg6/HGKxi7gMw+GNnaLYUe+AGcjbCbGvZOA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 | 9 +++++++++ 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 | 24 +++++++++++++++++++++++ include/fsl_sec.h | 12 +++++------- 10 files changed, 70 insertions(+), 14 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..9a20ebe84e 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,10 @@ config TARGET_IMX8QM_MEK bool "Support i.MX8QM MEK board" select BOARD_LATE_INIT select IMX8QM + select FSL_CAAM + select FSL_BLOB + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_CONGA_QMX8 bool "Support congatec conga-QMX8 board" @@ -89,6 +94,10 @@ config TARGET_IMX8QXP_MEK bool "Support i.MX8QXP MEK board" select BOARD_LATE_INIT select IMX8QXP + select FSL_CAAM + select FSL_BLOB + 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 249a37f5a7..656db51864 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 a99792afbb..9b751aca9b 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)) @@ -790,6 +791,25 @@ int sec_init(void) return sec_init_idx(0); } +#ifdef CONFIG_ARCH_IMX8 +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; +} +#endif + #if CONFIG_IS_ENABLED(DM) static int caam_jr_probe(struct udevice *dev) { @@ -820,6 +840,10 @@ static int caam_jr_probe(struct udevice *dev) jr_node = jr_node >> 4; } caam->jrid = jr_node - 1; +#ifdef CONFIG_ARCH_IMX8 + if (jr_power_on(node)) + return -EINVAL; +#endif 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 */ From patchwork Tue Nov 30 10:40:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561518 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=VtYvnz3d; 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 4J3Jjs2Ghfz9sWJ for ; Tue, 30 Nov 2021 21:44:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 410D9830CE; Tue, 30 Nov 2021 11:42:38 +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="VtYvnz3d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 3E2E9830B3; Tue, 30 Nov 2021 11:42:28 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0611.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::611]) (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 F0A87830B9 for ; Tue, 30 Nov 2021 11:42:22 +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=X8zy+cnhaJK0k3XfKrVVuwJoOMuKXuckVeGpK3DPjf2OipF2fWdFROqCeTrxBtoMA5gozMcUndjgFSqfWz2cK4DvJ5LqCxFfU8QwfhGx8DNn/E7PqXyrVxErH+DRSkLxuavYxy3Mk+Sag+KXtHpBoePD49WyHR3GYTz96J2onpkdK0yA0xf5kma8wB3Oaz4c1eK7sI1Gsb9Gk5aPUmGkDQ6pRd2bgrSIptDBvBPLz4ov1x/VXvSfOU3cp3I4xLyb3aFgfLsSsci2ZvlLsA063n8g9C4NKf17lwgsq1KqbWhDx2D1fa9GxDJ+5B6DavhhNhBvt+TIR5AMswW3hji4QA== 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=Bl/Rf/sxyGEPjci2xPi2MIKYt/v/xCDfuUslgsVvhqY=; b=Nu8gLXubvYMGG6/pcuO31eqGTwke/dt+C7lw08rTtLs1HKrnA7N30v/Upgd5MM2FyywL2a2EJcsFlhOl/Ko+3sf8gz6xuj3qBDuE+dtt22OjFpBzpesV420hkRus7N2/Hb93aI7jBNPKbHtmCzgAaqhJSjSUeluCsVa4HJmh827iBKJzat9pCOfDLHA/to5ifGkLYjyyLmQoBYd4iOOHaQIyg5reQ+lxjxHAxiXm+WKFFIjDw0swqtn/vNv9JMnWu88b40VhBUr4FHRA2m67iOeBjMuD7VypfLhTj+TAG8rnxEYxmUEGToUk6b4jBMt6OxZIHkyXTcecgoncRyG1og== 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=Bl/Rf/sxyGEPjci2xPi2MIKYt/v/xCDfuUslgsVvhqY=; b=VtYvnz3dIvDItESauqHrjyRiNRgYUxeefKDqiisih91D+K2S8RwbDLAoAQoCjHWv7EnOuSjlpEC93ML4DoNO66xCki9Qs39x0vGOKwwgHt6o136OcvtmHPiCqxttDWpD6ABl9Vub7Fs/FjfaJ6AfbwF4085B66qsfhi0dI+Q5Ys= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:42:21 +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.4734.024; Tue, 30 Nov 2021 10:42:21 +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 Subject: [PATCH v6 10/15] crypto/fsl: Improve hwrng performance in kernel Date: Tue, 30 Nov 2021 16:10:43 +0530 Message-Id: <20211130104048.6207-11-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:42:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3a88c4dd-fd17-468d-0445-08d9b3ee1698 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1284; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: asdujSGGxkUZ6pwb/SHe8U3yuYqNl2nfUhx7w7F31LvDqwgFFP18T8UpEixQZAYQV9TU9sIPKCRjAwDH/VBsVFRTRcK9LYnfcBpUItiSpkwFOYxztzZaf5XWhXZkCMhPGtyUvuGfJQFAkj70szyNw3miPk4g6FqfA+dOUo6ECMjGgTq/wlLgVlcM3UFpsecG1yO1YxbQqO43Xl29+piZ3qFnLfP4A13fGFp3WHv2+E9AL/T1OgUMxNOsLkoeKN7lKGkTMR6nbg3AxS5fo7iQalsdPGOT92kTfccX5/Sln4lbbvPtZAKynam9lGGqfHRZrFVs17qm+82Kjovu81MwKG4s8IbqmvfbhFw6QiHBFQIBKvwaQKlF8bbU24rasMoFidwtJ48xTacXSw5FFnnN0nw58ZhVz7ldh1voMFaxEyrokPFExp+zeluMceGJGevblUYtDN7jkvoftnmbBIZU9JJKOklHVIt5S3Qp5tvG/0lNNe0BSFcE0qnt9oKvRBJGP/W7Ii46htVB17yU1RtKYmw6YRi3RKI4AMsjylGPfDcdXdvyWO+RMEV0jDOFuWLb3c9Xbo0pynZ9pAZ/qfpOkRMX/mgIOUlQ3WBEls7bQt+CtjZeCB2HU9Scmrf+72QDpFShizK/TMdTVlQuwTKR//3LeSnZU3pl2nHisbIzKYZWJZfJSz2I6SQKbLiua5QQk3pYSDuqMhxCtL7EYyu1kqZVKU2dVHgfOhjnODsizi8= 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(6666004)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cBfgHpEbExkcT2Tp/b+kDKCPWvnjcKyWwnolBFlmCLbNihebfRTlu2zosKhUOlQwzp3ONSswfS7f5w4t9azEQ/MAjt2s9n6gH0vPc4P3lKuRUAjbMKhOrGAibm+lP+RPK1iYjXRLyPeaJfUQ/dde+i8c9mqo1/QLGRNswZeelxC2QcL2Z7Gk0q3JIo6rwm4Zlza1+vvPJMKVLay+r8z2SM3bpQK+voFTzRjDC4BjTny2XBl8KpGoeBAopmifjvIYFLsYzH67PJ3uSuNS0OHLHjKPkO8asz41HJdgYrt4kqdADJNBNEGYcT9XIKFM2DRNvjyOzpiYiTrwR5b81Picauo96swqQdduJsanBZQaZXauznofIHzlayc5f9pqfOanp+qMjeKT4/xNiDnQyEbVVhgCis1xKoBTtyt6AUGPBIC/Ug+2jE6Em9NEoh1+jhfFGUVZTKAWIigESqb+RO77DVgmfIV2gP5tYRBZ1Qqs1G1beEWj3+mfGDHrt6eTQeryhkd0dgkUzlxyKY/2KFZ5w6/qgFozM4N86m99mSs/9lCL3W89AruUbCipyC91MfYy+9IgWmKj5s77HcVO3aFPpgHf7icEHwPWMTauSB/C/JQntYG/aTO4Q7M1h17DRVtcgPsjYQUYfpcbIeq7QRf+fRxw0g9N8zPKX6x6nPalvtxY7elDgbd2Wny/zdyhJMuxlp6CPUG0ibbGrFgNKbnF5T8Kj5teEum1ow4+CEiW/c3MhFWSqeKezlwq0rIRC/cJwEOqK7nH3akI7Be3Ah0jf3nSqV80JATDuutTosdcDLwU+8S7oioNwRkSDKYLjs7b/JSjF0vyUcNPX3EpVDoI4QwVQp/Ws3gxNJygsbJPeRsJkuloNhV3ANDbXwTyD07chLa/KK9orm+qxezGKQAhxdBgP5f6y+L3T9ICdbXSe3TM/nr1b1xTgqlNX2smSy7ECEJdmMtxz55Cy1Hzrj+HnO11KtH+LzeVxvGla4oLTxB4FkoQ2hfPw1fLo1C7W8Qd7UifTM/F9PEd8rsYnWOJQJ4xvkuz8a8HMY4UooaNYOC/bqqQktlIJ9/H/jrRWuiKxJJio/9jacmU/NIMW3au3KZ0nJ0fGiE3TXpZjYc2tmiQPJI58mlZhk/9s8V5nuM7YBPJa3QyrD+URR30tI953ujZZWDmEkWPpIGbhTkkdXatdP7m2JbYNtZUxrnXUh0Toa7voOHLW7G93Yan64Q7ay7IwAgVoDW7fsq+PhsFYGTX40aWGwRVmEDSjoHlLJpQXSKX4Q8eoxL4WCbs91xM3bddgtJ286R/kBo9z8ORlaH7SMY4RW6lav/pzcAyC7CplR5wPRYDXrvg+8pB0qUSqr83wTZMGw1Vb8ZvpAvWXUJ85qfXFcuvPh2T8rm+bnjPglclyuoKGu5Luq+mUlprjpCNfNeNImv9zQN5Jbl9jmpKyztiLENBiNyxGAVH5agpuaf7zoWHVJJIgMQptfVYAMHCRpncrzCbmVc24HVaCsfzW43KBOIvO8xHT0t0OSi94U0zNbMOfqFM1yZvX5nHlERiD1k4EnB0OoJEXRrDSj19x8xEWbYaZ7WUGqyxfxq1OnPBEsoJy7V5u4S6HZKWAhHtnCJugMZttwLcoF5LjV4= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a88c4dd-fd17-468d-0445-08d9b3ee1698 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:42:21.5013 (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: LUlQuCKvEs0m3AU+fN2pXE8hmHQV+dcE5e9HVckXHxWVjKlwjNu94iqAdInSg72BmUBzituRKUcEqcSKA38fnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 From: Ye Li RNG parameters are reconfigured. - For TRNG to generate 256 bits of entropy, RNG TRNG Seed Control register is configured to have reduced SAMP_SIZE from default 2500 to 512. it is number of entropy samples that will be taken during Entropy generation. - self-test registers(Monobit Limit, Poker Range, Run Length Limit) are synchronized with new RTSDCTL[SAMP_SIZE] of 512. TRNG time is caluculated based on sample size. time required to generate entropy is reduced and hwrng performance improved from 0.3 kB/s to 1.3 kB/s. Signed-off-by: Ye Li Acked-by: Gaurav Jain > --- drivers/crypto/fsl/jr.c | 102 +++++++++++++++++++++++++++++++++------- include/fsl_sec.h | 1 + 2 files changed, 87 insertions(+), 16 deletions(-) diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 9b751aca9b..eb3275ba91 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -602,30 +602,100 @@ static u8 get_rng_vid(ccsr_sec_t *sec) */ static void kick_trng(int ent_delay, ccsr_sec_t *sec) { + u32 samples = 512; /* number of bits to generate and test */ + u32 mono_min = 195; + u32 mono_max = 317; + u32 mono_range = mono_max - mono_min; + u32 poker_min = 1031; + u32 poker_max = 1600; + u32 poker_range = poker_max - poker_min + 1; + u32 retries = 2; + u32 lrun_max = 32; + s32 run_1_min = 27; + s32 run_1_max = 107; + s32 run_1_range = run_1_max - run_1_min; + s32 run_2_min = 7; + s32 run_2_max = 62; + s32 run_2_range = run_2_max - run_2_min; + s32 run_3_min = 0; + s32 run_3_max = 39; + s32 run_3_range = run_3_max - run_3_min; + s32 run_4_min = -1; + s32 run_4_max = 26; + s32 run_4_range = run_4_max - run_4_min; + s32 run_5_min = -1; + s32 run_5_max = 18; + s32 run_5_range = run_5_max - run_5_min; + s32 run_6_min = -1; + s32 run_6_max = 17; + s32 run_6_range = run_6_max - run_6_min; + u32 val; + struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng; - u32 val; - /* put RNG4 into program mode */ - sec_setbits32(&rng->rtmctl, RTMCTL_PRGM); - /* rtsdctl bits 0-15 contain "Entropy Delay, which defines the - * length (in system clocks) of each Entropy sample taken - * */ + /* Put RNG in program mode */ + /* Setting both RTMCTL:PRGM and RTMCTL:TRNG_ACC causes TRNG to + * properly invalidate the entropy in the entropy register and + * force re-generation. + */ + sec_setbits32(&rng->rtmctl, RTMCTL_PRGM | RTMCTL_ACC); + + /* Configure the RNG Entropy Delay + * Performance-wise, it does not make sense to + * set the delay to a value that is lower + * than the last one that worked (i.e. the state handles + * were instantiated properly. Thus, instead of wasting + * time trying to set the values controlling the sample + * frequency, the function simply returns. + */ val = sec_in32(&rng->rtsdctl); - val = (val & ~RTSDCTL_ENT_DLY_MASK) | - (ent_delay << RTSDCTL_ENT_DLY_SHIFT); + val &= RTSDCTL_ENT_DLY_MASK; + val >>= RTSDCTL_ENT_DLY_SHIFT; + if (ent_delay < val) { + /* Put RNG4 into run mode */ + sec_clrbits32(&rng->rtmctl, RTMCTL_PRGM | RTMCTL_ACC); + return; + } + + val = (ent_delay << RTSDCTL_ENT_DLY_SHIFT) | samples; sec_out32(&rng->rtsdctl, val); - /* min. freq. count, equal to 1/4 of the entropy sample length */ - sec_out32(&rng->rtfreqmin, ent_delay >> 2); - /* disable maximum frequency count */ - sec_out32(&rng->rtfreqmax, RTFRQMAX_DISABLE); + + /* + * Recommended margins (min,max) for freq. count: + * freq_mul = RO_freq / TRNG_clk_freq + * rtfrqmin = (ent_delay x freq_mul) >> 1; + * rtfrqmax = (ent_delay x freq_mul) << 3; + * Given current deployments of CAAM in i.MX SoCs, and to simplify + * the configuration, we consider [1,16] to be a safe interval + * for the freq_mul and the limits of the interval are used to compute + * rtfrqmin, rtfrqmax + */ + sec_out32(&rng->rtfreqmin, ent_delay >> 1); + sec_out32(&rng->rtfreqmax, ent_delay << 7); + + sec_out32(&rng->rtscmisc, (retries << 16) | lrun_max); + sec_out32(&rng->rtpkrmax, poker_max); + sec_out32(&rng->rtpkrrng, poker_range); + sec_out32(&rng->rsvd1[0], (mono_range << 16) | mono_max); + sec_out32(&rng->rsvd1[1], (run_1_range << 16) | run_1_max); + sec_out32(&rng->rsvd1[2], (run_2_range << 16) | run_2_max); + sec_out32(&rng->rsvd1[3], (run_3_range << 16) | run_3_max); + sec_out32(&rng->rsvd1[4], (run_4_range << 16) | run_4_max); + sec_out32(&rng->rsvd1[5], (run_5_range << 16) | run_5_max); + sec_out32(&rng->rsvd1[6], (run_6_range << 16) | run_6_max); + + val = sec_in32(&rng->rtmctl); /* - * select raw sampling in both entropy shifter + * Select raw sampling in both entropy shifter * and statistical checker */ - sec_setbits32(&rng->rtmctl, RTMCTL_SAMP_MODE_RAW_ES_SC); - /* put RNG4 into run mode */ - sec_clrbits32(&rng->rtmctl, RTMCTL_PRGM); + val &= ~RTMCTL_SAMP_MODE_INVALID; + val |= RTMCTL_SAMP_MODE_RAW_ES_SC; + /* Put RNG4 into run mode */ + val &= ~(RTMCTL_PRGM | RTMCTL_ACC); + /*test with sample mode only */ + sec_out32(&rng->rtmctl, val); } static int rng_init(uint8_t sec_idx, ccsr_sec_t *sec) diff --git a/include/fsl_sec.h b/include/fsl_sec.h index 7b6e3e2c20..2b3239414a 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -34,6 +34,7 @@ #if CONFIG_SYS_FSL_SEC_COMPAT >= 4 /* RNG4 TRNG test registers */ struct rng4tst { +#define RTMCTL_ACC 0x20 #define RTMCTL_PRGM 0x00010000 /* 1 -> program mode, 0 -> run mode */ #define RTMCTL_SAMP_MODE_VON_NEUMANN_ES_SC 0 /* use von Neumann data in both entropy shifter and From patchwork Tue Nov 30 10:40:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561521 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=JX8WDKCB; 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 4J3JkB3vVsz9sWJ for ; Tue, 30 Nov 2021 21:44:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7F0CA830CF; Tue, 30 Nov 2021 11:42:51 +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="JX8WDKCB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6D43A830B3; Tue, 30 Nov 2021 11:42:35 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::614]) (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 6DF70830B1 for ; Tue, 30 Nov 2021 11:42:30 +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=LhfEgiVoY+BEy/zD5lHdtVIvrMgPVxhZWYsBpV3E/bpdIpQ8y/oEK4JMZR5uBxPhkhQtFalbzUav+/t6pyDNvvWuIGWqVNnacMQF8Fsr4lpUPLl+dNH2+f7N9ng6xw+tfB4wnrJyJrui4tanKIP8RnSJICOKaVBW/WS1XqXdQQRCG7oetF9hKXGf+RpcTmHRhvcbnYFuj1avnduAQfVX9p/QRw0S2EmXz4OoIPVLzgCK3yexguCa2RdrznH1gJ+QCAQrlp6CBnv/RopQQH2EvuGgyAQmBdfu2SV6/zlAzi/7Jt0AQjS8cfUzyKMzecEV4XpqcS1cAOMYHj/WAWNYmA== 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=+PSRP/kcoWw2YzyO5dGeShtMTu8bBO1prLwqzqVw5M4=; b=HKOGb+SN98QXE4zI/TozO2C12knIFRpiRb/9+qq/39JpHalD1ivdYsXJlL0wPfkLNG8qvLp8lZJEX514Z6w/5x88ng4T1+1JsZ/+TFS7XJ2U4AfvL9grxJKMj+EnzSxXRPB3UHYLgZ68rGJaVPgrScpxCe5ScF6dP1BL+WlLrXg40+rXy73f3aQWA3E33/6nt9pH/qClHWeKs4sm0sYUi4f4BgC+NG/+jguzzvT2BmY2V+czMYxWGUxWu16wHn+b3vieCVGB4+LVGHNoq+bmRBmQ8IMIEPUBlAi/TgHpainS8YuANeQ0vtO6ojPIOmmei0fCTZnsLTFhfgLCguxuMg== 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=+PSRP/kcoWw2YzyO5dGeShtMTu8bBO1prLwqzqVw5M4=; b=JX8WDKCBisBWxzT8WUQbVndpThAtDJGVg8Z7EOw0bg9pIPKgQXTWJbc90G+eBIBF5wdn7/L5kYDqDuTUCiPlcnEqbPQ/JaPoC7fSR94SekAQh0I6EhqghyJIzniSrViWh1450reyEJxtanm9HjJjTFjK1lZKRrBnW9zLWCn+ClU= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:42:29 +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.4734.024; Tue, 30 Nov 2021 10:42:29 +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 v6 11/15] Layerscape: Add crypto node in device tree Date: Tue, 30 Nov 2021 16:10:44 +0530 Message-Id: <20211130104048.6207-12-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:42:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d75a2941-c286-420a-450f-08d9b3ee1afa X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:130; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hJEt2dN/FaCnFm81iz8KwV8Sj+IFCgkxQChiysR2p6B/nId3iC2BwLuV1zNHduy6g9Lnr/jSMxfTdDaBLv1CKTNi2G9WA2torFxhiTGyoFpohnn2JOOd/yAbxbgt+XKPIewrG7JNV/4GWNloivpKGOLzgpzbsd4E5x5SgtGFQ1eO1TIcvnWvi2zIajVYsxLhz8wQadnQBYLNV1uFwxpTDkEYFb/vj5LJwEsgmzr3pOTxioL4GRHSXjjQuhfY0BrZgjBwo32CgzOsC8Wquz86FcLKe4ZGzA70jAp/ov1HuVrVCY8mvBoCl8jlWDhPOkDGsx3UbxLXxDR0P7YG9w8JnbpsNl8n0CarCiUPbhimxM53Z0+hMIWCfB7CoWUyVyeE2H1YqlQBY7mEonaEujcfcsjq+9XSmXKCHvfEMTpVaOZZGGm8y8EGTSE3npAq3Nb7YASqTZRrP0DXzYtbwQuiKFrEfw4zMu6IinpqDzwYUZp9rtOD2P348HyJnxg1Y0eG54ZWa2KKky8q4XMZoQVC2o7WMTFbModEW4T6LhFxRTNBGlv4Cq8Php4IBwriBpsNipC22zZXTp+tbD2f+SXgYAI7WZAk6JmI3v5UEcqmuBthDUb3hAjSXQCxBdVFeb1uo/0mEbGA93NF3+/i1cxD1wXrvhwf+QCOo364S1SXj8/KN5hxEAKYy6SY0/0s+0gYmo6dgSSmFeifm8jf17uXAwd1U+FG8dQj2Nr9GMdm9QzIpwlXvw7pBbUeJ8X2C2uNiiRcVniyjQIH2byfXv7/ww== 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(6666004)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(30864003)(110426009)(16843485002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DHqAr8Sp7yuVIIpkPDfK0l7u+HEkJJr56goGKoIM5pCc10rbtxGsLXLv4tXjfOABxbK9cMeDtUH7XOOX50xmvlX9gtjxge8jUqCsRH54x77e/Nhmbda0E4Jqa3X6WnT/jNS5D8hsnaBc5trfVVKs3+nmyprm6sPcQjuhCokSJH0Yf56nuOb9c4qfyp5y045PA6nrfv8MKty925qQ4tDeEc+MPAUzhG19ElIfYKQKDDEC5U/h+B61n6HoFjQ6ddXA1NVpNYfk+eYCx3VYrpZExTLePxM9bAtDWvTFwJqVy75Olm7Zc4K5tZBuaSOeo1t9rHA8C7cHzbc9Zd0y4/ch4zutSnzh/QjkcER6PnbZ+UjlNEmGmTJajknVbSql60e4yiGUG9mIEeCRtUdNiYBxX5YCfElmA/CKVNtvxHLJycYhnE8Nu7/3wPslYWvIqp7Sh34aGLd19bOk5j2pn4WlkpVpbbzwQev//VEePTZ5ULr3Nv6uhhpsf4IMxww7sNWl/HrwLKjLs/BaVx58p6sLhRTA8zfadpv0t5uNvaDy0NAyfJ6WFrcZ66iyPUZb66R79E2/pqe9LwhyBtkyW7Zqf2dBTUxpba8c9Lad5A41g/IyNz1hBg6kgwfbO7HOpCveLpDf63bXxjJIECCsXYTM/WQdXcBtgD1wxRKXVinVvaAVBGbDOAevymZyslB4MaLR3A3S2jN+qIZX4u1WlO0FLLkltc/s41LdAYvrWBjRnUi4nZ1zLZ1tI7Shtz2fFfchplTU7rRTE0UrwIS2fZj0Hf0G1ztu+ysMceSKGTaBk6f3OOcFy/OPIj8d8nU8V0WKeQfdlbeKzQTb5YKg4qQBtEvGsWp1EXbgePi51rbkV+cZTr6tQNnjvbwuYjUOVKtGOuZPekjowktASJ9iw+gleAl6EzbkzqiQxfXUVmjBc04oWawhAjocL07RfhgiY+sKz36DyXGIxBc5LAwpBqKfV8xlXFmgv0EPWXTJwGTCatFqkho8cQNsm6TZG9yp0lWkJadoiRiTLJJoKiOThwjITp4VJS4AI4/XtVHPzB9Z/nnMHbR1P37O6g4wt8XF40//kP6/bTvcYXrnGwJ2chZyySMTAwbKsT/64zJ1e5cjQ3Xyx8npl7ack3FcZ8/6GTx+3QS70oRy2uI0cgRo+SAap7c8CjjKN01UoRRTOdVTyHgCdqDh3u/m0EJg9YyrOBu0Q4fYTqC4YOO8MbyxAZPTSXUY7RQrdCmTa1EKmuPEXosdgUfEUeWE0+qjYPOrTgfFoCO0Daxu/oa46TG4CQDQkmfad8RkRswmFZIc3NZglEzH24DgUrAzZymztdSyvVk9V1C+EpG16zZ6fbzUvJtxiBRTEbdCEuYFUHLm5p2iwNTGXX/8lHujTIbUyfJQVEizJrtJEMo6x7tHmND5IAT770/PD4ubuu0btNvcV8pc9xMg/QF2FfA0LtD8gAgRLyJk+CNSZr2m/6aX8L0Iw9blgtTpcvt0ShAa0d2HS7H3LrV+fLbxMV/8YQAnXsoE8Kv9UvovOfPdGLhbSwsfU6oTcgLY/uGxputwsNYWxhgS0shoirp3oBZon17ZVhc2dRJ9DgLwKi/ZymHkCP+wwexXnXp47oWCtYmvjvIJhB0XYII= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d75a2941-c286-420a-450f-08d9b3ee1afa X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:42:28.8971 (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: eSDfhXgRwhM2hIVE9mYSejMLBf4/JxP/34FkbavbgbPeOaFHk1mTDL+v7nmgIhcIJ/A7Eqfmhi3VtJppY8xz7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 LS(1021/1012/1028/1043/1046/1088/2088), LX2160 - updated device tree Signed-off-by: Gaurav Jain Reviewed-by: Priyanka Jain --- arch/arm/dts/fsl-ls1012a.dtsi | 46 ++++++++++++++++++++++++++++++++++- arch/arm/dts/fsl-ls1043a.dtsi | 45 +++++++++++++++++++++++++++++++++- arch/arm/dts/fsl-ls1046a.dtsi | 44 +++++++++++++++++++++++++++++++++ arch/arm/dts/fsl-ls1088a.dtsi | 39 +++++++++++++++++++++++++++++ arch/arm/dts/fsl-ls2080a.dtsi | 39 +++++++++++++++++++++++++++++ arch/arm/dts/fsl-lx2160a.dtsi | 41 ++++++++++++++++++++++++++++++- arch/arm/dts/ls1021a.dtsi | 40 ++++++++++++++++++++++++++++++ 7 files changed, 291 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi index 0ea899c7d7..1cdcc99c1e 100644 --- a/arch/arm/dts/fsl-ls1012a.dtsi +++ b/arch/arm/dts/fsl-ls1012a.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ OR X11 /* - * Copyright 2020 NXP + * Copyright 2020-2021 NXP * Copyright 2016 Freescale Semiconductor */ @@ -71,6 +71,50 @@ bus-width = <4>; }; + crypto: crypto@1700000 { + compatible = "fsl,sec-v5.4", "fsl,sec-v5.0", + "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x1700000 0x100000>; + reg = <0x00 0x1700000 0x0 0x100000>; + interrupts = <0 75 0x4>; + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <0 71 0x4>; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <0 72 0x4>; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <0 73 0x4>; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <0 74 0x4>; + }; + }; + gpio0: gpio@2300000 { compatible = "fsl,qoriq-gpio"; reg = <0x0 0x2300000 0x0 0x10000>; diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi index 52dc5a9638..72877d2ff5 100644 --- a/arch/arm/dts/fsl-ls1043a.dtsi +++ b/arch/arm/dts/fsl-ls1043a.dtsi @@ -2,7 +2,7 @@ /* * Device Tree Include file for NXP Layerscape-1043A family SoC. * - * Copyright 2020 NXP + * Copyright 2020-2021 NXP * Copyright (C) 2014-2015, Freescale Semiconductor * * Mingkai Hu @@ -125,6 +125,49 @@ interrupts = <0 43 0x4>; }; + crypto: crypto@1700000 { + compatible = "fsl,sec-v5.4", "fsl,sec-v5.0", + "fsl,sec-v4.0"; + fsl,sec-era = <3>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x1700000 0x100000>; + reg = <0x00 0x1700000 0x0 0x100000>; + interrupts = <0 75 0x4>; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <0 71 0x4>; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <0 72 0x4>; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <0 73 0x4>; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <0 74 0x4>; + }; + }; + i2c0: i2c@2180000 { compatible = "fsl,vf610-i2c"; #address-cells = <1>; diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi index a60cbf11fc..c655e002aa 100644 --- a/arch/arm/dts/fsl-ls1046a.dtsi +++ b/arch/arm/dts/fsl-ls1046a.dtsi @@ -3,6 +3,7 @@ * Device Tree Include file for Freescale Layerscape-1046A family SoC. * * Copyright (C) 2016, Freescale Semiconductor + * Copyright 2021 NXP * * Mingkai Hu */ @@ -124,6 +125,49 @@ interrupts = <0 43 0x4>; }; + crypto: crypto@1700000 { + compatible = "fsl,sec-v5.4", "fsl,sec-v5.0", + "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x1700000 0x100000>; + reg = <0x00 0x1700000 0x0 0x100000>; + interrupts = <0 75 0x4>; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <0 71 0x4>; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <0 72 0x4>; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <0 73 0x4>; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <0 74 0x4>; + }; + }; + i2c0: i2c@2180000 { compatible = "fsl,vf610-i2c"; #address-cells = <1>; diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi index f73fdfda8b..9b7c54b260 100644 --- a/arch/arm/dts/fsl-ls1088a.dtsi +++ b/arch/arm/dts/fsl-ls1088a.dtsi @@ -174,6 +174,45 @@ dr_mode = "host"; }; + crypto: crypto@8000000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x8000000 0x100000>; + reg = <0x00 0x8000000 0x0 0x100000>; + interrupts = ; + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = ; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = ; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = ; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = ; + }; + }; + pcie1: pcie@3400000 { compatible = "fsl,ls-pcie", "snps,dw-pcie"; reg = <0x00 0x03400000 0x0 0x80000 /* dbi registers */ diff --git a/arch/arm/dts/fsl-ls2080a.dtsi b/arch/arm/dts/fsl-ls2080a.dtsi index 72ba52594a..a1837454f4 100644 --- a/arch/arm/dts/fsl-ls2080a.dtsi +++ b/arch/arm/dts/fsl-ls2080a.dtsi @@ -239,6 +239,45 @@ status = "disabled"; }; + crypto: crypto@8000000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x8000000 0x100000>; + reg = <0x00 0x8000000 0x0 0x100000>; + interrupts = <0 139 0x4>; /* Level high type */ + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <0 140 0x4>; /* Level high type */ + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <0 141 0x4>; /* Level high type */ + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <0 142 0x4>; /* Level high type */ + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <0 143 0x4>; /* Level high type */ + }; + }; + fsl_mc: fsl-mc@80c000000 { compatible = "fsl,qoriq-mc", "simple-mfd"; reg = <0x00000008 0x0c000000 0 0x40>, /* MC portal base */ diff --git a/arch/arm/dts/fsl-lx2160a.dtsi b/arch/arm/dts/fsl-lx2160a.dtsi index 52e4d7205a..57c7d3ef71 100644 --- a/arch/arm/dts/fsl-lx2160a.dtsi +++ b/arch/arm/dts/fsl-lx2160a.dtsi @@ -2,7 +2,7 @@ /* * NXP lx2160a SOC common device tree source * - * Copyright 2018-2020 NXP + * Copyright 2018-2021 NXP * */ @@ -27,6 +27,45 @@ clock-output-names = "sysclk"; }; + crypto: crypto@8000000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <10>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x8000000 0x100000>; + reg = <0x00 0x8000000 0x0 0x100000>; + interrupts = ; + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = ; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = ; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = ; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = ; + }; + }; + clockgen: clocking@1300000 { compatible = "fsl,ls2080a-clockgen"; reg = <0 0x1300000 0 0xa0000>; diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi index 86192cbb7f..be330c130f 100644 --- a/arch/arm/dts/ls1021a.dtsi +++ b/arch/arm/dts/ls1021a.dtsi @@ -3,6 +3,7 @@ * Freescale ls1021a SOC common device tree source * * Copyright 2013-2015 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include "skeleton.dtsi" @@ -144,6 +145,45 @@ big-endian; }; + crypto: crypto@1700000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <7>; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x1700000 0x100000>; + ranges = <0x0 0x1700000 0x100000>; + interrupts = ; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = ; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = ; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = ; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = ; + }; + + }; + clockgen: clocking@1ee1000 { #address-cells = <1>; #size-cells = <1>; From patchwork Tue Nov 30 10:40:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561527 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=dYIjjDYE; 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 4J3JkX28QQz9sWJ for ; Tue, 30 Nov 2021 21:44:36 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 46C8B830DA; Tue, 30 Nov 2021 11:42: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="dYIjjDYE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1F2F8830DD; Tue, 30 Nov 2021 11:42:45 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::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 4A5A0830B3 for ; Tue, 30 Nov 2021 11:42:37 +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=l6anLOC5Da9PivuPxmopI1oF3Qwkukg+oe3I0gMZA9STvqkJu+3xl2/PTX6EDVsgLmwxQUM2wpEx2Rly1XhzdOLuYlQ5UBfveBOxlaEnBGQwq0Mi96ofr0nz3oMqCVSVyn0vsW79f87TIE+c4RXi5UHg1QYY2hrZM5fRntqRU6VyYlMAeeWtcm1aCojy4VoYqlralU6a0dkdaf/6/HVvmZuw8/jTUUl8ViMVpAnVPp8thpEQY4u4LP+akX4kSs6h88qGCB8BnpvbhptC5FWIFuJiCGznWEUUEtMN6SnI//gq/iQk4kDwLhpfK9xDWfBFb2zDDF1kaG294wPTLxfmzA== 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=8FAn83MaE7TEATOZvuhfyTSYitMHeMQBzpveuEuLjqo=; b=RzVGlscCKsKQ8dsNbMXaACmXgIacHBJVgshxSWoeWKYRpTjASLgEE9fU0+lTPSpfjAZUJwChzVjSQx5+BE/RVZxy9QO75BJneHz1Gkpu+DVOPbMmJZoUOjqhNDcD3aYMAanGLokCpKs0afCntvhhLVljuy77+moGl1n79hY1RKw2d1k8T3iGm2eqADXWROYkvxD30jkFjhBNMeZOMQRR873GNNsmgowMtm2eMDifMOARFlHqCoO2Twdrjxt2eIiHzb2mKjxKvhJzrM93Tz0xqcFYz7dS3xNnfDKCFC2zfnrX++PaPErJTGPHDRNbHCTNAGhSfphdG7BFGG8iHYi1Iw== 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=8FAn83MaE7TEATOZvuhfyTSYitMHeMQBzpveuEuLjqo=; b=dYIjjDYEn06O5d44XeS6Rn0sGismbYeh71iyYYlhwQfRjdNMgYEx5h4ZGRIjmIfbZiIVUtZIJ7PQatg73+cOQbKYCgNQBnhElQoOW4+U+fjnfROLIYDZE1RKQWKUP+3dAR5SzMejphPVszHVqPweKbAlKNIlq5Fe0UfvFZl7siI= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:42:35 +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.4734.024; Tue, 30 Nov 2021 10:42:35 +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 v6 12/15] Layerscape: Enable Job ring driver model in U-Boot. Date: Tue, 30 Nov 2021 16:10:45 +0530 Message-Id: <20211130104048.6207-13-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:42:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2d0acc39-3fe4-47dd-2cb1-08d9b3ee1ec4 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:51; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pVkDseJAI7zwXJ09sVKbM2Ej03NFC8gDw531gP8+Mi4RErKCWf2NsVCAqR7DiU/OJTd3Gvr04O58plYjUd+8wTAoW01Vsb8eMQno/psCsYYeVT8eZ3oSLMIra06yBlvg5IYjafWoL+MiKve5hXRdGmljg/WLOHNFu+gCvvJU7h4rHxrcyvc/+ypGRU5gHPVTHojOYha8VcQz7OQ92lB6z+Kpfq+2i22XN+8zx+W0L/Z488mjygGz5UKmNVhQvwdb5FGenK0ShY44HaY+pboZsoEGn7OyoocEiHAGJn9qgkOZR5xcGmC7R1C6Ir70QoJgbIRWt/w1/2FuTeeNoXMOMCg6Pvj6inyznCJ59B8juRk8Do2l3jx+9tue4HBKLiwgVwJmMYJ5O+xuMIYIOHSQDtP8TcY5RqEq+SWwbRuzFU5f09tdX1KxLT10LQvmlqfpyHW0xhYa7ln36SO1CcZ1kna0C7EQ6Kb1tlD7b6H7XXT5UtGNu8DnMhU9o1s6wAcJU/au7WWUx9CzJHn9BDDUEfYbD4Tw0XtwDNVv8L5ZAWokd2Ww7avRTsBU4TJcv4WvfGgc1m9gZMv/Tta6Z4wEUBxLKC/I6Y/xTBSY5kapiIa2EylCM/2Zc79J5JUVS1SeLbB6WFCuf479zYhYvhTO4zrQwYJuDdyHYwId+MDZmet+2o5G1TICxoV34t+N6w/uHDf0anGYQCzkq2R4y2/ipoVKunNl1vRqn7WeepnxOrsv+2JPuKthFxIkNtuEu4UrfR3nK8j7QsinYEYR7neTVQ== 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(6666004)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(30864003)(110426009)(16843485002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VMH/phAA3P/Agy2EvaFwV5IFgwe8YQHfPxNv5QJyv9H6n4RRHSp8ixbnFi27nbZWz7f5dFCwDeHQGU4GA2pwm9RMNo5sA8veY5CUopEQRrDTQIU558ZQ9wHFhGOJP/Xs5LmDwiS9ALLeBypVg9CsDajiPcKILHxEQVyYUCLHuUh8HCutzLVk7GmynmOH6C6j865oGqobItyNMq5ImSLtxXK2x0N1G+cHCo0KnF/C5BABF9qHmm3mkP8I/7oxnpgHCX608x73I9ntcxqqoN9WdEdrgbp8RclkmoJxP8VUWmK0sk0gBgV4nXsYzqDMPgre4hbWRkUeK9yUwXn5XxJmqwsGta80NtXAbSaDnfLmzlynefYEm+T9VavUseYg+IbXoIEBv5+x0QyzFt03ngnkY2GdlrYAt9kvrWR/cJlXyPo/rOjs+8oNER762IwYrRdZK29mHaPS0JO9CcBQT5vvrEw9eIWZfIog9oJnO6846xhQRgp6BUbCwCzMzRUAUM5kjAUD3oIQU0g5JErefDjDmqXSG/35DJ2b/RpmJQ+CUmGYUwAIMTuKBqVhDZRM4uzBRmnlMWOPoIiJFwRuRqbjJSsrReB54+G2MK91ZBefJkqpQAK+Y8QvWz22m60QXm45dH0fkjDGmKDZUiFj1byMRnUeVFiL35kCanTeCkZ8wfmwvnpw0Stx0OoxDyU4Z2F3NORN4612htkvkhEI8nPJ4Z5HEmaXTXqM0gcaP1GJoCFi+T7pItTXObu3N5tPQ+CY5OmVYknfMWhYGLPQ0uoyD225qh9cMlvm7FMJwDx4baiO/6duzumXzadylUx5Avedk+e55j7DW/mANvbT/gE/4hZB4DgQl0hUlHpHDMvizBF6tHh6Yy7s7+aqp+j4gu3WM/NggfUPNWivq9jBroSJwA3kv1uPxR/FlaKD0DyZfx6wo6CFmgYO5ItvCFBkFbyRbeFVkSPgmM2SP7umpBWXREWGQZPYYmw0DcFQKT2XVBJz71imA63561rvYGXnkdRpZTeEWCexLtxwu9IjdXdbGOEGn+cTPRW0r9MDUESr1sQUUIffnwgKtRXMzzoYY/czjx+9S022QurkCiYS+S0Ceqd3Uh3giAZJznEeDSCTRiOiPnlO6BBTZi9zM7mK85vgn4Wp+wnMS+K8UB6ewyl+mXCAsq5V2j6scnXKI8diYvI30P/8kstTjKAYS0N1OUSRsW4nq9KvHOpXjd3xTBpnNzreymX/Rn4gNzzSXwrRyLmH1ITKFD44EnF3s56cUFMeJSVOzFC7b0gYfdPsMON5v8DJcHCKRfIKKM7orKPFZW3vjZzDTmH/wKLxQtgKo2K7fFNP7D/FJMUixbwVQZ2C6bePXxDHzGoHqULqR1tSWNnhYctZAf+77jra8L/TlfGU5ldSdZay2i02a26It7i/GD4354X8nxvbkyfJHDVRtsA2MZjloLPUcCVzrGZw4UzxJFNAHUDU7i6svk1V7JnD/6JHDbw4iURUe0VFKml5f9jcn79t15ApOpBXYVT7ysW3IyV16oY9jubU/HmErjA4VtVhLB3Nn/8KfL0goAU84fmwKSnDnypOu7Coai4dyyjovs4lfiuZpacDd30t/xiqXIsfZOYG4bnyvY0l+ZPQ0Uc= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2d0acc39-3fe4-47dd-2cb1-08d9b3ee1ec4 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:42:35.3964 (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: Ih6/4QR41xkudI3YZk/ZA4AfWw+fYCqAspFHpgLkoXQF0ja3wb0hu96KmXGYRK+I8FBAfyxP7dDeIMctOTSRDw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 LS(1021/1012/1028/1043/1046/1088/2088), LX2160, LX2162 platforms are enabled with JR driver model. removed sec_init() call from board files. removed CONFIG_FSL_CAAM from defconfig files. sec is initialized based on job ring information processed from device tree. Signed-off-by: Gaurav Jain Reviewed-by: Priyanka Jain --- arch/arm/Kconfig | 6 +++++ arch/arm/cpu/armv7/ls102xa/Kconfig | 4 ++++ arch/arm/cpu/armv7/ls102xa/cpu.c | 16 +++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 24 +++++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 10 +++++++- board/freescale/ls1012afrdm/ls1012afrdm.c | 7 +----- board/freescale/ls1012aqds/ls1012aqds.c | 6 +---- board/freescale/ls1012ardb/ls1012ardb.c | 6 +---- board/freescale/ls1021aiot/ls1021aiot.c | 6 ++--- board/freescale/ls1021aqds/ls1021aqds.c | 6 +---- board/freescale/ls1021atsn/ls1021atsn.c | 7 ++---- board/freescale/ls1021atwr/ls1021atwr.c | 8 ++----- board/freescale/ls1028a/ls1028a.c | 6 +---- board/freescale/ls1043ardb/ls1043ardb.c | 6 +---- board/freescale/ls1046afrwy/ls1046afrwy.c | 7 +----- board/freescale/ls1046aqds/ls1046aqds.c | 7 +----- board/freescale/ls1046ardb/ls1046ardb.c | 6 +---- board/freescale/ls1088a/ls1088a.c | 6 +---- board/freescale/ls2080aqds/ls2080aqds.c | 6 +---- board/freescale/ls2080ardb/ls2080ardb.c | 9 +------ board/freescale/lx2160a/lx2160a.c | 5 ---- board/kontron/sl28/sl28.c | 3 --- configs/ls1021aiot_qspi_defconfig | 1 - configs/ls1021aqds_nor_defconfig | 1 - configs/ls1021aqds_qspi_defconfig | 1 - configs/ls1021atsn_qspi_defconfig | 1 - configs/ls1021atwr_nor_defconfig | 1 - ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_defconfig | 1 - configs/ls1043ardb_tfa_defconfig | 1 - configs/ls1046afrwy_tfa_defconfig | 1 - configs/ls1046aqds_tfa_defconfig | 1 - configs/ls1046ardb_tfa_defconfig | 1 - configs/ls2088aqds_tfa_defconfig | 1 - configs/ls2088ardb_tfa_defconfig | 1 - configs/lx2160aqds_tfa_defconfig | 1 - configs/lx2160ardb_tfa_defconfig | 1 - configs/lx2162aqds_tfa_defconfig | 1 - 38 files changed, 78 insertions(+), 105 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7ce2bbc954..60beec278b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1504,6 +1504,9 @@ config TARGET_LS1028AQDS select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM + select FSL_BLOB + select MISC help Support for Freescale LS1028AQDS platform The LS1028A Development System (QDS) is a high-performance @@ -1518,6 +1521,9 @@ config TARGET_LS1028ARDB select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM + select FSL_BLOB + select MISC help Support for Freescale LS1028ARDB platform The LS1028A Development System (RDB) is a high-performance diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index f919d02db4..8e8fb4e9db 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -21,6 +21,10 @@ config ARCH_LS1021A select SYS_FSL_SRDS_1 select SYS_HAS_SERDES select SYS_I2C_MXC + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply CMD_PCI imply SCSI imply SCSI_AHCI diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index d863c9625a..4904592703 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -20,6 +21,7 @@ #include #include #include +#include #include "fsl_epu.h" @@ -397,3 +399,17 @@ void arch_preboot_os(void) ctrl &= ~ARCH_TIMER_CTRL_ENABLE; asm("mcr p15, 0, %0, c14, c2, 1" : : "r" (ctrl)); } + +#ifdef 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 diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 1a057f7059..f7089cdc4c 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -20,6 +20,10 @@ config ARCH_LS1012A select SYS_I2C_MXC select SYS_I2C_MXC_I2C1 if !DM_I2C select SYS_I2C_MXC_I2C2 if !DM_I2C + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply PANIC_HANG config ARCH_LS1028A @@ -88,6 +92,10 @@ config ARCH_LS1043A select SYS_I2C_MXC_I2C2 if !DM_I2C select SYS_I2C_MXC_I2C3 if !DM_I2C select SYS_I2C_MXC_I2C4 if !DM_I2C + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply CMD_PCI imply ID_EEPROM @@ -125,6 +133,10 @@ config ARCH_LS1046A select SYS_I2C_MXC_I2C2 if !DM_I2C select SYS_I2C_MXC_I2C3 if !DM_I2C select SYS_I2C_MXC_I2C4 if !DM_I2C + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply ID_EEPROM imply SCSI imply SCSI_AHCI @@ -170,6 +182,9 @@ config ARCH_LS1088A select SYS_I2C_MXC_I2C3 if !TFABOOT select SYS_I2C_MXC_I2C4 if !TFABOOT select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select FSL_BLOB + select MISC imply ID_EEPROM imply SCSI imply SPL_SYS_I2C_LEGACY @@ -225,6 +240,9 @@ config ARCH_LS2080A select SYS_I2C_MXC_I2C3 if !TFABOOT select SYS_I2C_MXC_I2C4 if !TFABOOT select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select FSL_BLOB + select MISC imply DISTRO_DEFAULTS imply ID_EEPROM imply PANIC_HANG @@ -258,6 +276,9 @@ config ARCH_LX2162A select BOARD_EARLY_INIT_F select SYS_I2C_MXC select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select FSL_BLOB + select MISC imply DISTRO_DEFAULTS imply PANIC_HANG imply SCSI @@ -294,6 +315,9 @@ config ARCH_LX2160A select BOARD_EARLY_INIT_F select SYS_I2C_MXC select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select FSL_BLOB + select MISC imply DISTRO_DEFAULTS imply ID_EEPROM imply PANIC_HANG diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 1a359d060e..ccd9116ff8 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2020 NXP + * Copyright 2017-2021 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. */ @@ -48,6 +48,7 @@ #endif #endif #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -1649,6 +1650,13 @@ __weak int serdes_misc_init(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); + serdes_misc_init(); return 0; diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c index 5dd19cfcd9..bc37c553a5 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2018 NXP + * Copyright 2017-2018, 2021 NXP */ #include @@ -22,7 +22,6 @@ #include #include #include -#include #include DECLARE_GLOBAL_DATA_PTR; @@ -172,10 +171,6 @@ int board_init(void) if (current_el() == 3) out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER); -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index 68578e81a5..361bd5c582 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -28,7 +29,6 @@ #include #include #include -#include #include "../common/qixis.h" #include "ls1012aqds_qixis.h" #include "ls1012aqds_pfe.h" @@ -150,10 +150,6 @@ int board_init(void) erratum_a010315(); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 064fb4d39f..456609d993 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -27,7 +28,6 @@ #include #include #include -#include #include DECLARE_GLOBAL_DATA_PTR; @@ -173,10 +173,6 @@ int board_init(void) erratum_a010315(); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c index bfe6137604..5ab03b3340 100644 --- a/board/freescale/ls1021aiot/ls1021aiot.c +++ b/board/freescale/ls1021aiot/ls1021aiot.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -209,10 +210,7 @@ int misc_init_r(void) device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); #endif - -#ifdef CONFIG_FSL_CAAM - return sec_init(); -#endif + return 0; } #endif diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index fbbd27d9d7..f84b94d946 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -386,9 +385,6 @@ int misc_init_r(void) #ifdef CONFIG_FSL_DEVICE_DISABLE device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); -#endif -#ifdef CONFIG_FSL_CAAM - return sec_init(); #endif return 0; } diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c index f31e16c419..f016088670 100644 --- a/board/freescale/ls1021atsn/ls1021atsn.c +++ b/board/freescale/ls1021atsn/ls1021atsn.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright 2016-2019 NXP +/* Copyright 2016-2019, 2021 NXP */ #include #include @@ -238,10 +238,7 @@ int misc_init_r(void) #ifdef CONFIG_FSL_DEVICE_DISABLE device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); #endif - -#ifdef CONFIG_FSL_CAAM - return sec_init(); -#endif + return 0; } #endif diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index f0b441db63..a2a87eaf35 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -555,10 +554,7 @@ int misc_init_r(void) #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) config_board_mux(); #endif - -#ifdef CONFIG_FSL_CAAM - return sec_init(); -#endif + return 0; } #endif diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index 486a544d35..71a086ef67 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -73,10 +73,6 @@ u32 get_lpuart_clk(void) int board_init(void) { -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index beef26b084..c7f214c236 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -20,7 +21,6 @@ #include #include #include -#include #include "cpld.h" #ifdef CONFIG_U_QE #include @@ -211,10 +211,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c index f1c08a13f7..5a298cd311 100644 --- a/board/freescale/ls1046afrwy/ls1046afrwy.c +++ b/board/freescale/ls1046afrwy/ls1046afrwy.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -20,7 +20,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -135,10 +134,6 @@ val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0); return 0; } diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c index cc95d441b6..79658693ab 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. - * Copyright 2019-2020 NXP + * Copyright 2019-2021 NXP */ #include @@ -27,7 +27,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -420,10 +419,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - return 0; } diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c index 93ef903f29..2e9a6d44eb 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -23,7 +24,6 @@ #include #include #include "cpld.h" -#include DECLARE_GLOBAL_DATA_PTR; @@ -85,10 +85,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 7046fbaeb5..b8bc8f0d5a 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2018 NXP + * Copyright 2017-2018, 2021 NXP */ #include #include @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -815,9 +814,6 @@ int board_init(void) out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR105_IRQ_MASK); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index 2f0139edef..5cc5d06823 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor + * Copyright 2021 NXP */ #include #include @@ -20,7 +21,6 @@ #include #include #include -#include #include #include #include "../common/i2c_mux.h" @@ -221,10 +221,6 @@ int board_init(void) #endif #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index bf660a8e65..e657097ba7 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor - * Copyright 2017 NXP + * Copyright 2017, 2021 NXP */ #include #include @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -287,9 +286,6 @@ int board_init(void) QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET_EN); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif @@ -298,9 +294,6 @@ int board_init(void) /* invert AQR405 IRQ pins polarity */ out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR405_IRQ_MASK); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif #if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) pci_init(); diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index bda665624d..c8a47c6bae 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -596,10 +595,6 @@ int board_init(void) out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR107_IRQ_MASK); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) pci_init(); #endif diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index c8ed7ac81a..d86cf308f6 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -28,9 +28,6 @@ int board_early_init_f(void) int board_init(void) { - if (CONFIG_IS_ENABLED(FSL_CAAM)) - sec_init(); - return 0; } diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig index 2a999e8798..c59ccd37f3 100644 --- a/configs/ls1021aiot_qspi_defconfig +++ b/configs/ls1021aiot_qspi_defconfig @@ -36,7 +36,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig index 3a2fe03139..f0236e35d8 100644 --- a/configs/ls1021aqds_nor_defconfig +++ b/configs/ls1021aqds_nor_defconfig @@ -50,7 +50,6 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x60300000 CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig index a787ce0b7c..73c78753f9 100644 --- a/configs/ls1021aqds_qspi_defconfig +++ b/configs/ls1021aqds_qspi_defconfig @@ -50,7 +50,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/ls1021atsn_qspi_defconfig b/configs/ls1021atsn_qspi_defconfig index d92fdf4a15..5abf6cdbb9 100644 --- a/configs/ls1021atsn_qspi_defconfig +++ b/configs/ls1021atsn_qspi_defconfig @@ -36,7 +36,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig index 548ec897bc..10026d0549 100644 --- a/configs/ls1021atwr_nor_defconfig +++ b/configs/ls1021atwr_nor_defconfig @@ -44,7 +44,6 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x60300000 CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index 404b33f938..e6c12c9104 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -61,6 +61,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SPL_DM=y +CONFIG_SPL_OF_CONTROL=y # CONFIG_SPL_BLK is not set CONFIG_DM_I2C=y # CONFIG_SPL_DM_I2C is not set diff --git a/configs/ls1028ardb_tfa_defconfig b/configs/ls1028ardb_tfa_defconfig index 035974afd8..d447358107 100644 --- a/configs/ls1028ardb_tfa_defconfig +++ b/configs/ls1028ardb_tfa_defconfig @@ -48,7 +48,6 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SCSI_AHCI=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1043ardb_tfa_defconfig b/configs/ls1043ardb_tfa_defconfig index 7e741c7183..a0474ac2e3 100644 --- a/configs/ls1043ardb_tfa_defconfig +++ b/configs/ls1043ardb_tfa_defconfig @@ -41,7 +41,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_ADDR=0x60500000 CONFIG_DM=y -CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/ls1046afrwy_tfa_defconfig b/configs/ls1046afrwy_tfa_defconfig index 85db989f96..9d60bd199a 100644 --- a/configs/ls1046afrwy_tfa_defconfig +++ b/configs/ls1046afrwy_tfa_defconfig @@ -39,7 +39,6 @@ CONFIG_ENV_ADDR=0x40500000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig index 4bf413c0eb..0a2d317c8b 100644 --- a/configs/ls1046aqds_tfa_defconfig +++ b/configs/ls1046aqds_tfa_defconfig @@ -55,7 +55,6 @@ CONFIG_ENV_ADDR=0x60500000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig index 3501764e6f..10093b59d4 100644 --- a/configs/ls1046ardb_tfa_defconfig +++ b/configs/ls1046ardb_tfa_defconfig @@ -44,7 +44,6 @@ CONFIG_ENV_ADDR=0x40500000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/ls2088aqds_tfa_defconfig b/configs/ls2088aqds_tfa_defconfig index 6821ed1a45..fb2fc3d0f7 100644 --- a/configs/ls2088aqds_tfa_defconfig +++ b/configs/ls2088aqds_tfa_defconfig @@ -51,7 +51,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/ls2088ardb_tfa_defconfig b/configs/ls2088ardb_tfa_defconfig index 8e76f59b92..6a99143e54 100644 --- a/configs/ls2088ardb_tfa_defconfig +++ b/configs/ls2088ardb_tfa_defconfig @@ -49,7 +49,6 @@ CONFIG_ENV_ADDR=0x580500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig index ddcf681255..9b6c7323cb 100644 --- a/configs/lx2160aqds_tfa_defconfig +++ b/configs/lx2160aqds_tfa_defconfig @@ -51,7 +51,6 @@ CONFIG_ENV_ADDR=0x20500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig index d81a4b10b1..9bf92881be 100644 --- a/configs/lx2160ardb_tfa_defconfig +++ b/configs/lx2160ardb_tfa_defconfig @@ -50,7 +50,6 @@ CONFIG_ENV_ADDR=0x20500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig index 2028bfc524..441932417a 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -53,7 +53,6 @@ CONFIG_ENV_ADDR=0x20500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y From patchwork Tue Nov 30 10:40:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561528 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=e2Xbcogp; 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 4J3Jkq47J6z9sWJ for ; Tue, 30 Nov 2021 21:44:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 64D2C830B1; Tue, 30 Nov 2021 11:43:08 +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="e2Xbcogp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 21500830C1; Tue, 30 Nov 2021 11:42:50 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0616.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::616]) (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 897DC830DB for ; Tue, 30 Nov 2021 11:42: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=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JLxAVNuvBeTXSn6Zt10w2a6C2YNIFqtIo25/zKCLn2W55rF6pACyLV/RnDljXbla/8rEok1mSK7wAiwtZVqxaGhn/3t27S1M7p6q64srueN+8CACQuL+moMEB1UVY620Cf1z0DG3H0NDnvPyxdPac9gBovFcXKkPZXiowpzwkHh/1J1OyuieJ17gZbE+m8WHlo1UkyAB7ue8InodvnHPm19ZQKa14i/rI0brnBXSVV/hVu33iiQkddhW5JOPAkFdkzBaa4UFr+jZIFMQ1NEg5gct+u9yZ7m0xdOx5qIQwiFAqFOvKNgJQJtdA//JTtfXIwfHAiuxJmKZPoLyxOO2fQ== 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=Cf8IYuCCK6XERjIGE3dEhyjAaoItV2Rzj+WMJFXx/2A=; b=iiNyPeoKuvxK0tDwmmSGn+rE2M0qvVxMQPJvoZ2M8zdBs+HLNTNO0AhO76d0HfBZuu/bCtI4YW4scYP8Ft1BwexvaHU4WXhaUIsg4Vhp4U/THlt9skhqmEbULT3ZOSJQ5UM9om4+ReIL8Sg7oBx0pTOj3S+ivu/lNYPdGun4/wAF0c88yKAGhhbHIcv/g/e2pyeGD6Vf2+S4dLR88lEG0096K57hwsFtxr6IDzeBdQ6o8c6dJ7pKe0Umj1aV+C4Srgv28+LqJj6Enhpt3gHIOROQhX9gnr7eQ8hbPh+RCz16uY0Yumq0o+FqsJTHpAxstFeh2msunzkvLzvXavneHA== 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=Cf8IYuCCK6XERjIGE3dEhyjAaoItV2Rzj+WMJFXx/2A=; b=e2XbcogpgkhknGiVSd3IhpOJ6EcmSimB3GkyYW/hOMWfBijSockQzCqBhguUU2N99RMxrr3FrcoWSEtvHs+oWuev4Reg7dkoT1Xk+Zkf4CxlJVa6CunYQRziIsrraUQkdNgC6nHCfxdtuXquMYSWifAmNGSgW48Td3LJ01usrTA= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:42:42 +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.4734.024; Tue, 30 Nov 2021 10:42:42 +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 v6 13/15] PPC: Add crypto node in device tree Date: Tue, 30 Nov 2021 16:10:46 +0530 Message-Id: <20211130104048.6207-14-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:42:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 79924b97-c76f-42a8-4b6b-08d9b3ee22a1 X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:60; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PcwCdQOVhs5yag1JD+wgtLhTmjMgHaIoU78Ir2/ghwpCJMFWCHSZ6pmk1in0fEsO7/Jzxj4WddQPV6mdBm7gWqDSrS7Vj3bGqkNWodbZcQooP4bzeKfRJRv9DbFgI955o41t++MnhtNX200hSyyqyvedKi6GbwaMQVhZPBEyq7/Wg1JwcEoBizkxtbik0clznoO6r1mH3szPR5qwv/hbOewI7RE5xKovtJZpmHR58bSwvxpjamIsTsr8LI5cEpcfXX0i8y+s+ss4mfAM8ciCHSy70uNuE4KsGqs8xKK41zcJ5w/Fn1glF8H6JB8nFYr67u0tkH9iZzTWujMnFzwx/k8jX01kpbFvLqKIIpUEgHJsRKg3izvsrr0hfHJQdXEMyTaHtbEm3x+F10ihiZ0N1e5+AZlLzlGmHRhBODqj6ysNR0ym1Q5RZr4UiUJz4sDaDfvCWzQXYJglGE74LUUAdgDdfCmOmTZZoghSTd2sk6Pk2ytFxDMeiDfbYBUM9J6wiFpB9BDdaxC5THpTORGYRgYsc7aMM8Kp/XMbyJv5OCdhaqfr1VwmmT6aMPOHR+DdICbJstWgqB9xWU+Hl/iWnR9SASdojS1skYldeuinanqOj5hkEYnRbNLHGB2rmAtaiughsgqxxqNDS+QPaJ0F2x4WAH4vPrY2WIEWGtAiF5gYkWWhj3z44/rAYd8DqBsI3g8uqWgKYQdvwGvGZUuGg72/7qz3107R0AKr7kYqSbn3LTEKX4JoFzAjdANviljf 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(6666004)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(30864003)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Zv9zqM9UVFC9TSwNrWv/QsXSiaxlbcfwTAnsxgdaSWdqGzOdvn8A6n3oPXZiJrTXFUbK2F2Y0gWBVKrkJnmKRmrbrovCgmJF+VoLaPK/q+KjwquNVwZQpIWSaS3pmY7VqCcY6W0Dyf44r9T+PWsfPbpLbu1QXS3L1rlTDS4FmTEMfkv6UY9Dalo5oNeSs/86gEcB2bNTF5gPUm68XBkRIQT7xt2oZf8GU3p9M2ezuEXdkweOSTd0sgjRQoDqAVSmpSX+zsc0UtrL6ji+VmL/VpSMhrVtLON1w0/paqmHRvvPzmlAM/k57FzbW8DvFkGlLs4xq/c4NL54bVMJxeqsLdnVOqxEONbq+2jax8N5i3Skzi08aVPA9ZaeGBZI8x5OBw7HPUz0xQzfHcy6yiuLVp4Svzen3Lr5yeMyIc2RENrc8rv48lh1ZJuhCciQEoHAKDQHc1QLS8DuaeW/cgvsApkaiR0SqKXzh3accaTqbpWEM3c7l9wsJQvb0XsLX5qgUjXGlY4b1gctd2fxSq4+LQ+STaCTaJYKeHhXHvjjRaIwql951w8CVagFpWgVSjOl8njPtJSQMKKjPaOjwEIzUsb2E2czU0elmucPBPsjwUQ/FXNgrvmhZUR8cCZhIxsMGW0F+aXPWhmVjbqZ3V7YG4FnmQbN8UZgwgJpdC5l4SE0YuvTpn3hYPlScDe0b23ZWhg14RJij0dQbdXKD4fyc0ovvJndqmrfvygtzDXDN1yM6Cf4NQrJVE8lmywfkPaiM18IG8SomtPAjjJGtmzKwqxd+QvehUYZHHHFHJ04t8AJWPhzH4pZy6H08cW943MCjzg4jZAFITHAlcp7063zRghztY9Pci0RY9bU5aWoyQAsL2iarAoPs3b/BbsxCw0AQCyzkmd+vDrHTx53lXQ7M32BFtX052Xp57Kee7y+Kzn0cLW8BdD61YIf33gpM8U1RXqcGGVXLyyWmTI76zRumrF91ZoN0b3qP6VI8SX9BhQAYDwW1sK7mXzE5eqRY18/lhovug+j7baA0nESk69r7RpVoWVOxmdENQwQNOYi8UU33B9CCMUy7QeEX6bGPCB/eGlUbqw7LinKkgUyheAb6lE+/7kKiHXW+/dEW5QRdXWMtO1zG6bnY40S7h8WcjCUlGtkc/wd4ow08aFqJxR+Iz7rPvTgj0/0b4FLzZ3rqotS/GpFeKM0+qbyBiuhCsQta6OL9FxPbdcTiIZm6uftzs7x3ENE4w5NoyDWYdmZ59FqLobYzRauuUeNLpNoV0wK/ih7+8UM/k1qytuAl7Uix5mpSmSLZjXd96U777AzYxLBBl7t8ZWEIVSbToxh0rPpQM5eipWmTLBW+xrknVMX0mAny3EZO9Chi2HTY3Sd0oJPqsQsJXsTu61QcLm0ubS6NdECoM0trKFI700qgiWPhn2KL+2TIW5gBABEEHWOl5I/Ee7BSuvpkOzgH7WLu7mRDdP/caHlMId3MXm6vRrNU0fVeyY9VdYZvFbSDZHJjPDyPFrofqt5koatnEicacZaxDDI4LAO2Ar2HYsE6/26gYgMPPPLob5cJRXHVSKfzCEzWRzgyttwxkB41CEBmuSbwMf5lSeJ4cgXKF+hMKJiZ6uaw01+cY6urN1rdWhB9O8= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 79924b97-c76f-42a8-4b6b-08d9b3ee22a1 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:42:41.8417 (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: HD3rc5nAWgR3W7ZFfKi7pzBn33Uykb1soEFU8IbBU+EAtKrR5RS2n8peGv/lJdOpKxSPW9SMeXwo+gWJik7iMw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 device tree imported from linux kernel. c500bee1c5b2 (tag: v5.14-rc4) Linux 5.14-rc4 Signed-off-by: Gaurav Jain Reviewed-by: Priyanka Jain --- arch/powerpc/dts/p2041si-post.dtsi | 1 + arch/powerpc/dts/p3041si-post.dtsi | 1 + arch/powerpc/dts/p4080si-post.dtsi | 1 + arch/powerpc/dts/p5040si-post.dtsi | 1 + arch/powerpc/dts/qoriq-sec4.0-0.dtsi | 74 ++++++++++++++++++++++ arch/powerpc/dts/qoriq-sec4.2-0.dtsi | 83 +++++++++++++++++++++++++ arch/powerpc/dts/qoriq-sec5.2-0.dtsi | 92 ++++++++++++++++++++++++++++ arch/powerpc/dts/t1023si-post.dtsi | 1 + arch/powerpc/dts/t1042si-post.dtsi | 1 + arch/powerpc/dts/t2080si-post.dtsi | 1 + arch/powerpc/dts/t4240si-post.dtsi | 1 + 11 files changed, 257 insertions(+) create mode 100644 arch/powerpc/dts/qoriq-sec4.0-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-sec4.2-0.dtsi create mode 100644 arch/powerpc/dts/qoriq-sec5.2-0.dtsi diff --git a/arch/powerpc/dts/p2041si-post.dtsi b/arch/powerpc/dts/p2041si-post.dtsi index 01ab395950..8819199646 100644 --- a/arch/powerpc/dts/p2041si-post.dtsi +++ b/arch/powerpc/dts/p2041si-post.dtsi @@ -11,6 +11,7 @@ /include/ "qoriq-clockgen1.dtsi" /include/ "qoriq-gpio-0.dtsi" +/include/ "qoriq-sec4.2-0.dtsi" /* include used FMan blocks */ /include/ "qoriq-fman-0.dtsi" diff --git a/arch/powerpc/dts/p3041si-post.dtsi b/arch/powerpc/dts/p3041si-post.dtsi index 21f322f06f..a3e8088d25 100644 --- a/arch/powerpc/dts/p3041si-post.dtsi +++ b/arch/powerpc/dts/p3041si-post.dtsi @@ -11,6 +11,7 @@ /include/ "qoriq-clockgen1.dtsi" /include/ "qoriq-gpio-0.dtsi" +/include/ "qoriq-sec4.2-0.dtsi" /* include used FMan blocks */ /include/ "qoriq-fman-0.dtsi" diff --git a/arch/powerpc/dts/p4080si-post.dtsi b/arch/powerpc/dts/p4080si-post.dtsi index 7c3f2fb92e..56b79b14f4 100644 --- a/arch/powerpc/dts/p4080si-post.dtsi +++ b/arch/powerpc/dts/p4080si-post.dtsi @@ -11,6 +11,7 @@ /include/ "qoriq-clockgen1.dtsi" /include/ "qoriq-gpio-0.dtsi" +/include/ "qoriq-sec4.0-0.dtsi" /* include used FMan blocks */ /include/ "qoriq-fman-0.dtsi" diff --git a/arch/powerpc/dts/p5040si-post.dtsi b/arch/powerpc/dts/p5040si-post.dtsi index 1efad2d017..fae3ed31a5 100644 --- a/arch/powerpc/dts/p5040si-post.dtsi +++ b/arch/powerpc/dts/p5040si-post.dtsi @@ -11,6 +11,7 @@ /include/ "qoriq-clockgen1.dtsi" /include/ "qoriq-gpio-0.dtsi" +/include/ "qoriq-sec5.2-0.dtsi" /* include used FMan blocks */ /include/ "qoriq-fman-0.dtsi" diff --git a/arch/powerpc/dts/qoriq-sec4.0-0.dtsi b/arch/powerpc/dts/qoriq-sec4.0-0.dtsi new file mode 100644 index 0000000000..ff348d70f1 --- /dev/null +++ b/arch/powerpc/dts/qoriq-sec4.0-0.dtsi @@ -0,0 +1,74 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) +/* + * QorIQ Sec/Crypto 4.0 device tree stub [ controller @ offset 0x300000 ] + * + * Copyright 2011 Freescale Semiconductor Inc. + */ + +crypto: crypto@300000 { + compatible = "fsl,sec-v4.0"; + fsl,sec-era = <1>; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x300000 0x10000>; + ranges = <0 0x300000 0x10000>; + interrupts = <92 2 0 0>; + + sec_jr0: jr@1000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = <88 2 0 0>; + }; + + sec_jr1: jr@2000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = <89 2 0 0>; + }; + + sec_jr2: jr@3000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x3000 0x1000>; + interrupts = <90 2 0 0>; + }; + + sec_jr3: jr@4000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x4000 0x1000>; + interrupts = <91 2 0 0>; + }; + + rtic@6000 { + compatible = "fsl,sec-v4.0-rtic"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x6000 0x100>; + ranges = <0x0 0x6100 0xe00>; + + rtic_a: rtic-a@0 { + compatible = "fsl,sec-v4.0-rtic-memory"; + reg = <0x00 0x20 0x100 0x80>; + }; + + rtic_b: rtic-b@20 { + compatible = "fsl,sec-v4.0-rtic-memory"; + reg = <0x20 0x20 0x200 0x80>; + }; + + rtic_c: rtic-c@40 { + compatible = "fsl,sec-v4.0-rtic-memory"; + reg = <0x40 0x20 0x300 0x80>; + }; + + rtic_d: rtic-d@60 { + compatible = "fsl,sec-v4.0-rtic-memory"; + reg = <0x60 0x20 0x500 0x80>; + }; + }; +}; + +sec_mon: sec_mon@314000 { + compatible = "fsl,sec-v4.0-mon"; + reg = <0x314000 0x1000>; + interrupts = <93 2 0 0>; +}; diff --git a/arch/powerpc/dts/qoriq-sec4.2-0.dtsi b/arch/powerpc/dts/qoriq-sec4.2-0.dtsi new file mode 100644 index 0000000000..57a0bc5c56 --- /dev/null +++ b/arch/powerpc/dts/qoriq-sec4.2-0.dtsi @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) +/* + * QorIQ Sec/Crypto 4.2 device tree stub [ controller @ offset 0x300000 ] + * + * Copyright 2011 Freescale Semiconductor Inc. + */ + +crypto: crypto@300000 { + compatible = "fsl,sec-v4.2", "fsl,sec-v4.0"; + fsl,sec-era = <3>; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x300000 0x10000>; + ranges = <0 0x300000 0x10000>; + interrupts = <92 2 0 0>; + + sec_jr0: jr@1000 { + compatible = "fsl,sec-v4.2-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = <88 2 0 0>; + }; + + sec_jr1: jr@2000 { + compatible = "fsl,sec-v4.2-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = <89 2 0 0>; + }; + + sec_jr2: jr@3000 { + compatible = "fsl,sec-v4.2-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x3000 0x1000>; + interrupts = <90 2 0 0>; + }; + + sec_jr3: jr@4000 { + compatible = "fsl,sec-v4.2-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x4000 0x1000>; + interrupts = <91 2 0 0>; + }; + + rtic@6000 { + compatible = "fsl,sec-v4.2-rtic", + "fsl,sec-v4.0-rtic"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x6000 0x100>; + ranges = <0x0 0x6100 0xe00>; + + rtic_a: rtic-a@0 { + compatible = "fsl,sec-v4.2-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x00 0x20 0x100 0x80>; + }; + + rtic_b: rtic-b@20 { + compatible = "fsl,sec-v4.2-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x20 0x20 0x200 0x80>; + }; + + rtic_c: rtic-c@40 { + compatible = "fsl,sec-v4.2-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x40 0x20 0x300 0x80>; + }; + + rtic_d: rtic-d@60 { + compatible = "fsl,sec-v4.2-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x60 0x20 0x500 0x80>; + }; + }; +}; + +sec_mon: sec_mon@314000 { + compatible = "fsl,sec-v4.2-mon", "fsl,sec-v4.0-mon"; + reg = <0x314000 0x1000>; + interrupts = <93 2 0 0>; +}; diff --git a/arch/powerpc/dts/qoriq-sec5.2-0.dtsi b/arch/powerpc/dts/qoriq-sec5.2-0.dtsi new file mode 100644 index 0000000000..e5f87effd3 --- /dev/null +++ b/arch/powerpc/dts/qoriq-sec5.2-0.dtsi @@ -0,0 +1,92 @@ +// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-3-Clause) +/* + * QorIQ Sec/Crypto 5.2 device tree stub [ controller @ offset 0x300000 ] + * + * Copyright 2011-2012 Freescale Semiconductor Inc. + */ + +crypto: crypto@300000 { + compatible = "fsl,sec-v5.2", "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <5>; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x300000 0x10000>; + ranges = <0 0x300000 0x10000>; + interrupts = <92 2 0 0>; + + sec_jr0: jr@1000 { + compatible = "fsl,sec-v5.2-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = <88 2 0 0>; + }; + + sec_jr1: jr@2000 { + compatible = "fsl,sec-v5.2-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = <89 2 0 0>; + }; + + sec_jr2: jr@3000 { + compatible = "fsl,sec-v5.2-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x3000 0x1000>; + interrupts = <90 2 0 0>; + }; + + sec_jr3: jr@4000 { + compatible = "fsl,sec-v5.2-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x4000 0x1000>; + interrupts = <91 2 0 0>; + }; + + rtic@6000 { + compatible = "fsl,sec-v5.2-rtic", + "fsl,sec-v5.0-rtic", + "fsl,sec-v4.0-rtic"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x6000 0x100>; + ranges = <0x0 0x6100 0xe00>; + + rtic_a: rtic-a@0 { + compatible = "fsl,sec-v5.2-rtic-memory", + "fsl,sec-v5.0-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x00 0x20 0x100 0x80>; + }; + + rtic_b: rtic-b@20 { + compatible = "fsl,sec-v5.2-rtic-memory", + "fsl,sec-v5.0-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x20 0x20 0x200 0x80>; + }; + + rtic_c: rtic-c@40 { + compatible = "fsl,sec-v5.2-rtic-memory", + "fsl,sec-v5.0-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x40 0x20 0x300 0x80>; + }; + + rtic_d: rtic-d@60 { + compatible = "fsl,sec-v5.2-rtic-memory", + "fsl,sec-v5.0-rtic-memory", + "fsl,sec-v4.0-rtic-memory"; + reg = <0x60 0x20 0x500 0x80>; + }; + }; +}; + +sec_mon: sec_mon@314000 { + compatible = "fsl,sec-v5.2-mon", "fsl,sec-v5.0-mon", "fsl,sec-v4.0-mon"; + reg = <0x314000 0x1000>; + interrupts = <93 2 0 0>; +}; diff --git a/arch/powerpc/dts/t1023si-post.dtsi b/arch/powerpc/dts/t1023si-post.dtsi index 7284eb9791..6f666a1554 100644 --- a/arch/powerpc/dts/t1023si-post.dtsi +++ b/arch/powerpc/dts/t1023si-post.dtsi @@ -14,6 +14,7 @@ /include/ "qoriq-gpio-1.dtsi" /include/ "qoriq-gpio-2.dtsi" /include/ "qoriq-gpio-3.dtsi" +/include/ "qoriq-sec5.0-0.dtsi" /* include used FMan blocks */ /include/ "qoriq-fman3l-0.dtsi" diff --git a/arch/powerpc/dts/t1042si-post.dtsi b/arch/powerpc/dts/t1042si-post.dtsi index 5c60944e60..eebbbaf0e1 100644 --- a/arch/powerpc/dts/t1042si-post.dtsi +++ b/arch/powerpc/dts/t1042si-post.dtsi @@ -12,6 +12,7 @@ /include/ "qoriq-gpio-1.dtsi" /include/ "qoriq-gpio-2.dtsi" /include/ "qoriq-gpio-3.dtsi" +/include/ "qoriq-sec5.0-0.dtsi" /include/ "qoriq-fman3l-0.dtsi" /include/ "qoriq-fman3-0-1g-0.dtsi" diff --git a/arch/powerpc/dts/t2080si-post.dtsi b/arch/powerpc/dts/t2080si-post.dtsi index d8ef579cb7..c06526b3db 100644 --- a/arch/powerpc/dts/t2080si-post.dtsi +++ b/arch/powerpc/dts/t2080si-post.dtsi @@ -13,6 +13,7 @@ /include/ "qoriq-gpio-1.dtsi" /include/ "qoriq-gpio-2.dtsi" /include/ "qoriq-gpio-3.dtsi" +/include/ "qoriq-sec5.2-0.dtsi" /include/ "qoriq-fman3-0.dtsi" /include/ "qoriq-fman3-0-10g-0-best-effort.dtsi" diff --git a/arch/powerpc/dts/t4240si-post.dtsi b/arch/powerpc/dts/t4240si-post.dtsi index a596f48b54..9fa99ae771 100644 --- a/arch/powerpc/dts/t4240si-post.dtsi +++ b/arch/powerpc/dts/t4240si-post.dtsi @@ -12,6 +12,7 @@ /include/ "qoriq-gpio-1.dtsi" /include/ "qoriq-gpio-2.dtsi" /include/ "qoriq-gpio-3.dtsi" +/include/ "qoriq-sec5.0-0.dtsi" /include/ "qoriq-fman3-0.dtsi" /include/ "qoriq-fman3-0-1g-0.dtsi" From patchwork Tue Nov 30 10:40:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561529 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=jfK7dps4; 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 4J3Jl33X54z9sWJ for ; Tue, 30 Nov 2021 21:45:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F1C9B830E4; Tue, 30 Nov 2021 11:43:10 +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="jfK7dps4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A0C18830E0; Tue, 30 Nov 2021 11:42:55 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::62c]) (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 A63D6830C0 for ; Tue, 30 Nov 2021 11:42:49 +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=RRS4Sa5tx42mQpL46QrLlXA6ctLZH2IGruoSYb4eo/EFtrp8lRwVQArdkNKhbdRdgG+kwsc2pEeveTF/qru3awbiJP05Go0KD0Z1lL06aN81z7yEarF8IrqCcOky3YKv0VYaZwDglPIVPcZOdn/jlSlY9V91p5kMlT2PLaLJ0+cLMFzDG1YD/IkQqP1hjtFrt8cf55gw1EWZhOCP/W57qRxnbL5RZ1G4iUTe7PdadL8FSbUrpzO2fbMEYz2rO69tUHOD52mxb8wLdDosfXdJYgea0Nf1EYavQCth+5Ah5odGJC7vzYCbswF9ndBl1BJ/wrsfPo7538V0oHoBZddNiA== 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=Ooe/OwXUIXW6N2tVm7XRvkd8+uZUt0DNJofE9WOhqQo=; b=UGFgGlaDfF3/rchld2pWbWi/9Eh8QE3p/wMX9JoGOmQ6b739NAdtU4zfpVPEezvXWgEwW7MIJ6n9tuvjSlztSHeAwKmZH2dvq4EBayAvWcMA38i8X7xYvnqA4dEWO7JlHr0Nveof5khGKWAQSelcSZ9128q1qWuk9fJPBBc/7DJIDhDUz9KV0SrgxRb9SAaytr+C06B1lDT02rdHnVj4MytqXZ/g1isIOcSfJc7hCQgBqNT2PtYUW71xozcCS45glAKiNb//swjFIPo5JwFB9d4xoYGpqHfk9lT0yJqPRX/EWMvH2hqlKEjNJnO3nxaNNgMrZhvEd/QastlcM2uPIg== 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=Ooe/OwXUIXW6N2tVm7XRvkd8+uZUt0DNJofE9WOhqQo=; b=jfK7dps4IzyZNK9swNLwR+PwZnK3Ld7CjR0zBFHfoubE8kpxV2A+O0UOXp+qyZmVaExHJcWZiUElkShisSJ/nY0m/ql34aL5tBxjJ88GtOSMocIHhlBdlm8vUnd8ELD4phUd3lHk+/bTigRvw9hZiXcrU54p2t3+J5+DGbxACas= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:42:48 +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.4734.024; Tue, 30 Nov 2021 10:42:48 +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 v6 14/15] PPC: Enable Job ring driver model in U-Boot Date: Tue, 30 Nov 2021 16:10:47 +0530 Message-Id: <20211130104048.6207-15-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:42:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4ca7ebb7-c5dd-42e2-2502-08d9b3ee267a X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:15; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: c3Ux/XeauSfWCD/zHkBs6zPPKrQHH7PTJxFSxsVNWfha7j7UMYmWsmFJSuMtkrmfhWEbaBFaNijihow5ukG7WwhzP9iWQ3wX2mmCLluNs5hsYDjlA36h/HBs9j3v2mpTSvD7PqRk0umenNRgY8QNHaeip+VPbcGx+dnocjloh3JXRFOD5l1BTYAwjK6dUIlvkUVSwmaDDgVAQ22g3grS3GtF+eExqi9ZjVZwD+lj9PcMBSOcgm38MUAFKiIzkNQY9gZ9tdk7lv/uwQ85AeHrcG65zM4RjENSm7wnvXQ/h4N/G2R4xS5HNYw1/mAj/EUoYt8uKxryVX1NSJsc/IWCOd37Kb+oyQ3orgXt2xRu7HWh2w80iDC4tLiQTzBYCHbaPkYkkZHLqF4HcdlKiJtaUspxLPcwJdBRDxE00si0kR5FEXS/cjoTd8YmATInCgH2biRVIp0uTI0NPxYYCq+ArbvROoD4AhrvDDEA9SvdxyRlXpYKldnwv9L22nTg0mIOABsvN1bjb28u3cKiBU/1pK/mIwt1OmVNlHTkOcVj9HULEOgBLIRkKJDY83tCJsAIBeDLMQUE2z4Xmxfb/mDzhRem4QohyhrleeZk2sIVUcdphMiEyX6rITrBMD30fElrjP3a60C8tfUzRbL2zqg4h1iQtAzhUOYF+vv63Nu6YmfEXiq5y3xNycreozy8Z1li0Q1INEqlu8h6R7tFxLO/poHT7WNXbgJCit8JSHhPPzA= 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(19627235002)(44832011)(38100700002)(66946007)(186003)(8676002)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(66476007)(1006002)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NVUP6Gpi7lsZL7Zq6kII/kYhNZfoyrij3Gra1I/LFus4BB3z7V0zTTbhVz6uPlUKVdB3jOklkqEB831t7yKEeFxie2RrdHYTEO5hPSMKA09kaJUrUWLELU5dPFH0tOle5HJOhLpIcZFRp49KISYgFzxeoSKKLCg3jpiGTAruzgNTPlADmT1oZ8mRzMbvKJever2meEKaJVJ/GZwv5pJzSHPVQm5d8kHbAg5JmwXWiQmIEupMkUL11PY8vxErWruVdZFv0PEHETePvlMn0rATNdaZrFRuw23K3tN0zwjFSNZEmvKTeZJNC96H1YiEtMzAVTtLxuZFvgb006PNXmZylD1P0OKWJLgg+8N/71e21RuUXNSbbwu6rURefCKVxL8Lx7OfNcK67ccvBaecAzzQ6nkpFtAqR0ElSoeZXZzlxk2L4+/Cf1tgieRoTCrfpLWgoBIYt4xqA/7NSoHJOPAEM4Dt72BSLlkVrGAvQd6sZXRb3VxiXxopSjfhvQbMBEpSoykPQzOlN8aoUYKQB2Okevv8v3Yw+IB6k8lt0uikKViJEY7LLuWkfwxDD9WA8CxFf+IpOlygW8qBx2d0nN+IzyZtkvmXQM/8lY8dNxsT4UqD/a4Kchy2jgu0YKJHvn3owpG9srpqUPlnGhGbayr9ngfYQedfrmr6RZE0dK3NC3UL6jeGBJ79fatYdWgZAt2p3qaRCRvvYGBGvKXiuwbQe035lPIQXl/zHgRmXEiWa5N1GqmWHcdpPTgdUEOuX3KVqa3xOqpNXXEB5O41uGsE9WNxe3zynI1L741HuyNn2yCUWDNd+jifQm645e4oA1LOKQ0A3cdaAWDiKZeTWmZdQZBbun0y8+VC3cLy/kwCaIloSrx8qV1MY6jYDeJYNzpaebAiCl4yPgfDw/Jubrv8IzFxYtDxyN0QaYnNL8f4OW4FMerGMVwj0IJntyORZ6l+DcOv28QGLOZrsa0Do6Av132sYRFJnhxdO36vMAZzHg/soXvfs4G+kMcwNouAb7crP4Ova/YglmHp0JOvE1BMAT3MUvIU/j7tQyibrY307bZa9C79a3BE0qDgDKQUPN0CDqu1YNBoDfpyPOIyR+r41CahFkhNd7Edzamkjvpgm5Q4UQJ0NqgUoN6Pmp2a6DHqNNcm9kztNF7B6hsneMKqdRiTCg9io/5PbVMMmsPP2emhTml34we9noEepHJshzRTreT7nnzY5fEci4k+eqaGzz7+u2MiiJTU45tUBL+WCN4WVE4pI/UCVefq/9jCQ2Er+PnJ78a75Gd3v1f6ut4jLaW8L5duHMsegFW9fK77QFbOAQotzNdRmbrvBQaGsIWw31JaP5UV4qZaPBC1JlHeQ8iNTukt3m67TBrdV4spQT6Ikr6AVN/3mRR4T0CFpcCvW8FwOSKMDvpcRGvEcxAUBYK6v4+k6WtpPBZNMfTKHiZjIQMAN9kNwYzHuck7V03Eib3xvC7aXoDDbNNuAIaoMzW192r+rDTbOasyOxOH6ktI2S6zZAQCv7z0T0tFaR7nd//TGkyz4JJBz040dJUc688Z6AwdmABRfq+N6tFKlPQ/7qxYN2EwzMxViaCR0+rN5VDm2fP4FqJmnqNsTP10XE/PoBYxqnpHYDtrrZbBfCE= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4ca7ebb7-c5dd-42e2-2502-08d9b3ee267a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:42:48.1431 (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: crSL1kOfdN9czuar2KWhUSb/tnlKzIEk0TX1AVtfv4fDUcK42/xlJjvR8rCHmo9x8UNaadYdOd9QdgDrKqyjHg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 removed sec_init() call and CONFIG_FSL_CAAM from defconfig. sec is initialized based on job ring information processed from device tree. Signed-off-by: Gaurav Jain Reviewed-by: Priyanka Jain --- arch/powerpc/cpu/mpc85xx/Kconfig | 44 +++++++++++++++++++++++++++ arch/powerpc/cpu/mpc85xx/cpu_init.c | 17 +++++++++-- arch/powerpc/include/asm/u-boot-ppc.h | 17 +++++++++++ arch/powerpc/include/asm/u-boot.h | 1 + configs/P2041RDB_defconfig | 1 - configs/P3041DS_defconfig | 1 - configs/P4080DS_defconfig | 1 - configs/P5040DS_defconfig | 1 - configs/T1024RDB_defconfig | 1 - configs/T1042D4RDB_defconfig | 1 - configs/T2080QDS_defconfig | 1 - configs/T2080RDB_defconfig | 1 - configs/T2080RDB_revD_defconfig | 1 - configs/T4240RDB_defconfig | 1 - 14 files changed, 77 insertions(+), 12 deletions(-) create mode 100644 arch/powerpc/include/asm/u-boot-ppc.h diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 836aeddbe2..aaf599f616 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -25,6 +25,10 @@ config TARGET_P3041DS select PHYS_64BIT select ARCH_P3041 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -33,6 +37,10 @@ config TARGET_P4080DS select PHYS_64BIT select ARCH_P4080 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -41,6 +49,10 @@ config TARGET_P5040DS select PHYS_64BIT select ARCH_P5040 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -102,6 +114,10 @@ config TARGET_P2041RDB select ARCH_P2041 select BOARD_LATE_INIT if CHAIN_OF_TRUST select PHYS_64BIT + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply FSL_SATA @@ -117,6 +133,10 @@ config TARGET_T1024RDB select SUPPORT_SPL select PHYS_64BIT select FSL_DDR_INTERACTIVE + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply CMD_EEPROM imply PANIC_HANG @@ -126,6 +146,10 @@ config TARGET_T1042RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT config TARGET_T1042D4RDB bool "Support T1042D4RDB" @@ -133,6 +157,10 @@ config TARGET_T1042D4RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply PANIC_HANG config TARGET_T1042RDB_PI @@ -141,6 +169,10 @@ config TARGET_T1042RDB_PI select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply PANIC_HANG config TARGET_T2080QDS @@ -151,6 +183,10 @@ config TARGET_T2080QDS select PHYS_64BIT select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE select FSL_DDR_INTERACTIVE + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply CMD_SATA config TARGET_T2080RDB @@ -159,6 +195,10 @@ config TARGET_T2080RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -168,6 +208,10 @@ config TARGET_T4240RDB select SUPPORT_SPL select PHYS_64BIT select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE + select FSL_CAAM + select FSL_BLOB + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index e920e01b25..728c6447a8 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -56,6 +56,7 @@ #ifdef CONFIG_U_QE #include #endif +#include #ifdef CONFIG_SYS_FSL_SINGLE_SOURCE_CLK /* @@ -974,8 +975,6 @@ int cpu_init_r(void) #endif #ifdef CONFIG_FSL_CAAM - sec_init(); - #if defined(CONFIG_ARCH_C29X) if ((SVR_SOC_VER(svr) == SVR_C292) || (SVR_SOC_VER(svr) == SVR_C293)) @@ -1014,6 +1013,20 @@ int cpu_init_r(void) return 0; } +#ifdef 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 + void arch_preboot_os(void) { u32 msr; diff --git a/arch/powerpc/include/asm/u-boot-ppc.h b/arch/powerpc/include/asm/u-boot-ppc.h new file mode 100644 index 0000000000..372ca3e037 --- /dev/null +++ b/arch/powerpc/include/asm/u-boot-ppc.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright 2021 NXP + * + * Gaurav Jain + */ + +#ifndef _U_BOOT_PPC_H_ +#define _U_BOOT_PPC_H_ + +#ifndef __ASSEMBLY__ + +int arch_misc_init(void); + +#endif /* __ASSEMBLY__ */ + +#endif /* _U_BOOT_PPC_H_ */ diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index 19b3c0db5f..36af8e5403 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -21,5 +21,6 @@ /* Use the generic board which requires a unified bd_info */ #include #include +#include #endif /* __U_BOOT_H__ */ diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig index 7b430f69e2..7c82812b28 100644 --- a/configs/P2041RDB_defconfig +++ b/configs/P2041RDB_defconfig @@ -34,7 +34,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y CONFIG_SYS_I2C_FSL=y diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig index 821a7c3bc1..fcd0214c71 100644 --- a/configs/P3041DS_defconfig +++ b/configs/P3041DS_defconfig @@ -32,7 +32,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/P4080DS_defconfig b/configs/P4080DS_defconfig index 564f28caba..723ef1c457 100644 --- a/configs/P4080DS_defconfig +++ b/configs/P4080DS_defconfig @@ -32,7 +32,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig index 79c6e466c7..0a13763d71 100644 --- a/configs/P5040DS_defconfig +++ b/configs/P5040DS_defconfig @@ -32,7 +32,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig index 3ed1c6db4b..f8fbee2e4c 100644 --- a/configs/T1024RDB_defconfig +++ b/configs/T1024RDB_defconfig @@ -44,7 +44,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig index f1ec400636..62cb8c4a37 100644 --- a/configs/T1042D4RDB_defconfig +++ b/configs/T1042D4RDB_defconfig @@ -35,7 +35,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig index d76547ab63..c5b0c28391 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -33,7 +33,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig index 610f706473..cb8d5eb69b 100644 --- a/configs/T2080RDB_defconfig +++ b/configs/T2080RDB_defconfig @@ -38,7 +38,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080RDB_revD_defconfig b/configs/T2080RDB_revD_defconfig index f8f459f27b..b3712be552 100644 --- a/configs/T2080RDB_revD_defconfig +++ b/configs/T2080RDB_revD_defconfig @@ -39,7 +39,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig index c66b152d20..b57410bf58 100644 --- a/configs/T4240RDB_defconfig +++ b/configs/T4240RDB_defconfig @@ -30,7 +30,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y From patchwork Tue Nov 30 10:40:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1561531 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=iqzstImb; 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 4J3JlJ016Fz9sWJ for ; Tue, 30 Nov 2021 21:45:15 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2CC1D830C2; Tue, 30 Nov 2021 11:43:14 +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="iqzstImb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CB67B830B1; Tue, 30 Nov 2021 11:43:03 +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 EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on0615.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0d::615]) (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 AAF0E830E4 for ; Tue, 30 Nov 2021 11:42:56 +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=IXfZO3ftxmiYTJ4QwRC6XU2IHIjl5tQkk064SmuRSab8F0eWFz4gxohqgpc0yYzKDjgfkfKiVi7G2YFovDMIKb7qPWFkHlojTeMkQMsU1ZMOWI77p5Xmz+8E7a8YMY3talhgL9m5lbaIdJP9JJY7oA4ia2p8hJkBFsTaxHmUu4q74CyjY8T/hTz6oyouSI55C66n/v/7BrUXg46SwDd9xIsHm8ZuS5vWpqQ8qN/eoM1+R/UxU4dIkmyCmVkp3Zpo3MPCQfdXOudUZ1Kj3Dj2qATLWdMCMCN75c1p5LY0MMj0+sFbwBCPzAVyppT+3cHt5pi0QfErbjnIw+O5RKXErQ== 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=tIUliBQG6L9fSukRX35rRAvF1ghPBlrE3sg9lBKhHxU=; b=WTog8Y941ftO29xCrraVPPeC+i0dENrj1shg0XG8LJbQRYbYhm22TmURkFWSmZcLh1Nyr4lhhba5cN7wch9hg8BfAH8NXTc9/Oj8uN3R4UYuIkNj4zZ9P+fiKE8w83W1YWll8fKQZxzHQ12RZGVNRme0lthsXFfPQ1qPMprly7QLiJ5Owc+SqUNkp5sCeDL7rYklPTrXnXhgxPVxqdk3BBaroIHbVNhZWQTkuwMZ4epcs09J3nFKLBKfBuZYy2+MiYylJIgPMhvTSYJ1L/3MjwTgeQoCjEROIp6I4q6//6izysBmuL4NfrWdlKAo+OU8JKUfuP8kK3s9xxgsdM/UDA== 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=tIUliBQG6L9fSukRX35rRAvF1ghPBlrE3sg9lBKhHxU=; b=iqzstImbMr23S7lfgOT8Ri1auA7sHdEn6E9hNlRFdiMQZWmaUxiAFEKh9hySRJkmBRVHoPZd/636tmnJ3kA+Uq88/qyEJgeTEQKYAp0KznJDCsX1kZaIhcL5CEFq948opcWnCcVPdBMT4zXPFaak+YbFrHu8AIpyJ6l2xZ0ey+Y= 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 VI1PR0402MB3709.eurprd04.prod.outlook.com (2603:10a6:803:1e::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 10:42:54 +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.4734.024; Tue, 30 Nov 2021 10:42:54 +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 v6 15/15] update CAAM MAINTAINER Date: Tue, 30 Nov 2021 16:10:48 +0530 Message-Id: <20211130104048.6207-16-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211130104048.6207-1-gaurav.jain@nxp.com> References: <20211130104048.6207-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) 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 SG2P153CA0054.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c6::23) with Microsoft SMTP Server (version=TLS1_2, cipher=) via Frontend Transport; Tue, 30 Nov 2021 10:42:48 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 71ed0c2a-1e30-4dbc-459b-08d9b3ee2a3c X-MS-TrafficTypeDiagnostic: VI1PR0402MB3709: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:102; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wKVHCmDxG1ZCYKW6chRhJEpim/wxE/99czK+qXiLqOD9VidIYOjxwgN4XuSgPB0TVi9TBWM/CyK2+Xhrn9T7fgbFRuN+sdwNt/kZF5CfVyIBzNbchiSfeBThypyGYAPQhsvQKdUGJZELOhxPxKJ7JAozzOzDtktgXtS5XKmVvXQNOImGneiXN5Bdunp1y4J+SluLG+x83GP+3rD+SVrSdH9WPftWzknavBcX12acILkAsaxWxO0zV+lJHGJvk6KTUyTTTOBSaTUnnmdwkhWpPA/jQqUsHvYF2xiWjj4lY95vTJu+nw9fuxKastXeAKjE3IL97nkh1EWQ6HBLmVRmr4aP7yIEKm33Vx+9Ew1G4RqCs64EWSsjmsiCCSmUexBhF+MhaNrKV5KUwdMochFU6MaxErzx1is2iWw0876HRI712FbSI4nfBSe8Xuvr8nWEeqGs44lQ0VcDEpdsufNrqMpSSM1R8/A6EahM++uKKdiEDH3FzaXBPjTmFA8kT+fEYmCU9kV6Llta7trOw97QrafmYaBMMELr2ofBzKybof7qDxj36Th2Ayup2A3TvTL8Bcrp8y33eYglQJHX8v56TVvfXwwNXmlI08g/JFDBLWxvT/OZAFSskQuLFevvPaes84Xkf/OnWGKZjUBPvbY7rjzlrnOaYh9XUHuPpQHnlLXnUZDKd6hu06j5ZOF13H1/MhCq/75spvFT0fGTDtzjfHOCRWNXWcdDoihgVqkUocof/r1X2oS84b8w8mJcQqCx9pMR3l9ldX7VVqrN9WBS0GZbzSnw1R29IRojxJ9n7FB8mk9GQzgz+V5faMDR7XWr 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)(55236004)(52116002)(83380400001)(54906003)(7696005)(4744005)(4326008)(38350700002)(6486002)(66556008)(5660300002)(8936002)(44832011)(38100700002)(66946007)(186003)(8676002)(956004)(36756003)(6916009)(26005)(2906002)(316002)(508600001)(86362001)(1076003)(966005)(66476007)(15650500001)(1006002)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WE5dXESat5G0iJlINN0ry1kvY9oyzBKvh3ntuTYjoKoljlc7d/Y2G2bWGndzdcHqEZuizcjz2XBRzCRhOlXaYn54wLPeFlWPHuAeefqcsYJHXag2WVx9PAsBis02m+0X7IGrfOxi5iKocKfg0/vii3CISI5ojeu8L06/4WvX/ymuB8d5VLX1KJomiI+Q+ClAqNwdXD/gQLni4a3eAa/0wbylGPavi6URo3LO5yimI8Ivql3LAADk8mg/sCzP1svV+/cJL60JO3vRKQJ8/53nnYAgs4MECPM4nwr87b0CT6THiNLAbphJZlrGiwb196XwEAi4C9FhYu/qHkH+CdCL70ZflBvt05jaJwkOpw5fxtASrF03jj78KDxxIhwkceCtJT+2BnYH8Z0Wnb9qUTqdzYLWy5ylKzuybaGzRzZy46MT+uVP8g30KvafPG+A9IR3Ddf6G55s3EXJAPhvAHbvO/Mt6G5seu0bSjYYS48iIY1j4uhLsQxGuWvW8kONLf+UnJFUrnc+ijGWQulRaFZBSEtLkBUmPXxgtgf+4y42c2LkAZnTIjuzrV2HP7AQFZXlii9Eg2hQLe9K/fp1f9uVoopShMNqS0S+j8csTm8NO+mL+qn1gu7F9jmQlgvK98eFSLpzXOy/6lOyIzwMWOTopEpLr4Mu6jnIiu+vjnIfodLPyDHmNoWrvRnKzX1JG5ilROr2nwn6Xs4TLDCAhizmUyjFxsiNR3C6BW4WeLPr9OKyJhBvyVodfOuQKUdvnqnfs8h8SZcCkJuQ2Peht7N+gIRXbSB4JzDBQBJF0M60qOIvDZRcNaaEsdGj4uu4lAAoZY2klK3fToGaQwwngGL/RzeBsoM290PoxZK80tqc8+RbYLRVtrdjcFvWTy0q8Nvgixh9si0tl+kT4vYYMQo+V4EmG39MwgdMqiSxnbvaHF3f4O4xG51SAgpZS10R+y/gChcPL7Ms5N1BCveC7EvBcgit6hPLvjYp8QrBaFMOu9dVMYzKfVtMWXhM3EG+2DCjAauw3KJb928vOxaXFOCFhS4dmqKRjAiPuL4yfVSh6BZbrQtVXE4S5mss7Z4OEpkJKWiRvfWrSfQ3MjBj745PgOqJDFDoe/m+AWEQdVRRiH3RY/rkxKA2V3gE/3YyQezK200G3Wbgi2e2xoTi+NCyaPlm5/HdXNtoYLOzouJVD4TtIVSQoJ4impZbCarxvy15+noHcJqfGU/FKMHJlOYaE/zLLRFEZqp0U25AV5zSmh6CiH+VFedo9IFkl/x6zSeeSRbHVuaWEFExzyqKS8JrjMyIKzJlJRzFSCB+nvSpTwb7WYh0UQZ0GXU+ibJHHejofwRfdKt7DMbDBmBR1y/T7ZbMNjtZKZo9c5/yVlYEecvvjqJ3yfmoYcI2a1btFjt4gsrfafgXZUNQAe4qtftQFo5CDSGuO4roTVtUEjhdiUZ3Y+izrrULVZmo6kZrYBOTpwWPHzPGKdOevzefLb8d4piISDdeRIeqjhAqZ5OwRgleTZbUy/NW9fGR4S/FKAB8DXeKyB5pnbu9Hgp3XpKI9FniaD9C7RVG7hu1pUWVWfSXWuIhcsEbyaeWqg6Ruk0cfmbg690kyDwKgRn9/tAzg1VP4WYCuGAaChHpjQtfg2Y= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71ed0c2a-1e30-4dbc-459b-08d9b3ee2a3c X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 10:42:54.5934 (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: NuKEDOYz+7mOrzKIOAFC79AUe/YjvGreknFFJqx7lH5RkQXRqqNbJ5YSfMozAxZGZQX4k65ulDoMuMJXDK8v9A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB3709 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 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 updated CAAM driver files maintainer. Signed-off-by: Gaurav Jain --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6db5354322..c5bb2b861b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1296,3 +1296,9 @@ T: git https://source.denx.de/u-boot/u-boot.git F: configs/tools-only_defconfig F: * F: */ + +CAAM +M: Gaurav Jain +S: Maintained +F: drivers/crypto/fsl/ +F: include/fsl_sec.h