From patchwork Tue Dec 7 07:41:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564513 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=LKp/FicK; 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 4J7XMB3X37z9t1r for ; Tue, 7 Dec 2021 18:42:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5FA73830CA; Tue, 7 Dec 2021 08:42:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="LKp/FicK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 1F4D580F90; Tue, 7 Dec 2021 08:42:20 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::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 2D95082F56 for ; Tue, 7 Dec 2021 08:42:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TLN0ywMhDnATyp8zYW0FX5F1TBivki4CesoEIt3rNXHd2jBNFW0l8uNlqRPXMkFp253/t0gTyIpGG/sn5Mgteqyn7Y9kK1o8Gj5Q7rKvojXcyse3nGNWbS/82b+UB5LkMRsd3nTv5HOgujz3B96sw9wVW5qvQdNPjdeJF5UEUDGomp85F+IlYj3sEUx6IpwXXeXGcbltTYo9fyLMy97YJRo49SZ2TqJdv175RxAaO3eJYh4AzUOSgisqnaaHk6epBykXoFtKFSqbcbA0ujpG7jjpdJxYDoiBv6yHKH1cuERaMURz8CKNuG6OjnqDs5Oi+W3EHXg6QSxigRmbZ0igZQ== 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=n7K902ceeltMOH+1jI0Q0+KJMg7m142DMKYSttxIPkc=; b=LnkThmepYER57qqUpQ3B1iU5je3QLgWoyY8XA3363Igl9NwQmx3qAgsenBG62FCAXE5qH72NtoTZRnNQVmloWhgXFscGcBMCAf9XKJ7qHb2U5nNYYDNKxl1Zsm27CZST5lJMOxjjvp9u1k+ZyQtz9wbHEqxQZ9SENW3eCtCtCswp0auwuemuIgskUA3bc0og4GbvteQ3qLCsSDkfPA3mlVxFgyW8dPebDE+/gfwxfgrCuzhRPHoZO/XWO6UWI1PTLUep2BVHkzu0+DXPReMVJbXrmmKYgdtYpdYxkqhzWjZCeXW1/GAH2D6OIf+hfiSMLjMomZu6MhiRxVU5+Kl/pg== 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=n7K902ceeltMOH+1jI0Q0+KJMg7m142DMKYSttxIPkc=; b=LKp/FicKzXtNwQMEMC5Copr5A+7CqivRZ/VR4TWvdbrVuvNM6lvas1NsGv+XBXmxP4JZ6nKikli1R+HvRong+fv17Ci0nEDAG0L35u6TjQczP75x6IsBpr00x8HHoTqyE/4DMSGtEN5c0psuS9EBxT94JYdyIwCHx6tBOYn69xQ= 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 VI1PR0402MB2799.eurprd04.prod.outlook.com (2603:10a6:800:b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:08 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42:08 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 01/15] crypto/fsl: Add support for CAAM Job ring driver model Date: Tue, 7 Dec 2021 13:11:15 +0530 Message-Id: <20211207074129.10955-2-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:02 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e473e670-1de7-41ab-ef70-08d9b9551237 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2799:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:61; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ubFhcYp5c8Kqh7SMzXJ44VvLVaHE3fiK3aHMRT78Ie3WW/sOz8GJBWIz/f1E+mSBquzW/iYMwqEZeezKL1EjcAx/eSwa52uBuPROWBu08gxTJV72tZuivs9avgqTSXo/O96bzeLY57mDnkxYpglHut07JE2f00+sCCxw3E/5Yn+MChD5GrXrUffrDh4nXL9qxwbT5IijoeCbnLzCQ9QmZoUcnifXAozFZmN32IebXifhdRNKd/UOHLUiQfLeRKhHUqEboUIE6qrVTPNLBXUbsjZrrzwhzOu/IUqukqKauAjnApbADg2gk8VQJ0jm93wwZFScSO1MnsKkF8HvCqic6WvLnjNiuYhsjfBqvpUsxmiTVOfgUWPrp7nmZ8QPF/RbtEKT0z3TdxRufivzf2ZHBfhXpizJH47MMRNkVMyWJV6qcAfF0ab5hlW8kv8KL4PmxGZGq/G4muzIOqsBkmOyzbJdQNw3y9wKzjcIa/Z4ZehveSRyJ7/1xzrs2MPSf+goV+CCrpNryTCTlKZYGdGQfb2WOmtClqPUK7Ty1ySroStz7XpncHQr9jYuLfyQibk9d0v4T3f58ip/XzZjkQKAL7VyYsjuuFkcZNUgsn9YXLlHWe1RUtkss2da+5snQ3ADNH6YcL0hWN4ZETDBCeTf4W9NOgpiFq/Fooe5o+zoIyZOd+KcDaKbyuX0RrumIMfjLbPex9I/nmzxUFJBFjcD1OVS9MWTjb6BA9bqOSrXlgKZvO3l0vX1JhZBaesYVdva 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)(38350700002)(44832011)(186003)(508600001)(66946007)(6666004)(38100700002)(30864003)(6916009)(55236004)(83380400001)(86362001)(956004)(66476007)(2616005)(5660300002)(26005)(66556008)(1076003)(1006002)(36756003)(52116002)(6486002)(2906002)(8936002)(8676002)(54906003)(7696005)(4326008)(316002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: gaurHD/LGj3a87xaTlsR0V6RdGPUKq97f3FiBuiB49TeeSogcxbA8c8JKUQ0ItiYJEvA8ynfMwk33m8Aev/AIjFPD2U/qlEyqx+pkqYdhT3VDcdkkQ3ScZNdn8Hbh1JvsiIW/HAu1NL4sbD7wi2ibeKS518j9wNdid32J3eGM82pT75pTNg+3eE2UZ1EhyxqMM2ta0AzQHAyQ6GQcefof1TVyVK3ZWRZVfPQXpucIYtkzMAmk7wPxEmPImYm4dKSQ/eEvRaEW1h6wD3/HKNZwcDZzIx+S/IXhj8zjWb/UXwAkwg3pbdhiLUB5TYW3XN42oF8CxGOEFyT/R3gOkHtIG7vTrcF0I+dS9ra92waUpQRUSLNh2aB0PWOfct1fGi7z8zbo8GEZDPs8JPsgpJoYwrqxUOT83Hh5wNUwjoIuIDYZ1q6M4QOc8TSWpy824R+KCX7Inp3ijV58UxYzEcw5FMNBJ8UuHi15WwaGrMkOe4jxybr84XnUBhFKZWG1a+X/Ling0LjGmmCBvRm817GQ2IACucBIrkYHNP30kgiWlG8pb7iP5sWuxq6nfMl5XcnhaG2VAIdworO1evW1//W7KaR/h4oeorlHM/iDBJQZwqQGl9fM51YFSahNqCuUpV4l0UiNhBWa4zIo1Y3mfYbfEcQAsQi96QQvkaJIR7zJb5ElEWaZAcsqm9nc8bhzcqy1PGRBrNheca/lmt9wnL6Xh3BNi79p7/i/z0dansooSojX3TVOzmGyQcWMyTqYcGdj3E6KBaaBdLEdPjX0cw0/gXRwN7yOuv31GDj9mHbRShreyZb3ZqG/+qZ5TPFlzXULdWpr7UuGoiaI4FygHgiJBv7suafFOcGZysjGxkk3CxEQYvGbixkFUY+ztwYm7GALWu1nIcr7pPQ5Z7gSpVASifBLJFmxNFj9MxG7ddJ0aD2FLhbLLvf+ABg37XrN2atL1Tz3XlDx179y38CyoLrAPZdu+CHHHlJi5z8WDOnvqY3MXREr8s2MGknH5qmgzbvQnKn6ByXqhNY+TO5HvkAunCzgJvlOhA1iJfVaiHXZY6O9ILWYqNW5Dsr+ZGdVD6USALgS+nTAVEOTqe85VLiISKucD/OfdS0AxBaaWlpAuzujPIqlq+myB/XO24B4tn4WSyMq1FpBMMC72+QGphUFNDTtlBYAztjvmBxuggs7mSA6BDcieZ3kGJRHKP1L49kPzvS1PssyCG/EDGixZGNDmSw+sE9sbQyihOXmCFFHXddN4Jk9NEEwiF/9G4Sbj4pgdYeaQclGQWM6GMNX8TRsJMWo9620+aWLNOQp/D1V8aNwwb937KZYsBmC7adyKEUqbvaMi/JmGa2JYnwcJslORYoSsIxyqB4a8wzvc3nm4B7JB/J7ejqWto4UzXtSTq+E8bzT9MTD52TPFxLzpd/2aSuZSQRfPMeU+nVRh3G0TuefTjQZBz7yxoajsnGYTAx+48UzY6r6zYsVfISY5i3B8sMdwyqF4T9I7/l6jpN4F5v0KL9nC9EqRV8oZBWX+xHulrf7fhD83JVulobjpyBjMCyW5VKOriLumYvWP2cZMHRPtbTh106A8im/sY2ChSvFskMIobis6BJ4zoALsB2X7gq0yuEddkjw6tp730iBTQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e473e670-1de7-41ab-ef70-08d9b9551237 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:08.2797 (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: u8/HFiBQpDvRwgITCtx7XgT2yd3YiPsDZrYttGpjmCeJSAmVafkSz6a1Jhs8iW556Fx0JT3vXLpuaskwCERzNQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2799 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean added device tree support for job ring driver. sec is initialized based on job ring information processed from device tree. Signed-off-by: Gaurav Jain Reviewed-by: Ye Li --- drivers/crypto/fsl/jr.c | 323 ++++++++++++++++++++++++++-------------- drivers/crypto/fsl/jr.h | 19 +++ 2 files changed, 231 insertions(+), 111 deletions(-) diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 22b649219e..441550f348 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,29 @@ 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) +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 +67,16 @@ 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); } } -static inline void jr_reset_liodn(uint8_t sec_idx) +static inline void jr_disable_irq(struct jr_regs *regs) { - 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) -{ - 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 +84,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 +107,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 +138,8 @@ 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; + start_jr(caam); + jr_initregs(sec_idx, caam); return 0; } @@ -188,10 +147,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 +222,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 +308,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 +327,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 +338,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 +365,62 @@ int run_descriptor_jr(uint32_t *desc) return run_descriptor_jr_idx(desc, 0); } +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 +430,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 +464,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 +510,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 +567,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 +586,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 +614,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 +634,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 +644,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); @@ -646,13 +656,28 @@ 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) { + 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 + 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 +707,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,20 +723,19 @@ 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); + ret = jr_init(sec_idx, caam); if (ret < 0) { printf("SEC%u: initialization failed\n", sec_idx); return -1; @@ -719,9 +748,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; } @@ -735,7 +764,6 @@ int sec_init_idx(uint8_t sec_idx) printf("SEC%u: RNG instantiated\n", sec_idx); } -#endif return ret; } @@ -743,3 +771,76 @@ int sec_init(void) { return sec_init_idx(0); } + +#if CONFIG_IS_ENABLED(DM) +static int caam_jr_ioctl(struct udevice *dev, unsigned long request, void *buf) +{ + if (request != CAAM_JR_RUN_DESC) + return -ENOSYS; + + return run_descriptor_jr(buf); +} + +static int caam_jr_probe(struct udevice *dev) +{ + struct caam_regs *caam = dev_get_priv(dev); + fdt_addr_t addr; + ofnode node; + unsigned int jr_node = 0; + + caam_dev = dev; + + addr = dev_read_addr(dev); + if (addr == FDT_ADDR_T_NONE) { + printf("caam_jr: crypto not found\n"); + return -EINVAL; + } + caam->sec = (ccsr_sec_t *)(uintptr_t)addr; + caam->regs = (struct jr_regs *)caam->sec; + + /* Check for enabled job ring node */ + ofnode_for_each_subnode(node, dev_ofnode(dev)) { + if (!ofnode_is_available(node)) + continue; + + jr_node = ofnode_read_u32_default(node, "reg", -1); + if (jr_node > 0) { + caam->regs = (struct jr_regs *)((ulong)caam->sec + jr_node); + while (!(jr_node & 0x0F)) + jr_node = jr_node >> 4; + + caam->jrid = jr_node - 1; + break; + } + } + + if (sec_init()) + printf("\nsec_init failed!\n"); + + return 0; +} + +static int caam_jr_bind(struct udevice *dev) +{ + return 0; +} + +static const struct misc_ops caam_jr_ops = { + .ioctl = caam_jr_ioctl, +}; + +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, + .ops = &caam_jr_ops, + .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..c5e5ed5c26 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,12 +38,21 @@ #define JRSLIODN_SHIFT 0 #define JRSLIODN_MASK 0x00000fff +#define JRDID_MS_PRIM_DID BIT(0) +#define JRDID_MS_PRIM_TZ BIT(4) +#define JRDID_MS_TZ_OWN BIT(15) + #define JQ_DEQ_ERR -1 #define JQ_DEQ_TO_ERR -2 #define JQ_ENQ_ERR -3 #define RNG4_MAX_HANDLES 2 +enum { + /* Run caam jobring descriptor(in buf) */ + CAAM_JR_RUN_DESC, +}; + struct op_ring { caam_dma_addr_t desc; uint32_t status; @@ -102,6 +114,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 Dec 7 07:41:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564514 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=nH1M6UVX; 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 4J7XMR4hp1z9t1r for ; Tue, 7 Dec 2021 18:42:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0975080F90; Tue, 7 Dec 2021 08:42:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="nH1M6UVX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C35B880F90; Tue, 7 Dec 2021 08:42:27 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20610.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::610]) (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 ED039830B7 for ; Tue, 7 Dec 2021 08:42:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dTFe0axs5a2N6TlcGQsebLptQ0gKuRy9lwmS0rrmTlODVJT2tKqxuG0YJ1sUpBZSY5S9avpjC8ApLXAohdAiVxBrGIUKY41O5X8EG3a1P/kTP5NpIL/bL/6oYxbcxBHZVMkkz+8ZLJqlSyYlFZFXEF8Gv2AtjEczPfs7PAYUFU8XSbQ4R7PUSBZ9juYgC8wFbf5m/Gk1yaj3FO3sOqpAzax2Y16/urJ/M0rawefnJXiYejJUM+pVlUDRXgE7zBeCuZJsp0avWbkXX7e2uDdZvgz7WdGqnEdinLOJdR0q4SqoUx6vJr3ALrP95RNZqzfT7DZjpnfc5d7jEn3GjhT4Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XrAhZz7JhrPI+hVRhkH+a0p4vQGGdYGMvPaRKDu5AXU=; b=QbIhKcXgM7Nr09vkF8Pki0Zead9hHwj0LDeGd01P3QD6Ymna0sXsU3ba9L2sQiwHeSMIFBeO6Vpg7JPscvTTJxlXPL4QrWpCT6e5HRZnHFwEJf12HA5k3VvJS3k233WGvS0o2Vyp+LjehZRV7yOVMw2rl0BJGVO9psSExnah379cUchGh17aUSInR3VVkMX9pOx18wlcu7EeX+spvbv/3gM+CbpxqIpAWlt6tWQB0jQxBOi7ZVROcgkhkTuO5Mdg47O/KLWiIJFS4MK46c8neIOFQW1J5iUBJ9omzLuyWgfwwF9Aq9/Lfm2GtNJ95Wm/KBPba1vh+gTRU3zLLLsi0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XrAhZz7JhrPI+hVRhkH+a0p4vQGGdYGMvPaRKDu5AXU=; b=nH1M6UVXnLIACqZAAv/UnfDnzzuMQYVd59aqk/IXhCx9HDkuuaXwIG9sUsSEpaNlLdoiu2DuP+qoDRBSqK2PvTV70GH/63K04pZQgKy9v3b+f836LqXGZ4VKcGKdpHdkS6wFr4EUgeUAlY6tbyW56Vhz2LJSbD2DeR6safWzIjY= 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 VI1PR0402MB2799.eurprd04.prod.outlook.com (2603:10a6:800:b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:14 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42:14 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 02/15] i.MX8M: crypto: updated device tree for supporting DM in SPL Date: Tue, 7 Dec 2021 13:11:16 +0530 Message-Id: <20211207074129.10955-3-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:08 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fff208f8-2e39-4e15-4873-08d9b95515fb X-MS-TrafficTypeDiagnostic: VI1PR0402MB2799:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:254; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: n/xtYl8p2mBJGJtcO1tfj+TF7043pscRpCZal6I980tR59CCMVd/QbquLqC+iQrITCiF9VAi4yIWLAeMa57rWC9Iok+pIf8X3qGNaTfzf55yEGj+/lVuhRSUSbv+De8YilaPpVXcoD97Z2UQN4kfMfgTJMmVCFuHAl2rDZuP673vaS17OeG4BeBz4sWvoOYISYewaLf08jHvx3kCY6GSruUX/f+z/Fd3IXUiTG3ja7EIFL9cuRXONOjlr3hyDcjkfNWtl2KtuY2eVzjEeCA7KEjj+LzAXy1wbw3SgFMIZzFEYZFJ5YmElO5asfeMb1J8BO1ju9mdszI7ltS3uN5ZE83NHac3DCtlQFRvAniR4i3xurwaAw4sZAKZr36mP5B1n62kP0geNQzxng3zcn/V/PQ5+oA2CMg50WA2Lw7TMWEak3FFCt9l5e5kA4mlLOT5ZM3uCTI9TnGsBKv6oa36PJ2Cpu7hzvNd0G8dFGlZqTwnGogks374SePYzNlMaiHorDqhy32AP9/wkRv88MtSNtODLN11LB2T+m+Nczl1+V3Jczgqij70wgSJyqirM3Wtxnig6EOY6Lw/+DOHM9CzBKUIpuL2v3d7DjwiaJKSP4vPRxKZxrIoM0DfKi9/ogfuh1YYCJ5P9jsfTQJNj5cRr+sKIwkCHYPV/mdEp4TxEQxmWr/Dg2ejvEgmKkcpl+QgaA1sZuBVPDrsp78ATKWNqTeO0jQP6Q7Zp3YRxCJgKRY9ajc/cxnOVuKl23HZEmMp 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)(38350700002)(44832011)(186003)(508600001)(66946007)(6666004)(38100700002)(6916009)(55236004)(83380400001)(86362001)(956004)(66476007)(2616005)(5660300002)(26005)(66556008)(1076003)(1006002)(36756003)(52116002)(6486002)(2906002)(8936002)(8676002)(54906003)(7696005)(4326008)(316002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2HU+LVgxBajVmhbIAlYaaCpHIcbl0xihPyHSlTnBwsK6+lIwufygtNl8zwOJy06khoAB37As2ge/rTCk8pc+WrvrIphr0oLmrHO5mYl2NeeAqbK1U4B/F0mD++DF4Pi/97ZuJed6fVO6Bp0bPkm0gHVl0EiX3z66jk006gB7tO8LPx+dpVwsvbUpZIajzYu+oFkar7tL4vVD71GSkJfkwEnt83oVzeylKWGJwSoBj+YdTTjPCllpTSo8qQjhIVBwuCnlVbcajEWrmVO9qJE3B/7hxK5vstuglgcEnayDNu/maaKWNBH0khPiO/3z/Y350eMg7+8qiIKxVqNwyNHY0oOJMBFjt2S6WeYXYEKtsyVcyCqXjntuJZ6AFa5PDf9JcVVdFGcLeCbKWfTi7bZcmAkTUxpywkA3t8N9ez3tQdAAkt2UfWBMD8ATIREUNrh8LPJc+U7f/rZPMhpaIeOfAkMq68v6BKUl1RXKJd0XZgRZl5tUKDhFrfUB7TjVB6EXTxAJZ4NKj3trkgGs2jwb4vE7Xr07EuS0fJVtmL4cMYpzkm5Qg8IO1NBGiN8c32e1nkJMNlr/McWYd6puha2wpwsLZRQLuwxKynQ83DeNrK3b70uH/6TBLoiLVJEYUwVhWz1qj3QQwsMsj/BpAo1LscJ+t3WChD/1MGTGFBUf4jVA4g8/4YTEKv7EKevsFG7u3kz4Gfjzj0TvVJxo6V0YehoaZ4/QGW4DAttBi0ThSDhLoo8UHOKxtZUQOZwofkoczY3l8zzuKDHxP2iasDNuTi+W32ZpzW2burtWK/X73lk9F8jyqLg8xDs097PWKoKpABQHqJc3Yh0mnglWtqk51U7cMsMsFabT7QZEqwLkqCBjQv/TsjIExWF5a0jpkw3/sAin0GHS0YKX3TSZgwnqKPsyTgH0CqH/7vTjcdHploTvg+zfSlReq1YvREhyeSv8QbKJXtm6v5whnvEl9PIO7mPkeivs4R7tNHPaWhcNXB014Nuu9BsvxndIKue3WSAosI/oL/Q5eXQ/t04Yjo5mZOmxN8dVCE0qiSIbs3DZMwSnhPq8UQPUikeqoJtKrfr5ixP5Pt737bHYq0KFe01W+k3VrNLyG2VPHF7c7mPXZJNzfnLjNxdadV0lKgn+q9pM3sx73LdSUJ5PTWYw29R7MXq9H9TOwRDpJ6QfnmVr7/vB7ydo26TZg9f0R2PZzXkh556tBBLROEgf+uGvkCHSPAanEe1b8Vtuw281dJFpctUMkZ8IyFar6MbTVK98Cn2NszwVpJxmiSmYsBROh6/o/5wUMxdZ4/8TsT24m86082WkJOgYOmyIHf1n/csIkXCx5vzxguOKrNobLmtvCAZXv48yhhXjYzEpeco5FTmhf0bbMuFdzYLIpmHxQSx6CZe1f2Hd1Wq4/RW+PZQQDSV0kFdc+SFXKvagGjYUKaayPwsDmDYU/vGNtjoIxq32IavxGRHrbH0Hndauy0M+0Wi7Wy3gB3PycM9JZQIDYDTGOXTCSUtbAwwsnN6vI5a45OoOkhBETIjlZ0UNid16SsVbVEgpYAyWy/whWvP+3J0Ze9iz43QKGOQZauPDBRimqiwzNHg7/rrYNPRHq/Tj6dhnN4ifN1jIgT2siy1Bf1hKjjM= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: fff208f8-2e39-4e15-4873-08d9b95515fb X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:14.4242 (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: ibyGVCJlqx/bYhQfprJpHzJffHh07ZxUaLuiaOZDUEC6TsbpP08HAaqaYtwbJhjj8DbpYRxzcGk7LuqID015Ew== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2799 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean disabled use of JR0 in SPL and uboot, as JR0 is reserved for secure boot. Signed-off-by: Gaurav Jain Reviewed-by: Ye Li --- arch/arm/dts/imx8mm-evk-u-boot.dtsi | 19 ++++++++++++++++++- arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi | 19 ++++++++++++++++++- arch/arm/dts/imx8mp-evk-u-boot.dtsi | 19 ++++++++++++++++++- arch/arm/dts/imx8mq-evk-u-boot.dtsi | 4 ++++ 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/imx8mm-evk-u-boot.dtsi b/arch/arm/dts/imx8mm-evk-u-boot.dtsi index 3c75415e8f..83517de52b 100644 --- a/arch/arm/dts/imx8mm-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-evk-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include "imx8mm-u-boot.dtsi" @@ -72,6 +72,23 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; + status = "disabled"; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &usdhc1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi index 1d3844437d..d8df863083 100644 --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ / { @@ -104,6 +104,23 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; + status = "disabled"; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &usdhc1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi index ab849ebaac..f3f83ba303 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include "imx8mp-u-boot.dtsi" @@ -67,6 +67,23 @@ u-boot,dm-spl; }; +&crypto { + u-boot,dm-spl; +}; + +&sec_jr0 { + u-boot,dm-spl; + status = "disabled"; +}; + +&sec_jr1 { + u-boot,dm-spl; +}; + +&sec_jr2 { + u-boot,dm-spl; +}; + &i2c1 { u-boot,dm-spl; }; diff --git a/arch/arm/dts/imx8mq-evk-u-boot.dtsi b/arch/arm/dts/imx8mq-evk-u-boot.dtsi index 2cfc12b7e0..23a3ffa18f 100644 --- a/arch/arm/dts/imx8mq-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-evk-u-boot.dtsi @@ -8,3 +8,7 @@ sd-uhs-sdr104; sd-uhs-ddr50; }; + +&sec_jr0 { + status = "disabled"; +}; From patchwork Tue Dec 7 07:41:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564515 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=rmODXTrO; 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 4J7XMf09Zkz9t1r for ; Tue, 7 Dec 2021 18:42:53 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1456F82F98; Tue, 7 Dec 2021 08:42:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="rmODXTrO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4A8D2830C8; Tue, 7 Dec 2021 08:42:33 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20610.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::610]) (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 1D9CE830BD for ; Tue, 7 Dec 2021 08:42:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xen5Q9Sp4kxByKfhccjEXK7GKiTi0AnxafWC141TYzWWbA24lVk6xPguuHULTP9TA4Tx5d7mmVpOnuz0Aq2DIa3oCPa/8Jo+GuolPo+OHLtUbDdEB0fmXeXeFqDytE0fMVtEaNAgLSX1Jgi22JCVQRZSKekCHHVpoBrEVju0eY8MPYZaXW/E5t5U4dDJkcMhKQUeVqJ8F++0ixCSqJA8c5Bi7XdP0pp3+o/gBF5GC/SuuYKMl9QS5jyrxQLgkcnzVBa1wgR/m8BmqNGnHPgkaDRBymNTo4rWPEDV4IHZrjJ5okytrsdaKpNIssQtzkDuWPZtDv5NCZbiTOZbHYvD0Q== 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=U1U1/D9HkQpWUCWg1Li2fVkWAqWQxrBsc6Rm42HpMsw=; b=ELL9+FdzCBD3dS6lGTP58jc+rAZwx0jtCl8+AajYtI/9CPpEhWMWFRZnNTl0xcMZY+Vals033aAP/hv6gTE6o3sWoQEqwSbrZQwVywCS99sdkDJ3qgpxFofIuVPILEdNt0/9efyYY3BIDYj0Md2WtnGy23qsdkrHaI5GuAx4nfZHSV6Z5pWNws9fp7uGqLY2j9yg2Xk8U04C6fUcR2Hzs3xCf2IrF8Nq+KWTh3x7xxtHxGlU7yC3+4ydvwrgMubKcnz4JI2HntyaI7f+68nDmNSZVMyiOyMjedBUrg6vcTGiZe7ayjvK8oQNVXcJihzzwkO5jhuY/GflAVp+pWXtaQ== 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=U1U1/D9HkQpWUCWg1Li2fVkWAqWQxrBsc6Rm42HpMsw=; b=rmODXTrO1+w/tX2jlRnw37p1flMdK5Jph89qvbz1lzG06Kh+sdS10yR2Ks7PWXQsCduO1FVPHTy2W+FnWQqkFEEmPO+b/N0XELGI0ZizNEYA9dazRpuATPXiclUzWInET6Q393RNue4aNlRm5Vw/5kSfk7DxsFz9OglGZpxFovY= 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 VI1PR0402MB2799.eurprd04.prod.outlook.com (2603:10a6:800:b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:21 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42:21 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 03/15] crypto/fsl: i.MX8M: Enable Job ring driver model in SPL and U-Boot. Date: Tue, 7 Dec 2021 13:11:17 +0530 Message-Id: <20211207074129.10955-4-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48aa99a9-ec74-45f5-0933-08d9b95519c5 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2799:EE_ 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: UirxNpocMQ6h7yuzeAulpVlbQNubNmwPPHNUiiAp+qtvuf6QH4Uz8pGMLX5KTo3D1s5rNybA0Y1pjGO2VAV3ikjuy8Gy7JWvWerivmyRRyL16e+uJzlhhLVI7sJ8TDwlxSf9lfRkPvmYNMxEwg4wvsM2Ymfrc34xWabv/YfxmWTfqhMCrziZNoDjQfJ4RDUXjo3if3+kXK+YGMfI9iryA8jcxiqboZvzEJldpbWx08RqMRT1fmqjqmQBMsRx/kwybhuEArn0kFHES83DPC4LsDMEVDsji4TdiTXTJRnIGO/NVSRVtw17yLf+2XAevqPB1+Xvb50PgJ2Hp0LkLg+gMH8RVpzr6Yo7NDyYf+wr3zd8wqdxxI2BzBFJpSQueG9zAW0cOwHYf4wL4nQUy491nQlWuhqVxNJ4bEtgn3GYpZN2OM+mXx1EHCmoJrKgnfROXVjB+LRBUgI+mlA0QzFCyzH1BKHa/V7ERDN9BjZVJXl9fIDYYh/1ibDgmhzsEWyA4S320WCnXtid3Qy5HMztPKkSZ+auQ1rElK8dCZ1Tt23101Kh8fZzgMfpnc2Hm6soxCLOHzW6P8WtH8SzEqSDSlF9nVpakWK4LtBKvZ1NSvRzTL/jBXp/naGxk+QRELaQbtIATLj+fMi9PAqkW5RVY1/DxUTyzSL72tU1by198QwsEyWCWp6ov9XJuWv2gOcj+JXT429vqJH9I0O31Agcqbsaa2L7/K5cDOL6iCDp9YQiCw2+5iQ/LeroVGZRBQst 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)(38350700002)(44832011)(186003)(508600001)(66946007)(38100700002)(6916009)(55236004)(83380400001)(86362001)(956004)(66476007)(2616005)(5660300002)(26005)(66556008)(1076003)(1006002)(36756003)(52116002)(6486002)(2906002)(8936002)(8676002)(54906003)(7696005)(4326008)(316002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pakcRTiXIbf83F5j+qcYhWjJ65IAUTp7Qj8SH5X2hA0I/5WtH9u9wLJvfMcYGtmaio7C7cfB7grtrKNubAnPuNxn4ariIsgZ7cjz2QRKfSxwoM1TtpNg3hlNJwx2N22XWVb7Iab+QMQETEFO8oxQpddO7PC6lundyBTernphypsSsdCm53DpgU9O+tymbVX0YCQFVMSO+yj8TYm2LUEUpE0iSWj3Q54ku3zEysHvoopTkGzHXKjh0KxOo97Yl3biSfpNNYRi2oNG3YJW8/duC2+HFLGG+WdIWExMFPRJjj5+m+VuKwyYvMA1jCy6buVYb32fdL688kGa9eoiKxTrqGZn7SKMn4BA5K4NjmI/y7d7rm6K6QR6GUxHUuSaMWfxJtupVzh8LdIaZ8cwdCpQylKXpW9Jzh09VUiYqM6kUbk18HK+HXZ0w+BRgd8wCEBsWyZCZgiOibh6vjgpSVrfGbZtD+LLfXl12ws89mPn9NglMAx5gO6GNLrSo5kyeDvGsDzBoDQqEMRyh89zV0DQjkaaY+kFFarwFs6UOoCLnrbmfruNHk83Iny4EtU84Pnn7CqlXpThkQUPo8WwCjSmncX44zc2KnQX9hGAQfZumaih+07kDivfywrNW0J/CmcOrxhStZP9pUpC2y6pgBPVf0NDVVt8DGRktrKMWYrK4PkXafjKyrl4Pfzw3ciRmsetzKvBZLOSCdtx9VnUMYsw2HMLHFLIS53oazP1ZRogS6dK0S5jjdK9sj7CnNVPdwkG+V0ft3oVCf9S7YRjszVqJpaO1nDky+t7pGvDrDDFcAIqgTEUL944gS1sUzp4Ng4l0EpZvGavvx80Mv2X7PGSCa11PNemB84TqKK8DhBC8QcP1Qxkv0UhRkODhDev3u6h7FGfu2tFuSfffr0VTGVLosoGJ1gufJfcRzWXLnloH/Vy9y5ZX7sdjWoHoI2/fk5H4PnlYwYBg1yF8ahyM4NX5ryBSRv2x/m9xVCiJUNNQXciOzPTV2BBTlk+v1QMERm8nrtJ7DCapMLZtWVu1dLEff8lvmZRLm6dyFzVkaCxaHrkgY8e/tIZxvwUmwd6B8N8Mm5XESiC9CJsgh0yqdTXhS7QZwn/0adTY1emLdaEpaMXMzjHvJAGulxs7OMyfb7NvgPxSpPV7AGaQcIGY0KN3FNtOGd7bYnT039SiA41i2najX1ftIr9b3bxtXRVXJlkQGPmF8IAC2mhmYhF0jLiQ0ILnDvpqGJXXkQX5jUqtdQy7m1kdB6O/IzidUX1MIFDU4N3hhc4axMdCTxWywHUitOAtgChyaGYPBRdq3psJJvLYi71ek20WpQSpTr6wcgaFZSmC6f4qp2D5gjFVSgtOXzTXHOVM3aVKGRmd0SoLKW1TG85qxhd6anC59NHK98mnQ/G3DaCVsZC1bZ0KuTcawEmLL/d8sDqrKAApV6P5G9cW1r3J6BFk60SNi214fNfXNLJwhM8wdsGvou891pkjSmW58RlTsmIWg/NHnPeWoaDySsJwz/syMyU9tof2ToTA7mAKzxMsT1/eAOlcNTBu0qnqu7/ws6X7wxI0yyyuwnSVkxbYZoz7XHX9SVrYKybxWwFpehHjKOcH0MB5tDpIfCDIktK5xcqeDwze7BlieU= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48aa99a9-ec74-45f5-0933-08d9b95519c5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:20.8546 (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: qQr4Q/xen2VD76Rc3LPfTaBDYAmjnMy0DihbfQ4qkgoRMosbcFVzsYQCvXyVhW3aur4Pkjt7wfZQpna5ETHOVg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2799 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.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 | 18 ++++++++++++++++++ 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, 73 insertions(+), 12 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f7f03837fe..550f884077 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -815,7 +815,7 @@ config ARCH_IMX8M select ARM64 select GPIO_EXTRA_HEADER select MACH_IMX - select SYS_FSL_HAS_SEC if IMX_HAB + select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select SYS_I2C_MXC diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h index b800da13a1..ff8de53f67 100644 --- a/arch/arm/include/asm/arch-imx8m/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h @@ -72,6 +72,7 @@ #define CONFIG_SYS_FSL_SEC_ADDR (CAAM_IPS_BASE_ADDR + \ CONFIG_SYS_FSL_SEC_OFFSET) #define CONFIG_SYS_FSL_JR0_OFFSET (0x1000) +#define CONFIG_SYS_FSL_JR1_OFFSET (0x2000) #define CONFIG_SYS_FSL_JR0_ADDR (CONFIG_SYS_FSL_SEC_ADDR + \ CONFIG_SYS_FSL_JR0_OFFSET) #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index 276b8bd974..a9acf6474f 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -38,6 +38,10 @@ config TARGET_IMX8MQ_EVK bool "imx8mq_evk" select IMX8MQ select IMX8M_LPDDR4 + select FSL_CAAM + select MISC + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MQ_PHANBELL bool "imx8mq_phanbell" @@ -50,6 +54,10 @@ config TARGET_IMX8MM_EVK select IMX8MM select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + 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 +96,9 @@ config TARGET_IMX8MN_EVK select IMX8MN select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select MISC + select SPL_CRYPTO if SPL config TARGET_IMX8MN_DDR4_EVK bool "imx8mn DDR4 EVK board" @@ -95,6 +106,9 @@ config TARGET_IMX8MN_DDR4_EVK select IMX8MN select SUPPORT_SPL select IMX8M_DDR4 + select FSL_CAAM + select MISC + select SPL_CRYPTO if SPL config TARGET_IMX8MP_EVK bool "imx8mp LPDDR4 EVK board" @@ -102,6 +116,10 @@ config TARGET_IMX8MP_EVK select IMX8MP select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + 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 441550f348..9379b86955 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 @@ -669,8 +677,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 ccsr_sec_t *sec = caam->sec; diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b9c1c61e13..81de1a3793 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1848,6 +1848,7 @@ CONFIG_SYS_FSL_IFC_SIZE2 CONFIG_SYS_FSL_ISBC_VER CONFIG_SYS_FSL_JR0_ADDR CONFIG_SYS_FSL_JR0_OFFSET +CONFIG_SYS_FSL_JR1_OFFSET CONFIG_SYS_FSL_LS1_CLK_ADDR CONFIG_SYS_FSL_LSCH3_SERDES_ADDR CONFIG_SYS_FSL_MAX_NUM_OF_SEC From patchwork Tue Dec 7 07:41:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564516 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=m2njNIVO; 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) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J7XMw3Y3cz9t1r for ; Tue, 7 Dec 2021 18:43:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 883C0830BB; Tue, 7 Dec 2021 08:42:44 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="m2njNIVO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE99A830D6; Tue, 7 Dec 2021 08:42:34 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on060f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::60f]) (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 95E52830BA for ; Tue, 7 Dec 2021 08:42:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IbGLjF9RZkPfV1WNCTOd861ztygoruUGwZcvGnfUvBIUfR/1JDeBZsag/9PvPeDshXgYgMARYnthcMolEGU/2vrSaoOLQUBeeFZac2BrLxJeDHFiLQABvhx7MnKNtFf5Bk3+FuX3fUkyEhiHTIPGJumtssY3EL3wFG2rNCmbXrRASB97qDsKpTDaXAO9CRxFqfS1rq+3FPo+EyEX2kUzjWgIA5VJ1hTK9LdCuE2Pp9S4bS1FCek70O0XFkoeanlfKvguWw2xXbu8hlCdQ6Rvs3ilE6bR/OQxUD1VinXEX2WEIClMi+De2WOI79VOJGRnkuKypQvrMTsnOttuzeCb8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nUcyiC9wMchVcTPK7AEtTwgo/pKy8WbXdWospDEMVM8=; b=HUh+IVF0FDnGgtLt0FZK6sHFuz71RLRttVHQC57iF2cjgUng5LlIhRRv8r3wXr45P301bEWBojbPkWM3ImC0YBE9sOwv6UdbDYdLOG9UOJNn7FrMCLmt7nWc0GZjXRBIWPP3yDf9L2Rb+DSHLb6Q04nDhwXiJBsQ6PfCqQsBMT2CKiASajg4bdiNlQNGyNrT0nUgZt/FYMlQoxegOvmnRWX+zrsuFdTydTYYQ/cfQUmPD4W8ajAACLrunoo1ouChFeBf96hUn0RLEzutzFFsd8hT7LnqRCdrlWPMJyxr1fu42K8lC2V5TDFfz59AxN/sMwWNuq3NaB+tjony7prsCg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nUcyiC9wMchVcTPK7AEtTwgo/pKy8WbXdWospDEMVM8=; b=m2njNIVO+69g22oEsOSAz32EBMB2/4Hrrnni9QNFKedDTrZjRhLojxhs0f7KKhXaDpgF/UQPjhCS6BENHD8VuctO1zw9HwZY1xDLQGCYQuarE54BG7hhi2MeR6UO9Q04kNOyqYo0C0xSo9lMSHs2tLsohgNNC4mq8KTg5MqG848= 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 VI1PR0402MB2799.eurprd04.prod.outlook.com (2603:10a6:800:b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:27 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42: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 Subject: [PATCH v7 04/15] mx6sabre: Remove unnecessary SPL configs Date: Tue, 7 Dec 2021 13:11:18 +0530 Message-Id: <20211207074129.10955-5-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48ea24d0-d715-4800-5bc9-08d9b9551d68 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2799:EE_ 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: nwVjCJ4eHvgoWTPxsimoLy8hC576V6HtitXJOpdHHMLU0ySdXrB7OmNjzKGFXjLYQSgpOvzPKY73ULwjUTbsZnXZK4+0O2UzXVxhUqe9eBcZBhBdr05n02fNa7+cw0Gau7CUDYxYr/OFNXbFgpAGQz0Y+W/EJrWLq2jlXswnaUCn1EVI/WxcS54ST1K6A9uriTUgDpi+B9dQshGi0rjgkXA9GmSj4QUf5ZLgfqpOXzOCGTUX68LScAs6gt9s3GzUqWvC9D7u+2a6KmNZOzuAX/DaiV0aXQZbVhatxhhs5QAeVyqkVxY6ecy+g9PToIqm/ODe+cIBY1OObJdDQRVGG9b/aaafLMXzK5rx+TAYLb6nvnEK86cMmIcYedKM3pS+KsMq+NLxCeOYGOvjb0YyvPjRDiDALXWHnz6MuKytUuy0eafav7KHx5b9l/PTsHjYvyCptbUxBAegijMs3qa6+JjTJAB0z7+PhSn+wlk0SWo7SVjbmWwGheYoTB1jxKCmpSPHcy8vAQJyCRMK0meqHkyBUyP4TStgZyCEJJ6rPzCiGTpO3hapGqpD+sIHAfGatHrixLocBuKItQZO5P7xx+QN3dyVgji1vEduL4J/+nn0O8efcn85k28OI/8GB0zjTeaGFuiv22ZtA4eE3L3ztev6HxQqTwaseFaMFZL/NTuwKKuWvCNQQssw/RFaGhRN6dCH2HnaAkJxDYrK2HDJ4AWsgfm0R9gWWEV/UHULHiu6cS92dR+P9bUBfPOudhoqYnzbOGqiTgxBpBGmpbmtmw== 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)(38350700002)(44832011)(186003)(508600001)(66946007)(6666004)(38100700002)(6916009)(55236004)(83380400001)(86362001)(956004)(66476007)(2616005)(5660300002)(26005)(66556008)(1076003)(1006002)(36756003)(52116002)(6486002)(2906002)(8936002)(8676002)(54906003)(7696005)(4326008)(316002)(110426009)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: u10IlVQGrOyRYywE0l9JG9XefhCcG130w+l1P9IkZZqf7Cg5KjgPu2AqsbKhbPVzlojN0+sdCbFr4S50uUrMDG16SL21FbK8HynC+Xaub7yAw4QXmvyOS5Ca7I4JfH3+vHweWbmhfaZOjtHhvsqDkFTQu2XLZSdLwI0SNtoT0IYO0YjNdPL5VZCuQNJznfSra/rBpMGil3oL/CiQaradaRfDg1G7yR3onZZXu6nrU/+2gG/lZe2gZr784jMHjbq3muuZE1nJrjqf9r5GeSXsY7DyNIWT8+LXFQcIBE+UIMCuVmFWgWIv3/OYbkebA1GG7R+zTHc6ZmtEJGU0AParYHa/q5sJQnNW5B9opryQ0AcXobzJb+Qn4s3W8IyV6qrMzU6eEVqPE5NXkogncVwL8l/OQzINxqMuO/dDgHB9/9jgVkebwtYv1HBp8La4FWhFq/2pUWx4TntJMkkvXdPfCymQBplEqnUWlDeLT+yfvaRGRO+4Lub3X+tgP806C6qtHnQIWw6VnEV13KQLmDcZyh4ermsBN5jLkZ9UR9YtKR0y51CLDpGBjPAI209GGAbOlr3F3PyuuiCBFOl/DeWH11JfSWs/kpyz7QCMk7nlRv+vmTWBbDN4YJzQJZzbpn0I+QBVTmL3UPvwJjF56xIHEY9T/rrPKuW9cTi3wDBnpJdehKEgxw9X6Z+4e2ppUtXC8LIN94uNq32mh3s9isFsS4GvRHKGu9xO5qLKYQrR3bMm9xeyRzxPOMl8yfXnkwJbh99UFsw1sCpL28osmTb9b264wD7IBAxFGHYMFjKHY19OKp6kRr3zo7SmzUaVZvj5CI+SoVLXxdF+gomO9wNQwpJ1aWO/rbziGa6JhLrzmnadah/wtnLs8BpbO9pnONURI2+YhY0iSx2eJJ6oZD4gKwM6ML2s72F6cad8GMFOO4PQOYX12Z5/xVKfqtaMWIfisgBQmsARLhh9asGzoE6f/UjakvyDfXnZFVLDJVbNGBdEPPVbv5s9XCQxyVgUUJuV4vqrOZ0Lge1vPbB0ax82xH/lcAjyeonFEa0Xu3EdnfSBNqygtIFRwJdjn8CX/czppl7JrrSO6oErW9lhiEpdSJbrQnKeb4xBb7v1paSm9oZdAW5TvRUpv4RShUii6KmBaCBRs87mzQR+qppi5ggDUBZOb6JsLN6UuZLA3fyQlggI9KWYgLw11q4IVql+68wN/KMESDIyJj4EhfL0URJQ5RX78z5hAdD5FWXDgS/RxRibAaQhuuAhjjHZ2U3GZirdsyKX+RRz4bPdRkNRG9D6EWhckjbkDLmIxzev8B7X8YuuW9mjVBx1btHgZ9ol1CvfoHlYpgG+kLFl4+nyaHsq/i8zExlJAgxranDD8ZYi0UvlCp7xitaHv6G8P4vjFHj5BdxupJqjgWqaIZPL8/iJed9TEdUgon9iUjZZmS7FD/pAlUuRl9tsksj0a7JaSnNe8ay3WnWDST2jP48cTf+uCMatbANAoSxi9aiy2skhAXQpPDk+O+JqtRG7Ga9T+6V+KHosQM++WcuREvxbajs9PQl7OufCxYbgdRlxsDVq7+ygw9/tqcaVwObjSsXFpB9lZP9010A7WyqZP9F9J/nyzISVObRoidxRuSjYlkjIbIM= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48ea24d0-d715-4800-5bc9-08d9b9551d68 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:26.8941 (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: YCrw0NcqzRijwt2OvCzPpUcwkcEWDtDAyI4EOU2Ci6ZSwFtsRVEW/dcbdxveck0h2P48srLYEN41lgvykYlFRw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2799 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Because we don't use SPL_DM on mx6sabresd and mx6sabreauto, so it is unnecessary to have SPL DTB related configs and SPL_OF_CONTROL enabled. Signed-off-by: Ye Li Reviewed-by: Fabio Estevam Reviewed-by: Gaurav Jain --- configs/mx6sabreauto_defconfig | 2 -- configs/mx6sabresd_defconfig | 4 ---- 2 files changed, 6 deletions(-) diff --git a/configs/mx6sabreauto_defconfig b/configs/mx6sabreauto_defconfig index c5cdc3ac17..2b8b4f6b9f 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -60,10 +60,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="imx6dl-sabreauto imx6q-sabreauto imx6qp-sabreauto" CONFIG_MULTI_DTB_FIT=y -CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 6733038060..f40401d279 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -63,12 +63,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="imx6q-sabresd imx6qp-sabresd imx6dl-sabresd" CONFIG_MULTI_DTB_FIT=y -CONFIG_SPL_MULTI_DTB_FIT=y -CONFIG_SPL_OF_LIST="imx6dl-sabresd imx6q-sabresd imx6qp-sabresd" -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y From patchwork Tue Dec 7 07:41:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564517 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=rxjND9nB; 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 4J7XN60SHtz9t25 for ; Tue, 7 Dec 2021 18:43:17 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 57F5B830B9; Tue, 7 Dec 2021 08:42:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="rxjND9nB"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B5986830D7; Tue, 7 Dec 2021 08:42:43 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2060d.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::60d]) (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 78515830BB for ; Tue, 7 Dec 2021 08:42:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cQ4AM+D6l/HTcVqm5kOXpV7HcgLlnDtr6ppx7Tbmd03jd+Vphp7jTKEjUyR2BJ0Q195RGiNCE1t5oDYV+YytJQWXL2560+PYfz03n8XEwbJvHUxNvhyD3PgMNwK8AAkv/EkBwv0mD3lPsyNlGEzz5FRjPLRh5DvoAnoESB5VkAU+afsUz9VzyYjvA4PnVfzmnX9+6vvBKJ5MiyAUOIQ05HSGRlQ7JNxw64VgBmp4XXdexOXxCdu0t/R/bujsJYXxXxd8808orCkuOGhZPaZKHyA5AeKRPNAFpgapgYR9YOpAnIlWVG0lJrdqimu0cQY3yri187iAnkmgpIzbtDlF4g== 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=0PMc7Zh/CkqNcJYYWc95s4Ha3eerVyoN839WbGqtu6M=; b=QlPD8VHWnRamCZlRIj6xw/SsfLP3uPNhz42en9rl05hX/Mi9r8j3JkyRqhzFU2PvwcrAr4Vvz2pamNxDxky2dKf8sIxr9J2XXDI4xmO3NCddxk/Uo1+4UAvLp+C+epkgg90VO5oZqaBuaIoBCMr8vV1OXzQIMTxqAcqsn05w901jYFUrYIY3XcBd07hX6BVTnzMiERpIoHfYzDcbM3hGjLrHvVVw8jo8Sbb957tEStJU8kuXEUnM2bdQeHMMqsE6KlzuF8KSwVq4bRRzhIVncmCfj5MjXmT21qCxYoNaZuKAGiJSIFRPEMXSpRLrQM3jVvZovg53gKfUDeDt5aSI3g== 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=0PMc7Zh/CkqNcJYYWc95s4Ha3eerVyoN839WbGqtu6M=; b=rxjND9nBvoo2RO0Pr75+r4um3WNrHQILXwQzlTkQ/CEFDjsvBfC4s2cs8e2DLyqsWvi6cssWeQv3X1NgGOFf0gm0zhkqN+ud6DcZM5SbcUP1Yi9Us/g4Vjp8NV30HKmYRkmWQ3+0RUZaWR+FG+v46FQVp3uKmi3175cWl4lNH1I= 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 VI1PR0402MB2799.eurprd04.prod.outlook.com (2603:10a6:800:b0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:33 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42:33 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 05/15] i.MX6: Enable Job ring driver model in U-Boot. Date: Tue, 7 Dec 2021 13:11:19 +0530 Message-Id: <20211207074129.10955-6-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:27 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7674e499-1a62-4848-0d1f-08d9b9552116 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2799:EE_ 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: Q+wRrR9ME+aMdbqki00TBXteU/Fk8fJAX/xmqbL6REUljrHfVNoIAxt6Ghj8LEli0VMnRP5GpHNWYyYCkc9ddi/6nDCQPBWswB271ItsbBDaYfAlw1hG4MM5rkaFnChkXi1Jw5287xXDhnQgnJaw04mNuoNTkQv4oPaYpF8UHwEcy0BPYfFQ3k++oYtXjfVNeFfUy3QRVsBKmytKCof5EbuJ8YyX4EyQOZqwTQLpY5W6KvmhzIlvifF9vdETUZB2Vh6otVlwLgD5x2cLNihz47i77BaoZd3/Lxq6ovP0AJrXOpYpbF2ssBsVI93Y6dsWs23pGOzohsDtleggZFvj8ScZsOJBJG7uA75ur4Ceig7s+lrfGxzgBnIPWtm5qopu9D5QzUDnqrhdh8W2mW9rp42nMf03TrCL0Ealde3HIrLLxm+BILFVxaeyJ9P94NE1dMfk/dDVl9fEjxKMDsKBQ4noA1aMJk/XpyhkxSHG1YTPXlVwKPkf2uoAjKjMxJ2zg3Ip2YNWYnmn3XG0IPWALG4gxpU1cLVNxSzAOkfQ+6QuLRLRCKXhyTfTvmMCm0vsADknGRtnm0MmD7uIcdUFTULOjs90UrpHbQXO//jM12BIY26wBEXTPlSamaYfz/DXYtPc7YDfGLM+VU1dMTLMSLC37QB2p3YHgvW7KKuGrzG4wQIKC+HF9ASxqM8lOmXDKGaMY7U1k+29VUdLwLcHJ5QOaQWgKASs9KsWwjLZZOiqQpcskFnU+o8Tjjy5GC80 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)(38350700002)(44832011)(186003)(508600001)(66946007)(6666004)(38100700002)(6916009)(55236004)(83380400001)(86362001)(956004)(66476007)(2616005)(5660300002)(26005)(66556008)(1076003)(1006002)(36756003)(52116002)(6486002)(2906002)(8936002)(8676002)(54906003)(7696005)(4326008)(316002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ilVaeeCNvD9zx+VxefDKV9WQnm+ZCQrPmlEb6IOFKFWxEiYxH6uEn5ukZm/3OpXcwNU1o28yGkBvRz7klAcSMPszNu9rfLgecOIl9l44PKfu9xnzrDPoEnhQ2UdXrtEr9XXxH7vGsWC0yCjw6xqfJnUNA7Nq9jAwAdVFGqgNIZwP568guKMAxYf9gf68qV9OEi2hzPU2h8BWPak4Rv3UlgQzI/aI1csa7uge/oG3SgMxjVbcqQrWxAElPTFA3nCvoiQRMqjObFV8cBMShhsAZ+nw/bPTrF7Xk04gpWQOWXHs+FsQVjNbOYQg0+DuTJxD3j0uz2RaJUZGBfka/K7O0OPYmsSvPobHnGP1V2v6yzJ+o3Tcj5Oguck8e5bV/8wjmINF/K0cxcGXbMPXZTneBdmMWoaqmd6vhlub/yeuSJN7K/PSz48wgH/kkFgwyCpbxy3KXoaut9WxZHgr5hx1DLR///SSN5qGCFfwBqQv8K+a63f0Qm42A4a/jX5dBZh7cUPIPDe70tdkbE8M5+4fm5sVi4KzUpKzzUBTQJCHg4JU/vqITp4tJiYI3xjCr8lfuIH9i9A/7Gqdpt0q99VSjWbcQwSfEfRs+/H1xMyY82CNIkCjgcRmsynz3gCAjsCRaDj2aRkO55KU8/xwhOMOKGB4Dg3XZMkWcN+XKMIi0cXvqb9TIbq638DKbK4RPSqnxCGb9Um9DL2PO7jCfytRD5TBe76XfW8jF8gNXYzOqGG28Uft9A4u8tBE75+E04GGZZ8Sp6U+HF314vpIEc21jUFh3s7KZfJpRudj2DAGqUQm7JhilGT3t9P1vqstZAuH5wQLc2mGSelQF1W2pAMJqhMRis72Hp8IoiyXUGg97oaQdKsME4BL1mNV7VQMLWj6Er3mFZ2AA17ppcRsrN3zFyxLJo3/GjWQ6WtNMVt6mxddzfbEc6BpCwQ3P+UgENi9r34IzBMKF4Ygz7RWqKG2TopXTwpf8s8ZmRH6B+wtmimYMNh8scAy0SIgm+puj2M8A4uqt6zYd15QnrcvSIdJExlB4O2tHQFXk6QKJZ2sk2WZX36zzOVANkk1cou8uDYZ6sr9Dc8NPxnvvuIigco8vtOrxKyyROr2MT3IpoibZUH4u8EgxzOTPqBeCvaHdftmH7ZYGjUKARoEA7kvRODknLZiFR9xkgdXIla0QKy0Ox3Qo75DbzdT2mUEJ6pNM7Fd+3kwvoNA+1NIU+ST0KfNNJnZObZ2rlABeXvOpwdDy4PKfKrl4s1wvXHaaJTkgnvxJ0CSil+myTQfO9vG8JJphowPESh9UGlihOmMPgddfFwld3PCeOhD/MFdRcUJSLGIxLPHmvN3w8x8LY39qoBoXbWpdt5FHM9p/AFbIeDrZaFFi1kPKtflH/K/x3dOLMfcekVYBcYQl9Sn/2as88aAEzDjDRmcZiAadwIUyz8/HEdPH5ZfF56MaZzk0y7os53k5f9G6cKKv4+9mjyTWAbxQPUafIeLONkAsooJGcJBFKGnJljs57yMP+PgId+JbiRbJDrBKvOemTc6irpuUoqOYu562M5Qfh7DWTZG1g14vcQ3IidREfgtKNGp0yq/HH0PlQI3Tw1jo7/KeWaJWZek4RwKB2h7JLh7qdH+CZUUsT4= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7674e499-1a62-4848-0d1f-08d9b9552116 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:33.0366 (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: 2paTKIqGPGAJ/EQ0Eb06bgDZMUECRSL1nqqjCiqYzhFgbxzL+bLvBwFPyQzFI/PbY6xA/gIzs5GpwCHUqZ/GTw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2799 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.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 | 15 +++++++++++++++ arch/arm/mach-imx/mx6/soc.c | 12 ++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 62de942a32..8ccb3b6e35 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -354,6 +354,9 @@ config TARGET_MX6SABREAUTO select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_MX6SABRESD bool "mx6sabresd" @@ -364,6 +367,9 @@ config TARGET_MX6SABRESD select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_MX6SLEVK bool "mx6slevk" @@ -386,6 +392,9 @@ config TARGET_MX6SXSABRESD select DM select DM_THERMAL select SUPPORT_SPL + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_MX6SXSABREAUTO bool "mx6sxsabreauto" @@ -404,6 +413,9 @@ config TARGET_MX6UL_9X9_EVK select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_MX6UL_14X14_EVK bool "mx6ul_14x14_evk" @@ -413,6 +425,9 @@ config TARGET_MX6UL_14X14_EVK select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + 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 Dec 7 07:41:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564518 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=FsxyL2N+; 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 4J7XNL3PXgz9t1r for ; Tue, 7 Dec 2021 18:43:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27E73830D5; Tue, 7 Dec 2021 08:42:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="FsxyL2N+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BE81A830DF; Tue, 7 Dec 2021 08:42:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::61e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 446D482F56 for ; Tue, 7 Dec 2021 08:42:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nffnyWjasgGJVOJsfnDNRU1MU0eYQrAii2APXTKTA/3CNKBJ36HyT6iZfaNoPBorbnrO3cqiE+dO4O9FsuH10fvo3oR0zp5wnmfUmXLT5HTlpmLj4EOd/wmHrEZoKp2fadWTbEviM8c7vaMt9jUx98UqPClrIrr1tIyLEwOggCutONhe5N1sUDI36BZRVnpDIcpvV6ySBtbdCvB0DQwgeTbNCZEZfFAWTUJxi9oJPZE5WowoxiMimxUldPmppDQcxg215yMbSxRT7wC8O3iDfx4C2H7ci9zS1TyLYYuTY22EGw/LqmZlv0iR+RPJlwrxXpHTinaf8G7mW2ABDz7BIQ== 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=kCAupizY5yefzEq1F3koxOrC1zdnUIV5QvJepTDtwpQ=; b=HlJ8utT3dk3RSa4YWPNMMaI/8ZqTB4HNo81CuSeWu2tCy0Srro11C9U87xcQJcUttqswhKoTeCDS4qt7BhZAMXlctdZ/J0kfDbXjHZTKrR7O9R7Zu3O97+OHFxulMKaUG797JgORW+WkKs2PVq17O/m7hXiCZu635dOfnfOFH4fq7Js8sEMI8b0OtR910Zn2fd7aDKXAeSb0H449Yho5AhKJgyy0mbfRqxNXIjXkOSPXkWjOmXjI4wQF0i3eiL6RdJgMKBCRP4sEuWKstIUJ/1u/JKQ1zED30Et8tsh3pz4lR0/bOgP1VXos38nSRZLGnDvSEN9RGuojtqZZOtsTgQ== 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=kCAupizY5yefzEq1F3koxOrC1zdnUIV5QvJepTDtwpQ=; b=FsxyL2N+lPVFqGQDBB5jwSiHWaGvapdC9qaIkcn7bfYRz1aE5S6rmOEs7XV5JfWMQY+vPr45baHCxvHw+GFieRyqV2Qqgi59aaLs2JVYashKtlgfhZLhI6A1G2YcPR25+5CNClTE0kN53OdfoY8cwz56UjHFpYMHoBwtMYOUgCE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:39 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42:39 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 06/15] i.MX7: Enable Job ring driver model in U-Boot. Date: Tue, 7 Dec 2021 13:11:20 +0530 Message-Id: <20211207074129.10955-7-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9d1fa9de-dec8-4a64-adbe-08d9b95524b9 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ 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: 5otqkn+ApoS9tqWyl0xd2kyVbSg4y+sauREYsRoz/cpaloYHGSNvYn7vtxFZ2tK5JZbb3Px+YM+kU+VSQqOI5/T/nu2XkjQ70rLSud4Eok9HYn6tk3pgkpFvM4oHTAIR0JGwi95q2emZ7XbFIjCVZrQThdgCVoS6tzmdC7C2ZnyrVWxtDGselSTEE5jwusRnANjWbVHu/vAxOxkHLvXrwhRwVoMcxJALP3md9hySY8tUAAp6V12YAUj6EeVzEPNxW88fB/qCcl/8oX1RTeOn0SajWNoTum3VaMD7XThiczAQEaAWL5JpmDCCxcAoluYlymA4PHxxEkYuXIfaR6CWKoWDC+TwH5hLsV1/6zpIPAsSLQCG6wSalubxjNC665Wceljl7OcAQmGQf1Pqa7jvKMFZ9VKUv39D3qeBCERWYCRI6/DtB6SwTUnjRIJqrL7V9OV+FOoCXbI09COKua7+TBCZqCX8NRUvEQqbrkAAdfu1RHAo/hJmFTstz6lWkbZEEzD3uLj8vZO4yPpWsbsVOEq0tN9sppb3T6yh8qtU9DpqdVsPSt453C8w3ja5lHvG//DQj4El8LhCBfknmBPS6UTlyX6wHwlF3x3pKjUQXlmDG7u33vKQBkPDMYlN8mWieXDIeB1ubYH+TfPm3gAuUjeFsiSRGy40psicoxpiuOqK9zp5kKlUyEJu7bHqA/YiYYLmEPKBIGtkoyfmyYjlkv/5Ni+YeI+7ULAM6f8KOLdEudKx3hloGKG5wddvgy1g X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(6666004)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rn9mvVLeXOA+UYjyQVKfWx0T0oOibfrAHgfd+nxv3dVs1wAOPKy8aIIil++55wXRAugytIED0HYeVTK5YnANKfmaVOjTFeLrGhkYY/wOseRpGZNebOvT2kWL1pfv2qfODktGBxDK6rTT8aHCtkGcua2dnTZCxMbru1Y57sca1GofGS+lGe4lqdkDX/frgUfDBhwRRPVGwG0R03XgXculf7utDfZqeeDQiGt+jkqHen1z6n79NByUuM7YM7CTIj4WXH0MbwyfCz0YYfcD7cPqR4qDSJ+jjOTz3+FyILycN2seweZyjZKX0gBELiA125gfhYnzhTlulZfECcg1U8H4jJ9T7kL1gXmUuIe4iSb/9LcOYcykbZ1Cex811yT+tzU1PkvMSCNL5I9JCLLlyKp2t6DKu3dAlwUEhKLWosGIrEpIG6BG8ZlbnbC4t8lMI0owS/hqer4+ySI4bO2uxB3aoGTPm0LotrVl4WZo7qps7XdCfcXa5rntArhHuzZFXQ03I/gM2VmAV+ZXc+MxgVmtg+GGTy1CHIJLTQcbLGciFqIe+hXg+bj8W2TJZI32XQJhptnnGR5iPXMjO7ix+Mc+Ut72V0VZVtTwloP65sWlPpbCGqUkGwO5vIjtdF5j+Fwgs+B1yj+RCZs+VYnV1XL5nk9UgWwAV43qxs4tLB/6cVnVG3MVF0ANIG1ZNbugZNEMdJykDwpADmb5jOkDx6MPgq08v0XTI+1GWY/jRtORm7YwikKIjWEAt6QiOqOslrIgs0X+YWxmGrNP9935hyrb+TcPqN11JD2N5obFnyFraw7ICcYwzo1uQNOukqoT1La8HGb3Bz5L5psDItbaZP7fsys7BasBMSXnvyrAXtPePenRBmggSor4k4eMLEEMuNTaeS0pl00MYoQ3oeyS8A3sxXDAIGDvjJ2Q9Amfox2T3IQR43wJ7QqfxaTwoswVm1utSiWR36MjUKCfOjZVOk3geBFKhWOLG4iySrIvz2sofrR+cBGasBrDVw/aEpHbR0uX4D4gizyd40i3CvGm9sE3EozNgT33udtooqrY1DwXV0nhq0+eVH8nNGV/myo0qRw4yNuN8GPriLdSYdmyEmyrF6R8YTqp8u8IB73OMySYJZndFJ3oyehFh2D1DuPbnvGNWvFIiDa3YaaRYAdhMkoAPA8qIO1jjk/dFyvJpxUQ85n8Lh1ulL33rczWi3exNWAR0gHyeOoqhdyQvRLDbYHIb9vmzXqfB6OvbqsVMyO0TPtrucH458ansA6CjFnwVb/TBOegSaRn2/X4W6NToE8xKQt+HarYsEt/6U7AZo4vxpaTZx68n1cZc/hSPRj9pqH/Te50zShXtcDnPQXwrcaveYf+HDujmEUBQk5gJbnx3t3QxOfn7Rr70ZAlmgh8MpK63QMGhuik1rLZqtclLX02SV8NN88IuEK13RmjcFT1WKF6Om2N+XIji8RGwSZ1DJQAbZjglgb9yLAUSVI2r+yYTyGL+X60pONJspphO9RxLdgnMZU9XTzZFWhlR5nX5UpM92XrY82xVlEdvvB1oYb8qz2uRKHPNPRxNu6cJFPtZTztqRDfp6GUlOXFaaxxuKCg5y1UsiYxg4GQnSa/1SYqjL4/Ru1CjsTi/Mi5JVASeIc= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d1fa9de-dec8-4a64-adbe-08d9b95524b9 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:39.1411 (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: YMetnLUEo5Y10UaMVUvfeZ9g+W4QFaMcRnn4Lp8ipLw7dXOXrhK0hwkJgp8zoR6EXUJfU+gxrd+ygBfcDww8QQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.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 | 2 ++ arch/arm/mach-imx/mx7/soc.c | 11 +++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 550f884077..516e1b5a8f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -883,7 +883,7 @@ config ARCH_MX7 select CPU_V7A select GPIO_EXTRA_HEADER select MACH_IMX - select SYS_FSL_HAS_SEC if IMX_HAB + select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE imply BOARD_EARLY_INIT_F diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 0cad825287..b2d532dacd 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -68,6 +68,8 @@ config TARGET_MX7DSABRESD select DM_THERMAL select MX7D imply CMD_DM + select FSL_CAAM + 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 Dec 7 07:41:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564519 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=Dn/Ca38s; 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 4J7XNc6h0fz9t54 for ; Tue, 7 Dec 2021 18:43:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 39B2B83124; Tue, 7 Dec 2021 08:42:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="Dn/Ca38s"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 277CF830C0; Tue, 7 Dec 2021 08:42:52 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on062c.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::62c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BAE06830DC for ; Tue, 7 Dec 2021 08:42:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RRRgwaZSvjxQz/4YDa3peKRzoIaHp7Ot/N3wg7LdMJTfhz/+65Wy20l66Br/I0/D+nIYsvEvceVNjIm+WSClqQKVm4FhKemW1PZ03piRZP+B88bBhtM6xlLsNTrxAeel4/LMF/ARbfgX1eLlQcoK3dGZqMGErX2oFig0H4yfZW7L6WwAQ3AiYnE7rtB1Y7UDEKtTp+bf3BP6gaF0p6MX4SAcQEyZcniIh4OHJQutSZPE4nFPm8f9LWEEAEbIvECj9QldfWz2QWqn/glsA8wKdL+nWJwvFA89vwjXijKqPkMw8SwAJQsV2ySnNhXULkx9sI19WeWhLxlHTgcSt2Uk/w== 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=19i8k6CQWo+8v5V3J1OJdfnYX3ZM/rUGrLy4lnZlW/w=; b=ipxccWP38o8ypbbrf85Sy6gbHuJGdXAxzjt2HfXyvXfsBxgKElvGx+TMgkym/g/7rvFXehQ0MKoXSWgH8JXwp3fbv4zbg4UAj2ed5y6VjX8HBSmR92nQjlY8t8Tw95BLyRMlyRtNEtAvu/vHtq4F6PeowBLkwT7CzQOjEF1SjwTvq65C3u4ubHzuW+FjV+vn7dcTXCwlFadVzCIfRXnVstf22UEtj6jHrUkc39u24MUeAquhjtUT9lMcbCqfCHBMlToCigLsS1CAs8uc3LEzzlsmsbhOi4RWqLsB6ELRKD/dKdzlOJGIdzTTLCQfTJKxylApj00CptU44MDj1fOKNw== 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=19i8k6CQWo+8v5V3J1OJdfnYX3ZM/rUGrLy4lnZlW/w=; b=Dn/Ca38s0lzMjPFg/JVj/CXgzPrbIXRagBE1YwWQKc4cg6GvYiM72mX0O1DikZTBI+afBlpl49IbldtEqOIzUv7yykzf3qwU/txNqoF+Z/xrf1CIduyA7z7SSKcqIhoKizNi12CXrX4E7ZseIFWmiXv/ycurT1dg14auJ0Bz92A= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:45 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42:45 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 07/15] i.MX7ULP: Enable Job ring driver model in U-Boot. Date: Tue, 7 Dec 2021 13:11:21 +0530 Message-Id: <20211207074129.10955-8-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:39 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aab4ef1d-16fa-4ec5-9803-08d9b955285f X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ 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: amGVT37J/MEDMCWIKo8Y94l56647PV+qPrUjGBGsjhUdubF57V5cl5I/Q7DgG4Aw7bK4CuQSpjk+OqByQUTKXAMGGb4zx/3lQeGBOPVWB6WrMekXiyd/2tab+k83470iY0YWrAL1kXWdOQXIeBO6NVfys84I3C51KCXyUvOWeMkcOiHRxQ1s8AKqfxxXIGszsTLx0B8oFv1GWAKGHFvZADxDvkjXyuRIR5y2QOXZjcWA9qG3TvBaHW+KVKyWi6ifnpo0uhAfd8QkyDtAakbX45KF7jPYMHwOkzZ7bJTXrJ5NhpdUy9rFSelxCAn/uYsq0OvkL3Hh59Fa4l8N6OmvHFozeUVWEZEpEai4iaVEgVva1iTOnWkn6uEXQ2P5nTpILYB6ZNiM3F1+lM02dzPVlDJU5dyXW63mEI8h/AQPShJwWcC9msH5chzs3XEOBvOoxkvSrbrlGzEty8fft7+9XjFcyoaCPJM7AiRIgSxAFoL9V2BIBKGSsGmf0jcczDF/PS4AOimoA8OeoNmrgST0HxYHb8T7yAcNlNB9fw4YYEMZPf6l0BaBvD8JkUzHwo6awAUfwT0kGnL8P952AzcavFsigDRkxHU424UC8UyH9cOCBkroNZOvpsY6woDAijgjrOtaI/BU8HhtIExYcjLb3a6bmnbvIGn3ssBNBNSqIBxgjUVBBgEtIEmdF4AUFuIQvez2S/2Y2Euc26RDy/D6sT17o3tXrfNdEoZbNK946DIynAW7J+x0dRv4T/SwW1GSvoBKtvSDBgZrXR8sYqplBw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(6666004)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(110426009)(2004002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8CP2JX88lz/IXszDx6fUKRnAoDQHEY9MrHNpVTFM26PHQLmOVi2aH5M/wwnmlz2f678B3APNBjkLcY5zs2U4HrMfWdcY3O425lvfl6+m4mGVJuhoBquf9iQ3mC7LMNKl/oVO2ZV/zu7VBvgtbdu9qVr7oe66d6GgKBr/VVLZZG6qUBhUsg5eAaoydU0xvR7tZ/AYwmE6ZbrChggc3kpwg1Y9SWgvLKjCyDMB5/QXipAtzfTzBF+ThQC8t5MogyjdpSWAw4JIKMAw5fG+ZWakAUczjV1N9hAFjDFxVccSjN4rDvG/ekwWm6z6Lvvi5Ntai8BiF1WkThlmxxZL5EMKGP+BRPmixWb+sCaCqYtj+2p35hhCkulLDsBvnONkjydzXtsWzxvl7wbyi3H5ej4x5PgzkcTE5wdelSLk3XDFzHOJsQuQOs+xoYD0cgpBIziTKsX32MbOugdPznP6gb4/ZwJdTaHA+cbYMzqWl4II26sSC7CaSFuTFaYco8PM3N0bSgOSSm6kjjMk5teWINN25dEpeSArqcfnFGhDiNk1JEcSmZ2ZkaP/+QTI6W5KzWu2rx4lAJ4hr8sq6tNDzbqNSQHEIMMxPMPb7xWHHlPv7xIhH5hDDBllqMSnCbyA9qw4HpkRXBJM8P8NHf7huaXOhIbnSiHdt9tzi058h2mqYt965B6WX1vvkut813FMk6HT9JtdSPpQ3rfbR56aMlwi2YcrHYPHOp4wa7nQTyhEjhIwV+GUqxowxBjjZoZ3MOxzdXQZ2wyTXFu8Zf3LJHeKuzVrF+8tkHOUGLYGwpOKrGzKP16Cmk+grv90HpCxnkK1/76sJ0IU1iRi0AYEki34fTwWtNiwE85r3BHRrPzCyL3uPvjCwoRK3/+PnbBkQFucbomfv1Y3KQIYtKrCaTvQaQIiEx2Luw2+zGU+NnhpJJ542mq78CKgfsQrMyMryTd7cgGWdAa4QNhH6vV+ejxFAdWKgEamRo6POxGMVGFYYH3gXvEKTIQshEU2ij3Tq3px0tQGbsoLnpRelu+BsCx99UHg6UgcdxD0KFyOex5OU8/sP8Exx4kSi10NZQLrGCYVKuA3re5ZUFjkOdhPhzcUO8Bhh3jDNmGfFGUmOE+6Kvq0RMa4yBkSsArEIkAor11Mdq5c4MTYwL6s2HQyowcWidMoPsZ6bj0PHWMnwQcunqcTqEmdfMQ9noo1mfn/bqJ97S+C5QUF+gVR/lNDp9qJDUOHP65bbZpsQQP2iZNizSs9h8xpNUhgfSLnEZFynp3h8IL7/XFgkRY8Azfym+oQNfwAQRInEyzUnMehotsnn2mMtTWS55TqkH2VUHhgZUG4ajdTiJ2CqtB2wVOZpdZs5luynJ50AQQmJnJqG31gASh0gXdf8YGZQHB9umUVwzmfnP5xsPg/j0BfpG5aOgKfon/sjw29zAo2GvMioxbXBGmeNuo6ZWaLb/uiI0pQ5GrG3LxmF5cfzOPM4dGuy7KuqcYFd4rBExpFQbryjHBhSd+vgNC+ywaDjNki7KhG+oGYIOkDDmown6NmomhiXaixgaPZAUzdPjyekjKVQtIEiWlLZ7Vs0MY/zGpGSOzAm/ZnCqhBb9fFVu8YKoqDGtS5wUQulGuIIjsNmHKAPypnjQg= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: aab4ef1d-16fa-4ec5-9803-08d9b955285f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:45.2916 (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: L3E+9wY56tzvS26AxO72BBoMdOoXkh8mV+ViWsc2ng7FtuJ5iLgbma7DJIxtk1/LneSx5qxyIJXepf0yqAkurQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 | 3 +++ arch/arm/mach-imx/mx7ulp/soc.c | 16 ++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 516e1b5a8f..524a2204eb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -870,7 +870,7 @@ config ARCH_MX7ULP select CPU_V7A select GPIO_EXTRA_HEADER select MACH_IMX - select SYS_FSL_HAS_SEC if IMX_HAB + select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select ROM_UNIFIED_SECTIONS diff --git a/arch/arm/dts/imx7ulp.dtsi b/arch/arm/dts/imx7ulp.dtsi index 7bcd2cc346..494b9d98b2 100644 --- a/arch/arm/dts/imx7ulp.dtsi +++ b/arch/arm/dts/imx7ulp.dtsi @@ -1,5 +1,6 @@ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -198,6 +199,29 @@ }; }; + crypto: crypto@40240000 { + compatible = "fsl,sec-v4.0"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x40240000 0x10000>; + ranges = <0 0x40240000 0x10000>; + clocks = <&clks IMX7ULP_CLK_CAAM>, + <&clks IMX7ULP_CLK_NIC1_BUS_DIV>; + clock-names = "aclk", "ipg"; + + sec_jr0: jr@1000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = ; + }; + + sec_jr1: jr@2000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = ; + }; + }; + tpm5: tpm@40260000 { compatible = "fsl,imx7ulp-tpm"; reg = <0x40260000 0x1000>; diff --git a/arch/arm/mach-imx/mx7ulp/Kconfig b/arch/arm/mach-imx/mx7ulp/Kconfig index 2ffac9cf7c..fbd2de5e3d 100644 --- a/arch/arm/mach-imx/mx7ulp/Kconfig +++ b/arch/arm/mach-imx/mx7ulp/Kconfig @@ -25,6 +25,9 @@ config TARGET_MX7ULP_EVK bool "Support mx7ulp EVK board" select MX7ULP select SYS_ARCH_TIMER + select FSL_CAAM + 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 Dec 7 07:41:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564520 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=jhO7IXrd; 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 4J7XNq4cSHz9t1r for ; Tue, 7 Dec 2021 18:43:55 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8800B8331E; Tue, 7 Dec 2021 08:43:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="jhO7IXrd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F16A6830DA; Tue, 7 Dec 2021 08:42:57 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0611.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::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 3C660830D9 for ; Tue, 7 Dec 2021 08:42:53 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EkoBZY0GQPCdiFH7GLdVJDLhtJJkthU8tBCA0Lpgamgh+3ARQIjhonPi4qy16HfMeTeUKfrPcQUEbuJ59zNF40Ihhl2kgxOy9FOEkGkxJUiZ2cnDPQf9B2RKG2NdmGuHGKJb+6miGP2Gb9R80Dokw7CMPTNdHM6tgEO4to59S2pDn8TqAG3F7D7ZML86LSrMzqZUcIBJ6CQH4Ryl4wGEvjpcPAa9DYn7P4TUhuH+vCvzuasf1mYdvckX7vm63P72guE7J5DBNDhoAFt5+hxSptkNIHbPpoaGh2NXA8SBVCxKtd87NYQRvvO2muiO19Yg4YBjgLTk3Qj0kUNNg4MmpQ== 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=Y0HwmcmafLQb4c1oEo7QfwYNJTQ7F5F93mjUgemyA0vRYe3ysUVMK7r4h6ihDDJsVi//JWD3lut29ZZsj+w48vsKqg47vt8FFFso/Nsfeu35EUyikkowE146TMB4L0zEg/la/hce14axcubzE9cs6pHH6wdoxpDhO/TohtD6vAosNr36RtQTnJ/mkVstgXs2lBnT+MYZQC0DSdddyadMG/7xLiBCnwN4o8BHKjOo0qRC5RyQQKBBBRaWsqkUJmrZD+1z9eLauedFOwGsqAXPVnKmXZHQ7mYMJ7Hniyk7ljwNPL9FTz8o8dmxz/I3j8TLdoUDgxkr/VoJnDHibmQoGA== 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=jhO7IXrdR1gw70qWC17438AJiVnkBT1ocTduKCjLVct7zntQgP98czWQjQvL4dtnWazFVq3v0nP3YbsVLUAVS6l95ReXVkzN6Pu+tx4JB+Gg1gdJzq/qf4IEIt3U/z3Oy6LmTaHHydEFl/zP75zY3sseMsyuYqNV7/1Re8Rasok= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:51 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42:51 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 08/15] i.MX8: Add crypto node in device tree Date: Tue, 7 Dec 2021 13:11:22 +0530 Message-Id: <20211207074129.10955-9-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c7cc299c-ef77-4562-0c83-08d9b9552c0e X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ 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: lWyiNK2NhgPLtaIH3M3amtOr+dSYEM4sbqkwJ746ow8JC4zEtfPY0Ybc5lWim9fkDsyba03tiDi8ksiHEWTdT2lkLdZFhMpiYYj7/kk0RwlMDgAmym70TZKc19x1MA9J+FRCa1t8w46foec4emLI+BkzklvzDbbsYClsfd1r8eB4SV36wSQyxu+5pfFMZVqwO0S1mUDLaC6fgjReSAPfG/xSUOF9RUBpUdJWV2UrrpFHXvMGod6DV4TZcf6CPPOktjpv/JwsrcoTNIr/LU4qKXadNRqSEUw/u94XjEr/fgERctdkgnAw5M7rtgrdhJQTWLhxadTbXBYda7WNsk8NX1THyVDINxFw0qJL5Pv07Z1qSI+XfDiounpkuIbw9ljTq2ZEBjkeSFRzyNLhSub/mexSYx8tXAVNJyGF+ocHa6likRP+l2H0c8t49YJ1CKEHjKfQn00Qk82yRqU+HsXuAof5V1ogRgf1/Vfn++R9i+PiwRAqttbFjYDd6UJEHNaEKQFaR9zk08xmsSnOUaRxlaj5mshmefvzXyBewEJ1ahO24ACCVoA/vBkwvtK3lNS8wl8QD6+DN9RDDlFGp7TlEI8WXgymAzqfDOH5XCU7uagoehYdicZSCPPizB0C3p0oc7pFaPqjN3fkv15kT++hddveVLyVHQLB08suGFVw1kuATjZNJfOIywsYjot0ICRRqcNWoiOThGONotFB4w+Zu8JfcuBWkk8fXi6h4vkakahLvDNGlTsrLXT07WLF++C3 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(6666004)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: E+cqArO9Azmta8o7vg3iA3mZdGH0zut4qhFDjLBC8SgOn83cYMbaEoaPhVOry2x8n3zqcoEO+HK9Pa9ctYbvXlcpmBMfkxrOaUwQ5A2JeY7uPWr12F3jBPdEVLsTe4w7yHaYn7ycRazzqV4aZFOQBXRhHT2h98iaHxq11A+wz20o/BPnDbccEpKe36+GWXtjPKeSCfmhVZDLKrF0Bk49K6QUqTzyCzqQoCnDOfFc8twHETzEzeTJaUHNmA1bAV37tVlWcT5c1fS8iE9dujWDECpaG/JZ6da2N3lkl8KtWS09a3J9VQschaPzeSdJWQ9jEtJNjIVYIG82Kkn7N5SqUG3+9X20T2WCCnMhPz/8pU4wZZRduXDeS37mGdxh0kCN2xcDQqbNNyURanx3HWaNOH5pOfazyl10Wx7dyBpzGcYwWLv7EC6mZJkSRwMwT6uC+q6x/mflWQvZHZaLVG3eOD+NQ4+hO6VDotoljqgjOJ76SCYCz4tG1srY6jplwMmGyf0qPrmpNxLoAG5ciZh2BfXTf4gzk8EeW1cs9AD3tJrHGvEjoLjozxPzaymcYGsby354OiRr8cIp9cKvXRH7w+CAGC6/hUg5P5Qj56r71VB8yNm/V3szAJKF0iWgocw2salSEc5gD1hZE8aOS6sLO+VwdCMM9p0xaZlUyUB5OlRPy4RLQERl0UAkVm9bIJh7RX8E6+XJJhZfe85oJZh23BGi68lFg4eyUkRK7nDL2ca37vgK0Cx73F7XChUKX2xzthTGFeSh8LIvp42vopt10QX+GrbZICe0gB8LY9nMPBFucrhOrD9IVK94JsptQKlwrMhZmPdtgwY/UKZ8FQjsoVLXz7W9wOCNHeNpH/bXvEh13Gb7P8DmLLbAooSpkrhSHRd9/haL3ElNz38s69FoSMAITqnxqKi3jyEkafURcuXQQrfXfpBDDvdDUHVV90wChAQihxP7ziaNcF3ee5plPYzwwORly3O8TIw0dXAevfTUemy3aUtW3kjnLL47MVvmhsQDljHL0WE68WLesqPl6PvKdPdGvEIn+cnK0Xk76grmxf1IEgzJmqx8B0/c2gSnp9oFBKLiaZC5s7WR0tDdAEmvnkLH5V2v8kzqVLHd1R8rEJhRpSGyra2Fi+H/IBP9pCMWJRoCSo/M+VjSjZVioWL6Hze2xBqGUdwu5eWxluo28RrDAnhk2TSXHtUP3HIWIXeeMEXr+pqIOPE7uaEEDk0W3Lc20oNWnKJp8zEEsOpOkHthC+tHTHaJjq2QpLMujRic3ij+NGrMwAFyioacVNIbwbNL/cZcQy6hqzfJv9Gx8EECztPkYNGsF7YrPaE6Wj74Mmg7LmsdikPQGa2ekteH8g1PImgFr1cu5AP6NZNbh1VOYT9kkKQUJF73UbDcNVxsI85IfiV8cUmEmnMOYaztDbIJ2V8rGSTgQrVYkDFn+u7bxoErUcVVeSTth/GOJKlgglIdsS9DwLbtk+Lwrz51DnjsW6Bv16IR9ywnF3kPnvn72Ah+CBMw22OFwDnzuyGAuScnbfTNOdWkyRV9WC0D2Xc+OJ1NsobGmZ/keggtchQrxA8kd5NxwBpF5Uk8dQXx0QksdCBNFv32rQyAdVtviVY55931zSdLUAocCpQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7cc299c-ef77-4562-0c83-08d9b9552c0e X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:51.4201 (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: yYWnIXtMTKznDO/M3j1kJfJjlCR6YEB4Eg7gEXYng6tNiZtbY7OIBBIGvwFgv/SWXEpJMI7h+iYkkCosr/1VHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.MX8(QM/QXP) - 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 Dec 7 07:41:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564521 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=nAF1425q; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J7XP40nkrz9t1r for ; Tue, 7 Dec 2021 18:44:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C54EC830FB; Tue, 7 Dec 2021 08:43:09 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="nAF1425q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EB608830DD; Tue, 7 Dec 2021 08:43:05 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::61e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2E354830F4 for ; Tue, 7 Dec 2021 08:42:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XRJPyLwDDgjMLyZTHmg53K3wiA2MqyoezjNdzgDuFrOEPJKKIsOEs0Kdsj1GBzr5VmBEyBYkSKgoqptOx26kGGBLIMV7MMa9Z6vt4IJ5vJhCwJOMr03huqx3mk1P3FWiTP0EfrqlLqVBdhj+ASeVKhBbctO1hIVu77SwbTaQ7Lfc5/YhdYPbRIz0rNEw9oYqFEJgsqF/jjciTXLkfUHdW2lrJZcOTbXgE0EQ32BqT4EHdnng7Yva6I5E394bbWVu5oEKeHzzd9e91m9mHjzgZrui59utueHE+IWgpEahhKpzyAp4ZymJ3vjGtMdtWAOmhlXHlE8lYUzrs09cXW/k4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QTLT7DzgL5x+kr3/Ud0aWcpeCuJ95T8dvUqmUoLxCTs=; b=WoY9+614uJe8PbB7B0gSpsubrawq0E8t/qN8bsynBUsgL+IM9N51etKrAdjhK3BapW5vU4u1sYhYj9KJIAIGiUft3PsHt87X+S1T63CYFNwdxxObY+JScJV2FWPR/hAxjV1+39FiPsXxX137cOGDRL2Cre9Nfl0evRwfdyXS/8p7/7Y+F0RYVaZCLaq3FkI1R8DZVCxj4VS55Di0CKgE+jcmbg1Hx0MupcDP/JWN9Vm8O46vHI77pOA/2IPgj6ftEjTm98EC8LgeRGgalzUgM68ZK8Jd2+exkDFwzRpjlxdh4Nzg+nfNQ3m5paBYQGYRx5wphmQdhLPhZhFwuuxYSA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QTLT7DzgL5x+kr3/Ud0aWcpeCuJ95T8dvUqmUoLxCTs=; b=nAF1425qRfWBOvHnD7O6PcTloFlbLOb2DvnZwqlLjD8l4TWtAoqhm48iNqoAMCApi2xF3iiHzaYT3OpT9QJhVfpg7WKFihd2rj6MsXn13rHNIdm47HupBFIA1WO1EvjtF3VTPK+9Ws3EBcfxgNV2foWQwcMk/SxRLXKHw/ddeQ0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:57 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42:57 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 09/15] crypto/fsl: i.MX8: Enable Job ring driver model in SPL and U-Boot. Date: Tue, 7 Dec 2021 13:11:23 +0530 Message-Id: <20211207074129.10955-10-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:51 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a311da56-ef83-4fc6-524d-08d9b9552fae X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QllQrxfalcV80xnyc+eF9km2O7rJke1d/HgQf5KjLzzG+yyWv1En71YPZV2iO7URzeO5mGhlNjMbdEfEHamU7T5hKUHQ2O8g1KNSfZWfbhKEYXAsWg6EuG7dse+MQJDVDEFPueaM2oJDiej78eZChejybh/jDJ7ovbK+gcihgLiEKgCHiiiVnLN8kzu9Lhg+S9CiUSh/9+U2whd7fz3CQkGw+t1dw1HsBMzRkYUqn5AQZjUpemFS8RUPjCGyl9UF5N/OAUHEgXSfN4NRJJcYeOzMjmPAZ7CC7fizME+ZPdZsV8oMkLBCjvt2ktdtV03NW5S58JnAX621vZ/o2pcaU7JQg1cDPbjMUyZcwrg6IONjldR5fBIUlFSgwDnXUjOmJuhBOzXKMSWBh3kcwdF42Y1+9tTS/P3bp9Q7Tg2dVGKwunFomPfdRPe8Lt2hmvRq1XMKH2Hatwm7qa0FrVI0nflSZspIUZ9hcBc1aFuJV/pit6lXteoTWwkaMElJ8PUpuz2QPIs79Ck+OD+zDxfCKUUHEuxzunqw7y6dQ7bkTS65iCUAphd0pjWdGKAUQz63NMcd8E/LgwGFznWcTONzKCFpjkIonJ1DTLbFibTu6cnbR27ZQxe5qH3fz1xLid+Pn2ph8wQBAYMBClD+E83KN8QdifM8zDEyttcDs38XZ2+pZ59AZ6nfSMA6v6WOWUAZlWpIAps5x+EXyhn9ttVwR+n+R8GTuftvc8HtHcJgoooQd8TWi35pfAPDct0XGwuW X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(6666004)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?fZ5LuUOH4PAM3GMizB4Q5CABmhFW?= =?utf-8?q?Hav99lzl/xuhK4QD0J5Be5DKtQQ2Huy2u6Vv4l9RCHJYnOskrgO56teYlpMVeS9hl?= =?utf-8?q?JFpFjKnyD8aun9hT5+YPN0WVTDy7vhgYXT772B07IjRXOZbc1wXTN6QSYvJpbkszQ?= =?utf-8?q?GZ1pnzCFt1qHpGGT7CBeFo6/R+YVabN5AUvZBo1dRod+XAnM3bZiUmgbGJUiuBfng?= =?utf-8?q?k5VRl6S8UvTJkmk7uyCysmDjcpC4na6KTa6DYYY0iYAS0xZiYhN1wBRPNAErg6S3p?= =?utf-8?q?EnXgWzPCKHRsJISWg59hQGlE2+VrOKBPbpc/JiDZ+7WZ7HupWQBpHTZyiOIYliTfs?= =?utf-8?q?ZE1PgRWGe9xwDfkI1wuXah9qa6pMZwcKzS60R8mNJt/XyuSqGgllLmqqLTDl6E3sC?= =?utf-8?q?leuYVFSl6eTXMH64+TNzl3mNhMitjDA9Wap1wp304q5lt9W+dONnUDGWEl23tJ+kO?= =?utf-8?q?iaQJ+C3jLSfYgASfDvvHN22VJ8AkimE4pgmXEtSvOF/ve32PqB16yRKoz/kNL2LZt?= =?utf-8?q?CoEjLVUidXusV0tYjYtwvGdfehghw3DyZAv0JzE75vJje08gkBQ35rsM5cKIkKQPw?= =?utf-8?q?80c/d4FQT2CZdF2N62zpMr8jCc0B1YJ0hiJxUhJQxos3WOrsiGLrTPys1QiHsF8nw?= =?utf-8?q?DT3PPUrNfN6FZzO4ABRXuZygY+t0wph7/Lc1JBKyrdPCSGs5KmeCA8TxJ4JC311Ko?= =?utf-8?q?3zLCkE8lo7KqIP3NWuaQC5MfoWl8zmX/1Pnpi4XbrXVJuClvn29KrjfYpeC33BuB+?= =?utf-8?q?bjfSj8Xmza9YeqL/lOTjlqLDMpYjuiXIQyhuSLHtLKd+VTQ1rv+UgAU/u1RZvS09G?= =?utf-8?q?UCSbYJJIS+2bLOzLo6AkOOWCzPEv0DSIademxhy5B52Do6+AS4+uAiS1akmtUHVkH?= =?utf-8?q?qVzBvWHlzBSZi2cH2ETCsTlB3axhs4L7Lnh1rcPDcSeEUZxNblf/l2VGBRxCi4bp9?= =?utf-8?q?YkDdrpssfWpx3l5MzcFM3LxCwg6n01gUyYZzuw6iczA7aNMI1yEzNTg/su2D5+/rE?= =?utf-8?q?sN1fZICHQ8qp7BPAcfhZYEvvnYayIyMAeukxbgtA5u3rQBxIoZVmr0eWd3nGBZbJ+?= =?utf-8?q?Y6BHimCa0ACmeV5vvH/Y6RRyi+0qnFiUgWPY19UylyGNY5u0LOeSNmWL0C/1p1J55?= =?utf-8?q?T4Fcnk9D5Ohh0VjeRI6hRs6/NeL+i5UzXAxYKwQQEfTIavCU3AUo3LEk8/HJky+eM?= =?utf-8?q?GKac0UhOYJU9tt5ymafJvRZDI5QuQaip0ZDAlC2un4oLU0rAN3VbOt+gWCNAQ1Dsq?= =?utf-8?q?SkWzNgNHKicVQFb89UG5ITyBp5O+m9/jtAnvJCg9pFPmjiM4smf0SH2LxmJJ/oUxi?= =?utf-8?q?1ykgIh/BzO8xCfDb0Ch/gEtRS1UzcSHZH5+ew8t+ncQH0n6ZoVHSHPVKU+Z+wlSz+?= =?utf-8?q?i8cpt3GBmC6UIWE1s3AAqWHyWde3RaKzy20OXxlNasbnx8FXoJ7iFpzRWWCbGcxry?= =?utf-8?q?4dBRq106uk5weJUPpBKepV/72CL1uBNhPJAOdOCConU6coYsNWDKz8bp4Qnl73OhN?= =?utf-8?q?z8+3CO0BkfnN9JKaWz/ZPGc6N0c2bKrXk5bwlU8hFX2TbEuUUoWRbqc=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: a311da56-ef83-4fc6-524d-08d9b9552fae X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:57.5146 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9GBTti8JERhuEymbp0cANJCrIPnxVygKOk7ev6zusuDiKQkNBetYxE9RkHxG0B/ZYkf3epzaIxSALTXApH0lHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.MX8(QM/QXP) - added support for JR driver model. sec is initialized based on job ring information processed from device tree. Signed-off-by: Gaurav Jain Signed-off-by: Horia Geantă Reviewed-by: Ye Li --- arch/arm/Kconfig | 3 ++ arch/arm/include/asm/arch-imx8/imx-regs.h | 5 ++- arch/arm/mach-imx/cmd_dek.c | 1 + arch/arm/mach-imx/imx8/Kconfig | 7 ++++ arch/arm/mach-imx/imx8/cpu.c | 16 +++++++- board/freescale/imx8qm_mek/spl.c | 6 ++- board/freescale/imx8qxp_mek/spl.c | 6 ++- drivers/crypto/fsl/Kconfig | 2 +- drivers/crypto/fsl/jr.c | 47 ++++++++++++++++++++++- include/fsl_sec.h | 12 +++--- 10 files changed, 89 insertions(+), 16 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 524a2204eb..7ce2bbc954 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -804,6 +804,9 @@ config ARCH_LPC32XX config ARCH_IMX8 bool "NXP i.MX8 platform" select ARM64 + select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_COMPAT_4 + select SYS_FSL_SEC_LE select DM select GPIO_EXTRA_HEADER select MACH_IMX diff --git a/arch/arm/include/asm/arch-imx8/imx-regs.h b/arch/arm/include/asm/arch-imx8/imx-regs.h index ed6e05e556..2d64b0604b 100644 --- a/arch/arm/include/asm/arch-imx8/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8/imx-regs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #ifndef __ASM_ARCH_IMX8_REGS_H__ @@ -47,4 +47,7 @@ #define USB_BASE_ADDR 0x5b0d0000 #define USB_PHY0_BASE_ADDR 0x5b100000 +#define CONFIG_SYS_FSL_SEC_ADDR (0x31400000) +#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 + #endif /* __ASM_ARCH_IMX8_REGS_H__ */ diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index 89da89c51d..04c4b20a84 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index b43739e5c6..f969833bab 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -8,6 +8,7 @@ config AHAB_BOOT config IMX8 bool + select HAS_CAAM config MU_BASE_SPL hex "MU base address used in SPL" @@ -72,6 +73,9 @@ config TARGET_IMX8QM_MEK bool "Support i.MX8QM MEK board" select BOARD_LATE_INIT select IMX8QM + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_CONGA_QMX8 bool "Support congatec conga-QMX8 board" @@ -89,6 +93,9 @@ config TARGET_IMX8QXP_MEK bool "Support i.MX8QXP MEK board" select BOARD_LATE_INIT select IMX8QXP + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL endchoice diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index ee5cc47903..5140c93a37 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #include @@ -89,6 +89,20 @@ int arch_cpu_init_dm(void) return 0; } +#if defined(CONFIG_ARCH_MISC_INIT) +int arch_misc_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + + return 0; +} +#endif + int print_bootinfo(void) { enum boot_device bt_dev = get_boot_device(); diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c index 944ba745c0..332a662dee 100644 --- a/board/freescale/imx8qm_mek/spl.c +++ b/board/freescale/imx8qm_mek/spl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP * - * SPDX-License-Identifier: GPL-2.0+ */ #include @@ -24,6 +24,8 @@ void spl_board_init(void) { struct udevice *dev; + uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(imx8_scu), &dev); + uclass_find_first_device(UCLASS_MISC, &dev); for (; dev; uclass_find_next_device(&dev)) { diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c index ae6b64ff6e..2fa6840056 100644 --- a/board/freescale/imx8qxp_mek/spl.c +++ b/board/freescale/imx8qxp_mek/spl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP * - * SPDX-License-Identifier: GPL-2.0+ */ #include @@ -39,6 +39,8 @@ void spl_board_init(void) { struct udevice *dev; + uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(imx8_scu), &dev); + uclass_find_first_device(UCLASS_MISC, &dev); for (; dev; uclass_find_next_device(&dev)) { diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig index 94ff540111..82f929c294 100644 --- a/drivers/crypto/fsl/Kconfig +++ b/drivers/crypto/fsl/Kconfig @@ -11,7 +11,7 @@ config FSL_CAAM config CAAM_64BIT bool - default y if PHYS_64BIT && !ARCH_IMX8M + default y if PHYS_64BIT && !ARCH_IMX8M && !ARCH_IMX8 help Select Crypto driver for 64 bits CAAM version diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 9379b86955..084a61c684 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -25,6 +25,7 @@ #include #include #include +#include #define CIRC_CNT(head, tail, size) (((head) - (tail)) & (size - 1)) #define CIRC_SPACE(head, tail, size) CIRC_CNT((tail), (head) + 1, (size)) @@ -121,7 +122,9 @@ static void jr_initregs(uint8_t sec_idx, struct caam_regs *caam) static int jr_init(uint8_t sec_idx, struct caam_regs *caam) { struct jobring *jr = &caam->jr[sec_idx]; - +#if CONFIG_IS_ENABLED(OF_CONTROL) + ofnode scu_node = ofnode_by_compatible(ofnode_null(), "fsl,imx8-mu"); +#endif memset(jr, 0, sizeof(struct jobring)); jr->jq_id = caam->jrid; @@ -146,7 +149,11 @@ static int jr_init(uint8_t sec_idx, struct caam_regs *caam) memset(jr->input_ring, 0, JR_SIZE * sizeof(caam_dma_addr_t)); memset(jr->output_ring, 0, jr->op_size); +#if CONFIG_IS_ENABLED(OF_CONTROL) + if (!ofnode_valid(scu_node)) +#endif start_jr(caam); + jr_initregs(sec_idx, caam); return 0; @@ -681,6 +688,13 @@ int sec_init_idx(uint8_t sec_idx) caam_st.jrid = JR_ID; caam = &caam_st; #endif +#if CONFIG_IS_ENABLED(OF_CONTROL) + ofnode scu_node = ofnode_by_compatible(ofnode_null(), "fsl,imx8-mu"); + + if (ofnode_valid(scu_node)) + goto init; +#endif + ccsr_sec_t *sec = caam->sec; uint32_t mcr = sec_in32(&sec->mcfgr); #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_IMX8M) @@ -742,12 +756,19 @@ int sec_init_idx(uint8_t sec_idx) liodn_ns = (liodnr & JRNSLIODN_MASK) >> JRNSLIODN_SHIFT; liodn_s = (liodnr & JRSLIODN_MASK) >> JRSLIODN_SHIFT; #endif +#endif +#if CONFIG_IS_ENABLED(OF_CONTROL) +init: #endif ret = jr_init(sec_idx, caam); if (ret < 0) { printf("SEC%u: initialization failed\n", sec_idx); return -1; } +#if CONFIG_IS_ENABLED(OF_CONTROL) + if (ofnode_valid(scu_node)) + return ret; +#endif #ifdef CONFIG_FSL_CORENET ret = sec_config_pamu_table(liodn_ns, liodn_s); @@ -781,6 +802,23 @@ int sec_init(void) } #if CONFIG_IS_ENABLED(DM) +static int jr_power_on(ofnode node) +{ +#if CONFIG_IS_ENABLED(POWER_DOMAIN) + struct udevice __maybe_unused jr_dev; + struct power_domain pd; + + dev_set_ofnode(&jr_dev, node); + + /* Power on Job Ring before access it */ + if (!power_domain_get(&jr_dev, &pd)) { + if (power_domain_on(&pd)) + return -EINVAL; + } +#endif + return 0; +} + static int caam_jr_ioctl(struct udevice *dev, unsigned long request, void *buf) { if (request != CAAM_JR_RUN_DESC) @@ -793,7 +831,7 @@ static int caam_jr_probe(struct udevice *dev) { struct caam_regs *caam = dev_get_priv(dev); fdt_addr_t addr; - ofnode node; + ofnode node, scu_node; unsigned int jr_node = 0; caam_dev = dev; @@ -818,6 +856,11 @@ static int caam_jr_probe(struct udevice *dev) jr_node = jr_node >> 4; caam->jrid = jr_node - 1; + scu_node = ofnode_by_compatible(ofnode_null(), "fsl,imx8-mu"); + if (ofnode_valid(scu_node)) { + if (jr_power_on(node)) + return -EINVAL; + } break; } } diff --git a/include/fsl_sec.h b/include/fsl_sec.h index c4121696f8..7b6e3e2c20 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -3,7 +3,7 @@ * Common internal memory map for some Freescale SoCs * * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #ifndef __FSL_SEC_H @@ -194,12 +194,10 @@ typedef struct ccsr_sec { #define SEC_CHAVID_LS_RNG_SHIFT 16 #define SEC_CHAVID_RNG_LS_MASK 0x000f0000 -#define CONFIG_JRSTARTR_JR0 0x00000001 - struct jr_regs { #if defined(CONFIG_SYS_FSL_SEC_LE) && \ !(defined(CONFIG_MX6) || defined(CONFIG_MX7) || \ - defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M)) + defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8)) u32 irba_l; u32 irba_h; #else @@ -214,7 +212,7 @@ struct jr_regs { u32 irja; #if defined(CONFIG_SYS_FSL_SEC_LE) && \ !(defined(CONFIG_MX6) || defined(CONFIG_MX7) || \ - defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M)) + defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8)) u32 orba_l; u32 orba_h; #else @@ -248,7 +246,7 @@ struct jr_regs { struct sg_entry { #if defined(CONFIG_SYS_FSL_SEC_LE) && \ !(defined(CONFIG_MX6) || defined(CONFIG_MX7) || \ - defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M)) + defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8)) uint32_t addr_lo; /* Memory Address - lo */ uint32_t addr_hi; /* Memory Address of start of buffer - hi */ #else @@ -268,7 +266,7 @@ struct sg_entry { }; #if defined(CONFIG_MX6) || defined(CONFIG_MX7) || \ - defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M) + defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8) /* Job Ring Base Address */ #define JR_BASE_ADDR(x) (CONFIG_SYS_FSL_SEC_ADDR + 0x1000 * (x + 1)) /* Secure Memory Offset varies accross versions */ From patchwork Tue Dec 7 07:41:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564522 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=htok41Bh; 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 4J7XPJ3M97z9t25 for ; Tue, 7 Dec 2021 18:44:20 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5ED2683383; Tue, 7 Dec 2021 08:43:14 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="htok41Bh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2E3BE83433; Tue, 7 Dec 2021 08:43:11 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::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 13314833E3 for ; Tue, 7 Dec 2021 08:43:05 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QjI3eCwRn4vFYQEabJn1xO3jzEtlNkGjl+INRyPnsj7DmWb3CE8dzYu26ht+l4nSHVHmRmrWA9+9zfwsEGQPB5i179TzVEjuk1jWvpcGClcP4OJFvVL56nTJiw8wWM4/oGtS8U6TVtNV1ymO7udUJMHyQcTbVt6zGJj7QtzjrnHNieXhNydYDgoatWKPeV6FyfUBICl2qVoFdQN/pC6aK26OHD2gBBpRT9x+b5GGPRatyZ192l7U7De/PrhuIPLflz60sqfvu1qUUr9i+hL5NMovXcWohoj5uS1HnUw8Onzd2pDf4lHDiJjd2rYZe+Pg5BT3jK07ZZYjPCtIHkpVbQ== 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=aAA1piab8fNKfnCzH+gXVistrGHRkSnj1x7oZbiz2bw=; b=CvGSfB733Zm2Hti+30CdZDpqOB0GMIxmCUgTvhkkEIROunEjbsM3SFLFa3BvKbdqn8ULCJAJ4q5sqhvla2+Ol26IzrwIegandx91lz7IaXrxUCcEZB3tGDEklyHXfkA/DApjl/DkY3ASSTdHCJfodBTyy+D0OAIFLuRxGgjY2sY+TS3kWIOPZGjnew7fGYLEXTbCC5YOgi5pRJ3Yb8ehXtOfgTvH9kIQfyQ20xk5xHG4GNB57FraEGDi5eeGZQb5CVCcUYGD4OyJ2Bnv5vJu13BJc5sQqS5MXbE7At0/07z58U9UU4MhLjZGsPqTPRhrWAq0S5orObkvKsGY0JBuLg== 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=aAA1piab8fNKfnCzH+gXVistrGHRkSnj1x7oZbiz2bw=; b=htok41Bhx6RlJA75X+WCnF6Z7IpzFG3gLvExWvluqj7Mcr+k1yF4aH0jX/lpR5iBnet8eYYX98+rr/a9CAff5gaRKzgGe6oKLLtlERc5KQcG4Ix2q8IwNp/Inqyuq5NeKwHDSshduA6JKaOCo5kENiF4RTcocQpBe0/z2jz5NgA= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:43:03 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:43:03 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean Subject: [PATCH v7 10/15] crypto/fsl: Improve hwrng performance in kernel Date: Tue, 7 Dec 2021 13:11:24 +0530 Message-Id: <20211207074129.10955-11-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 037c2fcc-04dc-41a9-2056-08d9b9553335 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1284; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ADy7BESupQuuW/RfSj2Q/ywHGbCElvYcafAlZeJBuKiA9x1lHSYFr3j1qrYjPS6dr27+0P9PN4MVxRfHare2KyGcDEZPltZdhVtKzMxbhfd/ii8eETV/IrfRawXKJjeRKeHG3gWqjEXLe7Ou7LAUdxgB+5syABDYqMcCCCZpv/cSXpUIR76sW2CkuGfMbqhHnb//bGaDTnHqW6OBX7hL/lQFY5eOjjdYHuwLnCubMLSATt3u79BP4LutQekaBvDJBYyiGg/zhufLSsDIECvFlj6fofr2oBHVoXIMZnaNFPrewngoZ2F2vKTGK6YuMlbYFAln2xsZMLnVselKfu6UExjC8ZvKYYkFXcDen5I/rJKmX3Lt1qemePghuLmi6sNKNr+dSi3jfjkEAzDIAz73nwMKNo7jQFzggKPYaPX+JJWBr8qUhtaF/eVjx/ryINPxa5/BmYaOW1AHZGlE4gGHVW582xTcvI8t4KzQcfltR/CBhjY1k6+gY7G+TwPmtuqQ5LJb4hpqhgtgLn1gpErbbemZpXf2QP/YeCBBhGztAtmYp9YHAFg+5/jRQ93NSDHcXpyokiA8rXCAk1vVxsOgj9GDAbC4DjMdafp1DA8WbxVDkCMoD/6LuE3GzO1us6VeXlEXCyLzTmYHoPz1LxqeY4WRRBQn1qnIJQE8zqEb8XmvubUznG660FpfSIgPrN7ZMV+I/bHuQjwMJKq0xhJafRqkUBfnm1KrNV6Ifg+o8YCOYTRgGmd0tjRk9K1Qw6KI X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(6666004)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vCbvcJPuFcV+jmI+2kpVBfSNvHBQNoZB02/hZ/iy04tcNW2P1YuVjM7Cq0Ww5m82lRhbxeUr3eOXNBIKu91d6zER41TgTAZbC5WmQrpr+b4drgWW4rtxqDTs2d9F0T5rza9dBjI6PLosz+fJwHNugCNdUV0Oje1eDQ/qRtsn7s2hToQ16plYi63A3MdC87o+YRCApT/dFuM1/pfTtmYRIpfcKKdJCWFEMnPfWGBiN2WJIQfdtpa/yOz8eY5zQDYWgvRemwE+CpgygzcfIii+/V8cFxjCmSHsRsCF9q6apz9cUXoE/vTY0m8/TlmD2Z9OOF4dG0ekgjBAhZVotIjGjTk0qjU9/rY56YtyZtjvlCDN1/rUYy2sGyPxYuLu0iuzt6lhcbERtotJQb5esD/CCWuaxvHpznFS5OX20Mzgc9/j4n2KB0WYl7tEZTzYS8GtaZlEl28uhj/qBekUW+/79WBJ8EPgcp49Vh9+FAShHzl9Yu95HxuovnhiYA1JoluuwtyZfACZcQJ4+wercEwbzYBlJ/M27IAIaYcth8HfS+UnyqldQQk6hrJysrvjOFGD8nYY04VYkcSM8UjqN52I0ZT3Ll9aeZUABPIeCmBauq1t7lV+hNVq2Fm6ovCHDcVPLwhMK4wLDyBsc7w3JlpS04tRi420esdtDGyOjVsFiwAKxSQAAXHz6eLIq6QA/TNDDgPZYlaMYxDhISpK+sGL6LrBf2d7ZUFOgv83hTT8yWG5YMvdxaMj+H96ek0rDdcz1n9LcTEcRdpQe4G9c10Es4QO8I/Ovwa2BdYSebjYQ7N6U64BcO8b6aJ72nOS0qI+QrALsqvBMJLbnGAVnYmAg6t1KaPT+bsJf+5ROJnUHQegCmNGSU1xKZO+FG60ZjIYN9x2Txz0kYfNDaW6hAC/44b+BR1mqlZ/c2K+reGOAQ2yc0I4DKzyYWJn9MGvyMD6mE8Tih8z9UG2xok08UgTjzr7Pz6uN+VMiHRnkfrMw+RDeOG92QQ5Wu92BS7kbDSYYoBzIZ2LLEuPI1Atlf1MeQ8AiCQwL7vmuvsrkQ3BLvaGwbfGD9pSE1Z0IdD9Lg/LtRNQZi+LDqQsztXwDouuQWp44QMnOT8fjXoMLG+QbsWHhenA9CYwdteYUJJkdVhlLszv7CiEvJmeFx5MldI18K/WjVr0dbIUgGWIRTnwdVNr4FSLJBwWnPVOgNicMEUHldICpLbAr6jHMNoxXoNesViLlZW5B2HkL1sQ5pAUTeyMFSP9f66R5icBmYu4qKWj0ABNn50LigCah68ywufQwRhcNj8/pcoQkcy3LkXJbULo/OyuqQdMLypfyrOS13TzVvboLYbyQ8sEt3vN3VxPwVB5Ppikdfzm8yhsISqvddI/8rC6aC3o7akl3eYWJCq40U5MuDJ6kI7HXnEDESgD+zp6vtYB0ZjDmlMHWRWzKFgbvRUV84oyX2Um/7s5FKaQVj3dpU3MciqicLET5xxcYdu6M8Xn1gNd6j6E+y539DZeUxRnCLGFlNG/OC68w/Lc6W1WoZbD9J2DBlrTAoh7AN0Ey9XD78CkWYhb+TX7ONi0T6f/rjuYImDNQfRwda9dGm9KInKKT02ndkd6w7tPVlP4AWfK7RhTcPiXT3jr9ac= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 037c2fcc-04dc-41a9-2056-08d9b9553335 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:43:03.4343 (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: tNOD6FI1PCnK/fsaZZu+0kTVpBu64LacCaBqCOAzPDmCeNkRJ02MeCVFVZVA1408nN/mVpkvzOX6vviX7Y2+aw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Ye Li RNG parameters are reconfigured. - For TRNG to generate 256 bits of entropy, RNG TRNG Seed Control register is configured to have reduced SAMP_SIZE from default 2500 to 512. it is number of entropy samples that will be taken during Entropy generation. - self-test registers(Monobit Limit, Poker Range, Run Length Limit) are synchronized with new RTSDCTL[SAMP_SIZE] of 512. TRNG time is caluculated based on sample size. time required to generate entropy is reduced and hwrng performance improved from 0.3 kB/s to 1.3 kB/s. Signed-off-by: Ye Li Acked-by: Gaurav Jain > --- drivers/crypto/fsl/jr.c | 102 +++++++++++++++++++++++++++++++++------- include/fsl_sec.h | 1 + 2 files changed, 87 insertions(+), 16 deletions(-) diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 084a61c684..15f5fd0d05 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -603,30 +603,100 @@ static u8 get_rng_vid(ccsr_sec_t *sec) */ static void kick_trng(int ent_delay, ccsr_sec_t *sec) { + u32 samples = 512; /* number of bits to generate and test */ + u32 mono_min = 195; + u32 mono_max = 317; + u32 mono_range = mono_max - mono_min; + u32 poker_min = 1031; + u32 poker_max = 1600; + u32 poker_range = poker_max - poker_min + 1; + u32 retries = 2; + u32 lrun_max = 32; + s32 run_1_min = 27; + s32 run_1_max = 107; + s32 run_1_range = run_1_max - run_1_min; + s32 run_2_min = 7; + s32 run_2_max = 62; + s32 run_2_range = run_2_max - run_2_min; + s32 run_3_min = 0; + s32 run_3_max = 39; + s32 run_3_range = run_3_max - run_3_min; + s32 run_4_min = -1; + s32 run_4_max = 26; + s32 run_4_range = run_4_max - run_4_min; + s32 run_5_min = -1; + s32 run_5_max = 18; + s32 run_5_range = run_5_max - run_5_min; + s32 run_6_min = -1; + s32 run_6_max = 17; + s32 run_6_range = run_6_max - run_6_min; + u32 val; + struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng; - u32 val; - /* put RNG4 into program mode */ - sec_setbits32(&rng->rtmctl, RTMCTL_PRGM); - /* rtsdctl bits 0-15 contain "Entropy Delay, which defines the - * length (in system clocks) of each Entropy sample taken - * */ + /* Put RNG in program mode */ + /* Setting both RTMCTL:PRGM and RTMCTL:TRNG_ACC causes TRNG to + * properly invalidate the entropy in the entropy register and + * force re-generation. + */ + sec_setbits32(&rng->rtmctl, RTMCTL_PRGM | RTMCTL_ACC); + + /* Configure the RNG Entropy Delay + * Performance-wise, it does not make sense to + * set the delay to a value that is lower + * than the last one that worked (i.e. the state handles + * were instantiated properly. Thus, instead of wasting + * time trying to set the values controlling the sample + * frequency, the function simply returns. + */ val = sec_in32(&rng->rtsdctl); - val = (val & ~RTSDCTL_ENT_DLY_MASK) | - (ent_delay << RTSDCTL_ENT_DLY_SHIFT); + val &= RTSDCTL_ENT_DLY_MASK; + val >>= RTSDCTL_ENT_DLY_SHIFT; + if (ent_delay < val) { + /* Put RNG4 into run mode */ + sec_clrbits32(&rng->rtmctl, RTMCTL_PRGM | RTMCTL_ACC); + return; + } + + val = (ent_delay << RTSDCTL_ENT_DLY_SHIFT) | samples; sec_out32(&rng->rtsdctl, val); - /* min. freq. count, equal to 1/4 of the entropy sample length */ - sec_out32(&rng->rtfreqmin, ent_delay >> 2); - /* disable maximum frequency count */ - sec_out32(&rng->rtfreqmax, RTFRQMAX_DISABLE); + + /* + * Recommended margins (min,max) for freq. count: + * freq_mul = RO_freq / TRNG_clk_freq + * rtfrqmin = (ent_delay x freq_mul) >> 1; + * rtfrqmax = (ent_delay x freq_mul) << 3; + * Given current deployments of CAAM in i.MX SoCs, and to simplify + * the configuration, we consider [1,16] to be a safe interval + * for the freq_mul and the limits of the interval are used to compute + * rtfrqmin, rtfrqmax + */ + sec_out32(&rng->rtfreqmin, ent_delay >> 1); + sec_out32(&rng->rtfreqmax, ent_delay << 7); + + sec_out32(&rng->rtscmisc, (retries << 16) | lrun_max); + sec_out32(&rng->rtpkrmax, poker_max); + sec_out32(&rng->rtpkrrng, poker_range); + sec_out32(&rng->rsvd1[0], (mono_range << 16) | mono_max); + sec_out32(&rng->rsvd1[1], (run_1_range << 16) | run_1_max); + sec_out32(&rng->rsvd1[2], (run_2_range << 16) | run_2_max); + sec_out32(&rng->rsvd1[3], (run_3_range << 16) | run_3_max); + sec_out32(&rng->rsvd1[4], (run_4_range << 16) | run_4_max); + sec_out32(&rng->rsvd1[5], (run_5_range << 16) | run_5_max); + sec_out32(&rng->rsvd1[6], (run_6_range << 16) | run_6_max); + + val = sec_in32(&rng->rtmctl); /* - * select raw sampling in both entropy shifter + * Select raw sampling in both entropy shifter * and statistical checker */ - sec_setbits32(&rng->rtmctl, RTMCTL_SAMP_MODE_RAW_ES_SC); - /* put RNG4 into run mode */ - sec_clrbits32(&rng->rtmctl, RTMCTL_PRGM); + val &= ~RTMCTL_SAMP_MODE_INVALID; + val |= RTMCTL_SAMP_MODE_RAW_ES_SC; + /* Put RNG4 into run mode */ + val &= ~(RTMCTL_PRGM | RTMCTL_ACC); + /*test with sample mode only */ + sec_out32(&rng->rtmctl, val); } static int rng_init(uint8_t sec_idx, ccsr_sec_t *sec) diff --git a/include/fsl_sec.h b/include/fsl_sec.h index 7b6e3e2c20..2b3239414a 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -34,6 +34,7 @@ #if CONFIG_SYS_FSL_SEC_COMPAT >= 4 /* RNG4 TRNG test registers */ struct rng4tst { +#define RTMCTL_ACC 0x20 #define RTMCTL_PRGM 0x00010000 /* 1 -> program mode, 0 -> run mode */ #define RTMCTL_SAMP_MODE_VON_NEUMANN_ES_SC 0 /* use von Neumann data in both entropy shifter and From patchwork Tue Dec 7 07:41:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564523 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=D4ewME2w; 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 4J7XPZ1Vdwz9t1r for ; Tue, 7 Dec 2021 18:44:33 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4271E8342C; Tue, 7 Dec 2021 08:43:19 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="D4ewME2w"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 81B588342C; Tue, 7 Dec 2021 08:43:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0610.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::610]) (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 29C74830F4 for ; Tue, 7 Dec 2021 08:43:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Raiz+7a41VPG4l957u/sPJQJYXJ02mXVahVSu+13It2Vm90ed9MjC88rm3uaJGVbD+mqmk2bVhqwOVKSqaGk+E7gyCALHpoOojdc5VMfYl2uSwCbVq66Fs2uB3YWtpPTcy3S+bbdf8Y+JUeFaIM9rK8ljjIrXGWA6fuQNvx83LBHSCkhfO5RIP3nT4yyPY6gKduDTO2NeWRKswc9DZutEm5xOFBwTIjhteGwhjrH7PHhD5iKUSss3YTD1kQlSTSHJnQK2QPN/OOzbp9tMYd6m35r3klPmMebkhHJNbF0Np5Bq5xSpY8ZhunmiA4/sowEEQxbQofdF4p23uerDSYI+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+PSRP/kcoWw2YzyO5dGeShtMTu8bBO1prLwqzqVw5M4=; b=LUvPaP/f/M33eNmSvu52ze+hPIU4DZyN4s7/s+18OwVVaL5fZZMnxzPKzX5Cnm7geFyL3YbXzRKrH+5cqmte/qmoVMsdKs7ubFWyihvydZICNj2//RMmMUfMs2uaVnpO6AE97n+9T8apd3hpKBIDQfLrtbY/nzvH2Iz/8/qwRWJuhRTxmidu0eD51PJi6AeP7XofbCrd7HcpXfiVB+IFjleBSQvWmKC3NvNMbhcrZpmXX27B7Z7XFGJaa0HhKkvekfa0pyLdGvh3CRfXzs7yPPAJT0tZbBbHyPiI9vVI6USy5qX8RFjBzQSF8pnyv3RApwc1nR6cqz6jHONkbXPupQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+PSRP/kcoWw2YzyO5dGeShtMTu8bBO1prLwqzqVw5M4=; b=D4ewME2w3Ka/avrahcg4idXitjA7tiKVxrlltq743Thxv6sfU9/IMvFD06QF4KPBLlMNSF6AbAPRR2/p62AibJ6h4N4VNLanXlOzoQTcBmgFz7WfSK/A1SUvg/ntec6k3b1QTb7eWAfbsj/dEpjRI+d4bxM++GtK9IPyFGVp7uI= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:43:09 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:43: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 v7 11/15] Layerscape: Add crypto node in device tree Date: Tue, 7 Dec 2021 13:11:25 +0530 Message-Id: <20211207074129.10955-12-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:43:03 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b18e70ba-b480-4a14-42e5-08d9b95536dc X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ 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: 3CjgDNbgZ1iZl13rpbcHiCVST9Gj/pUusracr4In3uxAH2GQGRv0bW9nQwfaScUuQGreFmZZuGy7vA1VIJBYsotHefOvTWYM5XAMXcpJ92w8h0yDOYks7Wu9J+K/VTN9jVTU5sIC2EtwDdxpCizQpvQU3KuGl4L1hLCgrt8SmktCS639lvvL0Oaeixr4PDKPu+mXCtthbcPKli3hM523pxjK+esDymoslH0bPuOLGPwOD7u5M+Y2RpvWOgLyygvxAWdzyyxlfkCdC/gTm8TIbqFKVTr/emPepWD/wlXEnEmFv5kwhbv1g65MJHCW4bFXvvq4F0hKw/oPQmcNAzcs8sKvK2q2cOMndzew73Z38v2n+gixsSxy2XU4C8jzoSChYBq/eHnXzH4WMxbHXTfTA1ftreAoN3u3ouODPuE7xPiySa998+CVfmiPPclomdk+6qDLsTCj/+3cAWvNhbZDOBkydlaGlw5xvRoxbpGODvDz5djQ0kYZJPWANQtDGcC1euIbCs6nmm9R9SiUccOXR5mB2gd+nVpQO1jBz3DUG1x+aMYVaNtVNkRJ+1MFwKr/fDRZv4BQyctM3MeHVPNgCv4nnw6P5y24A6POrM1nkrtsnFVn+r2ecKNJA3j9qXFa5X0FRELoVAm/FZalR+M7xrYCu5BfFF3HibTiRCjFuJxJYdSmilYIpGKujvhJzb8eWBaAjoLVaUSpEpWrd6mN4GJ3Pv45HUvIrtB29TqCSzXnnJmucohVnZPlg7+qGq1PL3ZVXDrUq85zuCHqO8h6Xw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(6666004)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(30864003)(110426009)(16843485002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MZ+1IhDU7LnbY1I+t4Dv1Q+79GiAnrfkL52eBGxFmMj1qYjs0hm2qVQWxqUpNqZ0FjsWYOOpktIvB4AYTI2Hb5caBrKSML19OF1N50CNL6hqPcPqYjZMXqiV3CVI59HFl9AuM7nH6AebfJcE69Pa9faPzRLiR7OtW1qzyBrEbxt4ZvQFOLk+GdXSoV6PDX7Flwry5R35bPQrkODwZP4WC2yeXfmRBhp+AmGDI4g5U9EXMnsNnkLdot5ycR/QQLusfWkHnxHCVooYMuaA0nG4kp7ihDXhrvo3N5imnS9nzk5LfnJFMc4ubi/nbYWDm9yauG80SpHDM24GEwjn1vexYzW9nFqbAApR7EKz7bASGI5W/cRzwULIHZKpHBVII2BvVBtXdZmpIQCLJayuSHA/ABgQzSmAhq1wyoj51MP8JrhWpK3wHuSp2jKVBr+cN+QcseAKc87pa6zayNBI6kyuMFBKF/RyGELTHiCF7J8wRImLkuJecoJEJNqrZKVioY8B8hiLxIseGtwzBWA0RhSrDWInvR1HPgvpCEN2pPIb61ZbEm0NXvcvGaz7Wie9t5YOHn/MaAJ38PA7KTwUYRgzL5Jk1OAYeZSNwQL0hSbhSNQ3Iq8T0n7jWh6PckY4qeYTuU9kSK4lWR5jOlfpZ/JgXaZ9HlHG213DRHpQBW7ioQDcAaBjzhKgnDwNLmBBWd01ewfOpDS4iGU5Si+03y4ElaUreAdEuev0tIW+zODsNn88/XUj8zDrYKdc0ZOpdccmdRjh6S9PnZSuNPyZftH9Uu5lPM+pN7bBVodoUYPIPymjGzmFpTdSBN2WQ1RGRbSMLxdL7zzM6YFFx3uOE47u8dtI4EvURl3pcDlWf4J31guPhP5iJyE461NhUaSbfGbiC6TDnvQ6w2fWM9FoImfbDE46HOc9FSAtUWYnPaqF3UFNScQeZ0GOjh/zGKHam/5IFrKxV7vmHJ+jEjaXsbpRYtl4ohuFchhRks6PJPPj7pxUe7zvGymhrtOZW0uX8xxfRI3IkcPptFQcLTi4r68ArBe/QnQakvWRMxTUihFPH7UbUcLSfCNmSOKq23nazxtn3ffq0W29WO5GgH53RGCFrb0m4D6k1ukCUWcjmvtIM/drh6pCNY8DWZOhbeli5mqLWr2j49Ux7KMLPCt8e2ILKNzJ5CCLW9cUpVzmqLqSSz+O1IVoQeysXRCpSNDXnZd8UmMWBEa/j8dz2KDBlnteJjvYzAGkJSvNLxXhnmDUzu9WyZoJaQDaWqB4LpHOnYEcgvSaXA1XmpTPZqOOI6XzwyG8kVUFgLdcfmLOmUX5kWF9J2NkG3wC6bgD1u52qPEN32tpU418VIHtXVyoQgRsUdnwOOOib1MdLYsXhmWH8sKrsj5GMUki+KcUQ/6xzgrzwCWR3gcqKfX9ZUc8rBqelaaO8d70K6UWj7UYJS4ogFFOhr98IRWlvLq21713oy8sJO1b92r9jJMIS+ZMRx/mtOZBDN1Xjyxosh2k5D2q9KljCp79hoZ+3DwGX1zxpCSdDcgduvpl+/eqq+Xm40RuAbo7KNJD2W/kRMYHMbzNiwNa6zKuZ4KwKnIlOgQONJsv+m0FfenJAv6CDpmYqeMyu+NOvMwEZPpMVp6OkBeUC78= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b18e70ba-b480-4a14-42e5-08d9b95536dc X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:43:09.5558 (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: 2JjT7ZrQGDB0Mw2hMK6lL0w7ex2JY1Y4kRZ4eOwG3pOO70/05rBYoc1m3o4mKz3p8SY+MW/TWFsAjy56ROyeXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean LS(1021/1012/1028/1043/1046/1088/2088), LX2160 - updated device tree Signed-off-by: Gaurav Jain Reviewed-by: Priyanka Jain --- arch/arm/dts/fsl-ls1012a.dtsi | 46 ++++++++++++++++++++++++++++++++++- arch/arm/dts/fsl-ls1043a.dtsi | 45 +++++++++++++++++++++++++++++++++- arch/arm/dts/fsl-ls1046a.dtsi | 44 +++++++++++++++++++++++++++++++++ arch/arm/dts/fsl-ls1088a.dtsi | 39 +++++++++++++++++++++++++++++ arch/arm/dts/fsl-ls2080a.dtsi | 39 +++++++++++++++++++++++++++++ arch/arm/dts/fsl-lx2160a.dtsi | 41 ++++++++++++++++++++++++++++++- arch/arm/dts/ls1021a.dtsi | 40 ++++++++++++++++++++++++++++++ 7 files changed, 291 insertions(+), 3 deletions(-) diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi index 0ea899c7d7..1cdcc99c1e 100644 --- a/arch/arm/dts/fsl-ls1012a.dtsi +++ b/arch/arm/dts/fsl-ls1012a.dtsi @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ OR X11 /* - * Copyright 2020 NXP + * Copyright 2020-2021 NXP * Copyright 2016 Freescale Semiconductor */ @@ -71,6 +71,50 @@ bus-width = <4>; }; + crypto: crypto@1700000 { + compatible = "fsl,sec-v5.4", "fsl,sec-v5.0", + "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x1700000 0x100000>; + reg = <0x00 0x1700000 0x0 0x100000>; + interrupts = <0 75 0x4>; + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <0 71 0x4>; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <0 72 0x4>; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <0 73 0x4>; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <0 74 0x4>; + }; + }; + gpio0: gpio@2300000 { compatible = "fsl,qoriq-gpio"; reg = <0x0 0x2300000 0x0 0x10000>; diff --git a/arch/arm/dts/fsl-ls1043a.dtsi b/arch/arm/dts/fsl-ls1043a.dtsi index 52dc5a9638..72877d2ff5 100644 --- a/arch/arm/dts/fsl-ls1043a.dtsi +++ b/arch/arm/dts/fsl-ls1043a.dtsi @@ -2,7 +2,7 @@ /* * Device Tree Include file for NXP Layerscape-1043A family SoC. * - * Copyright 2020 NXP + * Copyright 2020-2021 NXP * Copyright (C) 2014-2015, Freescale Semiconductor * * Mingkai Hu @@ -125,6 +125,49 @@ interrupts = <0 43 0x4>; }; + crypto: crypto@1700000 { + compatible = "fsl,sec-v5.4", "fsl,sec-v5.0", + "fsl,sec-v4.0"; + fsl,sec-era = <3>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x1700000 0x100000>; + reg = <0x00 0x1700000 0x0 0x100000>; + interrupts = <0 75 0x4>; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <0 71 0x4>; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <0 72 0x4>; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <0 73 0x4>; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <0 74 0x4>; + }; + }; + i2c0: i2c@2180000 { compatible = "fsl,vf610-i2c"; #address-cells = <1>; diff --git a/arch/arm/dts/fsl-ls1046a.dtsi b/arch/arm/dts/fsl-ls1046a.dtsi index a60cbf11fc..c655e002aa 100644 --- a/arch/arm/dts/fsl-ls1046a.dtsi +++ b/arch/arm/dts/fsl-ls1046a.dtsi @@ -3,6 +3,7 @@ * Device Tree Include file for Freescale Layerscape-1046A family SoC. * * Copyright (C) 2016, Freescale Semiconductor + * Copyright 2021 NXP * * Mingkai Hu */ @@ -124,6 +125,49 @@ interrupts = <0 43 0x4>; }; + crypto: crypto@1700000 { + compatible = "fsl,sec-v5.4", "fsl,sec-v5.0", + "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x1700000 0x100000>; + reg = <0x00 0x1700000 0x0 0x100000>; + interrupts = <0 75 0x4>; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <0 71 0x4>; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <0 72 0x4>; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <0 73 0x4>; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.4-job-ring", + "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <0 74 0x4>; + }; + }; + i2c0: i2c@2180000 { compatible = "fsl,vf610-i2c"; #address-cells = <1>; diff --git a/arch/arm/dts/fsl-ls1088a.dtsi b/arch/arm/dts/fsl-ls1088a.dtsi index f73fdfda8b..9b7c54b260 100644 --- a/arch/arm/dts/fsl-ls1088a.dtsi +++ b/arch/arm/dts/fsl-ls1088a.dtsi @@ -174,6 +174,45 @@ dr_mode = "host"; }; + crypto: crypto@8000000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x8000000 0x100000>; + reg = <0x00 0x8000000 0x0 0x100000>; + interrupts = ; + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = ; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = ; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = ; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = ; + }; + }; + pcie1: pcie@3400000 { compatible = "fsl,ls-pcie", "snps,dw-pcie"; reg = <0x00 0x03400000 0x0 0x80000 /* dbi registers */ diff --git a/arch/arm/dts/fsl-ls2080a.dtsi b/arch/arm/dts/fsl-ls2080a.dtsi index 72ba52594a..a1837454f4 100644 --- a/arch/arm/dts/fsl-ls2080a.dtsi +++ b/arch/arm/dts/fsl-ls2080a.dtsi @@ -239,6 +239,45 @@ status = "disabled"; }; + crypto: crypto@8000000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <8>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x8000000 0x100000>; + reg = <0x00 0x8000000 0x0 0x100000>; + interrupts = <0 139 0x4>; /* Level high type */ + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = <0 140 0x4>; /* Level high type */ + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = <0 141 0x4>; /* Level high type */ + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = <0 142 0x4>; /* Level high type */ + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = <0 143 0x4>; /* Level high type */ + }; + }; + fsl_mc: fsl-mc@80c000000 { compatible = "fsl,qoriq-mc", "simple-mfd"; reg = <0x00000008 0x0c000000 0 0x40>, /* MC portal base */ diff --git a/arch/arm/dts/fsl-lx2160a.dtsi b/arch/arm/dts/fsl-lx2160a.dtsi index 52e4d7205a..57c7d3ef71 100644 --- a/arch/arm/dts/fsl-lx2160a.dtsi +++ b/arch/arm/dts/fsl-lx2160a.dtsi @@ -2,7 +2,7 @@ /* * NXP lx2160a SOC common device tree source * - * Copyright 2018-2020 NXP + * Copyright 2018-2021 NXP * */ @@ -27,6 +27,45 @@ clock-output-names = "sysclk"; }; + crypto: crypto@8000000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <10>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x00 0x8000000 0x100000>; + reg = <0x00 0x8000000 0x0 0x100000>; + interrupts = ; + dma-coherent; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = ; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = ; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = ; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = ; + }; + }; + clockgen: clocking@1300000 { compatible = "fsl,ls2080a-clockgen"; reg = <0 0x1300000 0 0xa0000>; diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi index 86192cbb7f..be330c130f 100644 --- a/arch/arm/dts/ls1021a.dtsi +++ b/arch/arm/dts/ls1021a.dtsi @@ -3,6 +3,7 @@ * Freescale ls1021a SOC common device tree source * * Copyright 2013-2015 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include "skeleton.dtsi" @@ -144,6 +145,45 @@ big-endian; }; + crypto: crypto@1700000 { + compatible = "fsl,sec-v5.0", "fsl,sec-v4.0"; + fsl,sec-era = <7>; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x1700000 0x100000>; + ranges = <0x0 0x1700000 0x100000>; + interrupts = ; + + sec_jr0: jr@10000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x10000 0x10000>; + interrupts = ; + }; + + sec_jr1: jr@20000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x20000 0x10000>; + interrupts = ; + }; + + sec_jr2: jr@30000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x30000 0x10000>; + interrupts = ; + }; + + sec_jr3: jr@40000 { + compatible = "fsl,sec-v5.0-job-ring", + "fsl,sec-v4.0-job-ring"; + reg = <0x40000 0x10000>; + interrupts = ; + }; + + }; + clockgen: clocking@1ee1000 { #address-cells = <1>; #size-cells = <1>; From patchwork Tue Dec 7 07:41:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564524 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=LAGDGhDx; 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 4J7XPp3ls2z9t1r for ; Tue, 7 Dec 2021 18:44:46 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 11B1783481; Tue, 7 Dec 2021 08:43:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="LAGDGhDx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C7F52833E3; Tue, 7 Dec 2021 08:43:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20623.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::623]) (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 6BC618345E for ; Tue, 7 Dec 2021 08:43:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JqcS211zQdGPLrCjOHgxdQUzOTJtHL9xBrMUvSskF5z1MabzH0SaKHKoxz4TOp02FiY1X8CMKXIW724t1w5LQ6eMJ+g48vgWMFGUxbkFGaLhH6GasRUQ/DmLFYGc5JcyxZlk5frVc5rI9/WW5OJLdTMx9ty6nvmRvZ10UgQHpTxv6WKao9CvgB7m5cl/5K0FyUV/ZI70+RjCqiAjlo7bbzX0Ad8w+i7WUMFWno4RvRXDBC0bhVY0f6W7SwG1sy4IE7L2ZfSQECfFs0HbqPeOPk9W3kOhMmBRliQcRLOwqV2OayMrwB32mCSSMqvYA0mfnM8oqE56EPHtWfQCKq2+rw== 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=WuJ63NMgfWfdrophgocrkrCeWf7p6xmtOGvKaoQW1jg=; b=gq7w9y21FpRqBsmG9pZ+DZqR3B2KAJ05Tu0gGdCIVZ2FF0aNAzJLoEtqxKHdy75LHGePtWnktKShgLhb9mIV3oJN6SrrfJbbgHujh61GZVXBo5rk/JnQ7zubRNv9/gPbSU4AAXFlRAB1giIdwFb+qtc29n05HFKizsHR9uwqPzSu11SmVqI9T2+JfK0CWBHVk1lHp3nZmcwPcJxipmJwAwebhDvUqc7nYh31AMrABthfAwD2LabAYD3lH6Z4EBXzWlchdKw6NbJh1rBeRVhyAnkjEavipRgvIsQnIvWqaH/2gmDH+Uplq65EToBrTE71Lba4QQsHZPafSYGUJhV2tQ== 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=WuJ63NMgfWfdrophgocrkrCeWf7p6xmtOGvKaoQW1jg=; b=LAGDGhDxeeN/k5i5BXyi3FkRRZgWtRHmDWLngJJv/dp1oaGfoV2rzM6sP3ZEkmLwR4dyxCfFtkVssRu7BPUq9G/QUmaQjLmw6lt48DJdoQXLZDEFO2PThdXuGHF07ucEU7wz9sEaXlXdUuD5WdPWjUkCtd1PsYlj2/fXx5I7RGk= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:43:18 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:43:16 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 12/15] Layerscape: Enable Job ring driver model in U-Boot. Date: Tue, 7 Dec 2021 13:11:26 +0530 Message-Id: <20211207074129.10955-13-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:43:09 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a2d28a4-d847-4de3-d118-08d9b9553acd X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:51; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: peBvyOia88CmS/KJSN3TOsYznbboemS/aeyaSqzOf+ngVEH7Wj95D/VOfo/4RjMo878a6MQPLNXp3q46bbkOzVSrLxb2zoF2xyS7pvl+IEQ95MYIFbBeGAzm6qM9vJ88SDu9ptMa1pHnx1CP4Mu2QAbk4fI7GeUTtBadL8arthThNFiXYoLPzfaiqKzTh4FstGniDuib5Q0EF5YkO3B5hnLNK9pq2TRQaNc15pYUq7Aq+5PCiUZbqyrJ3jihJzbSczDJLwyA/l9zOVnqvxA2YQ4do0efPNVQQTTGFmxfF9fBaT1dPUwl9SmayvlVhaYr91QZxSmZW0esy5amPgYHg2QqF1CQR1gFwps5EoX+tD2davWau0+mq5OOcwdmlxePJ3VeED57JzxYko2eztYllydtUkWQbOOgPa/FBQ/ZiRfTuDiH8Z6q1MLxQ1hXM10zse7arLhEHJgmSdRTWqLn1UBkS7eMpGigFZi/H2X+E4HyfwhHCJlarr+O3UQ0Y007I4wHeKnHjCG6ikWadajo2dWpdnQULMTvf18HZyI9hgZygEACmK7dC7jNwD2h+wc9kkw/WowGUuHLpFACQSVh/XUKbIPyRJxDsNYV16r6wn34I/Qc9BICzrsXX/WKHTJ3nayQ0WYHOMtnn1EKfcWGGhDctdJoY1l+9gb3LF1grO/ID2r/KGv5SZY/CBuhsUO3tecymp72YUfnbEmx41VxdGEmVpW7cklq4N1pnIF5xpJl/sAJ3gpnKIw7mHkQF/ufxJfwTr4sEeBjp+iesl0L2A== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(6666004)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(30864003)(110426009)(16843485002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /Z4eLTyIyluUY8/NoFt/8nnwZJv1+9Ff+CJegBmlgJvspVZ2wqxtodWqqsmNnr6M/NHyX6SSW5CRaQOI2ClV9Fvm3j+Cs4wajbg+ZzJYYi8vUpKuCcCm/LhhCAsgKE6sdBSNTTuFyn8ZqgAXUQ+w8YiAeDJCCKb7IQWF02fqh8lbUeFKt+qBXqMt77R6DDxYiFihx8WqvndDm4pTA60o35r/d7UkIEHhAWOW1Q13CyY3XZkoxkOvizw43G6paVBLP9HMn6/UK1vTZzoXEKwfvH6x1L49Cx4LRQ7bZh3gmVXI8WvGImY9+wJ0KxW53vxe9YOq6NJvCw0Se8CVYSAwxLHPGNwQCzLcTg+lPGVyorisc48SPwF28aM9Af7JOh9RWlCgtcG1UbVhm+WFHLJUTa2r93piSDxgwSNYGOekhGAyhdTP8mKm5oQESzAusP2pEEVgwKhH5OR1QFmwvujaGccqbQg73RcvaRNenZQ9AHvtD0OpjhuA+ymn0rsK9t6Egak+lhIUjM5JCPPiltH59SFKISXp1jIZWEZsj1byvKWuUZHYOKPd5kLeKutikd4XF+9Ky9uBfeOXcMFPhBt4nP0H6mdvw2LrNS+DEu580o5KyhIXVap7pvfhwEZEPAmv4G43awkcBRtjQqQ6fId7ljI6kXlxTLlee/0P7alWoGKWLHnRHYGgYSPxsw1+3lS2Lmzs5aRFlRNgq7KFG7/nMle5Yfj7uyiYLvnJ/eiQtIqXRMrKDcsdfTiD7mM01PqyZmkZwLQqwD5k0CrzxdWaDxEHoDlJT5cqvS/X0sZNX7fL7kX2i650BRW4pyEu5y+t9kOdBkvFg2kC7aUBuBAT2cRqmUl0ERVlQkQ1K3Y3KP9OtDd5Dz2H6KWfx8RbAkcP5zSF1R1JEj4Ey5cklxGRwini20KfJpICQRAiA81JaApWBcc9mkqqMgq1qwWtcfmk3SsK5UTzc5goxLQfMZsf6mO2jsB4ZvqknKMYhq3mljojJ05B9d6WAErbxumCdaoMDp8RUfmUfbjfI/RVWnk9pE7/Vluwx8AMnT6Wza19my6ns9S2nF/Pg5/jApqdhiUPozcxyGqWufcntolzFmeT6QNlRR6PM5KFoyZZXp5Ho3M4nqmstUUnYaKTZ0bstoF5tbkbN75e0EMuFJIPryIdbIRmmaBCzLQssMHcHb3nNHPN1urH1EYGs4iSELKrx3dspNVWN4aM3x2F+Sh9ZHwAVjcXQSEJZ1kM2o7s9y2/2+Q63fsV5srDx5uNGtl98X4wjIbRQfge5/k1lSKjvCu1asQpYc1U03YJULLPVFUxs7o+pcrqf0+qwJXa0yzJyfiptrypeOLSSE2tJ433m4hywszGBEdUdSuboINNVvnZyTaE/ODOZOt7QFTVzYVvUkQ0r2r+vOXcFF5zW5Jah3thJkr5vj/WBdG8zrLH2eWCEN5yR/TBgLdQawrqxpNOrt/am2CehdsOi5aEGCIrJGUTnEWJVMD7LiWIY+9T1Fjm3T9xPxFCdHDlhJpnatzPHU5Abs6QToOGmC75KsFB3gn27IpQDdnP0PUasDpSGDeGazcouTH/5FBXYt//R9yl6upDqDFf5Gwq/DOA/MsR6yj7r2DSsIlLSZRS89A9Ou7H3gc= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a2d28a4-d847-4de3-d118-08d9b9553acd X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:43:16.3379 (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: eBF0EDWaE/Ez6WLMdWp7eTFTSsNCWdVPmUAtV9t4kKHoeIXA7F1oN3ZRyO0mfI7FOfCE/+vqnYaN8kqWHqm//w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean LS(1021/1012/1028/1043/1046/1088/2088), LX2160, LX2162 platforms are enabled with JR driver model. removed sec_init() call from board files. removed CONFIG_FSL_CAAM from defconfig files. sec is initialized based on job ring information processed from device tree. Signed-off-by: Gaurav Jain Reviewed-by: Priyanka Jain --- arch/arm/Kconfig | 4 ++++ arch/arm/cpu/armv7/ls102xa/Kconfig | 3 +++ arch/arm/cpu/armv7/ls102xa/cpu.c | 16 ++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 17 +++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 10 +++++++++- board/freescale/ls1012afrdm/ls1012afrdm.c | 7 +------ board/freescale/ls1012aqds/ls1012aqds.c | 6 +----- board/freescale/ls1012ardb/ls1012ardb.c | 6 +----- board/freescale/ls1021aiot/ls1021aiot.c | 6 ++---- board/freescale/ls1021aqds/ls1021aqds.c | 6 +----- board/freescale/ls1021atsn/ls1021atsn.c | 7 ++----- board/freescale/ls1021atwr/ls1021atwr.c | 8 ++------ board/freescale/ls1028a/ls1028a.c | 6 +----- board/freescale/ls1043ardb/ls1043ardb.c | 6 +----- board/freescale/ls1046afrwy/ls1046afrwy.c | 7 +------ board/freescale/ls1046aqds/ls1046aqds.c | 7 +------ board/freescale/ls1046ardb/ls1046ardb.c | 6 +----- board/freescale/ls1088a/ls1088a.c | 6 +----- board/freescale/ls2080aqds/ls2080aqds.c | 6 +----- board/freescale/ls2080ardb/ls2080ardb.c | 9 +-------- board/freescale/lx2160a/lx2160a.c | 5 ----- board/kontron/sl28/sl28.c | 3 --- configs/ls1021aiot_qspi_defconfig | 1 - configs/ls1021aqds_nor_defconfig | 1 - configs/ls1021aqds_qspi_defconfig | 1 - configs/ls1021atsn_qspi_defconfig | 1 - configs/ls1021atwr_nor_defconfig | 1 - .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_defconfig | 1 - configs/ls1043ardb_tfa_defconfig | 1 - configs/ls1046afrwy_tfa_defconfig | 1 - configs/ls1046aqds_tfa_defconfig | 1 - configs/ls1046ardb_tfa_defconfig | 1 - configs/ls2088aqds_tfa_defconfig | 1 - configs/ls2088ardb_tfa_defconfig | 1 - configs/lx2160aqds_tfa_defconfig | 1 - configs/lx2160ardb_tfa_defconfig | 1 - configs/lx2162aqds_tfa_defconfig | 1 - 38 files changed, 68 insertions(+), 105 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7ce2bbc954..30a34bdd08 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1504,6 +1504,8 @@ config TARGET_LS1028AQDS select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM + select MISC help Support for Freescale LS1028AQDS platform The LS1028A Development System (QDS) is a high-performance @@ -1518,6 +1520,8 @@ config TARGET_LS1028ARDB select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM + select MISC help Support for Freescale LS1028ARDB platform The LS1028A Development System (RDB) is a high-performance diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index f919d02db4..ca006e069f 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -21,6 +21,9 @@ config ARCH_LS1021A select SYS_FSL_SRDS_1 select SYS_HAS_SERDES select SYS_I2C_MXC + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_PCI imply SCSI imply SCSI_AHCI diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index d863c9625a..4904592703 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -20,6 +21,7 @@ #include #include #include +#include #include "fsl_epu.h" @@ -397,3 +399,17 @@ void arch_preboot_os(void) ctrl &= ~ARCH_TIMER_CTRL_ENABLE; asm("mcr p15, 0, %0, c14, c2, 1" : : "r" (ctrl)); } + +#ifdef CONFIG_ARCH_MISC_INIT +int arch_misc_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + + return 0; +} +#endif diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 1a057f7059..75d9876dfc 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -20,6 +20,9 @@ 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 MISC + select ARCH_MISC_INIT imply PANIC_HANG config ARCH_LS1028A @@ -88,6 +91,9 @@ 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 MISC + select ARCH_MISC_INIT imply CMD_PCI imply ID_EEPROM @@ -125,6 +131,9 @@ 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 MISC + select ARCH_MISC_INIT imply ID_EEPROM imply SCSI imply SCSI_AHCI @@ -170,6 +179,8 @@ 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 MISC imply ID_EEPROM imply SCSI imply SPL_SYS_I2C_LEGACY @@ -225,6 +236,8 @@ 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 MISC imply DISTRO_DEFAULTS imply ID_EEPROM imply PANIC_HANG @@ -258,6 +271,8 @@ config ARCH_LX2162A select BOARD_EARLY_INIT_F select SYS_I2C_MXC select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select MISC imply DISTRO_DEFAULTS imply PANIC_HANG imply SCSI @@ -294,6 +309,8 @@ config ARCH_LX2160A select BOARD_EARLY_INIT_F select SYS_I2C_MXC select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select MISC imply DISTRO_DEFAULTS imply ID_EEPROM imply PANIC_HANG diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 1a359d060e..ccd9116ff8 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2020 NXP + * Copyright 2017-2021 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. */ @@ -48,6 +48,7 @@ #endif #endif #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -1649,6 +1650,13 @@ __weak int serdes_misc_init(void) int arch_misc_init(void) { + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + serdes_misc_init(); return 0; diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c index 5dd19cfcd9..bc37c553a5 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2018 NXP + * Copyright 2017-2018, 2021 NXP */ #include @@ -22,7 +22,6 @@ #include #include #include -#include #include DECLARE_GLOBAL_DATA_PTR; @@ -172,10 +171,6 @@ int board_init(void) if (current_el() == 3) out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER); -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index 68578e81a5..361bd5c582 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -28,7 +29,6 @@ #include #include #include -#include #include "../common/qixis.h" #include "ls1012aqds_qixis.h" #include "ls1012aqds_pfe.h" @@ -150,10 +150,6 @@ int board_init(void) erratum_a010315(); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 064fb4d39f..456609d993 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -27,7 +28,6 @@ #include #include #include -#include #include DECLARE_GLOBAL_DATA_PTR; @@ -173,10 +173,6 @@ int board_init(void) erratum_a010315(); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c index bfe6137604..5ab03b3340 100644 --- a/board/freescale/ls1021aiot/ls1021aiot.c +++ b/board/freescale/ls1021aiot/ls1021aiot.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -209,10 +210,7 @@ int misc_init_r(void) device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); #endif - -#ifdef CONFIG_FSL_CAAM - return sec_init(); -#endif + return 0; } #endif diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index fbbd27d9d7..f84b94d946 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -386,9 +385,6 @@ int misc_init_r(void) #ifdef CONFIG_FSL_DEVICE_DISABLE device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); -#endif -#ifdef CONFIG_FSL_CAAM - return sec_init(); #endif return 0; } diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c index f31e16c419..f016088670 100644 --- a/board/freescale/ls1021atsn/ls1021atsn.c +++ b/board/freescale/ls1021atsn/ls1021atsn.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright 2016-2019 NXP +/* Copyright 2016-2019, 2021 NXP */ #include #include @@ -238,10 +238,7 @@ int misc_init_r(void) #ifdef CONFIG_FSL_DEVICE_DISABLE device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); #endif - -#ifdef CONFIG_FSL_CAAM - return sec_init(); -#endif + return 0; } #endif diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index f0b441db63..a2a87eaf35 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -555,10 +554,7 @@ int misc_init_r(void) #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) config_board_mux(); #endif - -#ifdef CONFIG_FSL_CAAM - return sec_init(); -#endif + return 0; } #endif diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index 486a544d35..71a086ef67 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -73,10 +73,6 @@ u32 get_lpuart_clk(void) int board_init(void) { -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index beef26b084..c7f214c236 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -20,7 +21,6 @@ #include #include #include -#include #include "cpld.h" #ifdef CONFIG_U_QE #include @@ -211,10 +211,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c index f1c08a13f7..5a298cd311 100644 --- a/board/freescale/ls1046afrwy/ls1046afrwy.c +++ b/board/freescale/ls1046afrwy/ls1046afrwy.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -20,7 +20,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -135,10 +134,6 @@ val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0); return 0; } diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c index cc95d441b6..79658693ab 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. - * Copyright 2019-2020 NXP + * Copyright 2019-2021 NXP */ #include @@ -27,7 +27,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -420,10 +419,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - return 0; } diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c index 93ef903f29..2e9a6d44eb 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -23,7 +24,6 @@ #include #include #include "cpld.h" -#include DECLARE_GLOBAL_DATA_PTR; @@ -85,10 +85,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 7046fbaeb5..b8bc8f0d5a 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2018 NXP + * Copyright 2017-2018, 2021 NXP */ #include #include @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -815,9 +814,6 @@ int board_init(void) out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR105_IRQ_MASK); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index 2f0139edef..5cc5d06823 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor + * Copyright 2021 NXP */ #include #include @@ -20,7 +21,6 @@ #include #include #include -#include #include #include #include "../common/i2c_mux.h" @@ -221,10 +221,6 @@ int board_init(void) #endif #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index bf660a8e65..e657097ba7 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor - * Copyright 2017 NXP + * Copyright 2017, 2021 NXP */ #include #include @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -287,9 +286,6 @@ int board_init(void) QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET_EN); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif @@ -298,9 +294,6 @@ int board_init(void) /* invert AQR405 IRQ pins polarity */ out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR405_IRQ_MASK); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif #if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) pci_init(); diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index bda665624d..c8a47c6bae 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -596,10 +595,6 @@ int board_init(void) out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR107_IRQ_MASK); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) pci_init(); #endif diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index c8ed7ac81a..d86cf308f6 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -28,9 +28,6 @@ int board_early_init_f(void) int board_init(void) { - if (CONFIG_IS_ENABLED(FSL_CAAM)) - sec_init(); - return 0; } diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig index 2a999e8798..c59ccd37f3 100644 --- a/configs/ls1021aiot_qspi_defconfig +++ b/configs/ls1021aiot_qspi_defconfig @@ -36,7 +36,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig index 3a2fe03139..f0236e35d8 100644 --- a/configs/ls1021aqds_nor_defconfig +++ b/configs/ls1021aqds_nor_defconfig @@ -50,7 +50,6 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x60300000 CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig index a787ce0b7c..73c78753f9 100644 --- a/configs/ls1021aqds_qspi_defconfig +++ b/configs/ls1021aqds_qspi_defconfig @@ -50,7 +50,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/ls1021atsn_qspi_defconfig b/configs/ls1021atsn_qspi_defconfig index d92fdf4a15..5abf6cdbb9 100644 --- a/configs/ls1021atsn_qspi_defconfig +++ b/configs/ls1021atsn_qspi_defconfig @@ -36,7 +36,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig index 548ec897bc..10026d0549 100644 --- a/configs/ls1021atwr_nor_defconfig +++ b/configs/ls1021atwr_nor_defconfig @@ -44,7 +44,6 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x60300000 CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index 404b33f938..e6c12c9104 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -61,6 +61,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SPL_DM=y +CONFIG_SPL_OF_CONTROL=y # CONFIG_SPL_BLK is not set CONFIG_DM_I2C=y # CONFIG_SPL_DM_I2C is not set diff --git a/configs/ls1028ardb_tfa_defconfig b/configs/ls1028ardb_tfa_defconfig index 035974afd8..d447358107 100644 --- a/configs/ls1028ardb_tfa_defconfig +++ b/configs/ls1028ardb_tfa_defconfig @@ -48,7 +48,6 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SCSI_AHCI=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1043ardb_tfa_defconfig b/configs/ls1043ardb_tfa_defconfig index 7e741c7183..a0474ac2e3 100644 --- a/configs/ls1043ardb_tfa_defconfig +++ b/configs/ls1043ardb_tfa_defconfig @@ -41,7 +41,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_ADDR=0x60500000 CONFIG_DM=y -CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/ls1046afrwy_tfa_defconfig b/configs/ls1046afrwy_tfa_defconfig index 85db989f96..9d60bd199a 100644 --- a/configs/ls1046afrwy_tfa_defconfig +++ b/configs/ls1046afrwy_tfa_defconfig @@ -39,7 +39,6 @@ CONFIG_ENV_ADDR=0x40500000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig index 4bf413c0eb..0a2d317c8b 100644 --- a/configs/ls1046aqds_tfa_defconfig +++ b/configs/ls1046aqds_tfa_defconfig @@ -55,7 +55,6 @@ CONFIG_ENV_ADDR=0x60500000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig index 3501764e6f..10093b59d4 100644 --- a/configs/ls1046ardb_tfa_defconfig +++ b/configs/ls1046ardb_tfa_defconfig @@ -44,7 +44,6 @@ CONFIG_ENV_ADDR=0x40500000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/ls2088aqds_tfa_defconfig b/configs/ls2088aqds_tfa_defconfig index 6821ed1a45..fb2fc3d0f7 100644 --- a/configs/ls2088aqds_tfa_defconfig +++ b/configs/ls2088aqds_tfa_defconfig @@ -51,7 +51,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/ls2088ardb_tfa_defconfig b/configs/ls2088ardb_tfa_defconfig index 8e76f59b92..6a99143e54 100644 --- a/configs/ls2088ardb_tfa_defconfig +++ b/configs/ls2088ardb_tfa_defconfig @@ -49,7 +49,6 @@ CONFIG_ENV_ADDR=0x580500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig index ddcf681255..9b6c7323cb 100644 --- a/configs/lx2160aqds_tfa_defconfig +++ b/configs/lx2160aqds_tfa_defconfig @@ -51,7 +51,6 @@ CONFIG_ENV_ADDR=0x20500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig index d81a4b10b1..9bf92881be 100644 --- a/configs/lx2160ardb_tfa_defconfig +++ b/configs/lx2160ardb_tfa_defconfig @@ -50,7 +50,6 @@ CONFIG_ENV_ADDR=0x20500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig index 2028bfc524..441932417a 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -53,7 +53,6 @@ CONFIG_ENV_ADDR=0x20500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y From patchwork Tue Dec 7 07:41:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564525 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=rottQdzE; 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 4J7XQ40sgSz9t25 for ; Tue, 7 Dec 2021 18:45:00 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8AADC834AC; Tue, 7 Dec 2021 08:43:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="rottQdzE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 528A68348F; Tue, 7 Dec 2021 08:43:30 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on061a.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::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 3BE1D8347C for ; Tue, 7 Dec 2021 08:43:24 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UX9I+1oVJ6Ewakw4s7Fbmy5ix87qGPkk3IBPQxUMbz7nUTCpBHs7XtZNUoUxgrKN3n1vjjqCgls4trKa7FX1YplHDAxRaQGlGFxgJaqBYrJJCjy2N3ehtvMaUoYuZIzBem68ET4vT54fYVjG9xmhCzcyQ/GJg6MkYDq2mZJpmp6OpSOdVle3k9RcnwpMgTzpsXOI+hKLb66cLKkhf/qJktARSzsWny3xT2BMjuRd/1BxFtxh4D3BLYzdgO2AXhhEHrfZeXoJMsShZ73YOD8ui4XiaVN+IiIATaFfsxXpz7G1+WOcDkE6V5TIWvBk+mGzJxKfe+z7UbzrL//h/cHdbA== 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=FOTVpbMEwvNCPzP7/iAPakM4h1nBShTNvS7eHJaXcLZZvqcTyc8kiCQxljcGJKp3FpSPbimgboYL5aOvxXW53rHwLWbwBURcfrYuWtSbKbYHmD4tvKqrh/5bSJmirJxz92i6syRsb5ZpfbgleeN7o/qPe7KOo5yY/FHd3iFbmT0VUC+55UE5c63FY5c7cXaaswllaQ5+Ku9I/doLc2G/TQ5Z8E+BoNoLO/eFxPpG8RUTWN1rzWtS4xVn54HzTGXRUXmCHD8N+FyzMy9XLF0bBDrwZx+dIxTTsq3rEVY0CQHOrL7tmY2RkjmLsC/M19e14R2fTPr2HF5r3vOPZHAMtw== 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=rottQdzEfMw9FQfJeLxSC2b4M2IaaR2Clak6bxtQhTi201xauypvjwJdGOOqBJJS54+TVhFGhQ9qFybyyvWT58atf44XMby7JHFlcOUwdJU0eEKczFpf/WTnfLIG/h/LFPz+iTF2H50D4mJrf3hgAEHRa8mxA9Yed9HKRiXSSYU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:43:22 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:43:22 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 13/15] PPC: Add crypto node in device tree Date: Tue, 7 Dec 2021 13:11:27 +0530 Message-Id: <20211207074129.10955-14-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:43:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8e832e96-e5bc-44ed-fabd-08d9b9553e8b X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ 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: xJRTKt2QjeBNOLehsTxY3aM70bopbfiWArrWFo+mtIlnTcYhCmMCXo/CEc9aN9tDnuZpqKOnFxKvU1LF7G34RYeZz3/MwidkR0qkDIeu4M3TODZNryXxi6xaDdBXyO8EbiQSE8RfMiWi9iAAJBbZNmw78frs2IdJsi1PdKY5CKdAxkNENcQOr3SFBvSO3ZyO3prgc5A2EEBF7E7udcKNmg+8o2lzJ2on1G37x6mdJdE8aAxHTVh5WiiD/iSCP/Cu4D4AkxBamSoWOPQakuyZqOIw0ndqHHr9daQ+k9UUYYetNLPWuLD1F8YxWahKq098ZVj1hLK1PgnfZCaJYgS8PHb2e2eYLGOCWyBP3KRYsbTWk/1TbnuNNyWF67sL7byfmsHoiokk6XsmuC816BQZW+fd2AoavcXO4h2pBuxIQfgsEvwjp9zk5QrDcbiX0fBMw6BOehaZ0ycTFviGxJpdZ+pHNbEVqEgx/GH7PHaouxR445HSG5KYh6/9CvOfh493kWKVUEXv/IXpxB13xgBhVhNa9j6IrFHb1qTMXqemMMIAFyr4PV9gWUOmtuirowWbkya3dMPoEUML8U2m/7wSDw1LjuoG3ireR5CmoOmYDFuZ+vDfEMpo6QeQHwWUXKn4wXpCUjyTthgUUs1T8XxpzbwVsFTOMbzt8oW3a9pq7QMAGD04uvJqWmFq+ZyDvnUr6h9aD/6vavZeRJOrOOngf3TbMHx+tm5Ekc0nINAl40A= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(6666004)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(30864003)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7ismWQTZroYjEPh+zrDO53qOoPSbxEtXo8P0cvXkvvb4pO1BC/RmA8GbsDce0DClw+HtZTO5ueVRtK5ndDHZA/EzQIxr9tOppqufEi0eQq8hUPXPSC7vMdYTnWzy+vcK7lvvgl5eYi4Ld3E5A/oeLHZsfEWElyKtwstKHW/ZjGNyBOaUXuf2x90FOVs/Qk6+pstYSzJZVlZbCwUffzmpJ3oDt5hgjKZnVnFoCSQcW3cLB2KSaVJsPZMJ0ENgau/R5GlDwKXc7dT+rWk6gqvp/73D4VUFqFbFaA5ywcnj1/l9lrE/WYaFXChRubjY9gFub832yd2eVsv1M+rxwIR97uOq6rUii32BTXDC7YOJH6fsScDBtJGQw+q17mxTV1YOtaiKdes3J4y0VuRGm9XN486GqcBUqRhzqdXMh/RtPUpvwL8EeoLoqip8ga9AsI3m0rwbiY2yeH05GVtaV/wQ0XbzWjzsCet9v4jvUmYhAgOLmayGA5/2L9PWf3GzjNY0kgqDe2GDRME1bukMoVr3/BFEBR3fkJ3mDXU8wzCs5soDFbQVZ8Qo0GbcjZKCm+iE9Z60LLCWycyqGbZycPyzVHl+M7zCTk5xdsu9103vhBVnSMA5SJTufBNqn0tAN9lb6n8ERCPf1WmZOWGgcyFooeuJeT18111PlbjDzwIVIBw85iaK/ltLbsU9Jzi+kuR1uP3TlKM8I7PRp/NykHerXOteWHnLRwHMkdormCko/f0EAPJI4x69CT0npGatM6A+Mc1L+u0SDmnvDNXoKSEaopNpyREJJFb0Vi7JfGNwGyUPxrCe/Vphsk36eygQHmyJ2GimFSHBHCbXq9C6aB/8d/go7PJf7mpC4fJZLfNdiwnVXedBdQTctwp8Jb27KcVaQ5I6pjkyVGdUr0nx5KhV7nkavSsKXNWNkqDtlL1E4SR/7ctpUDJVbJIZpXkzpFnNxz9iiCQ/kEh/2uVBe8uKJHVxzpuWF3KYo67ROupV4pLsXd76Y/kR9tpZW6Zhvr4+IHUZbidDGPM5063VxurK/sWCM/AuGLfuJSvHmRaJW9QZ0Pcagwvrkf6y/73BGKUSca5ywXhpD+9Xc4NOCGeQrIKSYw9V5eSOiC07zFhbiU3G36Z5lBm3JFm62581a4gDp/cQ9PjWRnaYGQD5g0XmdVN2sdXMUONyocUpo89GP166jNszCL+GsvWDdCxp8bQNM3YThB1dWK8bHqH5qgdl2MAnTG09f++he8CqYwb4w3du/GZ42YKZWSFpx1Ca6jNjI/g0h+JwaDz7S+KxtqjNL1BX2mk+WVTuhyK81bSiKaaPzoAWDlMybY+cEjBInQS7GkxAKPRSRFvyrytRHAmSFM6InHXC8VLjAM7xTGV/I9MWBxf0Jsx/9/UvbPPNvE8PoUzZ7Or+Yxg+llkOIH7x6InU90Ql/UPUSd3trWRlDI2BIt60m51Bi0c/Uoa3ky80IxEkm/3ZH5G04DaPiLXlBvjCUma8QDAOuEybvYm1xna/x2zZ9XtdzeDVAGDuiMVkWllYkXA8M1EsuRplwpK1cmzxeokBjAUQfcGAT3i3PfHiDNslzzSHohsoBJyPoCHw+ZuIfph12LfiFRp7uuJwlehC5ndNcsQC5JTmhZedcHA= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e832e96-e5bc-44ed-fabd-08d9b9553e8b X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:43:22.6053 (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: pMwmuWFWzQ04a/kt4a4vTtLu7tauA7srJyEJ02NsGLcMCOq8Bn4dHmGm6b82o0QttvN10Yredmcd1lXh0IaVJg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 Dec 7 07:41:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564526 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=Gy/sSnoS; 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 4J7XQL3Dpdz9t1r for ; Tue, 7 Dec 2021 18:45:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1463A834CB; Tue, 7 Dec 2021 08:43:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Gy/sSnoS"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C20B5834B0; Tue, 7 Dec 2021 08:43:37 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0611.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::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 2C79383457 for ; Tue, 7 Dec 2021 08:43:30 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ebj3FOXFU01LxpWkqltslLy1GISz94HILuVMgmFXwsMI9Vg8g9vd7osF0z9RypE80HlD0m+JNemKNPexjizL5pDwHGIaptuRATqgmEJ7wSCYZQgNlIvHVkQE0M7+PHXhPIBpkUWPg8Hoc4qlpxPDjC9O54Ll8eUWQRT3br/8JoN+Qv5sYRKTbix7Jbb9mqPUys1s74MjG0UpxudDeWoPjVYPx3D8rggv8O+8dHfTF6aGvW+2yTDnKy1NxyLGXflQfYegqrZ+3yMCIw7OG49i0jo8EFy7qyoeWMBGTOsOUvctZZE73Aw+hout3qfN24xfifFJptSL5gc6bhSx4MV3Ew== 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=YgeHWlT2XCBz7zw1eqVDqneGT2PCLpv9t3VcMhVFkr4=; b=L5xrQtNQ5VVN1mGXXjrKFK9Qml+ovLJksXWbnE6kieFcm99jsK0jMfMCviw5HTaygsQavuXGWWftCz/HBDwLeGuAuCsbWikdGenMUOMaoCioCSkg7hn2N1fxhlmv1bl2MjhgkG4O3cP/ZTvO13k758KT9yje5o3yo8lpM5qoBGrM1dPwdsoabH07m4+A5U+s7LYHPeJ8O8PFQ+KeiJmhEXhmSFjSRUW/vMDPC0mxz9SxvlqWI608Ygl0UD8fXs88H+e+l3npFtbo7BFwBp1dmFi/PQgbdmsTrLDWT/iF0mRckdNYQ1b6pvP+hCPJqy9JUWBTgaY+d8AFaBgfF1kc1g== 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=YgeHWlT2XCBz7zw1eqVDqneGT2PCLpv9t3VcMhVFkr4=; b=Gy/sSnoSgVSxe8RgrfFVVQ0JsQGJ8GTM+d6INFdAxqIiTl5DBLN8+N9keMgmbegzJUdT52aR69UJvdRpadjfgV2mN85LYnthoyo6vWJCT4KysCUwKdSfJmvtgLw4OdrEMg/Knta9B6oiSrqGQF6oe/S24SwXI6QtvGiIS4CU1ng= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:43:28 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:43:28 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 14/15] PPC: Enable Job ring driver model in U-Boot Date: Tue, 7 Dec 2021 13:11:28 +0530 Message-Id: <20211207074129.10955-15-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:43:22 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 424a64c1-1545-4ca2-3ea1-08d9b9554247 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ 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: YCZlMDE7061MBK4/9VeCdyZS3fTGd/X3/tuK3MPAt2Z1xuSYmC8C3ctMts4zxivho2EsHYDj+33xhXrWWHHY+1UaWvlU6cefQfZ92b68rQXKOQehfGEjQIboV82V0quqT2O0Q7WpPt2Z+hq3j9RKyv7nCspdWIOGWbBEXc4/gRaxVzgLFa6BdgeV2Vjk5U59u/5IWdyKKgTEImbhSsRZSKaO6tOmieR3BU5nmLkrjm7A0QThCGbdygATb+OyfIk1c09pKLiqVPRk4nudJcyegI5q0YFPnQ54o4z+a9uloGubzJltTDIenCFxc5truw0n38Bc8Uh2SK+WOD+0bvaFSy1ScQzJjEoE0C9hqjYYkvf5TPgk0aY+Y/9asr+aRN0OcQFqDi+PaW32ViSDCIQKDZo6KvASffEcfksKHzZmj0oHgsxM61tfIGgQc7iAg8ig2vrNMzQFgIbzjaSuLOWx0cqqoZbR5Myuj4Lol4iX98cRwP7cAEKSBoKT4J9ZuWeB3tzevqQ6KBcJQUOPVWF1G4rRSkgxj1BEVqoaHT2ciDu05OX7pYzyaNJUPqxSADj9x5qoCaFc6oPHbFb46WyFkdC5geMddUQTKhqqLvgk/LK/mw3j67JnmV+n+51vwQI8A5N6zSVXKunBc3SqawSlUu1OquiEbPL7eCbopBLQXm1Rvus/9bBFvlZKXMZFUPi3bsXMJQWN1a9r1r3w0oPHTYDjJTxVN6BlL6fxjLbei+pvniNHNZVp1yBYYdrenpff X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(19627235002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7XYm3dZOZnd/fIfJ3OPMaweej2GCF+W2LCOcQvHSIc5cX+ycWGwOLLt4tRSy7a5CVhZt/D1pMzrX4fmqpmjgzWncFhYIiR+AQYhkztVJQTUx88lTb7gulghbkZXH1f09YJNV/O42cVMkDfdr95oZcEvRj9IFYklJjDcWpj4KfrQniKli7Fdj5090hy7khrDpmKsaLPfxppDpjli2PMmHgDVXWtfiZYaI+2F/VtU1sXRqTq45g7vkN4NlG+YtfAfkt6SxVZD8PNqeGhNhm7aa6isVO0bv9Y+cW+t/zSZhqA40rFGmTQBWNpQQPThQojPlb/946G+4vuroWBfkSQh8iIX4DweXidpgBqiU8Guu0cXTsDGd3mN3J6fdxPDjJIA/vLqvt4fexuhfiis67XeXCD8SnCCCB5qhR2N+63kDDBu+Tr3aO0MNbDT7oWyBLaMTP0fa0vVVl55XM+jY//hZVpvzscQxWo/8RB4nRBydD7pmKVhfgGnoaV5seZIymhIaSxsuoQPQOGohTQQye6ZgDBJpX3Tdj/OXyaC8q5uky75GdqlynkpPVV4ULiFKbnrw/nohscWXL+8g8LK4x8WEznBr4XyDLg6pe/IzaZ4viz+fobDgJFp3f6ApuX2oCkfMopWdah90V7UzIZNLZD4SGTtQPqN/3DcnSxBY3bndbIvoP0/tKQ07wvvgHJJJieJ0WIWhRNJyod6deH5i3n/RZizzzNxikMfP0BuaG7am3XiH0gz2o+0++fNbCKIrS0dpDMNM9Rd+7oQs/jiXr6vNIZ6FQ7ck5K9eLbi3oM0zzBIcnRem2l/TqJM6ZZzzRdQKqfu6yrQj0JiZO505G0TqQEiGXDOnb9LBVol+uUQhydxIc4h8IY5zdltJaJDuD6lH2fkjpE7AnVJcyiTXsOFUOjp4icP7vi6Hjq5IDyEXy4S2x/bG9M1NVOOSOCxJ356jAzuhNpia2J9OO9Mu4ZCfS9rYMkZD7Nd+TQ4kXSwEJMZVsdEyhw8/QQtLEOh8imJwikyvHlBgaLVICpfVOOs5AFXgT59BwBHvSV1SUNUlkKj5WJjZZAE9QToLkn+iZetGbVtUn6VBnZ29a6miKmVi4mRek8oXUdsSwV6ACsEyC24AIQEHOCiYfyDNUUE7uRPx6qASJ3RBNOYbYjq1cJSet3Q8sBss2HzxLQk0OTuM1ITi0/D/3n6cXigtwRSjcxvv6099n57KXuQanbV0c7YLI+c7P2WYukWw0/0eaRLbOr5iQBFL/cWRdhVO60P8HjXiVjvS638NRyHCIG7zJ6XkIxBP7xhBDMG/cQFjPRfzxW3A6EkFPHBt21FfopatnzSoF6w7TV+O7mgRR3PLrvQ2yRVrLVGE9M61eoPi9tqDAxYmKH85l7RyGGvcumpvuoVQSBH3m+7AH7m1Nb41yoUOEBJFACtUut2FYgwGsnGK340zEziUJhO07ISlOPjduDvnbmgJ0YyPX6dH/nC8eIGW9dDv+gDVVjOVRS9U3LNwTcJ141H7Eq0GlPi37pEpLp1rpHUrT2JhiLObvkp1UFtX5/xMiAHrP0cubvw89e08Hp/PaY5sUMbO0aZyJeaytddtfZIyPuEzkMUL+DFLdM5/cbKnHWaJO1JKkpOStxdviNo= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 424a64c1-1545-4ca2-3ea1-08d9b9554247 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:43:28.7068 (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: 3cre69GbVwcWaMZxtwZq7xMzB6sN60h4rBVSScuxgwtSSK0rqR0k+VmHtjdYv8BYXHyuCFXIIpp6lQHF9ixOYg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 | 33 +++++++++++++++++++++++++++ arch/powerpc/cpu/mpc85xx/cpu_init.c | 17 ++++++++++++-- arch/powerpc/include/asm/u-boot-ppc.h | 17 ++++++++++++++ arch/powerpc/include/asm/u-boot.h | 1 + configs/P2041RDB_defconfig | 1 - configs/P3041DS_defconfig | 1 - configs/P4080DS_defconfig | 1 - configs/P5040DS_defconfig | 1 - configs/T1024RDB_defconfig | 1 - configs/T1042D4RDB_defconfig | 1 - configs/T2080QDS_defconfig | 1 - configs/T2080RDB_defconfig | 1 - configs/T2080RDB_revD_defconfig | 1 - configs/T4240RDB_defconfig | 1 - 14 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 arch/powerpc/include/asm/u-boot-ppc.h diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 836aeddbe2..b05c372086 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -25,6 +25,9 @@ config TARGET_P3041DS select PHYS_64BIT select ARCH_P3041 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -33,6 +36,9 @@ config TARGET_P4080DS select PHYS_64BIT select ARCH_P4080 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -41,6 +47,9 @@ config TARGET_P5040DS select PHYS_64BIT select ARCH_P5040 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -102,6 +111,9 @@ config TARGET_P2041RDB select ARCH_P2041 select BOARD_LATE_INIT if CHAIN_OF_TRUST select PHYS_64BIT + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply FSL_SATA @@ -117,6 +129,9 @@ config TARGET_T1024RDB select SUPPORT_SPL select PHYS_64BIT select FSL_DDR_INTERACTIVE + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_EEPROM imply PANIC_HANG @@ -126,6 +141,9 @@ config TARGET_T1042RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_T1042D4RDB bool "Support T1042D4RDB" @@ -133,6 +151,9 @@ config TARGET_T1042D4RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply PANIC_HANG config TARGET_T1042RDB_PI @@ -141,6 +162,9 @@ config TARGET_T1042RDB_PI select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply PANIC_HANG config TARGET_T2080QDS @@ -151,6 +175,9 @@ config TARGET_T2080QDS select PHYS_64BIT select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE select FSL_DDR_INTERACTIVE + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA config TARGET_T2080RDB @@ -159,6 +186,9 @@ config TARGET_T2080RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -168,6 +198,9 @@ config TARGET_T4240RDB select SUPPORT_SPL select PHYS_64BIT select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index e920e01b25..728c6447a8 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -56,6 +56,7 @@ #ifdef CONFIG_U_QE #include #endif +#include #ifdef CONFIG_SYS_FSL_SINGLE_SOURCE_CLK /* @@ -974,8 +975,6 @@ int cpu_init_r(void) #endif #ifdef CONFIG_FSL_CAAM - sec_init(); - #if defined(CONFIG_ARCH_C29X) if ((SVR_SOC_VER(svr) == SVR_C292) || (SVR_SOC_VER(svr) == SVR_C293)) @@ -1014,6 +1013,20 @@ int cpu_init_r(void) return 0; } +#ifdef CONFIG_ARCH_MISC_INIT +int arch_misc_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + + return 0; +} +#endif + void arch_preboot_os(void) { u32 msr; diff --git a/arch/powerpc/include/asm/u-boot-ppc.h b/arch/powerpc/include/asm/u-boot-ppc.h new file mode 100644 index 0000000000..372ca3e037 --- /dev/null +++ b/arch/powerpc/include/asm/u-boot-ppc.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright 2021 NXP + * + * Gaurav Jain + */ + +#ifndef _U_BOOT_PPC_H_ +#define _U_BOOT_PPC_H_ + +#ifndef __ASSEMBLY__ + +int arch_misc_init(void); + +#endif /* __ASSEMBLY__ */ + +#endif /* _U_BOOT_PPC_H_ */ diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index 19b3c0db5f..36af8e5403 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -21,5 +21,6 @@ /* Use the generic board which requires a unified bd_info */ #include #include +#include #endif /* __U_BOOT_H__ */ diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig index 7b430f69e2..7c82812b28 100644 --- a/configs/P2041RDB_defconfig +++ b/configs/P2041RDB_defconfig @@ -34,7 +34,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y CONFIG_SYS_I2C_FSL=y diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig index 821a7c3bc1..fcd0214c71 100644 --- a/configs/P3041DS_defconfig +++ b/configs/P3041DS_defconfig @@ -32,7 +32,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/P4080DS_defconfig b/configs/P4080DS_defconfig index 564f28caba..723ef1c457 100644 --- a/configs/P4080DS_defconfig +++ b/configs/P4080DS_defconfig @@ -32,7 +32,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig index 79c6e466c7..0a13763d71 100644 --- a/configs/P5040DS_defconfig +++ b/configs/P5040DS_defconfig @@ -32,7 +32,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig index 3ed1c6db4b..f8fbee2e4c 100644 --- a/configs/T1024RDB_defconfig +++ b/configs/T1024RDB_defconfig @@ -44,7 +44,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig index f1ec400636..62cb8c4a37 100644 --- a/configs/T1042D4RDB_defconfig +++ b/configs/T1042D4RDB_defconfig @@ -35,7 +35,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig index d76547ab63..c5b0c28391 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -33,7 +33,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig index 610f706473..cb8d5eb69b 100644 --- a/configs/T2080RDB_defconfig +++ b/configs/T2080RDB_defconfig @@ -38,7 +38,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080RDB_revD_defconfig b/configs/T2080RDB_revD_defconfig index f8f459f27b..b3712be552 100644 --- a/configs/T2080RDB_revD_defconfig +++ b/configs/T2080RDB_revD_defconfig @@ -39,7 +39,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig index c66b152d20..b57410bf58 100644 --- a/configs/T4240RDB_defconfig +++ b/configs/T4240RDB_defconfig @@ -30,7 +30,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y From patchwork Tue Dec 7 07:41:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564527 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=FYqmUGOc; 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 4J7XQd18Ntz9t1r for ; Tue, 7 Dec 2021 18:45:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0396383146; Tue, 7 Dec 2021 08:43:50 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="FYqmUGOc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DA4C8830F4; Tue, 7 Dec 2021 08:43:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on0628.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::628]) (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 4E601832FC for ; Tue, 7 Dec 2021 08:43:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hiv4XZXLVcnsuQ5F5kGyvC2SEMKgWQ51FQsXLh2YK2JCJ7hhc6P0Iq0pQ13MLGHxK28Ez20hE1Zhb6CmaLiixpyPbbRVuBQH6/JI9ZLh+Rz+l5kTUiAufCP9Hr3goF6+vGuOekcu15C351FXKDXQv7RJiSK77rHaIJ7mAkCXQ9Bk9ImgugvTjJ24RHEeoGnu9ZdU+O+TVqm6cjMNAwH3lZdHt/XIDkELk/ULsJg6LBhA21oxA1QIAaFSrgKluzOCHTjnFvmByQFoJxr1xoeHrRvVo+U3lb3FLV00bwYKYdV+yTB+UD55fbC9p0Xbft2xSrDY1u+SedYGyYvZ4oWcuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tIUliBQG6L9fSukRX35rRAvF1ghPBlrE3sg9lBKhHxU=; b=DhfbOiXuPo7ICZ16AU/PyCxWfHnQ86cd7RK5nneLgZ3VzviLhGxyyEAqcNXJDvIJqnTXdywJeqMXVwEmvbLqMMhH7/yfVBsSiQYCupuXbpXH2Fe13YEw4kn/Gh19VZ8pdP51iRuLfz63fC4GoVHIIXYTXbRGADBWHRxaBxwbzK/6uBdUC7KM9Iyqe1WK/p8BO56XH5Y+YtO/eRJPWvFR1TBp/M+5BXP7rJbZJqOYEhMLytKetPj9T0pfKmzXzwvKSQ7ao+QS++c2IT2CBXqgO8Bg0WEInFNsL+KGIuiITnvwjJEMQA6YDE5lDaxMuXFF886m8GnSybNJydFL9GSusA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tIUliBQG6L9fSukRX35rRAvF1ghPBlrE3sg9lBKhHxU=; b=FYqmUGOcO1zAUGUDVWJeZM/obbz1/KR+udQpusa016FizF88/RWIjS30UPSC5Z/oXqp3St1vipQbdyW4sWUvCOrOdkxPP2ez+ZlcWUEsprD9+fpJtTWR5w5LFHD3drepIYwL6wFHR1jmARGETgGEudr0WozjPYysTMKY9vshm+Q= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:43:35 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:43:35 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 15/15] update CAAM MAINTAINER Date: Tue, 7 Dec 2021 13:11:29 +0530 Message-Id: <20211207074129.10955-16-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:43:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e460a64e-b4b5-4f10-0acd-08d9b95545e9 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ 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: hiDm2oZ3x5Pg3YGz0XzRnyiDWavG7wdrLFXGVROplzRfUvfCwCkhXBTcWDRnQfLpawnjGRRuhY8jDHWvdiiIiZqc0UM+KP5uGDyQr8Xs5Vm4H976wmqRnPgW0BmE7azjrJkfg8pY96y0Fx87Os/C07C4aDR8krqjSdkFAZZLUVHPBozZGA658Cl2YTp8okguDAPD1nu0TesN4xgrVXIy7Th13s1KUCMz88xyFnWElWBCv7Qe/FWfOGeiCPz08sMrrfJl94tTl9HxS+Evehmhpg1QymmEvIIOtb3J1M/RbYBOtRuPl3giMA8+NC7zXrKSj/WpTXIOxxkjKC/Am+tvnAofhYMe56xEnqs294cnWX3qP4NtOlRwIygV5hcAqQNZMC0Kktyc6u4+82grhq/DSaiGnv/jUFkVGbUwgq5Zv3i26rrAlx5JQ6F+X8C/8CinhIY0yQOYkRY0l2Dk+ZKqxIA5BHJZax9Pph0Zld2XAXUK752+R2vDgDKP2hL+1VCVb+KYTdgkfkmckb2O3FclHpHwds+ANX/OVxrAfXFIxMlS2XDUYHx4YtyhGMGAuLxiFHYMJLtWihkJNj738XSgDBnQdaMiYkIVy/564xt45UhE9rpi3bp/3TF0KW1PKRnMYvGywrDkTeOqlCHACiaanxkW+DbFt7GUBXLCa/Edtuzpp0a7zpB1hFCHtZR+Q4Gn+vIIsB5PcBfGgxQqwSbawtuwpys8cn4nbgPm3PTMjgyNBHNgd71PwKLQnIeU6G4urSPihzP37m2okRHyES1tp6ARfrLYGPDXAi9GDUZLKqaN5n+Q0RSeWFGWXupowIAAZTaL9zrDthy6ZuGyBZd49w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(966005)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(55236004)(15650500001)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(4744005)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4sRa4JfS2mF7wjDzrqr4wbaQdFhoY1Etrtrf9zVAebW3ZjfEbCV/bCVOyUJek290hcUSWHGLxBzh+M240j+FDbUntPqI9vADS8vz7/jDNgUtRHw4jWKOwfRHJH59ug32HyKzAFxdlJnEBXxVLQjutbKOzoH7nymefgH/OzFezQeamxLh1xq/c3qi3BF084ul3KbClPne0OkPUkZNflIHIQhQvIp0/Iy0obdUqWJBGNyfC2mn8JJrIJEmGRx922kkQOEhgvJo1oxqB8j92acwT1PMxAbB0tTuoUPAv1y5NGOYVJ3DEdjuoNQkwFKodVLb2Onq9ychnnD5wToxhpv1btC02whHMUDXLx9Vjjy1FXN1/dV4LP7R4PM3VzcSX7TxpE1FHGrtSXLwLPS+TqaTYPS4Te2u4Y+WQanZLDxIjykjCmNj32Gk7+2B+O7KaFeon1EOsbVmsEWOY668AJdIPVp4+d3JRksNVaInl8kg1kPsyhgYUetGRy6V84yum0LbTHsaizm3EEcsjmMInxUCq14QeopPW7ivpq4VhZqcaomH+zcRpGDqj3OHrP091sA6K6vQYg0B07B00eY0MFcroyJH+zHeC+wk577wAvYK7P+iLIaxm9lZ6bMoG0vCpQdDj5C5faIvOmGj2fO0pwNNRvUPpsipR08Ts76ybVVgryc73p/3wknaZAWF4jQi+kliBjhu/66dHMsK3UxHVZFxsGnNgFevc7wy4NnyL0YgG15cFZL2kAq67ksa39T/2EIMo5UV/F6z3m1k7rtpZkXCeYsFx2vF1piHpaJZGx955+UbwONW7orzmWvPjbZnVSorfl4lYl9qD6aNLv6PSrfNrkXkrCehxGgdnFHOxCO9zsL9Z4MYM79Mfw/FEauY5hO5epYhcDiSBhlvQ3+HTzczVE4rc1xW2D0eOC5lH5BTSLF4X8k7GkV98Y8PuVLTTVQj+iEQ13GqU/3l9bHqYSHRrIqcO0kq6nCxoWGAi/QfilkY0DsFd/3HCXcJFAD8fCksL+QHZ7R2t+b5NlN4+i+Y//wo2YGJodRz1tXEILotpYtu5VBK9k0m21nNHjRLOgy5K3HIAAVOJDeFFDtuQndVzo0Ayvtu3yymIsaJs3MV/uwSx5X0eGihcWVYwyDKvRCdUAM744YL1auSNuTPNZOsviMyhO2xFWbZxxHZwdiV7E/qHh9N+yE8rM6LBaAW9fHutXyD2lYD2Oz5LpeJRHFSjj7ZMAarQ0oSj+peeaIoJCz0c2lTGPHjXDlkkGPLqLrJ935KoH8XCdCF7QoxRKHgdUu94TBYU9IpdgUX8wdPrEVxmA9Eonh5aL38rGMomizltl2Uo7jATdvRlQ+STwe1j2sCmWYENxAxhH8Rq4QDphT2q6zkP/k1BcvF88/gMOQAQiwC8KlAvYeN2zvboejs7gTiV0L7RrcRG2baxfKOOzO0AxzfDLd6xPNJ2nQHDeKifpfmKYb8JUb8Fp3WM1Xk+jj/4RLX+cjCU5MgaVtevEhmQCi0H7GY8gyjD3fq8tC35cruyAvHPDHfmySK2D9G9A+MikqhdRH2rdltEW2Bl48UqxRGRMQR1PCUR1TGsK8OY0PIQLm3RQfEiQ6K1gKGjtbcPww35vAMXQ3nIXtu/Q4= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e460a64e-b4b5-4f10-0acd-08d9b95545e9 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:43:34.9573 (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: HlXMI8hBJWJrKAdRKfmg+JFozl8rUDyyNxUqE5sxk3Dm3DAt2z2nFfz38V4Lp9ev3QhzBdclznJ4J47VTFWKow== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean updated CAAM driver files maintainer. Signed-off-by: Gaurav Jain --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 6db5354322..c5bb2b861b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1296,3 +1296,9 @@ T: git https://source.denx.de/u-boot/u-boot.git F: configs/tools-only_defconfig F: * F: */ + +CAAM +M: Gaurav Jain +S: Maintained +F: drivers/crypto/fsl/ +F: include/fsl_sec.h