From patchwork Tue Oct 26 06:55: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: 1546248 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=IjwH5PUF; 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 4HdjKy32Pxz9sWJ for ; Tue, 26 Oct 2021 17:56:54 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 593D9835CB; Tue, 26 Oct 2021 08:56:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="IjwH5PUF"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E38A833E4; Tue, 26 Oct 2021 08:56:49 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::61e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 39BE3835D2 for ; Tue, 26 Oct 2021 08:56:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bJZOPHl9A8yt6J7gWQVF8prlOdgeFUf+a1b18l0atclfDnVpRD95oyMnrRgsdVtnHaOmyMVp7Fq1L1ikFGXloc9WVU6tMLXOCEMfJtbhcfQzlgYepZ18Xrv6FJT6jwkTWUiKOwx98/OhbrCDFoASXxAJMtmfuSz97G3tbVYMeFZb4vfCFD2v42BgOJuZ+gE5DJfVkia37kEvYpbSx20xzWrCMrjW11pvmXF0OECdrL2d39wSOGzk63OL5AX2Do9vEl87fNOyIz6OnPrESHYBPQyfurIIZ06qECJnKDrsDo2Za65Ec+h3A+wbjNX3JHBXQreKn19xlaEpzdcxnWB3tg== 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=v2cUvFLMrQDpHTp83G+cwVN7YUdaW0yMycfY6PneFTA=; b=ikw+5dIcy7zXuBjq7/6CEhMePAwX8kpWgP2kMyzLhGwPZIcloEI3P3YZiMxNHxwN/ZrxKQXe+BnKYZLgFqBOu8B2m1LLXjhQrS8JTQv4F5FO06m+9h9NGe3gmEhqlBC3mf2Ree0UlhV2O5w07qB9iRZR3S0YLact8PxntJgAK7v+QYM14935607fu2LHA8cZnDk6EIdvlSoNTeOgAlA+YvOcV70EihMycnq8HlUkRX3Xl6v0Af0sn9jU4j7jDF07YbcPDWSa5HnVW8XxvjWJBy0xUubwWzLZt5NLhxASm53YPAenUEv+NLvHAkwnh4dtRu8bGcnVDF/FxfW/BdoAHg== 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=v2cUvFLMrQDpHTp83G+cwVN7YUdaW0yMycfY6PneFTA=; b=IjwH5PUFiRG2zN+zd25GW2RSzHRHm2ooDBDTPxXoW/r5ajC9Fe0V7/DjyNPsRBT4EPq+csJ3fFFZzt9xzrTauq052jHyqaNgzTcuvmSsbQH+R0HfAE+h/Z+42bb3gMJLQMzlztfBAopwlH0L8MyLxqdd/EFa8p6yZZ+VNEB8kSg= 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 VE1PR04MB7325.eurprd04.prod.outlook.com (2603:10a6:800:1af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:56:37 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:56: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 v4 01/16] crypto/fsl: Add support for CAAM Job ring driver model Date: Tue, 26 Oct 2021 12:25:39 +0530 Message-Id: <20211026065554.29009-2-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:56:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e733069f-485d-4345-7a60-08d9984dc16a X-MS-TrafficTypeDiagnostic: VE1PR04MB7325: 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: auiTuESBnoq1ms8Wrfaw1BpCOMEewWwgnr00t0uTpMd7nz9Kii960Piw/5IXxWB8MBzj8cIYsIKf8bjvg/9/809sE3orADFqokEp757F1/J0fo03yHEasPrd2Fl1eq2g/UO377lspWko0vygrMxtWTCoL6o+RvDTAc8L2YM8FLhTsJslbLCd++m8Dhu/8Jc75iWf0xr+6nrOPfPbEgI9HmyV/G9aiLt6NpdXVwZWUiCRwzFKpyiwF8khCDpaCTpdWYiGwqqeqP/BVy+DMVdP6ZUbtz3IvUFS+RtqZR5+xa9QnWvEI4544WYJWXXe6wcjcKOzwYbY8znf+TIU3Ly2oceykaJ3ZOAVn5konbh5n0DOBUOCrMC2Zru4DasLVXNFzfI82HBynaDkaQIkRSXmq7lnoFJBO0II3aYl4B8xuL6hC0c8gfXQ0Qk1+Jo5BJFnx1Dftz370HmPUSHDFgP0CTJbVpvfGfHMLeVrayq9kswUX3qWp+UebCqDFZNbzjA3JS+byg7F2RsdSOVMAshdHbKd8piQuDoqCS+oH66+U4wY8ApFrcsFgC+6jGHFUy+QPorAUU03Bd7ABPBCKt4oih6nZmt3Aazhxx0GoIrDqR8sopTWFfNsKCiNMtyQ+BryOcIjdfnsqc5b//NinsAgyoUZXu6KMP21kPedLbs7hRrc36nuaMLRCj0/0v1XUQArh1xcPI3/FqCeqUt+lgV7Aqn32ibWUoLwSexbk1dSnR5KrgH7d0uV+qrRS0dvPTwX 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)(52116002)(7696005)(1076003)(316002)(2906002)(55236004)(36756003)(6486002)(5660300002)(6916009)(86362001)(44832011)(508600001)(8676002)(38350700002)(186003)(66556008)(66946007)(8936002)(66476007)(83380400001)(4326008)(38100700002)(1006002)(956004)(54906003)(26005)(2616005)(30864003)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 93hOLz28S9SrQqOu1pJ1TM1cT5nkepL8zjG5Us7JbOxVJsrrfgmG46o/Joc6AFP+W4CXGasNhfRXH/RT55mRlrEupPAncxiqWtLaj4MVpXbqPyvYe+JsA6TR7Bsn+knkdKTDtgPesoF6LK8dYeb0AlN9TwoaypJWCWOTrY0sX9jaKKTbIawliKxn+0RS1875TVkN8cBnBybRlPykAqh5CP6HKtUpQQobnQ7SsoYQHFnCamoncV8zvlqyVIvkdv5MycOIaQMOMHwOHsBDy8uxpHhOKL2TyP8fQT9ehqBef8iGlu3wBNuuFMDM5BP/kzSWIfQYFPC7fP0rcE5b1JNkcrRN+jkYynsmvdU5iyBCm0BtS1jcDXj+g/QRySWMigZ9z39njNPkBkHizM+LCTCBBtDZjm3/4yHTG/wDBde9ccJ4aQLOIIBc73rxMy1ADQUMpznneHGpdMy9BPu2Wmku1ZrRR+NNZKyIEMzr59XWZEjyyU3B1v/t5Doyz6fMVbTdJlXzLZAoL/ZBq5jKL8SFAyFcLv9mCMDjK0Df6XFTJi7qh5/YzWniUn2jM/KUm/i7yCmIa5XBFy1HeJgZypDecPP0hVl8Pop3KMAUmIhV6i/WjV0bhNmYk5Kz7DF7yW5RyMaGz1qIxcFulQdJLDGB2IMWA/wlCdKGjOCWqmyHFhZv3UPAXVEnCXrXI9k54lA5RGYao5anhdne2EUs8UEKN/6XJJViOVVVBlT4TELeBnt1D4mcXC7grUn5U17DH8TToqvZPvbOK7yfEDjci4eouMzayMwtkybOI15V+TrCzpRZyA9es3VN1fR5TjT2TRjr0pVu+1WpLoRXYiNSfD+q5Et2WcQnSfl54R4DC/kYEn+67DC48sNxb4cQdME1/nOrlm0u8vErd7UXxiZPFxYaRRytzfa1ykVtq/jhuu/pXdhVyEo5CoK7HOGbVnYZPEUBWaAXX0GFlSLh7vjSIKFGT5cEJxBLPDz5VcR+ZFQfuib8q2hELceVNe2ojyMS3OQAhA/CON3ushabcUE8jbEsfMaUqTmkQPP6Wr9rWpRM7ut9SrlREPZIMj7MLdbvqz1mBzLsUDJwy4sfUkzR5RaoB6FK5LyJ70xY7pcis8CEwjaG28gZwPRO8UrtaBM+Tr/IzAoAN02A4UhB5FN87+hObKzTXGnVfN1RO1sa+IUuO2jJhb7OppP9ZbcHeQteuqhhcj83wC/6wtAsUJOZbly3CC2mqI9z5MP7SOCClm3i6o4S66XzTce4RfV6L160J+vEVHXCzQaF4TKkrSbtg2x5VVBkWFH0QSguZPBCoOAqep43Z+Ui6QV2eUJ5PzHkjUzJBySiRKfULbX67OfqTf+AJh6Rm8fBS9qm7wUDOIEQToXyU1ppglYrQOGH4LFqr6Ys8B372nSE7zfvlBkV//vwfet+ER1Xdd7HGqMUFqOjQIdXbpQh/wktclPZwGCI6JJfV/HRHbJwB40hHzrDLsgEdeiYdtdrVUt/bE7VWgNxXpQDoeNpC6kL+jFrQI3BMBIDUkv3EfesDZUL6ByGN/HumiQncfjHmVZt5UQgNjfrvy8LsnP+jA9PVSNvtpeC0QE4lUQB7wT60DL6E4inilukZJICica0hqs3evd0dIk/tgc= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e733069f-485d-4345-7a60-08d9984dc16a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:56:37.6789 (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: KxCbRkwaEzxR6mDxbiS8iYRuHbmOD4HNBmqSYAmtvuhZPQfZ26qbWGHls1iDXLkZjnG8OVk50jgLCNX9jyTB9Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7325 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 --- cmd/Kconfig | 1 + drivers/crypto/fsl/Kconfig | 7 + drivers/crypto/fsl/Makefile | 4 +- drivers/crypto/fsl/jr.c | 318 ++++++++++++++++++++++++------------ drivers/crypto/fsl/jr.h | 14 ++ 5 files changed, 234 insertions(+), 110 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 5b30b13e43..2b24672505 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -2009,6 +2009,7 @@ config CMD_AES config CMD_BLOB bool "Enable the 'blob' command" + select FSL_BLOB depends on !MX6ULL && !MX6SLL && !MX6SL select IMX_HAB if ARCH_MX6 || ARCH_MX7 || ARCH_MX7ULP || ARCH_IMX8M help diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig index 94ff540111..ab59d516f8 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..738535b8e4 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_IMX_CAAM_DEK_ENCAP) += 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/jr.c b/drivers/crypto/fsl/jr.c index 22b649219e..bec4953f6d 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,65 @@ 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); + const void *fdt = gd->fdt_blob; + int node = dev_of_offset(dev); + fdt_addr_t addr; + int subnode; + 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 subnode */ + fdt_for_each_subnode(subnode, fdt, node) { + if (!fdtdec_get_is_enabled(fdt, subnode)) { + continue; + } + jr_node = fdtdec_get_uint(fdt, subnode, "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..43cb5e0753 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 1 +#define JRDID_MS_PRIM_TZ (1 << 4) +#define JRDID_MS_TZ_OWN (1 << 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 Oct 26 06:55: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: 1546249 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=VngaqZsP; 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 4HdjLN4Qyzz9sRR for ; Tue, 26 Oct 2021 17:57:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0F110835EC; Tue, 26 Oct 2021 08:57:08 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="VngaqZsP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CFCDB835D6; Tue, 26 Oct 2021 08:56:53 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, 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-db3eur04on0612.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::612]) (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 27E17835C7 for ; Tue, 26 Oct 2021 08:56:49 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PdFp+TmqkBACF1p5WSSgg62lG+eqobpnAknOk3jci5sn2Et26p3t6oYLkl94v5YajCnfoA1dBALb+6ZDB471LqWL20dZxE5bsGDd+fTArncSbyxt9xHvGRdhl7T8JEkq+PmX8hibQVae6wYcZmTfdlPOwOc+k+JccmpagBwoXbqrwcdDGjVjRO7kT5nYbQtVVtsFEYw4WTf15BzgBDm7jbn3KS0SOrVNGlyU7MJbfTt3n/RdXS1g/J3/kiMB6DG1kQs150CdhsKksvj8Ol/Tsm2lRYezoaF1JNuqSUMI3/olniUgesL76ob57vZcnJAA49rZU0Pe/Tvq5kS/wAioVA== 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=T+udgT+YqaYCTGANnldHwcNq2CLjH07BESpQrqoT0oc=; b=iK/7qsgaghmQPfs4pZpiRNClEb4uDc5FFsXvcWbRlgQyn2FFwyLv9tfhCFd1TOKSKZ2NzemIHnkzfgax1Dvs3nX5ygqlbf365SJ3eQ053XJ4KRSR6d4MVSRLBzjlMXt4VKBFVxdZbIYwDw5gPyf9/lwSKsVI+ctJC4rfV1kBQtN746Twt1O7stFdJ4c2JNneVzxO2qNNI/nD7+8qcM6fneqgOUWgQtgokaZ8ONh7swNeg6T1sttdG7iT35kOgvfVNlxXeFsbxRAz0d23ZrMbl3ZfL46gxh3q5EhFTnKIswybEHSvEqL3PpYRTzXlxBrUPOIeVaE1JBl56kKLjcimKA== 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=T+udgT+YqaYCTGANnldHwcNq2CLjH07BESpQrqoT0oc=; b=VngaqZsPjEXRzYDvQMrEZBV5crbrfxQHMEHXVCg8FtzbCZZLP0Do95dQNKLT4zern2aA64HOjlqeSiscHIuMsSzcGgVm2kbzQKXrb6AYt4EtxrA0v9jcyEtix//KVHghJpzrAybQKT+xdCO5yae/hZkv5o3Uznax8paJyMOEZZA= 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 VE1PR04MB7325.eurprd04.prod.outlook.com (2603:10a6:800:1af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:56:47 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:56:47 +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 v4 02/16] crypto/fsl: Add CAAM support for bkek, random number generation Date: Tue, 26 Oct 2021 12:25:40 +0530 Message-Id: <20211026065554.29009-3-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:56:41 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 62db04af-a31f-4cc9-5516-08d9984dc771 X-MS-TrafficTypeDiagnostic: VE1PR04MB7325: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wyZLfg28wc3lDY3ci443REeO24RNHuYUfP/re242glX6J3u/HSdmFr2bw4hU6h4zlt/rWxXTI8NML9K0XZiCNXZCfwsZxcObHQzc7yroJj3aAFiA8WN7jg9lepm0AXqsZ2/inzQuHTjLVWc3u4T2atNJenkQuTedWl8QgTBAFmuvfj7UpdAFVvInRKRm/JJwXs9ekwAB4r6PquCjZJO0TGud1oq/RyWNVhPphYwjkO06i3YpQzAbExTkVCXWZBKKmdtH8FoOiMSpO/IrOOmVGvKe+igkW+T8II1bowacFu5yVG/2oa89yG7Z/0dYGCvTUtwk2rbvaG7r67ooAEFTGGgOL3nvDUMKZNlyPhdfJuEeA3DLSG8b63+EkGNAtzkcMjKLlDK3R0DwZp2oA8NkVxErbCitl7/qyVwbwEiBtgfmQPzUI9fBsxFBZ1GBtTYQB+Nz48PDgEQOhmN+9Xzrm7lBRjQI8Fn2rIauSUepv4Y3UVVIhIWqTvxyM3kxbh0qDLQ3/jsHAOXx2nhLCNEUDQo6Zm6allJOx+cg9h7I2B5vGuTv9Cpit7/tSnZhX/Gr62RpJ8tQP20lIGPrltFzAdB4LA3uwaYVPyAfohkxN7UnjGzwhvMfyrl4IXoIKocmhL1/p0suPgrr+6ppTqA9MACZaERSUX+3SVMJfHaFwe51eCdYXGWRhSCKAwcjQCWh86s2tCdGIZtODCbxLAPZKXy06DSitUxgVOSo1sDWd7lKujVODhhNnythD3qk8kdx 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)(52116002)(7696005)(1076003)(316002)(2906002)(55236004)(36756003)(6486002)(5660300002)(6916009)(86362001)(44832011)(508600001)(8676002)(38350700002)(186003)(66556008)(66946007)(8936002)(66476007)(83380400001)(4326008)(38100700002)(1006002)(956004)(54906003)(26005)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MP2yRx00XQYdqvjuK6CWa9o2EXHihRhqb1VFkVz8BmHmds8vOmEsLjM6sjSPh1q2SiKKewI1B/UkLLZS3N0OIHnrf5aqhWPyN+P7r+Rlm5VK6CAV/aLu64Rxs0XtBTCe2iWEdx2wsw9T12U0MWaNLg+zGzeo+wfNzujEHqZCG8RRLHe+8Wxdt/t7snP2rTqLmQtMADIZVH9jACxkxT8FJgXDbL9121HLARlZx3U2MgsUSeIaMBAyBS3gQHBraHYyniAVkHDdWn5lH9xR7tUenuoS55L73x20T1fXfhwpLpcvN7HKn1+q6aewkvdG42X9YjPzqXlA1Yi3xvm6KAj1hpwffnVwsVi20tsaCHDnpONlXhLDCvOIO/ItnnmaYD+iBAy5J+VF5Z3UOC9BxVwa9xKGgKmjL51Y86/dCURYZFgupd4N6aoTskDDknS3r+ATzpQw5EIxTfNgf4gYBeW2sXB+iB1CB5ncvri5sM019fil+Iqmp54ah1E+2uyhFCHnI/yGbRv+B1MEtSwnajgitzafUIqPTJ+LiZKAl6c+HxY5L8Uw4v5f59in70uqbTJFKkVtw/MCJxoqIp3XKgoB5Gkg9u6VIDto6HaXVl5TNMbjPIsDnrxVhi6szmDHQHrVzaV4MH824K5xC/HtgBq/G2g7m9QYvTEdU3y9mg4VcBcOwCly/kLr92gFYTCmfL3AG10tKh8RF/0dxA7Z5+eDEzI/uj0J3/x+YV8wNsmkENjzKdfQjyCfOq9ezKvyPGCGl9s+hTSCYwYv13suIe/TjmlRu56Nhg1u8nlIkhyf0THssHg9SpAM9FlOPDXWkVCkjCYO/dtPHb+QyRu4zqYUTYXZ5qICXtQJBJUpR+M7JZUnoUwissd/SNIDI3oS/I0eK3iiD3yDu/fAbPfilxB4nOWBg4ju+zmpuk1xj4PBywO6zcP+yrgFBh5WN9JuGrSizbiR/73hmDuD0mWa9LICqNnW2dDg9biIpgq2MBAL0i2H0mPitPsb4hhoT6Vo81ZEm2Q+tETm4/UvLS4Rwe+xa+n14lgixv+4116vPR2aopUn1F5S73N8gDixOhiJHU+hXDXF1Rk/H+jIwxAEPtM9GAeBQXEflJrUvSVjks6k6ZwkBWt4iLIWHbud7wAT23tS859YCYj+TdP7bBtm7tfA+kIAzllvVymZlbhL1EjWgJFIfkjW/i/Pues5NqXIGyWRn3WtOeoU9Qxq4VkBzpSaQzzsXI6DSIRm+7ZxQatTv7DmbZg/kT+3J9VChSUVFC6R8CJ0Xdyaw8y8SDCPGix/95Oa3Vn9sfJdriRnbMwQF0FLaKL6WuKrnpNpT/Ch6MBum+54nwCEwRcdQ/tmj4YnmITLQt02CD+mWDpyl+JP7bMKWAFE7n+fBTAibw0U4q497e0u+pREkmByIpUzR/J1K9ZgE99lYJiFxP95xCtKlYdkJwqcOmAnnzs2dsjhweQDLPAYrCBWdJXEeuVNd0ETkGc8dzofd+Xt5rDGsXaHHRgWwaed8TWHSNnJOVIiqOg75kU/nPEJTfuV8IYG3yeCry8WwKaxZxV8Hs9K+Fv0Wy3tm1X1yqGt3q9SiR1J6AdIKGySoDvFztvnzi/KgalnWqtH5gJdBwWwKs4RbmYuJnQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 62db04af-a31f-4cc9-5516-08d9984dc771 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:56:47.7661 (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: q6YrJzdav1+gRjI9ParX8Nt0FKzDjPruC0YKrq2a24iKV0InSAyv5JojbwYH+j+LyR3k2cXO9hM36Nn4gEtd8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7325 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 api and descriptor for blob key encryption key(bkek) generation. added api for random number generation. Signed-off-by: Gaurav Jain Signed-off-by: Ji Luo Reviewed-by: Ye Li --- drivers/crypto/fsl/desc.h | 5 +++ drivers/crypto/fsl/fsl_blob.c | 82 +++++++++++++++++++++++++++++++++++ drivers/crypto/fsl/jobdesc.c | 20 +++++++-- drivers/crypto/fsl/jobdesc.h | 4 ++ 4 files changed, 108 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/fsl/desc.h b/drivers/crypto/fsl/desc.h index 5705c4f944..5958ebd3ac 100644 --- a/drivers/crypto/fsl/desc.h +++ b/drivers/crypto/fsl/desc.h @@ -4,6 +4,7 @@ * Definitions to support CAAM descriptor instruction generation * * Copyright 2008-2014 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * * Based on desc.h file in linux drivers/crypto/caam */ @@ -15,6 +16,7 @@ #define KEY_BLOB_SIZE 32 #define MAC_SIZE 16 +#define BKEK_SIZE 32 /* Max size of any CAAM descriptor in 32-bit words, inclusive of header */ #define MAX_CAAM_DESCSIZE 64 @@ -463,6 +465,9 @@ #define OP_PROTINFO_HASH_SHA384 0x00000200 #define OP_PROTINFO_HASH_SHA512 0x00000280 +/* PROTINFO fields for Blob Operations */ +#define OP_PROTINFO_MKVB 0x00000002 + /* For non-protocol/alg-only op commands */ #define OP_ALG_TYPE_SHIFT 24 #define OP_ALG_TYPE_MASK (0x7 << OP_ALG_TYPE_SHIFT) diff --git a/drivers/crypto/fsl/fsl_blob.c b/drivers/crypto/fsl/fsl_blob.c index e8202cc569..e8bc009daf 100644 --- a/drivers/crypto/fsl/fsl_blob.c +++ b/drivers/crypto/fsl/fsl_blob.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * */ @@ -152,6 +153,87 @@ int blob_encap(u8 *key_mod, u8 *src, u8 *dst, u32 len) return ret; } +int derive_blob_kek(u8 *bkek_buf, u8 *key_mod, u32 key_sz) +{ + int ret, size; + u32 *desc; + + if (!IS_ALIGNED((uintptr_t)bkek_buf, ARCH_DMA_MINALIGN) || + !IS_ALIGNED((uintptr_t)key_mod, ARCH_DMA_MINALIGN)) { + puts("Error: derive_bkek: Address arguments are not aligned!\n"); + return -EINVAL; + } + + printf("\nBlob key encryption key(bkek)\n"); + desc = malloc_cache_aligned(sizeof(int) * MAX_CAAM_DESCSIZE); + if (!desc) { + printf("Not enough memory for descriptor allocation\n"); + return -ENOMEM; + } + + size = ALIGN(key_sz, ARCH_DMA_MINALIGN); + flush_dcache_range((unsigned long)key_mod, (unsigned long)key_mod + size); + + /* construct blob key encryption key(bkek) derive descriptor */ + inline_cnstr_jobdesc_derive_bkek(desc, bkek_buf, key_mod, key_sz); + + size = ALIGN(sizeof(int) * MAX_CAAM_DESCSIZE, ARCH_DMA_MINALIGN); + flush_dcache_range((unsigned long)desc, (unsigned long)desc + size); + size = ALIGN(BKEK_SIZE, ARCH_DMA_MINALIGN); + invalidate_dcache_range((unsigned long)bkek_buf, + (unsigned long)bkek_buf + size); + + /* run descriptor */ + ret = run_descriptor_jr(desc); + if (ret < 0) { + printf("Error: %s failed 0x%x\n", __func__, ret); + } else { + invalidate_dcache_range((unsigned long)bkek_buf, + (unsigned long)bkek_buf + size); + puts("derive bkek successful.\n"); + } + + free(desc); + return ret; +} + +int hwrng_generate(u8 *dst, u32 len) +{ + int ret, size; + u32 *desc; + + if (!IS_ALIGNED((uintptr_t)dst, ARCH_DMA_MINALIGN)) { + puts("Error: caam_hwrng_test: Address arguments are not aligned!\n"); + return -EINVAL; + } + + printf("\nRNG generate\n"); + desc = malloc_cache_aligned(sizeof(int) * MAX_CAAM_DESCSIZE); + if (!desc) { + printf("Not enough memory for descriptor allocation\n"); + return -ENOMEM; + } + + inline_cnstr_jobdesc_rng(desc, dst, len); + + size = ALIGN(sizeof(int) * MAX_CAAM_DESCSIZE, ARCH_DMA_MINALIGN); + flush_dcache_range((unsigned long)desc, (unsigned long)desc + size); + size = ALIGN(len, ARCH_DMA_MINALIGN); + invalidate_dcache_range((unsigned long)dst, (unsigned long)dst + size); + + ret = run_descriptor_jr(desc); + if (ret < 0) { + printf("Error: RNG generate failed 0x%x\n", ret); + } else { + invalidate_dcache_range((unsigned long)dst, + (unsigned long)dst + size); + puts("RNG generation successful.\n"); + } + + free(desc); + return ret; +} + #ifdef CONFIG_CMD_DEKBLOB int blob_dek(const u8 *src, u8 *dst, u8 len) { diff --git a/drivers/crypto/fsl/jobdesc.c b/drivers/crypto/fsl/jobdesc.c index c350b32856..d58937c284 100644 --- a/drivers/crypto/fsl/jobdesc.c +++ b/drivers/crypto/fsl/jobdesc.c @@ -4,7 +4,7 @@ * Basic job descriptor construction * * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP * */ @@ -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 @@ -334,3 +334,17 @@ void inline_cnstr_jobdesc_pkha_rsaexp(uint32_t *desc, append_fifo_store(desc, dma_addr_out, out_siz, LDST_CLASS_1_CCB | FIFOST_TYPE_PKHA_B); } + +void inline_cnstr_jobdesc_derive_bkek(uint32_t *desc, void *bkek_out, + void *key_mod, uint32_t key_sz) +{ + dma_addr_t dma_key_mod = virt_to_phys(key_mod); + dma_addr_t dma_bkek_out = virt_to_phys(bkek_out); + + init_job_desc(desc, 0); + append_load(desc, dma_key_mod, key_sz, LDST_CLASS_2_CCB | + LDST_SRCDST_BYTE_KEY); + append_seq_out_ptr_intlen(desc, dma_bkek_out, BKEK_SIZE, 0); + append_operation(desc, OP_TYPE_ENCAP_PROTOCOL | OP_PCLID_BLOB | + OP_PROTINFO_MKVB); +} diff --git a/drivers/crypto/fsl/jobdesc.h b/drivers/crypto/fsl/jobdesc.h index c4501abd26..a720d68e82 100644 --- a/drivers/crypto/fsl/jobdesc.h +++ b/drivers/crypto/fsl/jobdesc.h @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* * Copyright 2014 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * */ @@ -49,4 +50,7 @@ void inline_cnstr_jobdesc_pkha_rsaexp(uint32_t *desc, struct pk_in_params *pkin, uint8_t *out, uint32_t out_siz); +void inline_cnstr_jobdesc_derive_bkek(uint32_t *desc, void *bkek_out, + void *key_mod, uint32_t key_sz); + #endif From patchwork Tue Oct 26 06:55: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: 1546250 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=CMiKIili; 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 4HdjLc58rZz9sRR for ; Tue, 26 Oct 2021 17:57:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0FEA7835EE; Tue, 26 Oct 2021 08:57:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="CMiKIili"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 21181835F4; Tue, 26 Oct 2021 08:57:11 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, 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-db3eur04on061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::61c]) (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 E34B7835DF for ; Tue, 26 Oct 2021 08:57:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZKnXtGRuMJAZLtpEXi4XTiTGsy9Xu4Jxrc+L/VzYyS4WA+SB2IcI9HiVpe/BmKRYqw2cjt6GH07nbbwuj/4Ek0DF14JS2jeJsMBXwQV46G7bK4xaeWhPjSY7wq2hDxr1pARLT7L9Ha9qYm7L2EvpXfBm2KCCHLUbQQdDDrA5VjtxqDwXO6Fp518MfxGR6J7+VrtbtwmSD3PYRJFhgiYjK12uA+1jY7fe3Is4uP4muxHSZuM+D2hYNuYFnVKgrSgmyekktQSP58vxIZmuNR1M3RlyHLrF3fxUH5DBD/NySog5nT2O9FsCGmq20MY2mFjg9s3KS4jkDJmYZpy+6CCNlg== 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=TwRc1mf/cj4KLoeJNr5xG1xE6IhN9M0Vtdmx/GezOBo=; b=dbwt4JBHtlMn6CB6vTriQae9srTu9+oyVlTcwxgGd0TXRFbv+1PTWpTEABg6NeTNovCQRYJtoNJY6zXZRtLt+SXeBq6aHfCkGLfIB7ai3qskqq7a4zTnSOhVXdzV9cdrg+/harCB2JjCbb4HRM+kpeKVOj+h4HZagySodMkS0tS1lQnoJPRdrW4KQbj28GlmIgzU0houjwSVVZTjyvdJ02XgLYq7PWuP5obCdIfspuH57kdUPJiSI3cqqAe8nkwc0VRGSwh3klPb8SEoBSshoEaYRd1IxRrpwUOSuIbb/xW6MXaGTyTHqLqd6e512mDiY9dFl2UnEXURD7Nz7aFTyQ== 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=TwRc1mf/cj4KLoeJNr5xG1xE6IhN9M0Vtdmx/GezOBo=; b=CMiKIiliM2000yF9RGN2eiYzPUVBSUhJlBiVBw6+DuisUqLocnD02wL7OMNsoFLHbQcP5WzAdBcHKmEZcqlK2yVJVW/AozmcHaZvA7ES71UgkGVHkIkOrKfNTUWZjfLz/WDb7MH4ioosJX1UV0XJytkhyEI5vSQKHBbOfEUwsqc= 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 VE1PR04MB7325.eurprd04.prod.outlook.com (2603:10a6:800:1af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:57:02 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:57:02 +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 v4 03/16] i.MX8M: crypto: updated device tree for supporting DM in SPL Date: Tue, 26 Oct 2021 12:25:41 +0530 Message-Id: <20211026065554.29009-4-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:56:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 08f977a8-e844-4d4e-462e-08d9984dd04a X-MS-TrafficTypeDiagnostic: VE1PR04MB7325: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:47; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rVoqt+e9M8fBSmbGWSzmN8TNbPVftF3g2c4FYP9qWwAgsv5SDXJTw2P7JEq22ZrHRUogRoQxQ3qaBO+RxK4B634YArMiBNntc3BD+ed8+gN6+16rxioiRFawbeyVwyRlhyZoyVequz/HDeEDY9j14uX8hnQjGqKiNOo0d5QyxbA+wi1wpBf0ciJ6l0skTEfRL4PonmTpFEAY19iEMKK3Gs5h3YZGD0m1OYhhAaWh1GGBK9SEg3GoVZGxGjR4qUSOdZd1zcHlUsOo7T2/05UbrzjVQ3xuyKJ9mYUzdAuPhJmKKcvXuHtCoeP/Y7cwDV+A6uYyl6ctre8GIRckzNgG6Nsu20kCERDbnPIsETH0C7iFdHWerHYFGRRbYie8KEORx24GAM1IbX32cwbdpUCZ6PdeCA2L4X0c66yZsQlqcBEvzqWUs0hfc3sRxYruy8IrpKbD4e0kFge/Ia2+qCKSieXfY+Pt1jblp+nUQN04732R/nDfzOSBPMUIdlfg17SdKlqQJCY7s/9KiL0iSqFoewoQKGy++W3Vb+/TVjhwl+6zlyyHQg5IiXQYb/N3A4kRIfpFQL7xATlbTkSb9s4QxibYLC6MwlHkPAxkIRxB/sPwwHABqToRrYBaDWU9jjzc4loAe+IAEBk7I5F7XbFEeOudnIYd54S/OvOxV0ygSlE91YiGKqEIimVp0J7oxGYZAXd0M/hgkdRCJX5S29yoM0RB3DjdEanWjk2ujTu9v/aFkvOthohYvqfIUIi6dBLT 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)(52116002)(7696005)(1076003)(316002)(2906002)(55236004)(36756003)(6486002)(5660300002)(6916009)(86362001)(44832011)(508600001)(8676002)(38350700002)(186003)(66556008)(66946007)(8936002)(66476007)(83380400001)(4326008)(38100700002)(1006002)(6666004)(956004)(54906003)(26005)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rNEuF2UoCOrOpzsVPmeD63rFqUJhWW7mPqoKpnMEycKtYlMl+9Dbs2VFYfpgtyT5I+yAd0hKpY1jvknTdezaXIrBE+pHzNvijh459oE1/Uhre8zPssBilo1c9gUeCP1e/CjCv0Qlkezs/FmA6J7KxDSahFWJfvEONimlbAaX7h7vBI0WILSJTCcHHfsDVH5RpT8Bbv588st/qRHmAttikV2UdtzDDElxKlPVALZkJQx69dCuPAzHbeyM/ltp8giX/JU69GIB3hb9WbPe0TnXiHXced68dx0qKHqBbEI1lbIMJZOozNIdIknR3GMASHBKpnqZs0xhX7KUTvs3ij4CZy4cC9e+SYNZmkaJPJt7ykNnOAK1S0QaDsGNa394kJPCAIV2cQicMc1p5vnGComYcTne+W43bS1FGI7nnOBAu8NMStLh54UCnttTrRGI/SLIDQUnCmkdGqAPD++Kc+/mkyGWd21LFcN4FPQ0cJpF7uJb7sKUL2xO+zvQc0CZv2Gc3maKlUdu2zshpVIQ6bMyEKA3+rp4L68ECoC23311rSH48RgaL4BW1FOvc5Dg2kXRhvg1cMcMVa0YwXEnV9u9XB3Vq9zHFx2EeZljY8uThM6igiWFejLrRPBLsXk4Nt5GZrRjoUfP3VuOHGmxYuuuxVqGg3506GhnHacPXkMIZff3U11fTy5nbGWIp5BJSdcW+7Pk6ON+G3g1tf5EcfdQoMTcvSGb+Jowqke+4HH8n7k8zqAtXjNzK1bNiU1FYqTnwZIAA2D/swAlBUL+iHbtUU+rHxDQ64vzW2sxF4OKIFaPLi3TwnUXuvRBdsYPPvDhSGem65e2rwH9A2qegymNJW7haslzRjfwzdmiEac6RBXgGV1L3//mym62Xb3M1Lun3RMtqnweXwuHsI+qT61MNwdlyiKOPDc8tsnyqTkfb8zv//w9tgDcuchSCOr9MW3fOPLjSRAdGKYQemxPOTEU7GraBvPkn/uKcRP+ABVEyuNgn4uLCbJvFwmTvjWYUmGoUYmro87YgUfvl8FxMGpdz8Y9F+AeTvYb1ZPLUledFwc5aiTED7tKTC+vLczhJtXMxv/KetM1+N02/w2/zjkPdpyd/MRFxAWYw7e/6QjbO2lhE6pZxocoNcawKs6V4iwNwa6KxcdGkAuX6JubYBk51ZfrPDI9DmXGxFF5O8TXXCviPCgUmGilHzFO3wnGK8nW5MJLs91zdx87NyxAKAZYxcN9colbgmbR2JClmXhJZY1OoE3RYrya2LWXNQDvd2CDBwQMssiUIfRy7zi9evsmfzU0jaodjohVgk93VNf5CaspUmh1If/yD0lxNS+23QHXe07e7fn0KLOxiqa3lfZFZn4mXu9xSRSenZt6kCDN6UEglWa6eHudEdMQj2lxZLjwJVglVLTaQB5fyOlV4tDRlPT23GRPUtKNGBPjT4V9GTvMds1boUgcluStr+JBTEvrEKW3iRnQK1ox7qJpSjpp1LPEDYgEbWRGrZJuqIwnEwdCh/dK7bn/MxoULhuhygQRNcGCe1SntlGXw/31i0HcNjn/m1DMdjMldWWqcmnFU6TDKph+5Ib6pElZiRzvvOA1oXint6/VPvhu2eJa9qV+sEP/c1BFjfCylYSZD2SHj3s= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08f977a8-e844-4d4e-462e-08d9984dd04a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:57:02.6106 (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: 8NMYZU18KdP79s3CzFTw7KwK7v0+O+qaPg1LtPVS21OyRIiOIeqYCi/7lXeYUMezhYdV3QRm18unJHCPk0tj1g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7325 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 | 18 +++++++++++++++++- arch/arm/dts/imx8mm.dtsi | 1 + arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 18 +++++++++++++++++- arch/arm/dts/imx8mn.dtsi | 1 + arch/arm/dts/imx8mp-evk-u-boot.dtsi | 18 +++++++++++++++++- arch/arm/dts/imx8mp.dtsi | 1 + arch/arm/dts/imx8mq.dtsi | 1 + 7 files changed, 55 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..40f5cfda9a 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,22 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &usdhc1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mm.dtsi b/arch/arm/dts/imx8mm.dtsi index b142b80734..009999bf3a 100644 --- a/arch/arm/dts/imx8mm.dtsi +++ b/arch/arm/dts/imx8mm.dtsi @@ -824,6 +824,7 @@ compatible = "fsl,sec-v4.0-job-ring"; reg = <0x1000 0x1000>; interrupts = ; + status = "disabled"; }; sec_jr1: jr@2000 { diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi index 1d3844437d..b462d24eb2 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,22 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &usdhc1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mn.dtsi b/arch/arm/dts/imx8mn.dtsi index edcb415b53..1820a5af37 100644 --- a/arch/arm/dts/imx8mn.dtsi +++ b/arch/arm/dts/imx8mn.dtsi @@ -822,6 +822,7 @@ compatible = "fsl,sec-v4.0-job-ring"; reg = <0x1000 0x1000>; interrupts = ; + status = "disabled"; }; sec_jr1: jr@2000 { diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi index ab849ebaac..52f473dc52 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,22 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &i2c1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mp.dtsi b/arch/arm/dts/imx8mp.dtsi index c2d51a46cb..57b01c3a57 100644 --- a/arch/arm/dts/imx8mp.dtsi +++ b/arch/arm/dts/imx8mp.dtsi @@ -624,6 +624,7 @@ compatible = "fsl,sec-v4.0-job-ring"; reg = <0x1000 0x1000>; interrupts = ; + status = "disabled"; }; sec_jr1: jr@2000 { diff --git a/arch/arm/dts/imx8mq.dtsi b/arch/arm/dts/imx8mq.dtsi index a44f729d0e..ecab44ca13 100644 --- a/arch/arm/dts/imx8mq.dtsi +++ b/arch/arm/dts/imx8mq.dtsi @@ -955,6 +955,7 @@ compatible = "fsl,sec-v4.0-job-ring"; reg = <0x1000 0x1000>; interrupts = ; + status = "disabled"; }; sec_jr1: jr@2000 { From patchwork Tue Oct 26 06:55:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1546251 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=Qh8dHm0i; 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 4HdjM16kycz9sRR for ; Tue, 26 Oct 2021 17:57:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 622F8833CB; Tue, 26 Oct 2021 08:57:46 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Qh8dHm0i"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9D7B6835FC; Tue, 26 Oct 2021 08:57:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, 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-db3eur04on0612.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::612]) (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 200A0835D8 for ; Tue, 26 Oct 2021 08:57:10 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L6SWx4DRojrPCdGO6CtgkGGYHG0uoc50KjiPOIxUrRJyEelqCCse5j7lv12+HvfShLA96os/4gqSQvyuYaCxfIhlN/3W284mx3kaCTUchSFjOEk/V2hSxIpOVBe9i4xFbNwkZpFyesI8UcQh8CGV9eD/2UxFezl1LHqFul8EyRZJKSSOx+IrPDdCEAYk5ClQ/5tW6eyC5yNt+M0mwC3DRsgOPiuB0bLwWha0HsaZd4lam2A+xzSpE/rydKeK2bhbbuXYJUPU/yRs6lhOjfbAZ5+l9tscFeBpezKCF0YWZnqib4S25cXGUwu0q4aC+PlqsY5OGc0nShUg7R+7RWhS4g== 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=PtAkHTZJ4XYQojmTQZXA4Bo0qH5dq0Sb5AttDVp1ibI=; b=nkKUg6f+bbHzZXVNYMfFz96dS4cV6w7sU6PluIHsYQoIKcSPnsrfzFapJ3+YGhDMbzESlkn5ipg+5bvBEQsSdAhpBqVhwiEhqn5DNe0lkp6+5JBsidmoVM9px9cUxnh6v/rYQtBjmPr7F2wyRfHmZq88u3rdYCQBFwVDxtck5ggqqvc8s0fw/N9sAUUvFvRXafXYYHEzniJS/NDhlCVHxVPg15WsWHBuUU3HjkOZ9eJwZygl9mlqrFuuJCaW7OGXG1Hl1LZrycfXc4jbyekVsklcjb85pViaQWNNZ15bACOFwgeL0aB9G1DqdYBb+9P1XNWUBnBZ9ixtRM6wzBXgDw== 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=PtAkHTZJ4XYQojmTQZXA4Bo0qH5dq0Sb5AttDVp1ibI=; b=Qh8dHm0iTGzACjRdLuCNPYYOivPlycAHULsuPTEFSC9p+VxChH1Z5M6qTS4KB6ccZmD3qv3VGc87flJ0P2t+msgKE/DJIZW7nHZsb75haX/7oIcxRiocpqav1aL96fq1LpT2wNzOj86iU+y+eAzx0pUg3ComKNv3gsTs0HlP1aQ= 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 VE1PR04MB7325.eurprd04.prod.outlook.com (2603:10a6:800:1af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:57:09 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:57: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 v4 04/16] crypto/fsl: i.MX8M: Enable Job ring driver model in SPL and U-Boot. Date: Tue, 26 Oct 2021 12:25:42 +0530 Message-Id: <20211026065554.29009-5-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:57:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 08d22bc9-0e08-4dd2-4104-08d9984dd3fa X-MS-TrafficTypeDiagnostic: VE1PR04MB7325: 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: 9Xt1YoJ6kGDyrMsQie1igAk0AH6zJbDcnt2X4YOm2QWDgxKKjuOU+caYOV+LOUHi6QAnI/A7y1BVFf27VcVlBOdTE5Bd51ckheXe/0A2QhPZlDivDaaqp82IzSzJBi85qog9jMC7NnqZF81nwQlsoEKfZTMo5HQxLW0d7fI0vGXAFFV3ciT50UvIyKBz27TO1NwV6JZiohgFj1yt41X7fmbz2l3mOAlkqz6x0BXGAu3eoIEGKMgbkBlk9EZFplN4KQYUWaqvN2rvsT8FWPcgl3fG5V62U/BO2UPD0ta5rm6A50p6fa+7YIoj0OnZTaKruuxxdlDy3DKLxTjP5F5rR8w/7fnesuS1G6BoX0yufy9J6yxxOdDA6Hz+SDd8Scb6GNAeyfhl4T9qYcZbdCw78ceUsjRYA5Ek/2Dgj6ntCMra28KqevU5JhGP4YrKsUhyREP9vOUOwwpDVQMU7kQputBUJSZbQUjIkigngelUER8BcSD3OdLp6or0F6gDuMlxRjjdOFxwckl1fu6qcSInp/EOuDvGOR4bziRDoeDvbOLAcSSHP5ZmpjIP5KdKhAC57ZyvHuN9mXfYGSXM4OxWqrtxAiGtJqN43pgvoF6JzBJYKHOnbzmM7jkSmcOZXAK8xKEjKyJNQ80ZOXvJWOoObJjH+Bmeav0OPmFjvKwn7XOcmwbWmHtF5txfDJcuWzyTsErsjOE/iuB/iEgR8+sQc+qBMno5I5wm1op5qnZW7uM3r1t+5SfthQtPktFzGrIk 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)(52116002)(7696005)(1076003)(316002)(2906002)(55236004)(36756003)(6486002)(5660300002)(6916009)(86362001)(44832011)(508600001)(8676002)(38350700002)(186003)(66556008)(66946007)(8936002)(66476007)(83380400001)(4326008)(38100700002)(1006002)(6666004)(956004)(54906003)(26005)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QyI3GscXgcZ1+33eytXT4GypJeICM4ohpgIPzRFBco1EFqg5gLy/ySNwPfmE38QszesQ4gwxE25DiQvi4ot8yF2adlkTkfFeSMlzZVZHCxUe/00s9rzwoWGFQNrM5JtQb3VxUR1yeV4u1/QB7u3Pl4pURCOdl2aEbZ6DNUEuoBfWy/U+5kcEpC6Z0v/nAeAdDSeGobkhF+fSWJTHoQ3eQpPfSB1LZnLPgnQVst0yg0xbtGZ/tgP7nSe+MYWSFxti8xZ7XNvBFTjdiXuHps3URxC+NuZrbh2QbmdRgKRG3JquMHYfx8aMQxBPOnLUT+HemGdS5tas42aeMkXmEQL8qxMabWmJn9S7c0Oe+27mHnbn9U1TU3QxKHlkzJHlOLJlWXosZmF+C8/C+NYgLRMjAHvu/DJ/lWLvy7v2KZXmlzDyDR6o+fJk+68RoMjf+Lw3lXhr/XUgPdVauY4UPbK/i/GWDve4hpZZ5HgRFMkZitWEgSfwlz5dPCVMyVqKWUn8zb2iPgnMjt9Z7FLIEBTiaAm7HTRiuh/7E3TIAj6i57neojWAlNG2ABLoQkxB8u+nmRRq6nKga/aE8qXEqvvKdjKs6kf4tagoDgXeN+M8CAdOT0RLKq7In4qm3YpicZxCX57XZWlDULLEY1XclFcYDqbsPVgvdL82RIWVuTK9Z+ztzmZN7lh2aghXI9IJM/t4kYNz0x4H6ZQr+M4lygAl9lSFUhc6CtYMPZIp8L7FiWKazzRDVjNauFGpX1stK2KlC80KZjU4GVznD/srH6wFRp4A/oS3xUbuXY32vNORURjjBKdFSWCxS/l8aLPDcbzMiJShLPz3uumZByPRXECSp3dIFcn9zEi06QceOXqnPO2xqeh6mSNujomNeaDxTMaRbNG2Zdl+ZjwbwjZPFNfSk4bZS659f7+hmPcN7uHwtkzErK+p3Y0kI270IkLKgzjnfnFWwaM15gM9zA3aFNszm+f3CoNDOYoOWBOCTrZvRbsf91ogYCb8mJzFg3w3/7uH/JoS2VtgVNo770XsA5dQ9hlvIISXLoAN4O6hDHLd7DD7UUNLdwiqEIZdSfooJOiXqEI5RbJ5NMHTZrBnwWWLoi/e9UixfBxbCNcDENc1i/3KkBq38ahfe3mJBopyvL301r9pUGmEUlGGtfR8nJtGDwYCAK44qRVoWpqaJ5y+0q3huizHAdP7c/6jCugrMN8dgu3/dioNAinrs5L0D8Ta62nOD5btYBexMDEG359PLNI/fH02lentp0vUnpfEd3OBVh0eOvvRLfog+ogjJ2iKgs4YnMsyi5FdhmPDm7sRDTPhBOlYUQWG2oofn2QNmTITV7ryeWN8KeVmsKos3CUrgCngpg5VTT31+6xuc8QMo/kiPpIWgBIpcUtNsDBwsk57OjZmM28G59p0ZJ39Qm9IXv2jJs0/MUy4FOA7ibjEaxwx/zA7R9pXz7vsSKlGlIaanT1yg6vsXzCG6sBiMclKEb1AMryOd6r0lMhZthdjeB2YEYsXfo3/pcmZAA3fzFV01JCusP7n7s+cyxsxc2nRK4LKi3hnQDixiorGaLdzd8ytleGZCAdDpVCnFmg5F0ZyJjHorYamHF5xl/M7uNz9MJkk4TdNrFNblueErIAo1wk= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08d22bc9-0e08-4dd2-4104-08d9984dd3fa X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:57:08.8281 (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: czwS04CndY35i02Aflrpo9ystwoR4kle3qNlWt14ND2STcRz6D2FGednIctaTVmZHrl9OcTFwmrXPGt9NWEN6A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7325 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 02f8306f15..5791d7c293 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -817,7 +817,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 bec4953f6d..69804dc1df 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 022a27288c..d3b96f72ca 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1853,6 +1853,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 Oct 26 06:55: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: 1546252 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=qpldfDFb; 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 4HdjMF0ZCDz9sRR for ; Tue, 26 Oct 2021 17:58:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BC156835E2; Tue, 26 Oct 2021 08:57:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="qpldfDFb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 99988835CB; Tue, 26 Oct 2021 08:57:23 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::60b]) (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 09A208351A for ; Tue, 26 Oct 2021 08:57:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Hd1XHpWhe9y0s6uRbuH2uY0H4ViJfhZh2G7rygJndU5JKwE6nTr529T7Fz+FNbe8qKRs7tMR/V7vksBjOruWeXSIgkYqHIebz2ERcQ1zIHfNLlYZr1lXQEuogXVHBtgjzpgEJV7Amj8N3ZVW34nIfT7AGEGtNREmJeYDAddEPdmV+uc6iBb2E1WDj5jy6V4AQIicoylETAi+IomhGR+kadKCdDBC7oNSYhcIxI/7VvgBADmDBUlCVfhQC1Amux5sTd5csmKHlGMADadlKyEKxHu7kBi9mqnoiz4nt0J201zwjgGoptBvYBwnUMNhESSTGNVspxEqPggj6EjcqfiJLw== 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=Z94EnqUk0yThj9m80r8bc3Tfxq4iqIBwnDeEs84c8xw=; b=Ccx9qVT/uuym/C3LYVAnhrcQJQp+CfWJDkfsNNNqWVPC47jgkr2WznFVI7S8F2HzVyF+xXBwRMLglCoekR+S1LtfN9iSNUPDGl/x/Y3qnyTmVAjxrxQG1ugpPGGYdnRFdReoOf3kpVDzcDr6OeFOume7ymbZi3Ww4aAVq1ZuG7ea3lAumy+FOKiUd00N8+RIRwwHktOAyxaOX9Hg3GAf2b6X+n3ejybdS7sgKUgIUqA3hM9S6aB2fTgqTPwkYNNn7PB26K5pzethupPYF2z1No0SKAqoHlqSvK+vCUuBKbh48Ay/W9/SQ4SWTl0aksIB6I29tU8iBYoaKI/B+8Ufpw== 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=Z94EnqUk0yThj9m80r8bc3Tfxq4iqIBwnDeEs84c8xw=; b=qpldfDFbyyhvKbxG5Ff0kVNUnjEJYzqTg6HKNcwxsI1BAVZ88PohVQ+FOgCLN3Hj5POA4vI7XsNoUsyedyeOswd0kCG1wp+oHsF+KIp/69522fmDRo4lnseJ+4oNCfpPWkRCthye1nNZ7XLogl2W8g6mceNUQM2ATWIrL3pZG3Q= 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 VE1PR04MB7325.eurprd04.prod.outlook.com (2603:10a6:800:1af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:57:15 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:57: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 Subject: [PATCH v4 05/16] mx6sabre: Remove unnecessary SPL configs Date: Tue, 26 Oct 2021 12:25:43 +0530 Message-Id: <20211026065554.29009-6-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:57:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0ff59673-c134-46b8-123e-08d9984dd791 X-MS-TrafficTypeDiagnostic: VE1PR04MB7325: 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: Miww4QdT7Vzl0LvC9wLEbzK7yzCK5pZ/xk3oH95n5dSLAF73ZrTx6hugvoln8YnigTEfjk32GPYKAJjwd1ie/XaS6Iu4UKrShN5CL3JDVGPThZsu082c5mT70lkLQGHryQQrtYAusLui3v6W8AZteIPg/wk/ARRLA4tK6WroIQjVrOxJILTutOpZAW2LuPUupdTW//jFiB8PMsv/mmWJFTII0y2E79bw9VsUlR+piWhwLTnE8We28iML+CDS5ifm4dyqOyoL9sFHaBjQiYLK4hEk1NnSRtaJJWrcfuTgVv4dPTlQy82bS4UgxsQZlokhw3KNNoalvxd3KA4+Tds6AKljYFc7O0p91Sami0w+q9lQ6mZ0KnFbYXG2b69OzxHJ/NrCMhbqKX9D5IOWET7rZiezgjqawACTIS9fvI3xWSI+sOcAf5AO6DlxXBmSlhU0Q1ufQg8W9FVqtgAMM6cf/Mcpj/bU5DLWTbL3UeiQeL+TJuW78gWfnEvaBDujaHl0FnbZsVnqQAHEh7RU5c/P/BcrzL1BWBwo+C4od6XmwOSTP5hZGp5Q8Dv/affZGUHY4h7fFtlLD0MSzHnMhuCPZQOqW6kWJxBTZF1Q6KoMnGU1LXTZ0WeYja/BBeD8GsuYr3rTD9+3RGFsWiuqrGx7rPg7kACR62N45H8NzYXqCFnvdsLoKyTglcQu/fwFtXxp4fJly7DL+BS1xqrpcMIm9dSD717xn7XpbOvlmlyX1iHsbJ3cHEYgoSrwTzPxVNjl4m8SE7l3vY0b5n154S/L5w== 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)(52116002)(7696005)(1076003)(316002)(2906002)(55236004)(36756003)(6486002)(5660300002)(6916009)(86362001)(44832011)(508600001)(8676002)(38350700002)(186003)(66556008)(66946007)(8936002)(66476007)(83380400001)(4326008)(38100700002)(1006002)(6666004)(956004)(54906003)(26005)(2616005)(110426009)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ybGKaEf504EF/5rIAAJWAMPeF0QaEAEfK/UKaBP8CXSyFRIwMOT1YixgM61xpZCDUzaTiYpOyQA/QpcrWWkzDO556LvJeLcQEzCcGhJxIi9o1aNPzrcX6IPpfUFvAVxLcOYVouThKOSYLy9a69F8PLZrEwG+QF3wOP8pswkAlV1wFEcooCMtPVy2DcQmJoizUQ6kTy3UUoIKVCrB3edSF5o76eL6mT165FNjz+FwX0I/SRgiBWxzCm02lDAXEXB9g6VQinHAyxPx7If6dZweWXVzG6zXY7oBacycZeP2/QyozolvywooTtXFbrY95ax7kM3exuAsrHec4Ez6fr5bBwiJ/JSwBABszeJBFfg2a5Mhs2DnKZ4gKa1u3IJ7oxwr7MtBOqzOcw1foP/YzXUwIzLL0yoj7aEe+W+ZvEQQZmjnV88QINT9qArOMf3fqICsWTrRpcMqYtDi6b/o5vt48OF0/qvcsOoXvkBYX0CV6L+SciHRVPPItf1bXvjkaBo+Sj33XM9Xbm76l1/smiwvNjOH6wQe+NOeQQy2uhlZidZFmG05rCxg+o6fU8CHj/Zi2x2/6F62SlKOJm/Jd8YfU3v5AovasOa7bxUfGjM4YqlshlsE+YiMVDOWq6zblmTFcD1EFnqSVa31o9+d0VHHPzMM1Pmh35570huwFdnGwrJTQ+3v4U4D2CF05qdYuyyFy0uI+zFvJTlDkv6zxTOrQAwX9p9XE1NGF3kPgZagu50c335BWu5FaPOYQgdIfloxTHmwl+Tg0oGQ4NjRUp+OtGPxoik3UubZWa3KZcV1B+RPep5T/TvdPcKpsoTeRCJZlec2RI1mI1VrJ+nWHtYDeCVOTDaK0LMzZH9b4eC4M6tsJqFVx3k5Kj6NLh3daoUOPWeBGC58HbL3YlKzNnShnFixjKKF6YbbJY5PkCU5e3xiq7uaFtYuQNhGd2o1kDKIEHhk0EAAOzPHTOAKr3wxra5hchjhUn2IuKZoH2xPjrq1sqOukvCU4afkuatz3qrj4CTAes9Xs0ozDD3CcIteYybWPrOdBKGx/Y6mDAN/rI8JSrV4eA11kOBhrd5frsEZaB0JXB4Y11Wf4lpg20FJvSqESEgjzqw9v4vbHaMu2t2TvjtUSfd9hShoVBS540891JbS809+BAiMsR0Ao8rmGJq49UNGCTpT1fEUy633L2V1ygeZKza+8cZ4wIiF3Lyp2smpdEgIDQ6hpb4ZHKxRbSmpSWSL1ERC19ruH7OIZmIqEuivnQVO+to8Z+WFWHzeO/FZ4D+O0bhkp3dnjbRfACcQFxEbSgojh0OC0SH24i5pyPvuV2fNT1jyAjmZLFtv36POAipFuXqZ77+Hjkfl5kd/v2aAq3kzYP2r0GGinisbZfd0G4WFDt3b3ul3i5rm0pODxoP1arckm7rfuW9UIxe5cstQSQNx0p8J+ina9WEXNcnWFTQ8bvYK9JwYcMxISGQVkCp40s1tm9VL9gmQzxUliEULsrsi06n7tPpsklnhqq8crQZAV/cHdAeFLi+CiFa1oxz/v5BndoboFQvQ8KHLfG0H7up8vdvr5+IqtVd/yd/pFvVLQu7vxyD22otcMqXpSJZg37aEK4u8at2iPPSoOlngH0Pg3qBT5VdLtKo= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0ff59673-c134-46b8-123e-08d9984dd791 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:57:14.8307 (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: 920m9VbcNtQrsI9YjBgHZo+WioC8RB+y+Se2qKMCeTOiGb+UnuLLw32y1l3nUZUZ3XLR+z7PegXdPTTQnN8t6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7325 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 5fd0dee170..f2f9ffe0d8 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 676e8a928b..85668e6691 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 Oct 26 06:55: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: 1546253 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=e78kmOD9; 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 4HdjMR7080z9sRR for ; Tue, 26 Oct 2021 17:58:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 173DD835CB; Tue, 26 Oct 2021 08:57:54 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="e78kmOD9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CB906835C7; Tue, 26 Oct 2021 08:57:28 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on062d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::62d]) (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 5BACC83602 for ; Tue, 26 Oct 2021 08:57:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ceVK/dVdDPatw0tEv1lgA3pkCANvKtF15ywb2paUQIrR+s8+6fL9vv4T2Xlum+sDOyOEL/7K+Ig8F14Zt3729NoWQsKt4kd5Ixt11/rpCYlVvl6HfPWJvIPnCLbe1fgJpiYlgI2ikkVFCerFnjpqFg/wssJi7q9YfNIqwDaEfEq6vUopJ1Q/nfu72oYPpJr+uzqskImGPpxLyo89YhlrUpWCbJ9Cdg6DDoHKjgqU1QL3rfkCtQD0AjzGWjTJ5qV3cmF97ezk580+4kPmvQH33VVlfKxBQ0bsxaTBBHzMUnbQN18vwIOFcz4qGBkYzWVkQphuLVrQAnQHBrFmgjAf0Q== 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=9ZxRLzahJchNuyyTyBdj/QU7EkCpLoCGgbamf+gT5nM=; b=CvvM2rSjyUk4r9pqxMopGgJ8Pqo8w11jgskss/FkK+uDMEkPUpkBw1xJ+ThPW42YAWeE8JkaLUr5T1tRKsYRo3mo1dzaJ+e0kyPgvsBel/EYXxiMxQ5IUzBX0ODL90anikWNhSYIxJolcryh8gY2sQwT1NaMpSs54+ft468gZ1d1eH0d/MxmprVFAeIqzxdt0fLRfQUxy8SbMhJj/S7KKIC46QcUGbU3/bIc4JMFdpF/1xzSK6zFphcNoyxiKWx1zx564rpOH2QzZRBanrZaSdCl5z/lPcFkadFlggdB7yYdoY6z1LqBHwYGvGKQdgPG8CH6m+uuAf5ixDoQTGHuaQ== 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=9ZxRLzahJchNuyyTyBdj/QU7EkCpLoCGgbamf+gT5nM=; b=e78kmOD9d8ihWAee/OHn0o1LVhPgdsnSI9TzpXflA5DBtZWyHN8VnxDagrcxaimXbzYxNWyAA1+sDIBSYgDeNmMYagoddZdLNk53jMzcsViACp9/nfES3M8EvYKfSibTwkwuLyVlKzU7ByRbIP+l7N7GvnhD98m+l/TfOLzWwV0= 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 VE1PR04MB7325.eurprd04.prod.outlook.com (2603:10a6:800:1af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:57:21 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:57: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 , Gaurav Jain Subject: [PATCH v4 06/16] i.MX6: Enable Job ring driver model in U-Boot. Date: Tue, 26 Oct 2021 12:25:44 +0530 Message-Id: <20211026065554.29009-7-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:57:15 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9af7c4c3-0f76-4153-1571-08d9984ddb46 X-MS-TrafficTypeDiagnostic: VE1PR04MB7325: 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: s3OVpTJiJ0Jpwo1epGwq2P87MFzMwbwpOVsylXFz9Bm1jIpsE6qUS74rDeN9iIKvSlZDN+pRKbsTyohVwX1+/GU3r3o3TEOTUI8CcirEfYeXXMnPOS9cY2nFJsTFcikiPNPg9kz89L0wujNhuGmntFZhwq1/uKRUBesbecYTzf5MyO1FeCD/lchJtc64ucaxc6jCtB3/EBUjtqoZES1UT/2bhidwPAynhsOzsF4uMQbvZhY/5RLPowLmLTwFB2TbotWCGUwtNVThKoVt6sOtOpvaPTKc6CM64SbcdsZbVDlM3DE3BzLyFz/SwqFtZ5vdgPvdHJG/vCA8VOL7AVe3993tUbEYIOBVnzWxFM651HWqs5x2N6dbBhxjNtXhAr51I2Lxt1hfg0dp08VP5sERIwsR293CrY2kcBLoVcjKuLP4MrFhiWBBrL/ogIA7dL/FSq1nv/njNDOFybJQt/7k+fYhTZWlVq82QnnmPYdoDiMOKfxz25c6JcByujC5ik4ah1LZSE6v1Xgxur3KnAtRpdxL48F7RoQEQmA9YvKyzJ8VSGVKlNHPww9B5NjvP37475+hd1u7gACpujk0N4u4vicfMb6v03mI2yvgoQocojQU3Oc78A3h3bl19eIuoAYXY3GiaKj+lBQhdsZpeUayGUuTVsvmhidFTImF6KnaEDaTSfJY1wIg5/I4jxdCcaPRLwllFfoFiYNB+ZnSHLz4r47weSQb8rdbyE6iIVxxrUJq1SiUXJg5zDhnQgh+FgL3 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)(52116002)(7696005)(1076003)(316002)(2906002)(55236004)(36756003)(6486002)(5660300002)(6916009)(86362001)(44832011)(508600001)(8676002)(38350700002)(186003)(66556008)(66946007)(8936002)(66476007)(83380400001)(4326008)(38100700002)(1006002)(6666004)(956004)(54906003)(26005)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: lpknQN1oWiSw+ehAAomjzIfz+NeTE434Fu04YQ6DH2swCyqZys2Y8DLO5PB10tRBdrYJFVwv5QX1DEujF9j3z7pO9AhAgjUBPWL9pDzuQlhRSnC+erc3bpKeVdJnH7npbOVlMpgKfDHIsiCkVBeHhh7lZrtDiLLThTcEUWS2fevLQRhm0rwEKyGbBG+6lGJ1IEDr6/0OkB/RPWmaiQxonUD1HF6/l+GwpM3Fm1GJzCF93puZbBMIUcNDnBSb1AUCPPIrwTmZReo2D/czpHoTdEAMDnbiyosw3Cjai4ySa6PhWgNPmL22xvI7QsnpWTOiw7C/xekKHg52PzZi8vwSnllVKSLVp/vbEmzOr7WlNbXulOXwQ5A/VQxAIyGaTywooFsMTvLnk/gnheF/as1IBxuX5EioOJjsQdijYAHfc2pxBDOHAD6bxoedys1knNigBYsGyWerIQFOZh4HbekHBcN6h/72fl1TftNIJSb3xU+ZVAFoXwWXsPq8LO0tMHY+CR+vSbOTrH4sPeuUO/+9Xp/MvwR3bogbTAo5fxkk1IQLLIRSbaHFma24k1nQP+Iav152+26/4IJsU6FkKMogHV3CHTX51NCR7KOevD00MSTuO0Y+w9LJjagUwDjRapm/HrNhW8Zj3N2tkpdFULBtUjpx/MMybNSzfnwoVqtkSHPCdEou7fD2OsO2DdY0N0Ppp1AX/yp5TOhew8UOlM0OtlgA6jQhFi3GjEIR0HqranxSUn8929rmUwuuwOvG/8nSqEOIfMzvmhK8O62mh/QnViiTp3IhGcPAKCGywnZL5WWYZ1ztWH2pd1JgV9FcAp5NqogzZ1/E0gL/sCOlwHM5M3P4z3nEeR+/3dRDhG7KoWH4OKsSJdMO5D+N3j8ytKjX08RUbiEIo6cmqdaDAoxKeBpFK6A4Y7R3QRhGbN7hXcYjdAOxNlaU+f9SAgfS16ESlqh3WzgvyQ+vRISI5pGqLJacSrmhjHCRSqOrqQZVQ7TfAXxK3tJ9G/6J02k3pBlUPkmBP7cXMcw6WsQANWgLRqsdxbVyALz6u6yjRyYS7Hv1+8z0+4wpAwMbexqliuhG7ona/i3kSqvwNQCOjQqlZkU25xVNh2XG0QdRBnYNZfz00yqVnsyXVm99/QmaGpRFkPjlV9R2nTMRZlO4S6drEF8KxdVbF89N1od72pRhH3ZND98Pf8kPcIqAAjAZBrQF2OGC5xeqLmCYWcZ2kw9l84eHJD2qHF9UXi+8Dbdhr5SqgeShDwkH8lvYTvaXTl3/e48xxt+jWukjQCTUj0327a332tl5BCSojnGGsCSXsO7jZA4pMfZYmJeBKk4jNBcj+jQsFvLo2ge7PFtsDl2C+QNMkEbPw/Quosv7RWk+38mevly04vVTCEvP3OIkpLsJ0gwaLQxrI12Yf8g6pPX4Rk2TWEMns5F/610UuYW4haqGYHXk5qYPERjBq5ZDQs6nY7xGhwJHaQmfMka2neg49NdZsDZeJ/jptvlEhqGsD6oGk748jI5DdOW9AM1Tt0WSEjdjuGWWf4h/2chT/AzvGQaHyePhaXsjgr21OLH+hoS6IVrBUxwNuSl2WkokGfZxVJV4Hm90W/VvBp/4z8jj6JzrO7HXJfWMTBt44BMYA3A= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9af7c4c3-0f76-4153-1571-08d9984ddb46 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:57:21.0641 (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: 9S2S893/EMBykopYh4Uo4QIxzu+5YRJ6YLrnNCSPQFBm8Lzmn8BZHyYCnYuKKxZdOJNY7uWhhMvHk0nmbjz7IQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7325 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 b4c8511cb8..0f40e84915 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 Oct 26 06:55: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: 1546254 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=jvaQItgn; 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 4HdjMf0D1jz9sRR for ; Tue, 26 Oct 2021 17:58:21 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A7C6C835EE; Tue, 26 Oct 2021 08:57:57 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="jvaQItgn"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D389480F1A; Tue, 26 Oct 2021 08:57:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0606.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::606]) (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 7610F835DA for ; Tue, 26 Oct 2021 08:57:28 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lBcMCrGOZL7kZc0rtURX0jxlQ6srC761IYIm/FYH/UtI2LIwwW7DM//N1ttKmsnMouCVNcabtzyyynCCGn7mTXs8/t4LXKMiJLnY8V/pOgDibT175pPfJTD3ko75wmlGsn9sSt+QtPcL++jhoOJPOh4n/CQ9p7RTROiGceV4ZjUfuFkdmTgdAwwxrykJUSPNo1qN6z5S7aOckiQG1ySbaEATKaStMa3fkblEwVOfnJFslRGLDIG4EUX8uW6ohx6u7DbNK0iAu6kweIWbj1Y1a0o4W0973HriQ0l5N3UMo4p+Koh+x6cWr/1gK0cPfR8mBK4YOWzSeVT70tOBK5U9rg== 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=ETh5MYeVU4O6zWWsAIJrcXbu9DV5BOvGjrNziVNlRmw=; b=M4od176wVezFq2f7osNRHDilvRQphCbxh7Av3xU+xbnaIovZgid2+usb+/5xBHNsghQrTUbmA45BQzuz7ccBpVNJ78+WXVu0ei8mdr2S+9qJwiAzvzNQ+HreqWY6ysgDMfeHw8nTGgQAaqfDO7+HwWq/PeZZE95tQvFvbQapXvKiQAl9HzFJE8yib9yeHv9Ksi+GoJ9qJicfoVg4v5Jqe8G2pmECiGvABikhSyHwZItMf3RQCG0BY226FsTTy+CWfR8BYmUZidYWrwxnuRlpGkY6ikCHOCLjwapzjIl8Y74FtdMz5hCcCg4Rs0j91NqRB9nC+/BZtbXi5c7Am+de7Q== 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=ETh5MYeVU4O6zWWsAIJrcXbu9DV5BOvGjrNziVNlRmw=; b=jvaQItgniAkpHxLbhJk+DLIkjbYmNlMAE+J+9PlCtlyUCoh827ZHEGhUsVOQzWPvaaTUpTIyUggO+aRm21U0yV9EfpnBgsHRV53V1M/09YOBI7a+LTToXPhsvark4TqYMqC8aHdWnar/qS1faC8yShPWhxHdQPAecS6B9DmICXs= 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 VE1PR04MB7325.eurprd04.prod.outlook.com (2603:10a6:800:1af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:57:27 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:57:27 +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 v4 07/16] i.MX7: Enable Job ring driver model in U-Boot. Date: Tue, 26 Oct 2021 12:25:45 +0530 Message-Id: <20211026065554.29009-8-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:57:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 246b478e-0188-45a4-cefe-08d9984ddef8 X-MS-TrafficTypeDiagnostic: VE1PR04MB7325: 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: 6mYEQWMtKX7rDfjTcW9mMa1NhXrC9Paziy59JPVk6wWh0B5rmXKfwiqmnCUwMYrns+Zr9RiJ89X5minPILlWyP1MUCNdAfrmt8Koes3X4VulSQkjDpPW7Pbs2YFbgKBXSPs9vNabQO6Fq6L65G0vDEB/f9sKhrzJCR6lq3OgGS0IvxW04YNfAla+Jt45tMehTj5ovBrtnLp5EYVWCaYXHWMjXqkctLLjsTlpkQiN9o6K5G6LIrbeUo33UcaOFdw+FFPqnyi4enFBmq5XznZjPqzRYQeYp8fNXaCQVCj3kW53lu7NtKkRXWtZWqYjAYgQZoMO/FZktEhFeEoYQ0f2tHzFAx2NF34PWXM+dc7aAnJgrL6Dxxp+VigDsLxb3YeZVbfsN7RRJXxEB6e456d8UOLmwdE8UZ9zhywNAsBC1QAd4i+h4y8TFY9g4S9cjqpPB5XiOCTmF6BvaffXobp0Dzv8d+0y6O8Ll2cenrsFBcOx/19h2SeTiF4Kx10vh2sQKUkM04/sMwO4I6Z2ddD2Ed3v/o0XEo+zOnF8za6SLGamrIbB78FjHAzptef6YClUpZhS+DCO99lPm3xpFNdEadbgY2igPRlspeLCxrUU+8re77U2C95CTV0n3a1CND/XvZB1lXX9jNZ5EOaiEHtzoV3+FgLKAxgUHh53xetgEM+FLIO6zDqBVCFI6vvzHufg/LhlDzoZwDUm7hcwjXnopKpI8AURq+8190W1OTsQEneatC+H+rRTJaGtvuayn+S0 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)(52116002)(7696005)(1076003)(316002)(2906002)(55236004)(36756003)(6486002)(5660300002)(6916009)(86362001)(44832011)(508600001)(8676002)(38350700002)(186003)(66556008)(66946007)(8936002)(66476007)(83380400001)(4326008)(38100700002)(1006002)(6666004)(956004)(54906003)(26005)(2616005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +G/hEolRMSc206LaEBS+P52lgNuI6ysRZ7EiWnMsf+cxF6+jz3kGDqzfyPcvWg22N3CftfvkYbVYVPNabqv7Bsans3Jpr3G4wII0SIz/l1LE4I0QnjsC6dGJTtTdXAc7DeJboVeOOkoz/z94COXQOWpjcK9q5NqNxQLTwfBPX6milfWCB1xuCzu5lVMa/PagS4lslTyW0eYw7S2qPQMY40q8Qi0cH5uIeerZ18uTRHM8tC3vcB3/BSbLYUWBJq72VIwDKUf1/wte923NMPC4X4W0dWMIdmFz6NNN4Hq+FxBi02n+JGXJs0w5z59mE3q3MGGN5eQ10c/P/HxHo7UPfYW3kLtklL/kcgi/1mW9JBq5yySYYh1+Q2sw08SAHdAniCT2VaPehaf10I9kTzUtCf0BeM4nbVcaNB8QPznlFTM+Ajp5YZnkcr5njzcTzgpuyrjHl34+aCmlTWtaMKEar5Qm1ZM8AtG2MDPOTaOngIWE56F/2aTSZMKiCb2pPWzeS2ft2aqdamODIrwBoq2CxMZdC+L3AJU+4RhrzpyM4zvBvr/7e/4SCnalfOmCVjlOeA4xyQgs7qb0IHdo87Lzi8POAPnGiW2WFYxUpvhvUyltkdMSJlfrgcyacGTjw051DtQGX4y34GH7cfuKRcoICAyYITxp6XciHS8px++0eQ5/D0+tAd19nyX0K6eL12ad7o3IQXFylrystxKRMfeToAQekWuBI5FzOXI6HXxvEjScs4RQ+w29rym8mN//YXz8om+PF/c6S9IgeqwQ+Qt3ggP4angDeNGNTr5Z2zlFtRfxArb8Ikp8Wxgljq68oaBX548PM5ckTpxaDFrQA/IHuZRVrWUtGsEnqSFfX6nlZNCUw4paC5P4LTa6eZP0cA/bWtqfTyX3m0wOy80PxBZi6WBhdLtHO5hQgHeMlj9+J7ijvVjJ6XoV1+U/1z6jCAC9xvFTBOWnni97XUJfqvQgcd/CuYZNhyoYfi8wgnHTvlSP+bdYgos3c+81+XgPJMCkT8H5coRHs12NjLqgfw65hAbqPYSxQVdH3Mtvezq7nfN4Mg0n0bmBZ2Q6TcGQ9phnRxRKEHZ2nd4MYpf2BqcP7Rvtjwff14QZm+D85B3Of7be++rkbJUjInQPmp5lKJBWuMEbtdBpl3AdTIH9w7DrNXRkRkoRsCIF2hMJqyAhqxrzoan2lekE1HL2Ij61sbbtTIsnvLOKg9Jv8GVeZRptdUYZmqC7mO2PfBDRjN83jE3Jz7gJDhsSjEZFBl8+yexEssZ1saqGXkZpgklDUVhuvOnpqTvOl38xoFAgo86Ltrp2zcyfYLuk7GcgXeUwqUTMpNk5ekKDOcODfWKJ8z3xLte4QOtm4ky1oLo1YxyfRzo28yEa5AoB0CyCmUtGODEDc0hXejYwGvDAMzt+egGKKwahsH08/6GKHBFHQxkJ6oVo4G4oIwG0WsGglWiev/GfsFs3QtuaB6VxW9Qzk9pzhCCJodQHjevHHLBqbqVs2ctC+a7rxrLJ77xrzZ4/D3H0QhctwSQnLzyJUtw4knJjkxna1/SbbABpASYPwjC5pIHtQEyrJwsIlr91x8qX39BYKdLT+GZz7O1INliNOZj/FRge/5ipPdyDIEv6gydn3ps= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 246b478e-0188-45a4-cefe-08d9984ddef8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:57:27.2596 (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: umgaxf7ue5J+bY6sHM3zDsRMarku9is6ol8dlVnJ3HCf+7lcHqORTDYSu75O9XxKtGpFoiLyAMFfHNOlEZ1uBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7325 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 5791d7c293..f73789a4f5 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -885,7 +885,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 Oct 26 06:55: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: 1546255 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=nsJEfwdv; 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 4HdjMr1x8Sz9sRR for ; Tue, 26 Oct 2021 17:58:32 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8B27E83617; Tue, 26 Oct 2021 08:58:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="nsJEfwdv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4A2E980185; Tue, 26 Oct 2021 08:57:41 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2061a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::61a]) (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 5C4C1835FE for ; Tue, 26 Oct 2021 08:57:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KhQ+T0xZrgaQ/sSu6y/0bIG4WMUPfGYO+olziXFN32I3a7CT20O+tH2Zb+WYHfUZ14csM0oxFxlb3gTKwMy+QJOoxF/otuF7UDqATwXFn8Uqzg0Lb/GduyuA1tcxMSxg0bPaKF+F1aBnMct2+xRNZObhqBzddZzOf1O9tZL6hVUe/SarrPh4/SIUR13DpIZQuJhpr8Ekk1oBwiRV4Mvnqdd6ylqYeU6oh8bQWmT3Bt7ZO37o32Q0e6ufs0Vp5arIJq0rTUNsPRmbP4ygGY98BC1Zs1UIYFgGAysm9P0Z096elHOw2y2xhK8BLN/jtWn9nzuP7gm/DBCOLFrUlGbTgg== 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=UxxeTPbzJScLImjHL6lr0Alj6WdBeL6J4szJjq33qMc=; b=AivHrhIGAk/WbhDrK/OmVANKtEKcpNJ8I0puaNebFjfx8qgiDrC71DKJbYA8JnwIjBk3sj8jJ2BIS/B8OpQHP4aOmnbA8WLUmyvE5s7AkaUZM65cM8iObi0D8JIU3JjOaC0FGB/SU8e1zo07h7tpYsDz7cX2x2Kw2eF4Zjl2jePCsIT6PvPbxpSGDiVYoapytcA3ogIQpxg8vaBtmPJ+yb8/QAhTP6kuifuzXj22Se8NoO7vnU1aWijNbaPnHyVicrtUoymSZ9ebrEJ/4yQZ3se+G6yISillQZKhyn7mqQCPc0IZofHpHAiop0HwcwbCagElb9o44NVppWds9ZZTAg== 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=UxxeTPbzJScLImjHL6lr0Alj6WdBeL6J4szJjq33qMc=; b=nsJEfwdvSCJ/1MJ+a5l/b8bLLvpXM+asHj9U2S3R+8UBqQanxYKwIq/z9njESGX9VRb5Sx+nHaRsdquxFvXAMrAip+VgZOhFt5tfUoc9zVG1CZ9rlZc+mr58Ftys9bjJVuq6J9l1RaJZqHRNqOj0hlV2NmtHIz2sCyo4WYgDcnk= 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 VI1PR04MB5135.eurprd04.prod.outlook.com (2603:10a6:803:62::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:57:34 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:57:34 +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 v4 08/16] i.MX7ULP: Enable Job ring driver model in U-Boot. Date: Tue, 26 Oct 2021 12:25:46 +0530 Message-Id: <20211026065554.29009-9-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:57:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48717ef1-7793-4288-d578-08d9984de2fa X-MS-TrafficTypeDiagnostic: VI1PR04MB5135: 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: EGfdjABe3Jd11qiLmwRIkDtBDWSQT6OKOJ9zYNBCsPcgFSCZDdVY50ZTPKqH0+JMk1gNdQ4nTccBxZSPYL51hHpHShvMcFg8xXSVVulf1UlN2o7CEaGawqhH9yi3yrWTs5nWkwCuAohFyQch5UdhdT+ua2iMOwU9YFA84o54fv2aXhwiWX+nFDbwBtfwuCiZCzSKh043DfYAokpNIhxgwy7mHJzCjwg+O14G0yGeJ9BWfla1moz9w3lPuRYAuCWpOM8Amfvc2YdpRouDJ0e0V4KkugDvQAMWyl/6J3PpU+r0dcdMzVR7cbDjxVmgsl/6WAbWqNNE+TUbUgXlpgZHPZWTCzYTXLkzLSjqlzK2J4K7V9+S4GyeV86wixe+3lcDwJwkgBZlWV9uQIdFbhBjLk84M1kCiO52nlLMTW2+zjMSrg54NrsVtmpriJo7riuMhGbfBstKLh65mNX4q06DHaE3jUTj6zvgjtsTokgjr4HI9M606MyiCuw+OQfcHLxXEoEL1uYfjIBO+c/uTQ0bKZpFHmnGM7Q++/OTT7esQF3L6ZXWBOrs27UeI/J9bE+0qSYPGbHPtOx3INF/JW5w73ODRYUP/QseLnlCeE3bVqBJt2mSjsoBfwlnkAEXkoIQoQWVE9haS9vujoeysng7cs7lHcliLVNUco3FBr6s7ZnJMa/s0wcJOsHOGiiiQSxUlCM1KgBkw9RaNKUVP7uuomgUqIolZpVbHY7h5tUnj09KevAWmUL0I0u0y7O0UXKjzSx6mQ0ebeAOBMwetPdqiw== 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)(6486002)(6666004)(956004)(54906003)(1076003)(508600001)(66556008)(316002)(66476007)(66946007)(83380400001)(2906002)(52116002)(26005)(36756003)(7696005)(38100700002)(186003)(1006002)(8936002)(38350700002)(5660300002)(4326008)(6916009)(55236004)(2616005)(86362001)(44832011)(8676002)(110426009)(2004002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +fvM0HkxA19pP415ifO3F7K2MBOt/KJY9kkq4t3AmSqW+A3/nGFDbkex3oTSNPbYt8xIpKnlKFFzOASVA9r5tUAEpMw4zvv4aMr7HMvgglGZ40+5uS0h307I0BzQ92YeCzpwgjGuO4myH43iSiYdZtGyXdKgRGNmgM1d2GPwa8Kt58EfKUaj+2ZzKJ9Ddlj0rKPtmjX5a7hDf9fcMLzIMIee/GMRqukrkjcvDpyj/rzPH9JCB19rkZA2YTA6LV6I5Dk1jfSndfnmhM+6WbFvO2B2LtkBWcPdN8teeo10zWcuWvmJdjk0gZvTIsr2H0K6wioRB3YwY4m8F4Z/L/ecuc3t24cRgW9bFevTKIkLchcdUaxkS6BsZCOq4GuRL3qhWfrpmodhKUA3mAOIhFBXo1okF7Ne/XEyPSO97i+OaISN184bm+gIbYoNUbpq/SDsulnKIfBSY5B2iFctKNvyGVttF+spZZeNotgSVFKiT0iSLlDVoMKpup7l0rb3c+Z4zreO/5tdC5Mj7q1L8nrl/Bc0oRWHNvOiK1Y7UJBmbfVPzRADUWd2rRFGofJYL1sIdl5CPQwlEZPDDO1znesv2W0KYdgRcV6GFWS9GB+zOTZ8SQfd2P4clmpNkwHVxKjkfZibxJS5J8FwW1a/mHA8J6AJGbSRW3J8GBFM12cRBS2MUdTqXV8SoYkT25hiW5e0oi/FxZo1p/f08Q2rlxVbSy1CKOeyBDVfLHsfZL/i0zDtDhT3MSz4VagSuBJf83JKV3aNL2mDJ6GXB7Soe9Nip5kDR16Gpo1oCmDuoQQt/UIq9rptqPqe1Oij8q1R2vh8JNwB0QZlpLTKIGUOdnCCmHqwMQ9eKEkIdu5ysr96rKklDzm3id5quewnOqY0iS8l2t51ADB6uC/0a1OJX1C2BUS+4tg/whNrrBtwLwp0OrHssVHLhOAKlrsXhtOyvmbpWBcgzbZJQeNNJcxLnh031pUiUs+uW1Myw58zcwsaeseGscwMdY0IOxr6yfouKf37raYZIkiYxu3TD4wKs1a0/a55DI5RXZOUvDoWARt1hPunWDNX8vaHdjeK9s5EnkM4AlmbcMt69vhgcfY307oG771n3ofhLOGzXwSENIt4jYgO8D7k/rfsZsoDqNzxfpiDZUpAdCeDnqwcBKB1ubVUb4Lg7KQ4fErsNSScMsjLbo+tdrKgxuHqBC6M+f8C1ypALRSuofBTHkmTFE9nxCDJt3G3d8uQO3cIcfkoPFRvPqVixE8I7yMhsWVg2YX9HpOSzAUoUVO/QI1pbY8FnLiSEwMgSNwUkxwAV5z57YUtuU/EtJ7VXdi+Oi9YD/DKHC/ylBji5cwPOL+aUjQAil6/lu9mzXaqhcOQ5q97RVFch/K1lkL4FGpJQHbEKzmPy73RbKMxC9saDaGo4Fajb20oq55D35/fh9EcmbvvHJ+3YrqGjn5gxwoPjx28IjE5bey8k4IFWWqCxM8bHUEaYDOWvN2HxrLaKjAIFK+r+G1sxPUfJXMI9jTk1b+HTeT6xJb7dGHi3HdPT6uFvyYefKojLcSeXBaH4OKkYMiYgrjjiQPFsM/eYVX43Ct/HRsHvoGVHkIEMSN4LOqJE5SFKjAApIaNwkNNgJ6cYUi+vAey8ts= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48717ef1-7793-4288-d578-08d9984de2fa X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:57:33.9637 (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: yi7Lyn9VVyVAGWW0PJ/fl2ZJkpt6Eg4lOMgIJMSk7sVv0CAc7GHtlCnk11jw/qbPRsjdyrjUs6jil9Vv/XisYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5135 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 f73789a4f5..314e770931 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -872,7 +872,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 Oct 26 06:55: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: 1546258 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=bPxUlHoD; 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 4HdjNV0Vn8z9sRR for ; Tue, 26 Oct 2021 17:59:06 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A9DD583607; Tue, 26 Oct 2021 08:58:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="bPxUlHoD"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 41BAE835C7; Tue, 26 Oct 2021 08:57:46 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::60b]) (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 50D9B833CB for ; Tue, 26 Oct 2021 08:57:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Msj98gZFnwW5hqqmeAmV4Q2TASJ5sqhgPO2GtzbP8ray4zzk6nEoRp7Jv0ecjH1CoM50EOmByBPvSZgO3QYKYCaKDDrsxGD++g+0PdWbaLowPUxKDQ4l0QvVS+Jm+IgjKbgqofQ5coxFBfDzYX3Zj8eFRzzI2XEAVva7t4NhSflG8OaBrPoF/MKHof8+HzxmReG4l/RS3bXGVfGs7mBKPwc+aDVdH9DnOAU/dMnKSfj4Zb5HPx+0L+51bmhyg/MoH8V6Wmz6AsSiRk8/8wH8DtzD5VmxxQ9uGgYNuwlasrRpUt5uVJ/gt0s4yfMqpi/3WcXtdKORkBxgO/txGiN/dQ== 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=nTcWv/sD0I1NGht6pEcz1NKiAZlyZtRg5DtNeAoUwe87apnwI5B/WFL7+OMlOpAGFrIKXKbIoYN8Lu7uDGfGqup8u0bUNoJ8sustgsxPCUlVDZUQTgtG1xcMXXaITl1u7rutG0NHDm7uZarY/dBkLE2wr1eAK73zp4IgBjnwEYShRAfcKpr1bm0vsqbaY8/SCvwf1jqBfuScBRchmd7mKerItUkyp0Qi3sc3DxBCO8upv5f/i0a1AxkVS1PYTxk6QqnRQ2NPC0EaW+0noi+TZ1MGN8NYkpgAMhQnwy1Kk0dFRNwZRVY1zBc3DdLYV+CbznFdtbv3BZ1nKGhYoZVq1Q== 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=bPxUlHoD0lnDLnxmiwrkYIKpkYoddPk4TquMNYhY2tcqkGfjaZ++cf0hPSBEqkv02hz00b9GzMR26JQbQrJf1Lr7Eu1SqR1XZnNMRoq5RMG2MiPu5gDEuQZWxJpSYBneBcp1F4j3ik0J3ovkKcjc8LNGrZUBhBZmLhSxMNAgHjA= 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 VI1PR04MB5135.eurprd04.prod.outlook.com (2603:10a6:803:62::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:57:40 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:57:40 +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 v4 09/16] i.MX8: Add crypto node in device tree Date: Tue, 26 Oct 2021 12:25:47 +0530 Message-Id: <20211026065554.29009-10-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:57:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 56be04b5-82de-4ee7-ad27-08d9984de6b1 X-MS-TrafficTypeDiagnostic: VI1PR04MB5135: 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: fYDTU1wvoF+2+Fo5jb4gUZjRpVVPMHZCe9L86uSa5RSaQK/VRYm2nKmZUsCXpzPiEryP0HV/usgklMyXCE3SeMzvz0dyElz+hkeMNdIt7v2Mo2DYqxZOuH/cWB9Ph1sxI+8iUxMPNrvnN0AGUgqE6gMsiPcYupweCVnr8SScNM6gjfNyX45KLfmXQyQpXc+Z0iVYjMRxK5L2zaivnrKR7wqFBGIGSwEmT5UNv8XC7tiwcGZmn3DcVwroDc2oSagAenaGfSGVUWXKsARcWnS4rCfILhujYRDIXmIU5s38XvAq4m+E8LhFn5tnOzt03gBrUgJm1BLsTHTj9DQjii36Qu16MA4Ir9GPi9BeLr63GIVK5Fdq+iFh4MRUqRS2MvJYWs04rLAmLNoRgIf0ccAe8kUSE6PXxzuk0uTY/QCK2y55TJA7gFZXupGQNua2Vk6TptnS8k8yNjaL9QYK0tv8K68HmN1wxCTBQBYEXcvWUwDXnaY7zlCnjzCzEo4PsBYBIOfo9dOrxtABjdIsbipEeZ0w5GoG7WEqp+kFioJbRjjNpDt5Vgez/FrV8tz87nFlV4K0HW67RS6gF4gDsmfaWw7wrTqVLzKIM/lj3Bs5DCTZkfbedMAPM6kqrNwxgOA15OfRoLvuVEEOtsuBNQPtj1UV+DfgCorDGRul9rF8pvYuZ1XdmaZfa6xWmt1SrpV8ra5DwmEOswgzuhoh0ENe0b2+3ZSrHNVz68tFEcEzCWVdX+KnPHYaEi05CtWp8Ovb 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)(6486002)(6666004)(956004)(54906003)(1076003)(508600001)(66556008)(316002)(66476007)(66946007)(83380400001)(2906002)(52116002)(26005)(36756003)(7696005)(38100700002)(186003)(1006002)(8936002)(38350700002)(5660300002)(4326008)(6916009)(55236004)(2616005)(86362001)(44832011)(8676002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: thIx+YFIMPJTA/fZ2HjHxr6ttRdfyWhNCGvhvJJv1TwHfg0iRQXGyUC+q7mlZ21EoEVzIzjpx+rTQd9RM0G8BrDinCiljreOHAmV7Q4CEhmamn6UzZZz9SjV2EHMVZcJ7B9jXfBQ0AWDfRPlcoQLsgNhWU6yZKfkgDr+cd7SAp5mcaDPuEFc23Ns7LTJWQzhvcJhZv8u+hRaz8qWkohJTh1SlGxdQjYFuXX3bZuPujfb/MkfzYp3XBJhY4AiEBD/M3O3FRXVZZkVGuh5syg8dBZo6l1Wu7vY8wo6VglHKt7DYBGaF/wkie1IQIqaDiBrA+vTZAxUjwOLvnjJDuaYwauplhzPshQvO+wsZciF9X5vXXHAbE+uhBDgzYOHVC+viFcPV5XbwFpmjumZZWKEFt46uAO/plh3IWg4vrsOsqj19jxatp0s0H8D884Jk2GeRuh+be1IKs0N5cm56fl9oE+lATNlzqBq/xnl5UfrX+hMlyejei5ybzk/DRaIEG8XGz40otpbC4Lu6YE7zsQgzAhDH9DJ+ycYzfBD7dZkIxS4FS8aCtZuFz45oJuWgqzr1Fb/4q892/t7fTexb1Qgovea1e++9OhfdC7rBgSW27Wt/3LaaYr7HfsZmbZ0w4Fahf+YfmGQWtGdJtOCyhOw7wGcClyVIFc0FCe391OUrcnzrF1Dhcj0dRUcWHLZ096ZezXf9f1EUZUEZwM3Tw2d2Kxpp4CAlyKv0o9RqanDFtbJcFRaUulnRN74zucsvHfYurZfUStPmJJUrHRI+W4iWn7tXPLIP3ioEHNFZDWa5WCnkahvusJZEw+lgZeyTXdXk2KAbUZE4nXobY15JSLSZh7gsOBHrGw/96A9jYia5WPgP7yN5hb21Sabe4zLn1OSrFMFWaPh77LoneV1AGcuepDdokQem0+wacin3teVMZIUM3kH5KZkmDzRk5twkGav6O6En3OQ4kkEFvh/TOwA4jYprrK2EG0/JaaSqk5TgxDK3S6cwnPT9qivm6e7LRozH9o3sQyKaJw2tWMW1vNOQJdG3qIZTyOwG/xOmGIGWO1jz3i5yJqGu+tJBWeeH6zvrxta9CSsTljnSU/4XVofWA52/tB70hAMMTajoeMWUiNM8FbtOlfyRw6886maA3CMOWoI0/LPQKV7uZWzxCH2YC1v4eRvde7MZrjWmLVZr6qdR+l4rWtSSGOZD1V9qmkUmwH2i2OyJAXMx1BPbl1gyGbpU4OZNnaVOto+7khqmHnFl8sESCPiV+aIRY2+uHha7uK/LlUgZt6WjW8BPhsao5M5mnvm9MZ+pX5coBkwQq8yUyJFmfxrpNQkrpkkcd1xuwgg7BoSsD7ZzaIYlpYdXzhBvRvidAPvERSxPZHw6udPJYP/xmhS2N4iM+YRHQzTmlWlVTVBwayIHKrchcEZ4A66b9C1mewNiyavSFPuPEitcWVNapTe127htGIiK6a1mjY3BYdD9oTb1Zrkn15NJkOLhSAEq82nolOCR4zySZJe+EXrkUrG/35c/2yUrRMP4Bq8FC2Q3tNs33sTPzIthrZtyql0atBNr0fPMcK1m3rPQdS3w3iUtdwNhx71OzIvLQf/dI18mCmUoV7NyR+ljtSk56iS06tr7gv1XmdfDCQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 56be04b5-82de-4ee7-ad27-08d9984de6b1 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:57:40.2082 (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: /69kY5JDP8ZwqgEKU1vpH7x/9MRAsvd6LWFUsc2vPDw+N1Ou3eRtskD+EtrKa7xw3bNJgM9Z3McfvD92Yg5YdA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5135 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 Oct 26 06:55:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1546256 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=M3Yfyqxd; 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 4HdjN30LkLz9sRR for ; Tue, 26 Oct 2021 17:58:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8719C835FD; Tue, 26 Oct 2021 08:58:36 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="M3Yfyqxd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E54D835FE; Tue, 26 Oct 2021 08:57:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0611.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::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 F3124835DA for ; Tue, 26 Oct 2021 08:57:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=edaFGcXRgkFgbCblJfsUm+EuPVj372nQPfCUq0ofucIYDp6+VTUz0k7ZPVd/yzl6hHEPWog+0sSrpiphVpFUpYoRJ9jRIHhnLxLY0Tyi8+Dxtpu1YzpeEXyWjwpDh1GdwzxGtxmpLkjIcmzqoSe8TKzbQXftK/EU9tQk1+w1NR9sS8LT1Z6WC/fHq4I+zOJwJQZf/sHgoHcwo15svBG/XHa3pVWjnEd6OSy25BtK5Mfy5C/3uDqgYl0dHkqiOAqkHz0tFikTH7DcSh6bumpjcK2vZ3rQiCqdyAGHnzF91sa4Wih+ttpSXWaIOUochWkgi/8hJu9d1POgGdnRgnSkxg== 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=P8Y9NicfWFgQgRJ75lDgAo8n+F/vWZlX/d5LKFon+3U=; b=Hs9ZrLKPzFo7KSYyDR1nfIb0IUzpgqcY/EHkyyenQtdHDFYSlAPyC4XjRjyfUsen65pcqNWxottlQqgKhN17+n3ErgVRDh2WaNwtsE3Ed1VGrShP16cQBcVYxxOT4JzKDK6zveEDDYGI+O4ueymDZTFHiWWGJwbJBGL9q6McCjqaqECL45zhyaJa0rvJofcJm4t+ASGDiLCIWKjZDDwvGGobyFGezgu3dHhH9Bw6ejSjmiLJXXrRtDOYcFHSTDxeMnaBFqMZLAaS+Dp6/pr+EWKMUFjmRBI/KnsteHYglUmu/kn3FIkKVgO2LJL1ORH7bR28OTxhyB7HhUNpRHM1xw== 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=P8Y9NicfWFgQgRJ75lDgAo8n+F/vWZlX/d5LKFon+3U=; b=M3YfyqxdfcjVCWTgvnGkQF6QFcRkd/xdVWpbt1EjuCJ/a6TGtnArjixx5BGogVVM0785rS8mkq3N4H1OxHu2OqYgEBj6NS+YUfmPe+4oeBhg+y2y5nUB71a8GtiV3eKXo3cUXwWa8oe6nNQ75Uv7RvytNmRVUukQNir61xv2r5Y= 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 VI1PR04MB5135.eurprd04.prod.outlook.com (2603:10a6:803:62::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:57:46 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:57:46 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v4 10/16] crypto/fsl: i.MX8: Enable Job ring driver model in SPL and U-Boot. Date: Tue, 26 Oct 2021 12:25:48 +0530 Message-Id: <20211026065554.29009-11-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:57:40 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 63d9aee0-bc84-4ca9-36b8-08d9984dea68 X-MS-TrafficTypeDiagnostic: VI1PR04MB5135: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:126; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6DEu5qmaHXUxe2kV0sbsIIys3d+DGX4JzCCK6EGvaAKynBZGu9eWk46pi/o6rcxhyaA+jdSZxsuZyzlU4PctI3ja08FoNwIf/9aM/mprRGpL884Us24xkyOCsJj1gyzczuU/FnA6zSzRkKnmosH91y+QAMO2Km+I+07HiN8DG1hmKOjHzcYE5qNr20sw2la7ZbwuLGgWaHP2evfixLIHrDC2McznJuLgUu662hblQS0VDvZdYK3QjdIjisK3Q7dGmlBH3aLO/+tK0J8IDMIFdUsSbNPht8u+/RTJ8NrQX98lToNGwD7miDrNFH2d/JuV6Doap5CXTIShWcSg86RL+j1w7VpnmUnNt9ai3heffOIN+zBt4f0Sa2WD6H6wJmtzqlAcl4J6AlqVhb3u0lB2Z05z81NYK4ahuodpVnO3yhzlp1D3A19tevlM/nl5FF6LM7geD1jkIjcU47/JDBfFtiycuwCgehXg6NKKtXjwyD5IWuYGCj0qrBkX/dhOgTtvObe9DKhM/mceN/TbLESZcGaH3XumKAF57SxdRzwPIjK05wKFlbZBYPpNdtqEwSc0pl3dAq3nK6M0F1ECKL7sHNtxVeQ+lKa6WiAQk2/x3E3WfYsi7u735aGJR0/YO9DxajZGKMzl20IACkOcotL/3QwVZzTl8mboiYH9RESQs2Ib8r6c0/8f+fymqS03R/M18SmiMT3xuPiirV6eRkWsMiWKswlG0FBguyCtslCZkNfqjPdpaVV0+dPkKSBDDK2R 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)(6486002)(956004)(54906003)(1076003)(508600001)(66556008)(316002)(66476007)(66946007)(83380400001)(2906002)(52116002)(26005)(36756003)(7696005)(38100700002)(186003)(1006002)(8936002)(38350700002)(5660300002)(4326008)(6916009)(55236004)(2616005)(86362001)(44832011)(8676002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?HYGiFxzhdywZUbytw4vgITZ1t2yY?= =?utf-8?q?QvYHwpVBOOG2Rye/3ry4Y99dfiJsHYcBGCwYMAGmx6/8I/OWUHydZNuDlAPZoJwZA?= =?utf-8?q?tB3Bkd5oOC6BMdFBMmkPmDztDDpWK1bc9jWbuwm7pVgCTNmLk32NDK+kh7/ZaEzs1?= =?utf-8?q?4cq9FNhqItdh0PhU/nfk2sfcor5f2BEILn/0i23Et79owqDUgKco+AA9i5OReKVuZ?= =?utf-8?q?3dp+04cEihecdr47HiPNjaUYfyqJ6d6qiliL83vJ/Oh6TvBY7ktPW6iGXM25ewiqZ?= =?utf-8?q?zxfAx8AiVYt3whexj7v3HsHQzk1xPVY/FAjYe3HDG+ntQdZQJFB1cgyiGprMyaqqc?= =?utf-8?q?Mr4vIznhvtSsMIupNfLbW8Q/jzoRZUHsmHbbEVZ6XOthO6Wm9kTsm8wT1Se/WtmUq?= =?utf-8?q?sivfDHxjc5tf+/lgjQvsAJrEU4LOkMfDqjkw9/1RckYU42gpfSiCekfzAZj07ZzGU?= =?utf-8?q?j53AHEOyBAZ29A1QYq24BOd35PeqxrD9ZPWm0qt6uW7IKrUg6oYsAl+L40R0yrLO6?= =?utf-8?q?Xgp2aysHJMCm0Ud+sa1q8645KjkidcJWjSokTIB7gc8e6tAg1ZkqsFeOBMwsSnWnu?= =?utf-8?q?1jBs/w4dKpkfYkADbO/VBFUjTiA3go5/UkyiiyKEnBJ+h1yYZPjnfObPgY0n84OJS?= =?utf-8?q?/g+kXWFtXeaEbr6Yt6+8RSvYLV2ko7f1C31j4JKaDe/KBG7rOlWyBcuWL73eUKgKB?= =?utf-8?q?RPTe+649Fd2wv0kizuAndvy4xgmM1KHbVtjXZnpDP3giazJfIiEkNbfaZ3b1W1Qtn?= =?utf-8?q?uIlkx0d+hHgIEXonqzS1LtHfbKZmUGu2AhYgCLGAs8bFI4Y1ipp2rqrWdvBBGQ56t?= =?utf-8?q?MNaHsQfDkI0hAPT0yLRZ3aeRRP9pFuL7zORAsaswpQYkil8i6pQhEpGni79eLMRBW?= =?utf-8?q?nF0VbhJEX5aZPdvCYcyEkRvhyCLqVHHJUzs6hcjGFxW7JdSaAeeI3eP5jpXYrx+mr?= =?utf-8?q?wmJ/ZHJce8MHpKDRR2afBa4eiJSImQkR5hrfZ79CT9Azd9CZ7Gukm2Q8gjWSSO7c1?= =?utf-8?q?IhnWwPhOSHSpLtd0hnU4LMWdzt5zQhoukZoPXFDjOZhLbmQncnbJlCJolCvV99OOK?= =?utf-8?q?4aUaHjgsiA1t4dVsZz84pcmC7FP2TXq7kMCYSAKFRf5cr+WpJVXn9rGgVQq0FawM1?= =?utf-8?q?FmegsYb+HOrqR6dpnUqxDTNlmPItfPKEYMtamxr3CsxR8DU2PtGlPqlSJ6REtBKiV?= =?utf-8?q?3G9DyhB/r1kjlWCrLY9FofQsLSgcwYdiwiCXlcgt6IUTjU/HcoWWAhTVLqmB4W8Ki?= =?utf-8?q?KQL+bgFk6gEftdoJHI/NhPqAGsgBL0rpROj9S2KlMXynL/v1er4utO/PFZmKcE3xd?= =?utf-8?q?DsRHtcZBLD7atGgUOl6xOZQrqSrim5XK4a8fZpQLXgFWNo0QZ2kAgmTg8N3g4DP8Q?= =?utf-8?q?JmfGx9yUM1aOKFyzcL3t2WUS83EWsqcHzlH/2iesnaH+UnVRHMYEtk1VqN0crJ1er?= =?utf-8?q?Nk4jAGu2soxoIsBSe7gvAg6cx7NNj6G/REea2Efcv2FGa7f4VqxH1/vubczOSdGnD?= =?utf-8?q?+PWYhljUHaUjgHWjALUQA+qgAYExtGy6DTNYJykc1R3mLdfK/FWaoAU=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63d9aee0-bc84-4ca9-36b8-08d9984dea68 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:57:46.4326 (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: iEvTJeUmJY/x5D9eqJKIbPL4PEgTzhnkOHHtbW0FADH0i5QwsjgrI3Lk7fmdFYhal9APZWV1l7/p98rNWAWIAA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5135 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 314e770931..9458ed7eb0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -806,6 +806,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 ab59d516f8..0bc1458eb5 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 69804dc1df..0bfdf9070f 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(int subnode) +{ +#if CONFIG_IS_ENABLED(POWER_DOMAIN) + struct udevice __maybe_unused jr_dev; + struct power_domain pd; + + dev_set_ofnode(&jr_dev, offset_to_ofnode(subnode)); + + /* Need to 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) { @@ -822,6 +842,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(subnode)) + 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 Oct 26 06:55:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1546257 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=PHbwp+Jk; 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 4HdjNG1mB7z9sRR for ; Tue, 26 Oct 2021 17:58:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A7221835CB; Tue, 26 Oct 2021 08:58:40 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="PHbwp+Jk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C7E4283603; Tue, 26 Oct 2021 08:58:02 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::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 E5448835A3 for ; Tue, 26 Oct 2021 08:57:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mKjcWvs0Ba2S1jBtYVXyMwooR7v02MTd9jLaHqbNS8QQG4kEMpRuyaBUMvDcP5C2sXmSgeH+7fFRbWkpU8xrzzuKlP0DSAQ/1znaUaqXFFn2EEyI5umMHH0o6JXaxqRgVAXlCUmlXAlmahOPzTlLMbmBwt0HiDuNlxX+VnNv6WDgsuDOfgxAeeL25JYsSmtyn8qYl9g+AdmTEw73oOxcH8c/YZeuNYZ8s8ky5oltQNDMh7qI3IgSudaA6JxOry+TAYAkD7/GYKjwdM8b8deJ/sodYkeI+CzqkVmA/zsa3NF45TBQQ68H3xm4780oF+yeMWBfS+xtkHD71p5DVMuKeA== 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=+V8Hi/ppl5eA0ieQX1uAVWNL6E8rMmohtPzX/8KtvTc=; b=SIctb8okWbnsweFgp4A9d2ooQRlBnU/3qesydZHGTyi2UBu3MzRt8guc2CBsxaT24hHp/rzRAJX9pUzU31UFswDrbJyA6I6TiN04yADY3lpxSIIi5Fiuv9LqsF26ViM04Lc6CV2N9HL3g6+IfjNkVwsVnCMwj1SwXlJctAgwkbr+UsImr2XirMpFhhxtlVgQ7ji7Q29EyFIKiK3f6fKOBkAtA46ZP5RIcmJqb0LZ5xRencWxs/ne4bN07M3j/BmsjWGoOcFDM6V+2xpYm6wCmMZG8kZwk+CD3TlEOdEFZm8uRiWj0bXpGTDUmvUbIvr1q266oCKXZRYR9JVvpi4Vlw== 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=+V8Hi/ppl5eA0ieQX1uAVWNL6E8rMmohtPzX/8KtvTc=; b=PHbwp+JkfINJQ/PrAWhhkNJc69blEXdguidLl+bWT1s21SdViq7PH87l2vrANLpU+WQMPiKqSmnnERNUpc1vkvJTLXNP1bmIcX51P4Iu65Ko+TQ1zebaGxwDSgk3BsIbagBgxE6KkZbtXZKohpJ5Q20GqkK898Ovr7Dr491sNIk= 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 VI1PR04MB5135.eurprd04.prod.outlook.com (2603:10a6:803:62::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:57:52 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:57:52 +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 v4 11/16] crypto/fsl: Fix kick_trng Date: Tue, 26 Oct 2021 12:25:49 +0530 Message-Id: <20211026065554.29009-12-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:57:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2ab68dbc-e935-407e-7d10-08d9984dedff X-MS-TrafficTypeDiagnostic: VI1PR04MB5135: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7219; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N3hx5Of7SL/aBs7qVgIM+nX0dKKDXLXPQjo9ppHQXs1zhqnwoaXggOVnbMSVVEem5HB77NP+I+lpAMkFk2DlHsMGg7qY/vEXHYEDcKuMHW0KwFxfzqs93Viv8OeTmHqd9W1Rx7RJ43RtdcwHA4RE2YI4/3y30x0YmPqgDsNl7M1t//uW0LH9ew9a2948W4Cz+a2Zt3BPrFiB3jrFK4D1VY8ZFsqWpogO0AekoCtTg1DdcgQwYgdenWjFhFrYw5N/cCFwrXtn/MI7gcU5ya+6QpWfrTnzRpRIfc+oRMchQb5D+VGjOovDwDbCHCxRJTc8xekLiyR26EhJ0t5xOg+Tybfi4Iifx7b1VMkq1C1c0l/hv7eORQ+mqZIuWcElFxtqmkZoDy9Ky6Jm/ttwyHJaJ74RfRovthJ4c17KS9eet4QHAMpMNX/YHWB0T2Qx1/4cbpphb7CnIhk5q0jmPkQr+T2wwdveUOS4nxruHYZ39GQ5akC5xV7X6HkZHPdDcDzdJ0zFT3ztpnK/vGj8gqbM81ehHVpFPX/m/vOl6AsSL5ysjUQXYKkX33q8g+EpximoYafWuUECRUbIHPSV+ECy760Nq1pFhqtRbZOtUwotuxOLwiDo9ShJOfv9SSghgB4iRZBHvaNZU2rYD6oYxvkrXiaMdwBR4+TCAXYa27AmOIUANvpunFKCcbDd8XR4n1yLVRWbGC3+g+O0QVuRfqlyAS4H+Wtcu7ICmZXQByQTHUj9JC7e+0pi0q7Sw/ScTGyD 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)(6486002)(956004)(54906003)(1076003)(508600001)(66556008)(316002)(66476007)(66946007)(83380400001)(2906002)(52116002)(26005)(36756003)(7696005)(38100700002)(186003)(1006002)(8936002)(38350700002)(5660300002)(4326008)(6916009)(55236004)(2616005)(86362001)(44832011)(8676002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XJUy4m8GTNcVdbg0W3vQSU73Kccqe9KuwuzhMtpK5yLumMZBmWxmpqbSp2Mh0YijxHTW+jamBRbOzE5oPgpijzYWDe6e65VhQ7FMJyIr9cjKRw/HJMzgheF6h5JaJDbDlQQ8t+vSYBFmO3qK0Zp2IZI7DVoUSVs8rZWgrwV8j1d4ne6KSO/3C+MD1KqGcilN0jJ/HddHMuQkn464B6GYAKrS+yrTKtN/t+mG/0b/AoEVRHglFyjn7VlwdAkoEwfci4GevaqaSe1f27QbW+aZ8h/o33f4MeGd2qZAMqsRm7MjxWBm4Iyfq7eJJ79Eev/1npldMdvxPV3xYAON46j3mRSqSda1iaLETjI24hqcDJEWmuOQkoCTKjHiDt6rG3lKHpcHcGu8PMNGO57u1/xhLAtLq4qMmNjgJ6dg1evvs2w1spb1cxQ9+tyfBLrUf03b0I/YTJc4Z3diq+xYCd9VdfXctliYNT37NQdGcV/np4jEyjsjClCzfH48diY3MFWmWTsZrKWyzBuxNHh1HnS0F9eho7GDz34fCjZXlqu6doq5D9dhv3KpwXNE1Yk5B5EPNJHJuiD8ffx8Vwj5iHX9zhqZFo4hoBSgZtTMn/p2OWqp1ABD4N5tvj9YeWsioJv+D/wjzqX58NTCNNDfi1NlWwWuK/Jvn8EUSO6eb9Ikbx08usZTyhCfWSnf1hnMeQE4kJ1OUxK+/JQ7w0PuDTd37qLVNxBbAGlttbIVhRTShnrx3pD7PcFsqqZtrAf04LBo70cRiN0pMxRPyngp8NOAclX+tx1MRg1QqpWmFnS9H/B6H7xqA15bGq/Qjf2Q11y5K2Q0NtL215gKx/XEmQxP1jXVRSxXq81HbrtK9PYs47LRgpH9qz8ts+wwfSEOflxqfbei0dz57o0OZ7DT3AbNcThH22kfJ3RklnbQ8H47ZqFUJTjJRZix2leTshUbVFN/aHDXg07vo7q/W8yIYJDgmSdbnWKFA1swgC/zOQupRe0mGQb5HbZtFW8d/tHlV7EYEwj6lAAWyW10pj4KS7YeSwvNjPOQ0YaY41467axWdQCenEFbUk6GTpbUhLyLGWyk+wV3pSzYLdRyUkvQFxnk7GvEOnaZBmQnUbc/s8pQJyHXdxXAy+YV4hLSFW6ZGisY18PTDewd6N/aJ3ukwl1OlTrkqnGjlwJcQENG0xlyglu2Qld6ssrV+OTVzZ7nGlCVezrFfw+x6+6U/J2LzODexfrgb/qssDYnwWMxYTyMFHjph6D/I0bK8+Ne+e0dKQN0wglQhBPjtSnq5ngejdof57HW5ATZEybedBriseOGql9DSq61utvAQB5nTf8aSxuXfLl3w7ywnm4qDgb2l0mxNOpL4ThzusST3vbRBBwGDkf69RIHRNvgPmDxvLVPZnZQY/1OVyPi1hIIVSazU/TJkLyh6MBkOBw2S82Gg4XBKwh24BzMqvor63DjrVp3v9sImoVya1v7xsQtoXxW0rgQQnnLoMvAmLdEIxvPfd0cdN6BWisZkIHxDUftXuX0jaX5RCwn54WRhMskwZV0QvWw3RDkkj32OsEdKpxlUyFHuybkJQF94ZiitO+gqx5zIn4UMCEtLdE4rDrge/esFHH6g0noO1VH+hsKBspHFjHM6K0= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ab68dbc-e935-407e-7d10-08d9984dedff X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:57:52.4562 (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: 0tuh/ZR8pLYaJ2A5UhoGF3kl5DoIghDvvnAnmpjhWsAosG5y2Z1jfTX4JSzxfUrHy7ofBmhEAY2zSo+672zvlQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5135 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 fix hwrng performance issue in kernel. Signed-off-by: Ye Li Acked-by: Gaurav Jain > --- drivers/crypto/fsl/jr.c | 109 ++++++++++++++++++++++++++++++++++------ include/fsl_sec.h | 1 + 2 files changed, 94 insertions(+), 16 deletions(-) diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 0bfdf9070f..72f09a1d8b 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -602,30 +602,107 @@ 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); + /* - * select raw sampling in both entropy shifter + * 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 * 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); + + /* Clear the ERR bit in RTMCTL if set. The TRNG error can occur when the + * RNG clock is not within 1/2x to 8x the system clock. + * This error is possible if ROM code does not initialize the system PLLs + * immediately after PoR. + */ + /* setbits_le32(CAAM_RTMCTL, RTMCTL_ERR); */ } 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 Oct 26 06:55:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1546259 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=RuAP/2SH; 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 4HdjNj02Nvz9sRR for ; Tue, 26 Oct 2021 17:59:16 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EE7B083626; Tue, 26 Oct 2021 08:58:47 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="RuAP/2SH"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EE4378351A; Tue, 26 Oct 2021 08:58:08 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20619.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::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 2485883602 for ; Tue, 26 Oct 2021 08:58:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ltOmOxClsk7Wgdig7Z+6ausqOedLPWzkVIXYrVUJF0FBiviepC39/i31u1K281JVTqLp/JWbZXisOkL8Qx5u+XF00yDK6+s6SIqYFTT30T0VZTPcjP3cHXMvPElcaLdF2Y85rDbWKBrzEcOZMAbEZt9nEjVAb7l8k0DFz23+nb8Qnvu7YS/bko4AW+ah/02badOhER9Y3PRk1vM5f3mDgUIGoCXBpIiwsZthV0oGJTcR6HLgfMvop+objHymZykc4QMN6inDX+OzpAZGL0xkAbTgI5UpxNH3PcuxU7waGiTVAQAF7zSQ5ceKvGuSHh2fniI59ha08a3zXfGCgbEaRQ== 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=K4EoD0xZqtcz6+2geFo9yPD7Km5Sxaw6HczqjwcG+fQ=; b=WErC3pB13P3dWgP9xOqtppwVzgwrODvghEpNADT5DpvlraGPKdNG0jvHg9wma/vDky0rCKdU0jumwQjDqm5jJfK1VzevmFoE8pjb83OI0mh+X85sGVfVspZrVexxbGZMGA4oVSjgJgdjwxw9AqGiYvG9Xe0TzN3hkoyCnPNtuoDFkUlUVtwnXszziYk/myd1+KmMkpSlhBUwTOjmF2zaYsQUXFPT8BZYVeliqiubIKpyZZgdVpi4XR5NDebX9jOJYFPUt/MB2lq4dBoYongZUl8uzsqQDZhQVyviGqvb7pkR0tQpfMuFuQH06vauK4IkZVGEvQ4vy/Fgu8j7PYAWuw== 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=K4EoD0xZqtcz6+2geFo9yPD7Km5Sxaw6HczqjwcG+fQ=; b=RuAP/2SHmjulV5egF+Gm/RWC0RVG9ZmevDLRgZ+j1hg82jkW5rRIpcbV4zFuwANa5Rc2mkXzEQ1UYZdCpHuFVOxSw5PPf/fEsst3BnzVjFdu5xAeZ2jcCUcrubxCfMCiXj4EmwBEVE+6aKsTSwKFl/XA5Orr0aDOzEoWF4C6hdc= 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 VI1PR04MB5135.eurprd04.prod.outlook.com (2603:10a6:803:62::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:57:58 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:57:58 +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 v4 12/16] Layerscape: Add crypto node in device tree Date: Tue, 26 Oct 2021 12:25:50 +0530 Message-Id: <20211026065554.29009-13-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:57:52 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 579f84ed-86e4-4633-36a2-08d9984df1b2 X-MS-TrafficTypeDiagnostic: VI1PR04MB5135: 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: +6EJjXoKEPnDH5soAgo9jTRaXtoDx1+1pu2Ee73tPgfZ8etx29IY2hSn1lb/mTpcTCeExAoNo+aH2CVOese7Oe79MyeQoxZiu+dJIvg/m7RADRaF9cz46YOzzmHHWgP6bSQpP+izkKsakmi/ZT+MKS3POEfPRHoEwWH0PnFdRlKRlzg6XLgFK/8b05apfoCfIjNencu641X8WvHvdTMZvey46kNl2XtO3u6FttiQTfJMfBspyNbhOr6Ett4+ePUAdsUnI7yDPr6rpMxLW/ZDuqro6fG/bvuK7v8GmaZ2yPX4HKoatC3swZKUCQWd8CefC7aoBZE+dP7rFWB+ziz6ixuosVlek3DAXwBo/ECmYBQ+iHKBJZH4fTlgJrEP/fuMOYonbAVQnAigjAkR48inzZQdZw99EulZgrab9M8I8Ze9wOAE8s4+kV15HUuovQTLb83jv3PtK7pv7+vTD/HYU2RQs6xA7gDcXcH4mtP1DrsMqUYpHru2WfoyJYZXI48xQbAJNnAxpcyuv8VnnXNjM7i6WqzjV0xAb/9PJuoiQ7ZyGAdKp45v7AmPRDBcxVYNRcDGg6O8KmXlmSayPEX7/I+eXPZ0Urud9NH3CQ46bdGVPt+bfgYmezRP3JkMJMbk8c2gX/UcC9Xtj7uJFE0weXENaY3ldOnBFDQEu0Q/M8oimFPnSKxb+f7pDH/V4SByHJbC2JPvqoSWYNOp1v5YjcneRn30F4i9mTIo85m2Ursfi3vEyWYXEbUU3AAqDK/L3VaMg7qe2w3pOjMRBxCjkA== 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)(6486002)(956004)(54906003)(1076003)(508600001)(66556008)(316002)(30864003)(66476007)(66946007)(83380400001)(2906002)(52116002)(26005)(36756003)(7696005)(38100700002)(186003)(1006002)(8936002)(38350700002)(5660300002)(4326008)(6916009)(55236004)(2616005)(86362001)(44832011)(8676002)(110426009)(16843485002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FoIhayNkXA/rFFw/YWYUQhE68cdfjYvqum+/Zk+P8PaxjZFgeZwl0PBQ6MXZIyj8O6yGiBp2eh3GrBoAOYIJmZgoEHjJ5WYppNhooUYXM9v9z2WfdlmsHkpsdzxp1N4RALj92h7jKojJfmjrLs7ml/WjCrNzX7D8n5NUq0q7OyOo/kxaBWB+r9r6NqnAiZmJ6kIg4RNnd2vvxDWLWf7mzxT7rkSzO2oD/R5fwzLiyAKkgz6dg+peEpnz59BDlxcJF//59yAmVl7XVz/VQcCuP0PpPgWfCmJL3v6S6qWBX7a+aS8qVr/2GlxQQtyFGkqwV3+ceJX+kmL0uFx9b0Gm7ygvBkgPEsWCLpae4Ai6QTonwEHy2Io1JAv/c8smnTqO/WJmhXz1whhlPlhvVQJ0yewyC4xHEl4uxRuVftIb+v4Z0MYwTDDZQ4wAcEpmxCQ3GmmFxmU3E2k+c1tT0vixIaHC7dTvRzD85SUj9lP/8d64OUkXsFzKnp2DmZKe9V1r5n46EhiIvyXbGNNQdn4L7umhgsl9RbSZnj5Pl3XihR+YxW19DZ0iqIdtpeWkNirJG/aId0Kt3K1ir8RCwpA/K7V9gvdY4Mt3yGY7RV88uCWG+DsVgpGdpun9I5PZTZXXHlgRjF62csF18gtjg0nlV135712L4zZP4KzRUtyWaKh2l+OfnY2UwC9joRRjCfXvuNOYHZw27SWc2QmlZdJR7sd7+epKMW1BhPH5hvbCoOYgdyJ3m8HR5sj9bmqOoGUtcrAa9rtlWOxLpE8Ajn3vnTcgHMPJmvOVUPdwTeBsttLiXjNtUxvtNLwLbqLSBMwJuSvYDyFx9ybQUeEP78aCxL4zwgi0725vp62wQxINFiK7CGLRie40oUGctZDc2F6pJp6fZoKEuv5473AisE9WyTI9IomXY68sOwf31mTylgOWCPR9KhjiCXzYvrNlG4Tzp/hPfVDIiyEv+xK/wegNuOl+oTutZzES/gYl4Srlz+jPuNxhK5x+d1lMPGt7uiOhy/BQLRPYl+b/nIVCW1Uv/l+1C4Z4vMhAQPtV5FVRQLsco/J0ORZaRwqZtwOKxzhKluqNSJwGTRNDoyemut3VotLwT+SqESnwp47x8pVe6uTL2ZRQ/cFkzp/UgjR26q34mbIBjytSY3vDXesiyv59HM59T5ZZ9r6zmWNm0MZCQRuRXLj2bkJZoiredOEk15jkGduZaRYiu3+2Cv3VIJP791taoCA56jtmZ7qGF1L0cpMsTEqubBwXWKPnkQzbzUCyMgBiR0fTs2BOAaCmaFyDIt0VYVfBYG4izTfv5aQv968wML7tp1bdJF95rRNOziNhioCH6J3HILT6w5nj8RCt429CChn3T1nKUvhy1fd2psrSRcyzQgsyji6k4d2oNmVZL/A702xs0V5+lAie9T3dXOhUijQ7UmUG6m4FSalwbNZMIznocrK50ooTHXp09a2bc+SMnSlCOl2Xm1f4dX99sjYMir1KLYeCpEnSSa/8ZhEUcriBSG73ksocdatD9wxOAp03EoQc0+WooD+NZSg553Ns9MonXt/cteK1m5ioDP/K33DAdrZbhYA1vjUHPYEz0jdVL6SVdvO/w9qkmii+KnZy8210EJVE+MgJQzbS99E= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 579f84ed-86e4-4633-36a2-08d9984df1b2 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:57:58.6766 (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: jPGWBfSYg2i0ILgMWvrbgHyRkd7FVHsrzIJgJKnN0IXEaFAhKVlae6o2KrNhAQ+HFsUBpsVtE4BsrJ/CjX/xkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5135 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 2894842cf2..20ef111d27 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 d8171bd03b..51d556e43d 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 9df419a87d..c07fc1441c 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 64caa600ad..5c2d7eeac2 100644 --- a/arch/arm/dts/fsl-ls1088a.dtsi +++ b/arch/arm/dts/fsl-ls1088a.dtsi @@ -180,6 +180,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 7374d580e0..aa739279a8 100644 --- a/arch/arm/dts/fsl-ls2080a.dtsi +++ b/arch/arm/dts/fsl-ls2080a.dtsi @@ -245,6 +245,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 a6f0e9bc56..4c1f06702e 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 7ba2dd2269..d068f266b2 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 Oct 26 06:55:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1546260 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=U0pjbSo6; 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 4HdjNv1pbrz9sRR for ; Tue, 26 Oct 2021 17:59:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9C26A83620; Tue, 26 Oct 2021 08:58:51 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="U0pjbSo6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 64750835D6; Tue, 26 Oct 2021 08:58:16 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0631.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::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 7CB4A83612 for ; Tue, 26 Oct 2021 08:58:06 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dF4p0upKBz9VKxB3AEZlz3LcWPix13rlcIb4xFpbM68XyX6HQW/GTLwTqdyWsJa66e/ve3y8SXEMT0968PIbz7o4QktVrOub0+AC+3UYGQ3rMDnlvt1R0EJO8rRVby4o435oCDoT6sayOvNSvDqwKeVN+03CdNicqAL+LJn8VanUkyuNc3sY9b1fNcangvi0WvHMXSoDuNNNPVxfDlpnzEhVvqoNKxO6H76RcxtJncsqNBaj5o2I4/3ti7wqhv0Ra4KA9CJulR/nwOj4LSycZUv8Ez78Y8SoRPwdCicCmQjPWOVK4cckIiADkr6XKBawsu881LmxjjEmv/dVbFobQQ== 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=uK0/I2wVywAyCAA7Td/MVDhqZNwryjIKcbhbqdLnFYI=; b=EVeSP4K8Tntrb29o3/EsVelziKsanjAHt5VyFlFfEKrqX2QRJtzovwDhaq0RClsL1cM3ge6XtoQ0KJtLqIJMiQgTZw3gUFOiDGLIw3CmUo90ZrHaL+pay9x41it8qMBzcuBsKxZCT5KQFkngyDNf1hYH8bW6YeLOZkVBwpti5vE10rEDCJtVQqpQ5Zc6F7Xs0l4PKpK9tjOJ2bX6stILdfZdV9vdOPpKdjMt4RnHGScN7kWb9g9/LWD5dsZTrK+YgCyvwYkUoEMutF6kAHeRaWk7vqP5E5l5+oaRz0GygPVQwlq3I/Lw8WopDzbOI2h8iR907sSHznd0Fp/Va6I8Dg== 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=uK0/I2wVywAyCAA7Td/MVDhqZNwryjIKcbhbqdLnFYI=; b=U0pjbSo6ueC3WJIlKVvZPYrcg9FAfeN69lny6SQvofJuxjZ/8zsurUiIkZ2ZwUNPWB45PwEEnrruGK0kumJ2mOSEMn9F6PcGzW1m6VpNZcEwlkZUL0C6RpWZMJDd2FQt8D4fJFxTRdIbeTxNnVIUpdhBl7UU4iLqWcHHmW6qcMg= 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 VI1PR04MB5135.eurprd04.prod.outlook.com (2603:10a6:803:62::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:58:05 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:58:05 +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 v4 13/16] Layerscape: Enable Job ring driver model in U-Boot. Date: Tue, 26 Oct 2021 12:25:51 +0530 Message-Id: <20211026065554.29009-14-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:57:59 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c12c61b-5096-443f-8c5f-08d9984df565 X-MS-TrafficTypeDiagnostic: VI1PR04MB5135: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:37; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qaI9GZgMeitBSVRY4qcMARmlXOh+VbgrRbfMyWTySyJ28uJ8fUVjsOYMndh6x3GdR+lqJ/wofEOl2BkU9tGIMEkFCnNcjvecTMX5Lg7p72MrFKTDSCRn52++WRchYrEJbzpN2/is3Y1IDrUF1X2EdeNK+nEEDeOx+vNewGl/wC3m1Dcl33LN5Q9IOaFWzLFpoY4Wd+xOt364g9lCu6yVeci/Qea4W70sHpLY1yylQ9jZkkbCsQoNx36kqbNYIEwAKP2xE5mQrCpfLIFcQKFbqUNK9Thq0F2XEnRk4tZ8PLCw0c3YRQXTOit4sHZhgSr9mVo/CP8j2Rz+UGM4CaRdyJUx6wNnLxLc3eKMWWQze1ZqmUcEq1fI6Q0ZlZOxWSVqleF1E1+oh3uimpYWeRDddIMpcawcg7sH6I2GCwTS2dcW+8uUccSar6wZGLH2HK8orLFYUFl2baDglBdJVh+800KedGGeHWP+0PqCK4HsDN68UwQzNaYV0J+6wmIW/kxB3zoXhcTMoz0vKY/9t+hnJsDoGIL6hop/0k6+rNoJAYMyPI9jGm0+e+E8V9huWjY+k+uskRnjJ9OLniq8AAj/xUNBEhzaSxBvQIurP/A+Y/DqWgI3eVUbw+byO4wzRjILFB73wt0fXSy/fBAfJSNFgSuZCODQBTwKOpw0bQEB1sLN8ie9WcK4HhnDPZqYJeGaPY48CzYp6UODhnA8MB2a62HfAdYvGggRnY3q7xmugy+op2jVI1Tz4Asa3UIdpsBtZwikNjA1Pc+2fY+jOsxBjQ== 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)(6486002)(6666004)(956004)(54906003)(1076003)(508600001)(66556008)(316002)(30864003)(66476007)(66946007)(83380400001)(2906002)(52116002)(26005)(36756003)(7696005)(38100700002)(186003)(1006002)(8936002)(38350700002)(5660300002)(4326008)(6916009)(55236004)(2616005)(86362001)(44832011)(8676002)(110426009)(16843485002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7D2HZi2xpJvPjaSGDkIOTng+fZ1Q95l3O4/PY3gVtfI8uopDKrTUY9QwtxDGsAEw/mzS6tLujtSl6JdsUwtYohicltJcwf79RrCR6BicNhxXeFWapwYx6FlkIpmZuCcQbbjOYg5l5pVvjDbZX/38zW3s1J02J/8ujKFwOoeQAzaDzNfEp/UnqvqSEt9SWm2jVziqhtWUm+l/QwVrb2xEE7xkXWMQmQbatRmaqpcs3uatbFLShA6XiTzOWtNIshBw1Aa2lUF/Mw2HdVQMElBx/oPVLfVHPLwuG+Fn/XxV7DwdTU/r5g8IJz1H/Au76YegjbKQoogULHx49S1S868bgUE46kMdmaZ5KoBYuY/JkGppoRS7D84rCrdoba+GgDq5ywAGxmLFfsGS0alXhxwsJnvZWqF9n97XmG05uzJk1UCnCN8sy/dtKZl9ezNzDzD7TmZsOrc3u3nI7VIuqu3UW4I0b3s6+Hpgbnsvhovg8cZrT4fv6LnstbYAMJfZc0rXdoWWyDYmDFN6NtieZTsTMIEu8fqOZto7P9VNL6uUHHVuQccwiIUuIDlZpjjYlP4otUFSLxy49aSCQS7YYt0BRc2+ggsADzooD8bmHsKvXhcx3VIK2HCWf4Xawqas4ERw+YRy8ttCvnxAj9LgWLF2Qnb4ZItenepH732F4dHedKtiBOLQ4dgmCzj4ecmAkRbWoqcuQQMkEjtReOp939j30uZchkWOJ3OFiLF3S2QiVKFWvxnzHCA1OER74kSeAcn16MK8HH0dAvjr9K/SL0o4v45Vk+9CqrcU+jdMa7TLBFlHhlwHOaZaldjGQ/u5YVuktWD2MePxvFkz4MO9S78T0Ce6+bdN6nulblB1ZgkOZ9SYsiejTRa+Dk5nYul/zMWDegZlbC7bJfzHEe6J2APWcxTvuA0CfrVsKN4MxQZRf1nGAgLUWHr1HUvRgxYzaVk0kJCFkZmJ55RzbSsDoPkgZd7o5EMvosx5Jj08uwZL6c6DXkEZuqPxk4RWdhRBlGx7ux9xxXI+5+egh5jYg0V7k2IYebDr18/354Q/L6qqNKsqhumBFPrvLfBhWidiHXwBrf9MbjhdjTQr1jJZ7rMsQnAmhmoP6XyzOb23qpx6l/xZA0QvGEtm7ejrfMWl9MQghgfEXznTfsqMUGAjTsJ36ib8M978fT72Xg7b3OEK8WxdAtHR5i6I3QafAZSqazVs9dBPMn4Iru29oytssaZDIRHZXIDXLYs65B9l/XI5pxd6RWW2MVwHdOxGZQMWxn7G15FYGSCzI0eKcy30drL2Y5RUZ6ezcgMkEIf+H9K6eWS0SITCD0fQ2gKAy8i67E0Mw2SzKbiC9rU7MrVZEm174/s1SB3ztRhp9dJwWtcCwnG7xfu4DJFDFusp7/PpsPMlL9mWZCfhYyz03kVL+CuDWqLo/TWsCP+TTt29q85Zv7yqRDLay/amz+BfY3OaGMd7vDXlw625f1Izyusua8PYkAx9Ha6seAzOnUhwqvvRpGQCkEY+IlTnSFq/d/e2BYqU87KzMWBbNTdEPbOSbyWOsAneB7c1Sn34OajeOrSIpL2Q31EAmXn6CYv+yKH+19ZNo5xfSJuRl9AvmBrbDo0WptgFR15uWVBegItjJxpNPw8= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c12c61b-5096-443f-8c5f-08d9984df565 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:58:04.9091 (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: TDpENk3RAyIjPWycN9+LqKpQjx6SGRkmsnWLaa45hIHMXqLiBEIcq0MOAITtwZrTSDw8iyaQS4VYOKrE5jiQRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5135 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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/cpu/armv7/ls102xa/Kconfig | 4 +++ arch/arm/cpu/armv7/ls102xa/cpu.c | 16 +++++++++++ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 27 +++++++++++++++++++ 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 ---- 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 - 36 files changed, 75 insertions(+), 102 deletions(-) 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 1e166c73e4..2531a9fa0d 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 @@ -53,6 +57,9 @@ config ARCH_LS1028A select SYS_FSL_ERRATUM_A011334 select SYS_FSL_ESDHC_UNRELIABLE_PULSE_DETECTION_WORKAROUND select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select FSL_BLOB + select MISC imply PANIC_HANG config ARCH_LS1043A @@ -88,6 +95,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 +136,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 +185,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 +243,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 @@ -257,6 +278,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 @@ -292,6 +316,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 6473ee0572..7fa1e36a45 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; @@ -176,10 +175,6 @@ int board_init(void) gd->env_addr = (ulong)&default_environment[0]; #endif -#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 6e21040601..e9cd0ef6af 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" @@ -154,10 +154,6 @@ int board_init(void) gd->env_addr = (ulong)&default_environment[0]; #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 62e8af48cf..16fe6e2fc8 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; @@ -177,10 +177,6 @@ int board_init(void) gd->env_addr = (ulong)&default_environment[0]; #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 461c571b36..6800c71e19 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 @@ -77,10 +77,6 @@ int board_init(void) gd->env_addr = (ulong)&default_environment[0]; #endif -#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 2f422634d5..532cc93d55 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 @@ -819,9 +818,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 62658c4702..64e89fc125 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" @@ -224,10 +224,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 58b852383e..8c426fd3b1 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" @@ -290,9 +289,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 @@ -301,9 +297,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 e61289d228..0e82ec1aea 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -599,10 +598,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/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig index 10aeaf36f1..fabe7ddc17 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 cd681906bf..3fe0a4af4c 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 31fd7866b2..c2a5e9c234 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 9645ad0d5d..d6bf809b45 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 b0883c554e..e5e2fe2265 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 561a39044a..427d5bf167 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 9f10146fcf..69151b7f45 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 e8e11c3620..23faf16231 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 9c04bfc421..9c0dbe5965 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 a93ce1935b..98887b9187 100644 --- a/configs/ls1046aqds_tfa_defconfig +++ b/configs/ls1046aqds_tfa_defconfig @@ -54,7 +54,6 @@ CONFIG_ENV_SPI_BUS=0 CONFIG_ENV_ADDR=0x40500000 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 28000fa7e3..b76343074f 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 323fbdf1f2..8e058955cf 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 a0f0961590..63a07b32b8 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 06f0797f38..8148d55238 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 e763fa623a..51d1207ac2 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 10262aae68..49924e464c 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 Oct 26 06:55:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1546261 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=JPiUL410; 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 4HdjP60kbTz9sWJ for ; Tue, 26 Oct 2021 17:59:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 51FF183636; Tue, 26 Oct 2021 08:58:55 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="JPiUL410"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BD50C835F5; Tue, 26 Oct 2021 08:58:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on0604.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0e::604]) (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 C925283613 for ; Tue, 26 Oct 2021 08:58:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nw8gnjxsV9IA1UqOQUY9myRho1Y1xmRK0FiDiZAMjgCtBUvC067klKJ6Kx4Cxab4NXbIe5h8ICL2yl006gxYLdepeOSItmy7spPS+vwTF734704p7t5FoPFyHLr9azMrL4Je1OLxfMZqMhBpvVjJHMom9gL8CUw88OV2u7t6xM5OcR4uZgOhsWxFgzAUCYnJYMpHpwUwbGTPkmrQxDaWTlloCCltQBPJAXZvfkS9h9Fj9Qdia1lRBT6Vt8mSa7Ls0vfAetZ03bwa4M8gFQIwKHPynii4Oq4nwxwRX/88IZtNSDiY/OuH0Qm6BukH1ySsHT3PYVZXP2h53HwijXZq4A== 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=PHYu8rcICPUy3BuRWjydU8imu/3/SpjDdrS/4w/iWyheLCQyrOWlTTN0wBEv+kK1K7j7nL3+O6PLsK2MnTRgLFpgMTXTPO11b9tUzjXDNlbNK1sBSbDu8XDHDQrp32aEDVZF4lQNA/EsPK6Q78/Aa2xRqcZPG6U4AOSIPQtBhf0Ulyz6orL1mD7/xYA+vBhdUmeEwrrUwU+bKs2dZBzFp3zNMLnZ8DtIL3cjliQ57jX5TiWLF/W8NAq+xKO+NZpXipmaJxZcACTSLdk1biLG4fwDo9vxxcW9ZgmODzhpjLAQRb/SlIElerfSpnzLybSGONvU1XMzNoioysXT47iAcw== 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=JPiUL410i0WnFonMJRb5K92NWE2gq3wnqbS8uPPU0hCRFjpdXH8VQzeN/Ihk+faaPmVveyKw/tPrQli58wQjRz3txZ/A/W4SOvjq5u3qXVL8vXv5LVah4BuaS5iRxDxcNM544AK4OC5nNuMtL5pUOjH2sqVnPNfmEPnp7zHIu3A= 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 VI1PR04MB5135.eurprd04.prod.outlook.com (2603:10a6:803:62::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:58:12 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:58:11 +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 v4 14/16] PPC: Add crypto node in device tree Date: Tue, 26 Oct 2021 12:25:52 +0530 Message-Id: <20211026065554.29009-15-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:58:05 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 27484cf7-11ff-463e-b9d3-08d9984df92a X-MS-TrafficTypeDiagnostic: VI1PR04MB5135: 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: SapJpyLl2AJQBSUWaSj6gUlbB/cVNK/j5ElKYPX+8tzTLkJGCvfpBmma03rR+711paweIDr7OotiBuxZ6yp57+JXEP9UUnwoNE/eMIrhe5PYM14PZP3e+Gnca1xD2q1KPw/FIso0bWQ4LxDoVcpnx5fdjwozv8MppbXCS+qPFeRR+cauWBN0le2ddChwY95l4K+b4RiiR5DKTj3BTKNRLBk1TQ6xGkpiL/74+wGXAr8qA4OrnxcjSGyzabosYTUy7gVydR6gn7vaW6Z1e3f5g29uEPX3FEmQm0TyT+I5HF28GjC9vO0ehx9YFtnGX09jh66r6CQiaSngZrizpC8TjkLnNr/O28m1FOR+ZDlcTqdloEfP6csOqmmo8gq7RPMLQ1xmMU8e19j+DfCrnZnjcBa5B2b2Sdn9Ec7jrnuC/yNXpWImjmUBxYd5C9HOFgRKykbz1vTduXlz16PcLIqk1VmUfX8k+cCYxX5Qyx0AOBYP/ysIrTPJzuJLaCqVW5753pLJb3Uo90iUJupVmPCi09d0wohdQzukiSrJSSOBWD6fpEp4L2dZzH+47Uq+hcbeL3vsSsnTBJ0OEFEHQOKsDQNeKtvQ7RZXz3dssVGFIfuflsnWfn/TqT3P7epyjbjvbb5PyOkD67AdbJCYTStPKmeaHbgrhsXn3XUp37xDvChwixrRPfGOP9y+731ntu0xL66uG17z+WvhAga/j8iS8FrBnOh9SEh9d3iQXFlMy4Y= 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)(6486002)(6666004)(956004)(54906003)(1076003)(508600001)(66556008)(316002)(30864003)(66476007)(66946007)(83380400001)(2906002)(52116002)(26005)(36756003)(7696005)(38100700002)(186003)(1006002)(8936002)(38350700002)(5660300002)(4326008)(6916009)(55236004)(2616005)(86362001)(44832011)(8676002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6Evi/jYi3nodgga+QqqK5xTzPby7kiovrFYdSVAHlM0JBIU1QrMblKoKoTsdZgy8MCHU3gMJ2km+KQG97uqtpGHadj/nt0wfG2vbT6IZ77AC5dMmRMY26HtUp7gLPeHPsAdG/nMqMs1/aiDzvIjGHO69hdy90mxNX93dZq2dtDShEmecBCpT8m1DlhxeJXYfmSLrg6C5jMQSrPnRu1Cd2DYYfNBIGUDDQWtEv8ioAm7RdOhH6TTM+ZvAqZw3fGks0YgQZ9oH/5nbileqVYOAygUUy15zkvyihYyF/EoXrykaBXANoY8g95rt6oqE5NBHUFnvoNzlE/P6OxPfZLaQyH+aHybXrprzzIrnVdTNUsjS3HlhRMzLUyLAQoVYPvGYmZTn+ZQeerElUGqqwBkwYYBP6Wi9A9i0Jl+9G9b/slMEyHgFVVyFI3gqm1YOV8UWg5I1oOGVaSAXX3/Oe0Ywj8YwLuN32kSPLEGeSvNFvNMrehuMBBG2bVD2kgsW7mXUp/PNbd1bxaOJ6afBRbbj/2G43tTv3nyCVxKsUlF+naxWnZRY30IAr2DjnAxcVJRWmbK+J3hLV0OmeqQhDgoy2cf9BJT7Fc6eQ4Swlu5rekO7JRmqfzSoNIj66KECOfD5xbhKGfzyV434xmweVxuSPF2KUBpkNBbVePfrOoRXX/MoU6HxklGpPGG41h3FRUA11wFcTfWrQjlJJi3jgHjepQgsNKlfN9wuCHQnwKlhN8fV1+4f8r7I9Fak9lLCUpshupztJlJ1BFMUE4s/UDbq4Sm2hbIWkT/wzBt3yo1HUCqnRAqBlC4O89JYK74RlGOx9lQLQlKy9J9Eo1kI2OBNGzqeoUG/EEv8uwr1MGsaqTsLaHdK1GhXyI9CoyjurYSwYYTFzKxH+Z1SBP70lUmFb5OcHgdqZKRbFMs1SiF3TmwvQ3KNLzG03QZSz8w6azYkJo/WCbUv5OM/pL+YZCF/HntRLObfQN4N5pgStndbGY8HLqcJKS//L/m8RFzEUVwQj7ZcWGilgyq+GQEMZFaiy5DeEWUmav6Uo0sF2nswwTCxW0D0cyHIj72CRObCRQIQ9ESkVCYhrjx++ubhSu+6HbZ+uDTgcukWGSSBQKRd4PbrR26bvjNb2AO1+lyAI14ezaPHmAZWy0gwECxsPjTs4XteppTPw5zvBT08n5QmCeBULjG8Mo8B6HiW/qT2/NlH/8zaQQFKUQbLJlsLJpcOaVGf+lrXtKQwfkL4n+/xKCzDDjXwP2FrpaHkjMyMmOAy+JFCXLyKaZBrdUBPFRvC/2n5DbOmNbewYlUr1u9bqGx33m7EXKACQJgzKICGzYpb2Tp/sRnvz8BZpsjrFSp4sMgxrRRL9lDvIjnLc22NvJm9mJgXLxKMyBeSM49VP14HBA8sX9V05G7qVpCQNhPSJXBWM3DajSEL60G0VVgS/uIaVOBic5xTeSd8bqyPspzsnnQNXtzx2ROMm4hC2EOZ+fSj0Mw5yPIZXggrET9OQhSqEVoiv69QzFWOuuZ51eTJ5hh5ALoeXNM1IT/EWG6PVTZnye8LvtbTlFEjcLkYYXvXtCIlM2wU6Xm3Ow11MHvFUZoBgOOlJ9TFVrm2C1n4Uf9L2ore3g+20CQpn2bDiPQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 27484cf7-11ff-463e-b9d3-08d9984df92a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:58:11.3744 (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: 4TSFEBt0bfCXYTeEBC1kqp4iVk88GnntKcj2TcnYucSEjDx8ZUCLHgDFLDFqn8RycYeRKvLDAtP9RsG+tBwe4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5135 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 Oct 26 06:55:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1546262 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=MiGznzkf; 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 4HdjPJ33Thz9sWJ for ; Tue, 26 Oct 2021 17:59:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3228783641; Tue, 26 Oct 2021 08:58:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="MiGznzkf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 10B258351A; Tue, 26 Oct 2021 08:58:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::60e]) (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 D6DA583616 for ; Tue, 26 Oct 2021 08:58:18 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VYVTIM2rqMqvto1wCYNCAEVpni9AppKYHUmYmRgkghDSrcQWUCGT71MM80Wn25xdWYGXGkk+sRld67C75+rvLjUwYGIavv8h51JOyFrdM0bV3EXpuJhRYX7QrKwwKyHnZoudO9quQMsFwCSedO4E+sQAMTAWOejk8fIflsch2rFfd2zNqe+WHbz4UuYcRORsY63DSquSvGchNknKcnRUpKpuCopY+VhsonHkN5dxCEb98B7kIW4+58Hdl4KuxKfTaQEwQoeqPETpUbYr+ircbGVY7tvVxu5Ef2PkjHaGSt//7GTNsNGAaLWmH5wtPhf5nzq3PQT3hgkrOoXlGnlOXQ== 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=mqJSRbD90OL0usfapvbTX97fDzlSpC13iSpjkechUk0=; b=e/k2F/6EIWucm27d4k565aETTdepIdpxL9qagQT7JaKIBBNlpqWdNjEz1PBFxVpV9Rd2agGHOHe7H/pDpwNFCxPkxqbNja3Ygjq4Ur2z3dJUaczfGJetDL411KpTPLbT78OUlVWiU0FJANxPIQyAfKRMUGkXDbsrL0NIKRUm4yZ+W8zSUXP6ogEqNte8c5CKl5HfRIhxmYTlEvsoyleBSkzHoM/z+QXv/czGiM+b1WT6vWO+1JtaFA17nk0KYuwnIzqS2yyj+YZ+8cfmoTx84GZzfXv16AG23T3IjBx6a85KJjRUlcLvoreF02hMqQADfoY3XSTVhwCRkhIE7i4ikg== 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=mqJSRbD90OL0usfapvbTX97fDzlSpC13iSpjkechUk0=; b=MiGznzkfhxmmmYMG8lHcyEahFQxgz07tBp6hEJ5S534+sgfgS586DCNNFqbGkum4+OAmN62s5AX9ag5n6nuUNPEwahJJ6lWukaM6AwxSjaCjz9QmTIy/hLdcJBq4UAzRRfh14atT9cbWzPC8qdOVjXu+9pmsI0L0suhWqSk+FuE= 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 VI1PR04MB5135.eurprd04.prod.outlook.com (2603:10a6:803:62::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:58:17 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:58:17 +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 v4 15/16] PPC: Enable Job ring driver model in U-Boot Date: Tue, 26 Oct 2021 12:25:53 +0530 Message-Id: <20211026065554.29009-16-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:58:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a566f6be-761c-4d87-ea7b-08d9984dfcff X-MS-TrafficTypeDiagnostic: VI1PR04MB5135: 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: JxXuDcMAMXbDO3DSCJUypk3bLVpewNiAeUXf6LQnchooVG8HQSqujtF4G1YntWMW3Mk/qtCGYpqxQX56RClzDe4KSTUDmJvEGzO8Z4xlj6DXTmCMaI4xG/3+MBaVyczVT2apXshEB1etNKg6Rq3GRBmlxXlMNV86XyG7xn7G0MC2kE1UtjjKSfLoSZuxXkn15aMTUBGsxnhLibXS0ss5hcEGWRMKuJnyRb1GXdIb/29UXlFbPs4ZztbAee1OYqdztKuf+O/Q2cpHVimIIYEBOaKC5g0rfUjGtPS9ekeQCI68FNjTmphG04iujUbF/wU2JAdAnhoBHdndnfuVy1hueZwHAbsakNjHAjfOaNluvcIZLYonUX77SmoL8uodNuQbrJCdpL0D+p7Vo32cntiH2OAywnc8HGn0dB8ibAjOcwPacomwNQ7guAy3ymJ8kffG6yqskkcQ+Jb0QLjesq7NZUtm2mAERvXQfowcVwpmLrrpJw85WPUIMEyjVzXUVrTzgnefGX3ZAn6AzXPQqVK2dhioFWImeUHSq2pSnfQOo3ABCArntKeooQddjCg5MA+VuXOaLCzM5ChNjljV9386kPVtvIe1jWd/BYMaIL38bhGyt5PLqkg7ehI0DdzTaQ1sAwH/plTxbHmJylDGS/NYc+SDaQzeVLYCBWjkl/wm7v0cZJpTSn+uHrof/cyQyXWu7zED1J00XXeB7oJGGhY3oP4lBN3mvUkO5Yr+3gxo/BE= 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)(6486002)(6666004)(956004)(54906003)(1076003)(508600001)(66556008)(316002)(66476007)(66946007)(83380400001)(2906002)(52116002)(26005)(36756003)(7696005)(38100700002)(186003)(1006002)(8936002)(38350700002)(5660300002)(4326008)(6916009)(55236004)(2616005)(86362001)(44832011)(8676002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3NFQmo3lZoD7aoAfwUwOS5VkFbWmADiWRpLoKDesE+2wAjw/8AiZW8fPRxryrxqh40kXVUOC6ldsEDmpO9i+6rEFzo5K5mQlf1W+B+knpnjuCorNQExwwjfpdLJbv0mnJnEqh//mFePJc7TL75nAklApSKTz01rJIkHrNk3L/huvYIN6ufHQurDUeqoPX4ewpnEGKxOhM9MiSb4AtugauKmgJGPeRHNNwxuJ/BgT79JB7pseEBzlKU9ZkidpTQpYSnRNu+XWrefBBWDIsmdTKIZs9p5Kvk2zRkNaRjWzLR2RufwG+ZgqXA6jxDFN/s8PCcZ0of2oNvzlGJ8pqkNjVYdF6ITOoCuoYmFfmMnGe0O3uvwEcJ5eJGjLqm8TtNdWRAgZVucP95rgFj284YzLF1vZx3S3XqlVoClQhqPq+v7sfSW3V8a4ztt0DFGBFHociWgkG6o/4XCIXa6/Ni5rBygFwiavjSOA3p4rFQ1nT39Uf08vF02X94Ee1aZKJUDL1t+soPQkYFdUpTOq4+IXzkrTCDUGpiPuJ3xJxjPFQPGb1OTZHMbZm4IE1y95tqihe+A6MYl2V6Or5+KumHqpusXk6fv43Mjf+q7jS/DAbyODsF6vFfAeyDgKFENdVUHPgqJgFptf3fkUceWwxl7xX3ulSIaHumWGSq8r7K0vYUH/Y7oP1RzXPCcvI4jG9rIul6PfqNTKV+lSQSawCq0+q7UeD0h23p0TILO9W+ocEgOMVm5bdnGEajvy9a5cEXL2KtBTlpoW/BVZe87sIp4xpQdFmpNZzqkWskcIuotiYdw0lOM0IAwqVoAk5f5urxyYwQsSGzfI7NCDgaBlI/LMZ4R46qpNqhvrDZVrp+94j3T+mBPTE3c2H8E3L/tg4TB7w5wPwqTc7bh9zv9DddKb3cxC+dNnQPfsRodOORIKOTaVcOZGZh2hdim39//HaJgSwBw86ERvv0hzlDPBZGPwY73DK8iJm1Uo43jakSJ+vkDZupuhjEU1NwGX8uNeePWtIVH6+mDx56kp23BCYEuFZ1dpb8xaY7kCMMeMHfKadJ6kJ9Byz+h/p+stkR7sOwd+vxIL+1LvQWaSxZtHlQ7SMQXWl5Q6X+C5rMS7hsUqyPrvKbpC7QVZN3uxahqLFDwofF2u9Z70Q7rMyVuNFs2BdQPfrgsPVB+6j40T9gG10Mb/FMMf+Gjf85oXJDjtVd+jykag9xIUmqyk7rZavNoKnEnU5fqB41SBS8UAdf7Kji9FpuFlri6ffGQzM1l5A1e7ezlzZfL5TfDt/MIiUTeqiurO0kUiY4NAjuRz9RC0aCqB7zHrMpEN0XTMBywKBduObhBt14lBgL0qa+Z4z8AM9JjAmp6jDjYncRK6SmUCVkVpQAMy6jqWd15d5K/97+i9yCKay7FvOskFu0I8oW0IdbL31XEgOUugv97z2IpIsljMGccnyXWnAZQ/dxYclyEpQMULTzCdXMpDP/vYprM3sui/F/T8n8qN6bIN1oOLs1+J6UY6SaANyFvSnV6QvjKOZBTf1k/rSCmDr05ggyDHAAyQk/T7nVeiRwMvIK1klPyZuGIjknyBUVbvoTGrNHHK1pAarWC4uk5Uen6KXhTlIJverkTA9C+1nA7H7gYQ+AI= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a566f6be-761c-4d87-ea7b-08d9984dfcff X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:58:17.6208 (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: T7PwDZeolTblp0rIkzt/CEQ43CsQIUTX+Lb8Rss9l826a+dJPZF7mP4IcJIgIpja1bqigIdi/qm4syeTJJVwaQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5135 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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/T4240RDB_defconfig | 1 - 13 files changed, 77 insertions(+), 11 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 7d950645c1..bab5f27051 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 d659d682a3..bdbac9162c 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 4960ef048e..a259dc5121 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 5ebc4c39d3..7625162a75 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 8da4802662..ed3980f864 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 12f1349660..841256e635 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 00cd009e09..abb4911791 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/T4240RDB_defconfig b/configs/T4240RDB_defconfig index 3a28c2a315..6e77903c94 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 Oct 26 06:55:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1546263 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=Zf0GWUuo; 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 4HdjPT5h3Hz9sWJ for ; Tue, 26 Oct 2021 17:59:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DD40783632; Tue, 26 Oct 2021 08:59:05 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Zf0GWUuo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4B1918351A; Tue, 26 Oct 2021 08:58:32 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, 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-db3eur04on0611.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::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 A26CE8361A for ; Tue, 26 Oct 2021 08:58:25 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SnZbEA9r2IEOltGoGOR8w7Nhbts9Thy/icJTokGBqpyVjZLs/dIyr53/Uybkep8hExC1m16aSDZGmxLSMGsjeO75umDh8ABEI6lSRa9nlHK9t32z0MBcTNFr9dDWDJ5DX+tVi05LDZacY8Rar4kFejaW74G/91HZMwdihjUWE+zk4Uu2hnf60gx82t0YilcQbwN08QdsY3qVvlGkRjQxkOzmA5ROt2TzRufeNX+Cj4xz59PfU84W2M0dEvZSmxPrlBCPnCCdx9SHhGrRwpPpx92EB/pz9EkjLLrnBa1RfJPQspz5IZv1ORTmOKMcGfC/4U4J9RtG3I6dhGg6bOfGrg== 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=gt4UGb9nngx1w4SVPTtmt9B2bW4QCYSSJpd29KbwyWk=; b=IIMJGZ/6BsHycl9qLYODo12yjVfckjfmA1Ge0pXJXQqTGbV8dZzCQuCyGJV5ToWvyk34aJ92NR2fJNhmKVEEor5TDmrt3DV+wxcskLL8PnJC5JMFqmhy2IkKlafb1KNnqX/Zdrxv5H4M9/PqtRPPTfAUmTFFypeOqFw9xVNUGfPiwruUhN6LMke96wLjwvBlercT8YY5EW+oTm2s0YHUL3y2iEUctiSu6WzRBEsH1vDpNtN6O27+WQmQSyi9Tm+8i4DMhVvaQOGAOJCfBlmNkWg3NnGMCVDk/sybQckTxwsUPFGWhh+77Yl30oJnLe/B3Ws51UvXtoMX+pFI1NKXqA== 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=gt4UGb9nngx1w4SVPTtmt9B2bW4QCYSSJpd29KbwyWk=; b=Zf0GWUuooqx0NM0pClsxDwxGXp3Dccpc+B3vVfq7J3pgfVxpzcqHpu7O3mvCDE5bRKJ7qy0ZS4BlLJ0DDal3hj4YMBZU3odJUJY9Jpx8nFHXo2qcXz/IwUnR+67/CtOBZsBiogfQTWR69SQ1SjIusb601/f/BSxqm5DOFeOWp64= 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 VI1PR04MB5135.eurprd04.prod.outlook.com (2603:10a6:803:62::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.18; Tue, 26 Oct 2021 06:58:24 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::7daf:2591:dd7b:b608%7]) with mapi id 15.20.4628.020; Tue, 26 Oct 2021 06:58: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 v4 16/16] update CAAM MAINTAINER Date: Tue, 26 Oct 2021 12:25:54 +0530 Message-Id: <20211026065554.29009-17-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211026065554.29009-1-gaurav.jain@nxp.com> References: <20211026065554.29009-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) 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 SGBP274CA0022.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.20 via Frontend Transport; Tue, 26 Oct 2021 06:58:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1db0fdff-87a0-4304-5a71-08d9984e00b0 X-MS-TrafficTypeDiagnostic: VI1PR04MB5135: 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: hdhkxQBHpwC6ejY4M2NHxLfWHsJecRF8/x5VbR0H9KUfKK/OERye/fdVpPBQSSuKfl7ulXbXGHVZ7nPWHxKanikpDaiu25q+1zayL71hwyqkV80IppJvHELBoulgI/IoWGlQMV5gOndJQLjuUPlL1kWdagX6LrVfuJyRGpTq9Dz9L4fqsFNyYkhiCbqxewK9a+Ntvt69+5ZkBNIAQgG1qqC+3y5vWY6wbxHbjvDJXXWIqcSjuyNEEPNiFNmEL6oprKczvURLgyOfYA3n35LvlqbmnuJ0v9dVaiYU21yvuZTJrzXNLNkLHIvnxm9SJsSELTnEav68JgFefGg+RGLpHpkERS/zfzjSxOax9yA6+NjOAFbSvcnsgNTbOLLO7RVu2RcG+bBR6CRqn427nhkCVbcaYDfdiA6CRkePu7p0lgFsVEdqHBL8wK9a5Jhl2MIGmgqzP3HkKkIdXY42hBSLFd1TEuUQ6VAs/tgQx58amO/gvIs1EZTczEdnGAubtIe0DmMqnAAUyGPRolk5G0V5MTagSctq5YXufM0YTh/dZ+KlD1+XulNWGKdbM7F2+z6ACkrubAKjoIeE7C/ZrnzOZMTEijv0Pi3SNQav5qHPecR+l6sDsZxt7zwsiI0qJv9bZKGZNpOGKGTtMfAeFPyaQtUTYEq7sMBvW70uOEA1QFOeq/OAUg/ZnpgGJCWNJy1g4TcSKUbbCq2EkfkKOGox23uvo/oA46+BRNqi6M5FXcHVXRLE5bGe3/+VKETZUobxI96jhFOK1G5Ckl1atEo+KdJ/pTmWzX9yUVdC6EpqKyJ3LcmqX/wGjktVrMhIBfNL 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)(6486002)(6666004)(956004)(54906003)(1076003)(508600001)(66556008)(316002)(66476007)(966005)(66946007)(2906002)(4744005)(52116002)(26005)(36756003)(7696005)(38100700002)(186003)(1006002)(8936002)(38350700002)(5660300002)(4326008)(6916009)(55236004)(2616005)(86362001)(44832011)(8676002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4LRV72thlsPMJdXNClp69sAWVm8thHAhAvh1A3y1wiz48vDZEr8MV4b8a5zBbC4UkBXUtYGf1haNjRZNvawRasmmY7xWjk4egyyFQHJHwW3PG5oQLM7L6rYuPFohEP3ds4twC2PWMcTx5svtMkacsQABOZl3c4LmcJ17XU3Z1bM1kXH3be9eA1y2MZR5eSUm5cbTyOios9z4kXhkZpZDIeAxRAzJqyvdbG+AZNhtrFqOYBFxWA01rHX84lcKarEBSDA6IduK87NsdYMaydCcqZOMPzyVPinyrMEL4WzikMDz5Cs0u4qQBGDJ8goQSkM4LwUwjvOusQ2vSVGceL0m8WoNF+HINLcYnuoCpPvKTKejHj+YR45EpR5VB0Zlpc7vP8sQRQlhgNX4mIw4z3LvTWoWzwkt5VIK57eNLgBjCdXuKMbCc+gX0j1rbSpuaYqbBiz/td202QGyc6/thHIfpe4iip6C/1qU06FzWK1DjIpBibbIxmu842pgoEmc4E49NFZ0vTyisyxShRSVP9RPIVvA+WugDAmrFWYlfPlc928HGwxnZDF6/kwbab7WiwTg8s2a+WWWPa4i9g+NHumT1DenIpKyPrUkoDPxA/ZcM90nzVGxAtylDBZ7CqhCzR9rU4t0JoT7AGEtESl9x3W0VB/TzkdQii2gWcdkzh5xZdCxd/ku5HCRfILJLFqw01UrM2g6JCyRA/vBDKplnleJ2vykHBUeGIlnPLtMSCK0PzAtZLyQPZGhzj3+LFqSvgnjhpobQ9Fjq9FieyYvPzCHzpk0ZlHXURfeYC7EiE0df8zhNnD4K3f5w5UHndvA+0PdAClyo12nbqEYst6/y6hFpCgxvWzM2qiJ+9kP1ysI3U4gjTRCpccQ69ViRdtMoanN/SmmhDyyO/48PS98FgkT7MwGo6knMmlHYmZgZMmTXwbNNTtLG4JLXaMNrZdlfgv33Yzh0Ny8fY1Rj+srrItIQ3SXuY46lXNy1FKZrG2y/ywrmvtgNLYHmt0nQ+eFuD2hrmH2jz41baOjvzpZJtnMDUaL/3De9T0wa6f5rtC42YuwyvQI1ZsZDuUX55HCGCIDudukl85tFInMdYghKIzTVyVDvSmRMWbsDjh/4vTgCGhMuOCDuD//rBtoe4iMLXKKJCtr2HB9pipC+3heC4ho1bAYUAwPD9Pa933L9elEnad+3sX63kF62szC523ZMe8Ri56joG1w9RMO44U4vRVZZvf1wOHLdyP8TnLLk4S4J01CHsoEikpSWdCj9L2dOsj18h2E1c9oVe4vVFep4lJFDznUCtBDVOcPUaR+uXdKBKdM0dQC3arj8J6lZIo9ppnjwNKTj4GK7f/OVeTKeF2ZF6P+nrGNcSrArSNvbRWnTzGehtrWyx0Lm7bw7TXD2UwvgsupKqTu7kR5Lgvis4kRnuBAEcTt1qI8vcKi0k25mWBrJye6bykg77ZvZ+ReA7DXdyt9kV8nDe2AIFYtMMddIaXA0dW7VpG8SiMstc1kdW3up0u1pkJM48Mz2HYtebhdWgKLneNX4crYA6TaIlQimpAOg/s00zoP2/tcyrm1RdLg1oCIuBlyjk5EItFNs/5xo5MNWkkcUUYJbKPZz3WbPje/LUHtwKfWXnIKSQxaxzg= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1db0fdff-87a0-4304-5a71-08d9984e00b0 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2021 06:58:23.9602 (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: 8Qmmy7Vw8ybl8MtFYEVO5cxLZkx8dreQrXWZCXcK3nLx2v2/Pn056b2dUIYrXKjYwBcSW06/Az9moIGcYQSNOg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5135 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 Signed-off-by: Gaurav Jain --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 5069f18806..12a304bcb6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1276,3 +1276,10 @@ 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 +F: cmd/blob.c