From patchwork Tue Jan 11 11:27:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578378 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=O/zpzKp+; 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 4JY7kK4TNCz9s9c for ; Tue, 11 Jan 2022 22:28:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9473A83082; Tue, 11 Jan 2022 12:28:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="O/zpzKp+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E28EA83031; Tue, 11 Jan 2022 12:28:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20616.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::616]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 243A883025 for ; Tue, 11 Jan 2022 12:28: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=Na2JJmt9t2/BM/AQChy5SYkAXX3Z5lgxLjew5QzgHq3WGAjDClxukgXoX3fVYnIChyg72s0hb4z390c7dG0S02xtNrcFzQGmPlZItO81Im1fSrjwo/cLeohBW4vJewKWcgNg0BuuSIt4i6qi9GTQv1o0TpAYRZIS3/aeS20JqATj/rJ55qhmqTeL0P4qyCOu4Ejp99UGysUOFgR+yfM+GM3equ9mOiIQ4EbqOWOQF9eNEAvi0KhDT3J7JtS15vFXNnMJQbvnu58fRwtq40YY0Tz1Wgg0vdOtDqaIFhIgvy/nmnqDWuLmBenSGQigd+dSxN21d6EnFIlVKBiV4U4/DQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Ou3diqJ1DoQ5j6FkBQZnIDZHB62BiqPGGeDI8yjb2tE=; b=QweZ+VqqPjd8r5hIcfpk4YODIFhV7Ilin7Yb9543PU3Hc07PijejADWZX8EwFIAq7yg3Pm+ZCd+touyfX/SnksOZUUmWU8iRj/mjr6A1CagvWzu5nWCmeEuZbrqtlShl3T+unMc3JlXvF+NNVqxHdCQYRP/mXbNdGFFK0Yu4l/iaxBI1efzgLkzgs7NXfR/f9qOpsROoQKOQD57pdiw/qxm15kPPLWIHESeRXeGfJW+3kMECDZikKX+u421TBYwOE0787B51RsP7rFxD78qPSSTdXm8d+GPxMopZXKSCHxR2Zv7qCai4EGORIVCSCF72fLX8p47DzFaLrW5F3SV+xw== 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=Ou3diqJ1DoQ5j6FkBQZnIDZHB62BiqPGGeDI8yjb2tE=; b=O/zpzKp+rpCzqSySD+TtD3Qq4WfnYhTKhSoIa4dlR5T8NHhdDu0R2GNmjSpAbBW1VYAPFkkNB+9H0ikIkjsKI2F1RhUF1JjdR6fRXLHhjNImUwDgn65TptcwE7CtkS1W3My7vEEKW0kML6fpHZ5Ys2LnsDEl1r9R+48dqknpK4Y= 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 VI1PR04MB5295.eurprd04.prod.outlook.com (2603:10a6:803:59::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Tue, 11 Jan 2022 11:28:44 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:28:44 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 01/14] crypto/fsl: Add support for CAAM Job ring driver model Date: Tue, 11 Jan 2022 16:57:52 +0530 Message-Id: <20220111112805.3566-2-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c48bff49-049e-47d5-2101-08d9d4f586b7 X-MS-TrafficTypeDiagnostic: VI1PR04MB5295: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: XrDnvkGanD7rjK6B+Yg3n9rctNiiUCuONiPAMT8M3a18SPQ856ZeXAC3a7px3RZz6ARuMajIetnJ1fx4u7MUTNuqHAsKxBqVp84Cn4Aw4gegpi7HPZcGjaS7OfleizbQpMvCjj1AO7WNzAubl/hpQKkldPwVNunNeNCRv8i9dGv8ptz64bMlkge+vNYcfhidZ1x0iAHdZ8fnqaObdlPaJGlJRh1ziiKw9m5DoPVoEaT2fZeXWvCgX4B0pJi68a++ANu1Sv1lh/XWckcKeyBO2SVNvM6zUqD7c7D/Q5G7D6WgIYrUveqtcmO2ve3OPvEtcdWlyAJSM8Yxs4MeeRJq0/gl2rnHIMgFdBDjbJMdK5UE8VTC8phJ0acynGDOOv1JmrsNDEq5XrWfEPdr3MQZOOyZwEIcIO183DI6OpuRLFuATnCnNegg+MQYdZ7NCcns7NMLZwRGBtOMcV8mavcLVc1nD2z2N/geqxMNbg/sPa5RmORIxeeZc7vHZNvDGV81lSGwtjZAEqKlCqqdlMhPyEy6OGMaz1tqdmNZ7Ll/Xip8TQ2vL2TS6qw1MGA2GKXBzF7t/GFPfDwZovTidp+Wfk35VkguXQIWQXRkOk5qTyT0P0hNfqSUE/z2lJETEFyhsUK7cVo/CXrHRCHTShKA+x00ZmZNLLbpJxDcX+2pg/fNajtFku4rMRG1ipwESQF+U98H00JdRQp7b0p8lGIchQ== 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)(66556008)(66476007)(2906002)(8676002)(8936002)(52116002)(6916009)(30864003)(66946007)(44832011)(6486002)(6666004)(5660300002)(2616005)(6512007)(4326008)(36756003)(54906003)(38100700002)(1076003)(26005)(55236004)(6506007)(186003)(86362001)(508600001)(83380400001)(38350700002)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: r2PQii7xuatFTrERPfzssJpmpDjdxl+L4B9nA5kzUi8gchJwGzqmuNPng5uTin/3sKYEd358RvThe9Y/P3vTPTo6MQighAUEu8CU1JFs+HDF0YxqMGlTnfFI7J/kQMWICMzneY4Dfh6cg5rLcngQRGYeFc4DW9csVpwyxppcXVDMH6UtF6w/0aKuB+zEEpJzhcnOwY/h5OT0cOPHKYuDrx+XStaoADs/oWjfm5YmE0cMKhqzbHxdZ0VhdNTE/1YlMbDJM5zA9TJjkMX3FtGIFK76zbbXn6BkMnoOyc4BX/1LBTkzH+tkTisEHJXBN2suea2c/vCMM0e/XTuZRvav/Pin7/kEeCQ7xYNpLGPmur89IHwFIiZWrPfSR599Ldode7YHDvROIi1S3zQMLPahNtIolJ5633nsEc9/OQGmmJNJkdYfjIkwj/51kfhNeIWuUyC5XHGFfEFk0DpYqcJD7KxJYv38d2Jxj+T1rqz0vZoBegDJnXL9YWBIGyho19Ipt7+1hBHV1aucCsU4LI4UBZ/GGWINzaCVbLma0ogzRZRREmyNC7Q3Vg56r5XCXPqCGtnMswgfy3mjORO0Xp5wC0V6sgZVX4RlsPnuosHmd+A6oN2Naql2NaPmU3elUHQcfgT0JmoPA8Y2Pn+GUBq0YBoddLO4t4k5ZVR9u3AIgRx+IgFhVZWgkj6E8HfbRTFYxzFCYFBi1rtFYKe0HkJY8ND70XvNI9HjhQLyW5PL859iUGgecBZI+UWJiDLTArFgaGZ1lkk6kWEtSAOsqrDwPAB3jlj8/OqQ/gpgWtrUbMtMy/NAiZwVnUqMR6/dj2eYjg0ipk7jlEIe3NyasRMK0iHk2nh6RFEUtRLEVfLD/KSNs72YnAcmvMF3n+cZy4moAIjeO4zfsdswWWaUlAgYp0kleCqLOWNrPq6c8tcZJcfPZSHUQXeI57klPot7LRNjer2wWuxAH/9U+OWuUMc9m1H7JUw6dNqLkdxs8dZdi3mIWF/4HiRpAoo85ct9LWi1+PhF19Z3k1zLdqjonXFb7rON90XMVJ2sWkF4Yf0lsXainXTXn3wOoW+cLd8QxRhve51WNAQ9dxyr46ctpxrvFG1SGq8Kga6t2+nVWzQe5gziTvr5pFwHSpahrstwvNO+rhsTEEDsaQLEvPgCbk7GB4kXYc2OX51ShZMU3WPqnAbARxL0iiC/gxklnVDR/PXjIeApd3w1bm9Av9l1/eoicR0AE71i2YA53qjbTx2GZTtkpWanP9u7fwEPjlT/lX43MkzJXs/8CodUxL7ESzBQR4f2X//Dj/xYQivzZum5u2FLNmnIINiIX4mxx4h0BNMFy8qsMSLvz/5eyTdnxIgeoKNc+t2Ot4sv91FSXNoWuCiyKYQbVv3QYTREtiZkO9qSdiFdShmNw2BX3ZNnTibfNiyry0/ya+REFHj4PjMLk1BjFvvNtKp6M3LaO+qc88tEdDDRwB41Z+UlSpKMD7ETfJl3IsywALlX0lGDmpw1VgTNDUOgYXYFPpHIwBLHrtAXl7pIrsrL6ZysKSsxg0bgQMUcv3SWBfq9RPKS0kVSbNAk673PA2vSyAaq5ULokH12j3mWJOGuMVcU+dB18M++tIMwb0+XG4NXKWcSlvex5yM= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c48bff49-049e-47d5-2101-08d9d4f586b7 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:28:44.3735 (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: NbR8qwJXm9P7/mFT44OGKZ2ajmQNSHyCdL+ANstclbly+TbtQcKknzFdiaXW+Kz/3dFXuO3Ve87S7eiCpdW02A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB5295 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean added device tree support for job ring driver. sec is initialized based on job ring information processed from device tree. Signed-off-by: Gaurav Jain Reviewed-by: Ye Li --- drivers/crypto/fsl/Kconfig | 1 + drivers/crypto/fsl/jr.c | 323 ++++++++++++++++++++++++------------- drivers/crypto/fsl/jr.h | 31 +++- 3 files changed, 241 insertions(+), 114 deletions(-) diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig index 94ff540111..231eb00b5f 100644 --- a/drivers/crypto/fsl/Kconfig +++ b/drivers/crypto/fsl/Kconfig @@ -2,6 +2,7 @@ config FSL_CAAM bool "Freescale Crypto Driver Support" select SHA_HW_ACCEL # hw_sha1() under drivers/crypto, and needed with SHA_HW_ACCEL + select MISC if DM imply SPL_CRYPTO if (ARM && SPL) imply CMD_HASH help diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 22b649219e..8103987425 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,7 +20,10 @@ #include #include #endif +#include #include +#include +#include #include #define CIRC_CNT(head, tail, size) (((head) - (tail)) & (size - 1)) @@ -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..3eb7be79da 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 JQ_DEQ_ERR -1 -#define JQ_DEQ_TO_ERR -2 -#define JQ_ENQ_ERR -3 +#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,19 @@ struct result { uint32_t status; }; +/* + * struct caam_regs - CAAM initialization register interface + * + * Interface to caam memory map, jobring register, jobring storage. + */ +struct caam_regs { + ccsr_sec_t *sec; /*caam initialization registers*/ + struct jr_regs *regs; /*jobring configuration registers*/ + u8 jrid; /*id to identify a jobring*/ + /*Private sub-storage for a single JobR*/ + 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 Jan 11 11:27:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578379 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=ptAQkzti; 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 4JY7kW1LlHz9s9c for ; Tue, 11 Jan 2022 22:29:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 04EA483025; Tue, 11 Jan 2022 12:28:58 +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="ptAQkzti"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D31F583025; Tue, 11 Jan 2022 12:28:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20627.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::627]) (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 2018B830B9 for ; Tue, 11 Jan 2022 12:28: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=W56Nn7MlVy6BDIjFvnsAIa/XXDOR2WHOv/OEEnWnZ2KQFxDmG3e1kYdMH6cTHZw/M7heKdJSBPBn2+YVgeC+eS78R/XUco3vpRdj1HHXf1VfDWt9VqfiOjnZTQgyjxUiCwSiD/dUsheZ6XCUzKKqDbLDjADmRyWBhNobzoAbt9mu5cAtzPZ5jDXDXi7WRTSDFd5S9VF6ubluOLyXt9Em15RxP1GS4tGmkbSWw6hp+mwCpTgPZA0LFfPP9MN13Ncm3pBPzs7B48qYql17PjD2j3xN+V8FukGutcWBqt2bhDyrRWhJX8sW8FsAJlsKibe0182j1CrQ1QyfvJv6s/xddg== 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=WSOF4c0ykTYLct3drl/RRSHg9hHxdqyKAD4fufQp+o8=; b=Potw9Nslpnljk6oihQsHffx6M1gMxSSxFq+SCin/eEQ3+JmR6qFCS5yrvoj3zaED9eL0NbDJC6chvNJv18SIXgk2vpo/hwJoP4eDD/b3qSuY2Ljg2VmATBRqpkEuB8dvQ7LI6uz6V3L8mRbZSs2EtC6qKagZgsldm/uIIP6VqnulAu23/PZF32oQhZ48Cfx/tw/XRfOnSa7c6hsZoZqtXwggvHx9YdMaquwgY4JJ5E1tB78gqUR0kOODfAQGvJZg8lEGAHyAKJV3hnmubslp4KJvtyBuGbZzHTY4/CbJQQuAkWRYmD1jnL1GZQjhKyQoHI8F6JeI9QdR5ClrHKKoKA== 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=WSOF4c0ykTYLct3drl/RRSHg9hHxdqyKAD4fufQp+o8=; b=ptAQkztiJJzwPoSKDlrPr5Cytlgehv1G5RVTYq2xYRd/yWEkdXxiEcFqbyatYoQWPEqBuZPhyrnnBFIt9af56jPCjPdszsgkujONQ7nm0k0bWEOp3xpdR7fZT8lOjtDS7JFF3W7voBIk+0iUykGpaGNoYUoTCS651sOrIcmX/zg= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:28:50 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:28:50 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 02/14] i.MX8M: crypto: updated device tree for supporting DM in SPL Date: Tue, 11 Jan 2022 16:57:53 +0530 Message-Id: <20220111112805.3566-3-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3158fa10-90ef-4805-31c6-08d9d4f58a86 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: l8+kjmAqf2m03f0uAYKK025WNgflR//cq2vVGB2fzHrwJDwAv8PKKmod9AnMAiouVOOeEO9WVe3e0C/QSQHMB3NBDy6zh9wxu1h+4CoVN9Ib3h1imM18O25EXpMIrHUC84QXnF50Dz6QkBSu4jk7r1NCzYcTxVDllKR/vi+PnwpVmQt02goXs/oSe8Udhkqvh1dt4niowtjdT3d0nMBCRGtBbQgKgbNzcl4OlpkEeZXwJQBP30ZUA6wDl8W3gg5iVuIUrdjNadCGiBO4S/cRXrf6mZxYgpVRpV0R45V+0K00MJpyAvjXoeOVeb2RIEPAKlL5yhg70CdIYQX8U9682oQ8NlMH26oRCY22HVqBfWjDGodtpebiXhv18CvEiBFBGtlzRV6OGZS2NepD/AUau61AiYlJDBBYBNk+qYYz/hBJR9nfvX2Bli4zq0402GlNSSJCaOIVP+979bsZxopdSA4zjQ6SK2Zzpk3unuQ98G4lIA5Ic5Pm2cLyzWyazuptcOAbtZwBT1lOB2gbal8q4mkLWr5kS7SJwaM+r/kJ1dL1jKCrQrlrhZqwQOsmx/TkStzYbvVUX2YE5mzhRPxxtb8UUn4XjMKfwf6LGcsws8V9n+RY4kPbqsGNhESg/UV8Obe3YAOfIBDlS83POqYCFF/6azJSk/azxpPHz9ezlfApfq6Utv111+0DOKu3MGb5dWbbeuQnefBKr4D9cWL8ng== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hNR1MW0HhpOeSyKSxXqk7cQa/fnsA7e7pMSSzpKEksW2evdN4+CXgKXCeXgtemeiE43+JIugia8+6eXzEKsQnnQcxvOJH3Xj4c1xvwWGFRb1qLUVwUXksOBmPXZI7V62owIFlm6e3oIq4+1kRESFT54gn63sk6joEe7+peZQhil3dXeXGJHLnQ+dxlfq6PpVQjq/t+Y+GHi3xnEWp3a4uHlyHnr2hFBaq3rolbiHzzMPsueHgm7z4f2EOI2SlpVzvqzSSKXYu8nJgiqhZzDGszbN8kaOG95cIHXbAMePGNwlpV8OmhVsEE9VotzAomec3urJMxialYmtGDjpqAHzPaG0LzqhNFLWyInwk6yIxViaUnVxWjOECUcKZmVAObQaKdsLMczE3g9o9z8sSfgJmoRQhGayHMTw5OeFHbAGh7TUbMgSVgL6NB5V9/pxlUhx3H4oDPAWjwwxEY46A/GeMtfNdRzqaUgKIwIhNUNPqzCsrPd/CDdJ4MHCAHrP8gtlzcek8tEvywcdwg/bdWKo37qsrKI8BRjTixBHX8WV4Cjwtb5CTpC3Igr0wNGv+1SUslzxxKv9hHIoVP83wHBznou3mHMABQCHThNI+CaCefIRm+FkQjNe/gFUJDpsrlCcFFbHjX4xyDjnTwLAyEqt94sGPl+aad/x+WRa+jIwiF0D0UvNdh0RsW/IjLRgJ02I9UICqGjbt/KveXPaeD3VV8geVaExyAfjwwwMPoa37luw2v916Lb4OLdZmt2htSxWmsLuw0uCwIbTZXN6rdP2oo4d3W4npjkbLA3gKa9eya3pvZUunGzMwv0ephaG0vLmDKbFMzsbWsp7pNysPqPYoUAaOusGxdlL5bG6/iP5zYfSQ5PRXOtsqmUBia4Q7HpmFYrAap+aBwgPBcvfH/MNJ6rlgF+5TDnYg9AI3M26g/1xbryuSWunGlJn+fVeoD29xiVUKIPyLB9rkvHODizZKjXy20mXrPZCwCKXYhsPIhRzvpDOmAkRgv305O12ESMhdXwg55IDVshj/ZcCaQzMXWXSKtFFzapmdLqKA5VZQSbhCKa9tvarwiQbbfs8ggY7VNOFaNsFAczZCzwDHN453jlSqg9XmgCCO5Vg/XbZnK9RPQkbOuWCM6W+qzvDzvPNnwskhxBQXs0Xg+RiBzDRfst96wNqT3IJiRJklqHtEt/pLyTrZXc5P4EIpWaLa2pnAG3NbiFprnK3yqagxdR1U2Ht1iUYPnZf/qxiuKnnPu6uKngtw7578JjAIa1cHZE9qU9RxYFAq5bFS1ZqG1FYU0IWljlvNtAB4KmdZH2mPgN8orEJZeiIEqQLHfiTQjA4zCcb24Z9671aH1SCUlLB+Z+u6f6PWE8qSO9cXKrWtjAWgCA8NLlW2EGeacPOgzJJUvKAJUu1N0PqXgOfHmnbEHqPxTtgEjy10UOnM57swkgCOOYrPtgY8IQGKWLj+R+I7Q/AgAH3eeQeYuDgGmOSMJ+6JG36tqeWzNjTaOsmWtNrGYz2yTW1H8+C+DxbfSN5yR2HszxR7b+5XocMlMJAzwB4uWAcfv1F1ScGwDXTa+PHTJM7pxzS/PFK6RvyMCHoYdgS6kEia7YChcVwrPNGPu7a4YQIHA5thIt+T35PxKc= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3158fa10-90ef-4805-31c6-08d9d4f58a86 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:28:50.7324 (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: +VRtH+Vcl7B+IotHJtKY6FaVK00ZHRh6C0YzJhRROzjC8CHCgI1+BzTquvg4ZAWgkcyI1Z8eXn3+IyyP2RGw6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 6b459831e7..e5682ca165 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" @@ -68,6 +68,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 6f9c81462e..8f1f942215 100644 --- a/arch/arm/dts/imx8mq-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mq-evk-u-boot.dtsi @@ -10,3 +10,7 @@ sd-uhs-sdr104; sd-uhs-ddr50; }; + +&sec_jr0 { + status = "disabled"; +}; From patchwork Tue Jan 11 11:27:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578380 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=pJ1VpGnE; 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) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JY7ks42nDz9s9c for ; Tue, 11 Jan 2022 22:29:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 72C6883107; Tue, 11 Jan 2022 12:29:06 +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="pJ1VpGnE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D765830EA; Tue, 11 Jan 2022 12:29:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on20617.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::617]) (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 4CFC882FF5 for ; Tue, 11 Jan 2022 12:28:58 +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=AHfvJRkkmV32z1vTvGHeLlHge+mMCwN8+xAKMyK3N2eB4P0QKBC2Fo0WfYmrl1pwhXxK+Y4OWA6/Nh8iUuLD3R/jMtjVbhTXAlORCy5wuC7SoGITB6xaicZrZ/jjZPoofESZUbVL5wPt2ugPKpgVUfCavdMf58WsxVgemtfM1F9YxObPi5VTvWkbBu/CC4pT0bzYI7PbToa2TPWyireBR+WZAs+nsvh7gal44130Liu/QOtwcno3iPrk359ViKbZt5cOGZzjdvi+PuE0oPRwtfIkCjZsMlFBZu3hZp/ZpooN3Amr/V1fXFa3qcdUzO+RfBeeNQ+5OUO9sIfD8jGe1A== 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=OxzoaQuIYvGb3OcqtlqdBxjq4H6pu0DA50ypgn1QOmg=; b=BKwRTroBl+9H08R5nyVU1KEWXPNCW04gjbnvJWB34WJFWQnWxB+YiYBNhSjJd5hjLvo02fPgR/+Fs7jFXkJxurPIKXBYvoYANfsQgE1QDp2H7dm/mlOsVRt2hNIBSrfPo0OvPKPAexiwg6OmmSrZLaEF55B6KjLnINkbOGAQd2cLBlzYOyg19SPnwypN31zn1Li8rNuiQzsYBkkb/FVAbeW7/fahcEXfJyBTXlRslJPtIEVUuN5yjYgzdFkRXqf0J726Cb0aA1FymcaJyTyhc99c0MjGQMmZn3zBOoxsh1QbM2I/ePK2SskY6boF7W8d32SmyLRf+1XlU+wwOeJ5Qg== 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=OxzoaQuIYvGb3OcqtlqdBxjq4H6pu0DA50ypgn1QOmg=; b=pJ1VpGnEkBjgo+Jx039zeWbpY2il3OjA1lMRm9PiUQDt0z6dCa3Vhf+pO6b5awtc/zVgnLVeFA5CWgYfaUyTZGGC6YiZ+/5Vd2M5gbgkLlO+kpXD2Ij9fBJ9D1l85q4qKCNnCCn2VklvKIdhfZ2q4aH0V/Jb/w95OojGmeI8AWU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:28:57 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:28:57 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 03/14] crypto/fsl: i.MX8M: Enable Job ring driver model. Date: Tue, 11 Jan 2022 16:57:54 +0530 Message-Id: <20220111112805.3566-4-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5175695f-8a4a-4bc9-7dca-08d9d4f58e50 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: LcJ0oKYv8D7AnerYniQQO5RDIqLsg3UGwqj+87XahIuXpnHrMkTVHNpJH3S8WHFLCJujRo21uC+SQA3yv1AYxJfwdmrzznwf+uN1L0+kSV/09MOLqmRCWqyJo1NTCvXcMO0u1EHCX2DA79Z+utEiu2+02+CgHPmxy5SIRbJc58wezF+UglVNQYfitINW3eEmNkNNVG2lL894YVdA4jrFw9RZvcUMbh2+BVVflrzB0pRhah4kKq/i5ePyhxdpU4v/wedFkzvJFRbIULh5A9Oi6VxSa5uRp/pdOzGJyWWrTXrbSeVYf1EqUVNmbwCFltgEC3j+CUGLpwZfbtQCvyJHhOf9BBDlzKRjqkPdbr5/zISiVx3lmopWjEryi4jOqzEJOy7s1SaqyepfiDAORMy3zTgNNrE3mELBFnE2rwU/Z4uUaC8JNf4cGXAPUczQPaCkAawav5XMHwe+qK8iJeErDl88i+LNT+/km6owPJBFVmtd51P7N47pBRH2KFlN2adPDde5Pt86VWEgjtrFl+uOxaNbQ4te42v9vYHQr5Lo9i6zWAKLP/LzQI3eS0QG8HhT8I6iT86gFhbkRMet4VibeCRZKI4S78dg8/UQ28t9Pm67JvONpw8ijWWzWxI+phcptTiY1SHQY9LqMOnAGfsNefzYVndjA9UK4XUlaBqCiXwzBU8GgmbPh/BzK+uuTla5c/AkEbyfFrtaVLmEqTBF6w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +cdAJkgyz0SbcRG7+mcTCbG07nwDVaHe03i3WWDj5BmFOsg/4wPi8ZYUc870QPSAoZJ63ZglCL0PPI+CwR36yZ1eueSlOCRyNy7GOtVy+maEHjlcbC4KB2ad0askLp7pYSLv2Z8nyvkuD/VNqHw2/bHuTHJBXLNeGL38unxLfp96mRClKmfV0SyZausPGRSmZHkgP57a7jUlsjTGFnREqcmaOU0gg9hKbQ3usmmH2FPC+5u7rXZWFlGi0RJh0PzQlF5Q6J6Y9Vq+nIqLRHuA3B8NfyTVPT+DqDwi58RFEOXgaCtp08t1JMQRyO5WbgOfMaZXbDHPRr2M5Zetwcr+0PCBiIqOm87B59S9iyFdWjzxySY8L/rkU33Jiw8VtkRX47Tilpv0Hxm7UMfgbwQC9qn0dMze1Cp41WFnJhOlkI0OS+6TDoHUTgDKJu4xGX2iHJ4PmUZID9GR1M7OF06BF7bEOGvP5HqWtuNdKK44RBugtJ1aT2lDKzZ02jYr7QajFe2t8+7vcTF8tm0L2Q+m5I+DB+xtQUddctZNhlaUXoEwngyR9Iv5gpNC4rutullOEELUkro7hBCJYWoHRqHPBhIGJ858kgnAn7xL+UiooAwHcMk0RVybL+600xhuoqgwLlO4elu+4GN+RuP4UMwK3Tw7l1/h8N8lNEXldkBJX2h2mglbQapLRICEIT2a85naDhq+N4gA/mcssJqAe5KpwwwWHuCtna9dXu2lEc2aninqAaYfJmKheG2LKPxVz3DPZl9J9nbwfFzmzN+Fd4m5P/dee5mrLXGoaY35/JwqtB700SVdE91AkQ8Gj4XWJ6M/nQ7btVmjYMRfEWWu7eROqz1XKlhkL7klNtn2hzXTlNlxYEBBEbFRwYMV4FF8zCnp4PVGvVjIBIfigBKrwTqkTPORk1xFqSY6XJlB2RUseK0WapWcUTQ/o8MJGpxCfN9rXyuh9M5j366lzBrnty+A1+aAI9dBLFuPRpUg/Yg8zODCbFOZbFPx7bktEof5h721jy0wvvE/9P3OGixY+IPyrC1Kl+f4bjYMZBqpnWT08H2ejj8JBnA7ZvEODPCrcnByleyAoqg8vK62sr/6B0I++5XpIqXkaSUAtSK+vxUFmlZcXWBCXUZF/ORFJ6rThIm2/JoftxGeMxOdO0qsNPADr39vmxhEA6okw56clUxt8UAiWCl1oXTLqVORPXlmcBb5UIDL7ebwwncf5ExdTu7WtzT8VQicLuwnx2TkEUhqEvRGV+xvvbmZLIU68lTVDKDOtRAwjYmWs5HFJ+1rJjMAA4HB048Qc84C6xhraN3vd9oEox8IVGlQvuZcgOX+jo/SsVyQa0fYHg9vS4H5/7lgl43rjsepmTb3YVxEOlmhOTVPXICxRZ9GR5p4ZsbJLFIe9LSSEJvuouILY7OpRBrMyE9P+q24Ginpf1s4xhL8LWG7U+cpk1lsCt/B9qN+BxmtGx3nIWqfq4xX+Cd1jMQH9vKXusWylvcVeWHKzbZnT7fIbC19vB8bVhU60Fw++/3WpAu4CNr8xGC4c6tStqiXXacV022T1l/e1tYvQ3bCmsZjXouVIsymMka7TU1gIdtS9x/7q1Mtkj4Zlqsnta9yk658HVBFrdIMHtfSPN/8bx8= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5175695f-8a4a-4bc9-7dca-08d9d4f58e50 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:28:57.0914 (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: 5eLmVctTGxYtEtJ3Kr9ZmmGNLQSL6VN55q5MIhcBAr0MUKHJr4tVfybwaVW0wFdRyInkHbiar1IKfIAZbEQisg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.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 | 13 +++++++++++++ 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, 68 insertions(+), 12 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7264d72bde..67f6805b13 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -820,7 +820,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 d6a869068a..f3713529da 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -39,6 +39,9 @@ config TARGET_IMX8MQ_EVK select BINMAN select IMX8MQ select IMX8M_LPDDR4 + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MQ_PHANBELL bool "imx8mq_phanbell" @@ -52,6 +55,9 @@ config TARGET_IMX8MM_EVK select IMX8MM select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MM_ICORE_MX8MM bool "Engicam i.Core MX8M Mini SOM" @@ -91,6 +97,8 @@ config TARGET_IMX8MN_EVK select IMX8MN select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select SPL_CRYPTO if SPL config TARGET_IMX8MN_DDR4_EVK bool "imx8mn DDR4 EVK board" @@ -98,6 +106,8 @@ config TARGET_IMX8MN_DDR4_EVK select IMX8MN select SUPPORT_SPL select IMX8M_DDR4 + select FSL_CAAM + select SPL_CRYPTO if SPL config TARGET_IMX8MP_EVK bool "imx8mp LPDDR4 EVK board" @@ -105,6 +115,9 @@ config TARGET_IMX8MP_EVK select IMX8MP select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + 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 8103987425..4e7accfb89 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 79f03d1636..98a4bf5aec 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1273,6 +1273,7 @@ CONFIG_SYS_FSL_IFC_LE CONFIG_SYS_FSL_ISBC_VER CONFIG_SYS_FSL_JR0_ADDR CONFIG_SYS_FSL_JR0_OFFSET +CONFIG_SYS_FSL_JR1_OFFSET CONFIG_SYS_FSL_LS1_CLK_ADDR CONFIG_SYS_FSL_LSCH3_SERDES_ADDR CONFIG_SYS_FSL_MAX_NUM_OF_SEC From patchwork Tue Jan 11 11:27:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578381 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=cXfS7JnK; 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 4JY7kw0Y91z9s9c for ; Tue, 11 Jan 2022 22:29:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D614183041; Tue, 11 Jan 2022 12:29:13 +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="cXfS7JnK"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6E7E0830D7; Tue, 11 Jan 2022 12:29: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,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0628.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::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 6E3FC830B3 for ; Tue, 11 Jan 2022 12:29:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kz3vENEwD4kNu5fXKiuMCBmideO8ewCT2ItT9UitVv5xqEowM/Y9cI8Fb0gOGbdb5dJTMzLjpH10KY8SNNzgfUeTKC3NfG8aC4vp9YW67PCXilPmpxo5ppPQHbv/aXqbvNLC44KWyTWfSeZjAh1HSz7qfyr6+0DIgYEwllyr1hURLMeUCtXLzoWdQV6XLWgc4npjsYa6cUsyBcphB+vy5ygtTuIkYCeAnEISKWduH1Vv7X8rwl9mLj5z7S9JJeKEd7HpRi8bGvvuiP1aHE3I8t+5sVnT/L1R/3WQsg8X/mm85g3Me46Btkk5dlFmkJXiBtQG+HllHQb2T70IguM83w== 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=x34EcaQeGRIjH8JN606yVVwKM+op2Lex9KosO2kkqCE=; b=jV+EJZOVsAOKJ7V2MJOWQOtdZcb+8FTNsbnfPuuJNLBm+9qvc6B9Xy85BpaIlzbMCKuLaJs1yTLtCV08bobuR5RLs6FMC1xUghuKzTKdposxWf1yZOai0fn5zYbJloghtkSAO82XwmdaFN0y74whD9Ng7d9h19TyuD/0LM3AA2LEMFSKifJITMAzZQGXN9Rdbs0s+847fc+sqDafG0n4AE7YynQhMfMYkwVy5mN/LgTCUd+S+NWs/YKzNaS/zLgT2UGhS6jg1GISvtJKKLTn+hWSCttOLvOHL7cwXjBmgdfd4wrl7oOXcSxD6Tjb5ykqz/bD7ujT+qdPB52mcRx/WQ== 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=x34EcaQeGRIjH8JN606yVVwKM+op2Lex9KosO2kkqCE=; b=cXfS7JnKOhkSLKVrHcRRjM7vZR9+1K4W9XhPPMVkgDlv5GIXcFZYFWHstiRVv/nFafROjetCh3vOVMJwLIAywsJwJ1pGtI3jDkdrVVgHLem4wPZUtarylLc3/19Tn8HF2ca/F+Vxv+hTwkhKYKcUiWlqIsOnCIxk2hZb/W7BlMs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:29:03 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:29:03 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean Subject: [PATCH v9 04/14] mx6sabre: Remove unnecessary SPL configs Date: Tue, 11 Jan 2022 16:57:55 +0530 Message-Id: <20220111112805.3566-5-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ecfff4f-99ca-4913-cbd2-08d9d4f591fb X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: Xvzlferbx6yHZLLgUYCJYfFWqsI92etaNrgFiZ6NKXbVAxiOshObwaF2tLMVFPdWw43SIB3mXsScPtNHOEgUjtYN1W0N+uH2KTd14WG7lmD8L7dBP/h75/s2BBs5u8aOCMYQLt32A4ylijdMPEm/USEfpXqStk3RbsFrAfzmuDQJsFkArd4U3xHSvh7JFCSTowAHJrl3fOZMdFnlmpnHbzx6YgusyToBCNM+Q2C7lhBQUt7L2jlTwGQ0WQJqXCRUzietXbNbTdeDcLG/+Hp1FTxglcdJQRPq/krv+3bzf4lqcw1GPiAzJqzX22qGFIxpEE+X6snIZfWGsRIwfsaOtxSMuLBCSQRMpSGrBZnVvNoTYa3fOhDXe+p64m8W/YNreben8R4YZtHjJMPa5GPzk1Gw7Ra3uOSGSFlSekyvW3vePncmS1Yi2+INWM4aSbnDi0uZPqQ95LgnOwE/dNDIcJyj5eVhThu7794v0rPf5vDNo5ghS/A2iP7kVxZsNeFgkK/5xEspFcoWFPqjrJYLzmcjQJcW8g6sizJFdkv3m60AZ7LUxWRAUEN1NWotWJ2m1XSDUcdzq34ua0UTTU0rQlEUIwq/QFKw/qypipSXRIdok4y50PpNr13bA9ABxz1ZFI1H3I0lwJibYMC61k/YjfacLtFfRq0ZqYARqDUvsb4GxTqFI7RTGxmywjaE9t1qgfT8BJw1Onkm34N7YkAMZuRb2Nsgg8DgGDlrSK3rgks= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: knMnhqGPXYVYk9663mp+qz0t5yzm0spbPbsHPKSUvwynLccLizDP+Phpyaa0PwV0WwYVmx3oYVtonsHjTQMtLFzViVgKHSjXSzWtlg1hoaNU+fCJOJ8gVOmm5qjy6XNl0fLwhrE8t9nR8DjZL7xhLg3kfCkirNuShVFe5Be6ujX678yfayM0ksitW43a1pURGj1rTKdgWXUNwPQBdwnWWs9TnGqZmkcnRNIhWVxyO7P45zL3ifkn8Nu1StjtoDOLrjmKMoEN9t5Ss5L/CWRE029fTMhDUCZW6pZ7Fp8Bp8kWBdVZ8Jgbe0SewvW4Fl4/b0ic0KdqnylC0/eiuzmN0/tJu4joT8lDAhtQxx/hAz/xzgs5HnTc6cKKgfISreeuxbUfP1WM+wXas63pkodq3fAF2GO7HgktCl2YlVTq/pbXaHMZ5ysMd/k8VnEO+6VH4x6OxeeG0Zm8P8I0WoVo1J0sajQCfGo4VYfvToUL+QsxaeZrA/6BsYbwXHsWHW8BOF7f5C09tq4/baY1atVpKWipt2juxaVQOmEHWu8tgwTKr9zNL69ShZYuvQp7Dr1EiMakDapjFCOi7QMgTYyLXU5EPJdzn/LJPxUU4t993yYwR0qXPIz0TI72AvkrDVZpqIY2HbD0XwB8THfC4eHEX4cPj6UuVFHdHZ1ulrT6yyJU5PdKGhPkVmHg3SngubuYIIJYpfCi8wSenml86d1KUvThoW4DzAB2rpuURoKqTpb1SLuYS0pLMk6dc9qL24NULoKB3Vc+C06icKWAjQxiQOj405UCdbV98LMmp+v4FYTTDR28kYjLO1OunGz1GCqm238lIhqTulc8GE+91TQ6aV6keBsjVj5uXz5oMyV1VsgnHdR3KBos/KX6DMQ6qy7/YCecNmfBrZHSAgExVgaJF3qHXWAggCyL4C9KVyxVl6G76nkeBX1oO29++FSMu6Y71E/VjBmqdkuWc5jPX+ioSMGSAz331EZJAW1n0xuBwnRubtNsF2696YLqnRf6QHzeBtirCnJQKBAzkGzcarZdGFSJnw/6Fq+4+X8L1SyQ++LNKRzk+Vkcy4I5daV4pNCv+uf0D/j17cp1A/L6kLNtyyjYi7HAwBg1hemWkyQYIUtA1qJZ6TKFXTmXddRaZRRINVr0blERBAEEgn8NAXUrHPMSB1F2+wbhnsQ1cMUl8DWRBmmFVvCUYkjz5hsjAZIKRRGbXrbsZXeQum/ulTO90HPcTcuKrSgta7ztXdoOqtwQ/VlboUQXEoGeeMIQx0cyO8DRpeJlcEWoO4Z3CmNmA8QRm5tb7W2YL/DB7r3uZJh2+jEMs3kTyqWJcrtGpuxfZ+u3bCT171C26NB9xkGxVrv6hSxKd8PZ4OcrL7RRbbe357EaCCdz9GAveTClVKjr4MHdgNqe7aXhxxD6uenshOTxhJaTJpqsF2WHana0kQXGbxj9dbjWIsnxeihG9sa0lSH+9B/3KRMjeLWBpgo9V0kKELmQfyznHIO2HTCb81KXVDOdH0Yetl4TT5xFewrQDQjebB4UygmpkrmKrId8Gc0R2ujOEPgKtOg6dyvOdqPK8oaylVHGTH4HeZk1b9F4keDZUI2LL7jaWKH/twBT3EDPNqlFe7Qg0XzBFB3Dcho= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ecfff4f-99ca-4913-cbd2-08d9d4f591fb X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:29:03.2941 (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: 4jI+OoZcwXcl5vjHsAK2MllmSV5NWn9gmxIGk0EJ33I5DwkA+QMhXv2cyVNX66ytKD+Nx1I85jwG0dZ6lkeOFw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 e03ac323ee..03e10f0711 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -62,10 +62,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 6cb74132d5..2e250397e0 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -65,12 +65,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 Jan 11 11:27:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578382 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=TXvdNsnu; 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 4JY7l608Nlz9s9c for ; Tue, 11 Jan 2022 22:29:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 53168830D7; Tue, 11 Jan 2022 12:29:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="TXvdNsnu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B0F0381E3E; Tue, 11 Jan 2022 12:29:14 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::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 06602830D9 for ; Tue, 11 Jan 2022 12:29: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=oNgyYQVXNF2flMu7jgQ2/7gEHUeOepSbsSELIx0jPEm+4Wx4vbVQpejsXq7C8dmPfe/gqENwfZRAyGBInazOiLR9kkX85rXDzoz6fazJJa7GuMZ0Cw3EkKBBzI7WhiUB/lNJuSQpSq2sk8Hvfc5S0PtZJ3jcLTmZtBO1vusTOn+0nqcq98VRWVq8LsBwI/qW2eVrLEubmQQIF6aCLVw3PRG1rQR3YFLzsE6IXpad2+OyYMb9u2HfEkn1R52FbxL4pieg3QqcIF0Gyk06R4/nyUKrfJSyLHMjZuchiO/J4/ZAu7Z+Bn6ADp7gLksYwC7IPSSlskAIcFY3vCftF+FnpA== 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=xER0VpMQ/z1HFwR+Wzvu/BHVZ1kjCyE0+V3w5q6RgpA=; b=Y46tORr9Klw6M1QMWrj8GWnyrNnnG1eYaD+NwJMcnuH0RMdEH16PEGcdmciYXeYXY1rqbzG5a2XGTFfvPnZ3BDHL1ckod186PdNqIIghd94PkCM5vG8+GUOQCnL2u86dLYzQode6FcVRqTQX2pV7c6UnN9ACIXxpibAy8rEroBvKDii/SAQdMguPcgOnRNio3+VbuJHhEPpH/xYeU0VDcqhHDa5eGdMLB8mtz3ipM6nO86mVMjZEi8U4jKsN27HPc8YfhpVqNryZp7ZRc8+Ppv6AIm6smwcP3uAXuHJXpquI+SLaf18vud21l2C9lbB/LjsV2MIG153yhM/ebNMp6Q== 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=xER0VpMQ/z1HFwR+Wzvu/BHVZ1kjCyE0+V3w5q6RgpA=; b=TXvdNsnu4ImVcSZgl7D3/myU+1SZ/g9S2aKGYFsNEqpWehwFb/faogSMDYYlvNhVAhhfA9OmidwDwfUEkVDkXYbX1VV9Rv9ALKxyJjJYBx+Zh05JzCwyv+Iuqa3i/iqgdNBOVEFoqDCe1ttSG32kaZBLG4BNyb32KIO9me4mSiw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:29:09 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:29:09 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 05/14] i.MX6: Enable Job ring driver model. Date: Tue, 11 Jan 2022 16:57:56 +0530 Message-Id: <20220111112805.3566-6-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b1b6ba76-5a04-4862-eef9-08d9d4f595dd X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: N0xB0d6jtAFZBxvnWdA4bBb6Itl9KGgEIpG4T6wZ8Ew0LxmefhkaG65jRtXtXOYADemka0uIWoMixwHdy4VzqV5TBHm+P43xv6po6FUH6B+7wW8js6N0SOvRp+PHkvhCJilHacyPT8/FTqX+ptwnZ2MMRTmF2DtqMoq9yIbKLscP8BA233BZwWNuCk8ie/MaI3Z7w14ttHVcSRPnrhw3MVy45QgeizJJuXMfNEXZGNljpJ/WbM3HEmzZETLNyt5/lfukFKymVFZ1L//IALg0OFqK+jimEIg5MT6kAZS2ywVO+QMoGRO4EJPyxuWwcD6QT2RVPKQi6aLEZm+X0mYF64QZXXtaHPLtX3u41mK7dwVRWK+FyqtTqOzPg2nMLhalqsq6Df1CrLF6pEAoQSpusbKPT1AO1z2uJQHHHrrUmdwE5Fa3kY+dBtsxpYpwX3Vg8LufDZXTkNJDjalHfY+svysdG+4VpZ9+CH+Ehpj9Eni+JlHH8dU+MS9UTU7o4DIFOsfy6dbnf/Iv4Aicw98gnxPEtJf59MBqsdHIK+opscKfi3JtwkqpD2HvjorBp2Hx7E57pLDIpr6NXf/uXo2DwjLcJvRWB8QCNXfQy+8dA0s98Rc850yF1No70OK/fCrsGpC9b0xmxshnIOeusakQvx9iedBPcLkWz0YEnIJe+SgXWwSUmekjL1kK4eP6vxy7apupc1M7Try/Sxv/LH5Yow== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KZtt4SaJ88Y+Ppy9bEylYIzktYnxvyZlJBwt69iJ2BNoPXbFRtT5dEs/foGvnEmW/U7eqA2KdFYfn7ErPa814WfJG3N/Frl6JR/TQyO7ORiZasXT3HwiUzKbrfkLUApZcJOr6r70oNNQmfh+HQ1TBxnSlO2XAN2kiFhVsGarYc1FQGXg46fpEUuUHR1tN+oL397HGEM+OcJTSfrqnoNI9Fw91kF9gqTShmu43ugpxNNkRY73Nhi0JGUBG8zRRjdIm82ydzPGkJWpzPjrMaTHkN9uRrTsIgo8Hc3pwc13az4fPJYgzAATbn6CUIGUEs99OpShVTNIMiTO+zsfQrqqnJ9vJ+OoxU6zlsPXGDuhKynw3U8/FvTa8z5zLhZGWIZOimVmZrs95va7xCLCnMZnHu23kB11DANmVgRZq9PpBF3VbWG4ajscbekIhYwNjznM2qO40SrCzERVCJaSjNrzrWjyxhtiBDAnsn1WnI8QQ/MqFU1t9NvZuq7FUYPmzLqYUWS8N6hK8IKVGZpuT18f7tKeKe9PFPw4Z+/oLyDSKbmYP49jN836nz1v0GCeYAyJcSsAvGLQB/blyOWTlfk2+2wrGdiwwAhrxFT3COuLBT6i9R9h9apiRzpzZzCqZTbszErr5rVBdsfCD824niL9+Kt7JkGhWEJ5FBMnqBLoO6s2MkOv6Tq7sFN8OgZCYyUk6IX2p2gm7A4G+c5lWgnvOm/RA22NJoKFCmqqOjVQgW581tw/bzYc/j9xDrny6EdWDJIKQQaqTEz1T0v5gG7Zg2rMMrk04shnfzN6zcskHotVzsTZVR0vUsTm2T3QqlO5NH7bZdwZ+LjdQmli+Qya6qTvZT6MsNA/9qbVydGFQO4OCaXwZS4pYIXSAxHJSU2vh42x+go2VwkIJn0O8Vn+lPigrd/US8Ht84LIX89hGHQ6mKiQMO4KQ1PIBJ5W5BmIUDd8d5l4g4zlfDn84qp+4agrQ985QaHNpS0R+Ape1fO/gxJ+7Kb3cXtOBZe3cpOgf4CxbvOhZLC44p1BjjatkfaZNngI9Oex8Di62mE+ZhcmS+cgdoyxsrDx1Jq2POgFy9bsepFsj1GzguwUv/S9aa7SD8+wNssr9odrJNQmPUJwIeIbVmNFXejbtzbZXd+wE7NzbSWUoaUEjHanR+GQB40eASG4M6nG39gVxujDhv2dUwc9sV2sq04i7vjcpXxUNgZ33qv8Ktm7vajL6LsgqRveNxzzuhXS0jrP9oKICtO6FwYWNsOHxhROprr9fNak2mC91OwUziH6R0bhIjGqpBx/Mg1Uw5soDotGTvAcuwbDLRIsBjNmzvdwtPa1y8yLn7/CFSNm95KIwmYqoB+RRpQAeUfvWTu+J73JisqHtH9NTnoNJKwNeLsHWJrpPChXeoBA7WnnSSCIkxI6aYW0V1pEvxHzo03cNqR5SFSi5hmC6BNwWgKAID1Den8kvvMOLELemuBMLRwR/8kLlHJc0eQz+zmfUpRQUmz/oXKe+XZbY9Uf0UA4kkyEI5657r4c9STw0ulBzoPukvUU7CZr8OYWkLgFn3K0tFipFBj1BMbGanCZbcJHApslER5Qbz0xRqdEEkClusGGyw4CbA52AIPuVAu6zYKO4PwaIegpbWc= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1b6ba76-5a04-4862-eef9-08d9d4f595dd X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:29:09.7624 (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: on7JB9FbQqCtsWIocYjpaUgz1h7Yc18nB7XNEWrrThLADCiP9uP3ArOc++Ia+yPsrQFNUGxWMkNm1Tbe6j0FiQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.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 | 10 ++++++++++ arch/arm/mach-imx/mx6/soc.c | 12 ++++++++---- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 98df4d4e42..3d675fcd73 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -354,6 +354,8 @@ config TARGET_MX6SABREAUTO select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select ARCH_MISC_INIT config TARGET_MX6SABRESD bool "mx6sabresd" @@ -364,6 +366,8 @@ config TARGET_MX6SABRESD select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select ARCH_MISC_INIT config TARGET_MX6SLEVK bool "mx6slevk" @@ -386,6 +390,8 @@ config TARGET_MX6SXSABRESD select DM select DM_THERMAL select SUPPORT_SPL + select FSL_CAAM + select ARCH_MISC_INIT config TARGET_MX6SXSABREAUTO bool "mx6sxsabreauto" @@ -404,6 +410,8 @@ config TARGET_MX6UL_9X9_EVK select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select ARCH_MISC_INIT config TARGET_MX6UL_14X14_EVK bool "mx6ul_14x14_evk" @@ -413,6 +421,8 @@ config TARGET_MX6UL_14X14_EVK select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + 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 Jan 11 11:27:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578383 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=iHmnf8Fy; 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 4JY7lJ53rbz9s9c for ; Tue, 11 Jan 2022 22:29:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E606F82FE7; Tue, 11 Jan 2022 12:29:22 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="iHmnf8Fy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A9935830AB; Tue, 11 Jan 2022 12:29: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,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::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 2704C830B3 for ; Tue, 11 Jan 2022 12:29:17 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BkFnMPb0o2xn1+utrm+ACQJXnL+z3ln7zDGYzO65MbyQd96veAa1c2Bb1xdgMKDv5M1AdEbddI7xwJ43KQKZTcHBfDuTTKlATZHYxU3/yHn6w7YTFn3iyPvWJ3HSGDDbbykAs8Uk5drvUABQEHn/oWQFlbEDUz2moRT+Zqzg4TwWIsOU3Acche9pYHI8a8HdybkeLzzGtqRzjkdg0g5DVPCwhgnnABLhME0GTaWfODmh6x2VtqiFdUFuFdu2Rlq24RmklYY29y9rXaVR8i7XUtVGJRj0L2NMJDbyMTZ3cp4a9PxHDKcjRbT2H1U8am9aN7BnLQm3I4IPP41/L2/FWw== 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=zG5LN+3j04+nZxPl+UZzmIjR22kKmTbqaGXI8Ohkuuo=; b=HbfgW6jgQGfDvatSNyuowTmfSs+Xlm6C4IT3ASFmff25n6gsLYjnfJfVvQVDa6a99O2kqvPgjnod1Jyhrztvzoyu8P115IIRgDLAUAc/kPW44KdrJKTJK3z32zyoLbxQAoyxS7bJ7EIrsma9hJsjgtZKGZpZKGayE5GOTfT0hio9nBG4H1AYjXD/9BYxOTHD9u4SmBVbYMne8AESodkZ+5cTArDOnkZXGJAmu0XZRmc91F+DaqELvq9RgG2zu7Y9A9OY7baGZQ4uTEkcQgya9ol6o5pz0KORM/T9v6zIEg9M08bb6qUs3KE6T4om6yLmi5GCYLR5vENyBrwyB89Dwg== 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=zG5LN+3j04+nZxPl+UZzmIjR22kKmTbqaGXI8Ohkuuo=; b=iHmnf8Fyo4yWpYpVFBsjhIaXU4Q016zjSG2IEv7Z4PTKNg931W7RnXhiPLAElgV/s8fcoJhSNDZ6FOkymU70+IDOJkT19UxcjR5vg0zeN4aCjeTHl5dY9H649A3mb6uwnJ+WNUsM9AbDituJGMKFXHlzDsFrH/Q9koInL53rTWE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:29:16 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:29:16 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 06/14] i.MX7: Enable Job ring driver model. Date: Tue, 11 Jan 2022 16:57:57 +0530 Message-Id: <20220111112805.3566-7-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 827434f2-2d6a-456f-1421-08d9d4f599a1 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: /5iGbYtdt267K3/VMK1pQnJR0fVkvL7/oBgmOwb4tYyuXNfV5Excf+3XwBH7DpdV6Re7hdlfh9cCcLmjhjEc0cDJiTZnb70HFYZa24umUOXzzcUFT1V9T2g7hbbDBqA1jdaJaX05EjZ1MocP7XK7ZEqZqmbyvSb6TSiUtvkU++xvqbG7ck89o73ib8QUAWeZQu3SqVOePsH7d38hFb0HT+tI0V5xQJLmF+o+RqeUf5LMg6jUOu3O86FbBndZ/9L1/dqilzRCxT+LZCDtRM0Npc14H8XxmmsKYKzMGj61qpcC8MaZ6/tQk6H+GEmxeVjfZimZbwK7hnFetUpcWw0FtclXGYQ1rwPYd7RnZGsROyXYFBNK8a0AI64G32JfNy/8xmVZ1pG7/CSrkv7XVSfFXfGjzzJW04sWX1l8soRlcNiYlB0su0DekbbfH0YodeWR724R7XBVwhSQpoxzG3ZLtlWc9AS9N4dqJqpRRnDlgZLkRI+X6RbjkoRVSeazfCqchr9XjlOz7d0VFmbFDik7V8Xbrz7MCtoTQmC/3oF040eeY19vxxwARfz59xkSOKPNbJWKykQpWpeqcv8DDhQ6XkEZH8JfxYrX02Q/l7x6W83gCMeSN8Ua9QwmxXEpiWU/vTvAcATIjY3+16VNfeyMEuXBaqJfBbwVgQRt8YvmCuBPs5GeSielN50g6SN84bgfx7cFHljVUSorWBVOrosvNg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6t8cGgzR6K+D07G37UboZCFWFYKY567StQPCmBqT/E03xBzgsG5B9nSqJGWzoClgZyVt5XPJzpP8Mqgr66ZK+dUj9x2DtsNTEav3L/4IpBpmi/oqiI6RhrmLT6uc5gzM869gKzdwFrpjsWSHHqvt/vf35JjZ2dlinr+jie/1I3Cta9WWFqNEK1jRH2a10eGJ3Le6L+61uAulujG+E8kaR+x1eDCA5DM5H8mW91g5+nmRDyclnXzKruMYslAFOoegPs+eVKQ+hQsz9VXw+GuQ60h4+8Aw5zPXG2+/YVAWVa8tMJaoybTWy4Gl8QK8xO4ptgWJeV1T70qyacbVwjtlPDeOkUaNr4X/fbUQ57kHD4ikntPq/pd8qjTAK5sPEnVZPkTj371OlzkjbEb8zatmkSLyQdgPgBD2zDT+YuPCxdxOCaJKS7zsEFgaqiUwgN22b5R/b9bC6QWcRaJov3kdCPv+pWpnvQhGBL/42nTrQ55Mx5k2cJkkuWPAvHV/zEEr4FCEWqawIbu79iZNAXrM9aZ9efkcaQbishaGO2gGjdeinKU+a37lLP75ojVDbvaSxzZmgfx+rOvP2tWujVlemegZ728w1X58ahEmgCkkOuk5Tu0Np+R/bauEb/r0un7JDRAfTwTv3XGJNWvdV9zYqVyeuozIeKMQ8xqq0yv5+f1MpfsEK+6dxd4yjnIpd418Z0HBsr9byn0u0uwzgdvYq9zC8y9at2GuPm9dE2kpNzMgi96VvE6i3PxPJagGFkEMBJhIjBbPi8Hnt1qIDg6UV0PuOBYjK5vUQr9Lu88MnxBHQqnNwd0kXBpjliCC8207sUudWFyyk7kBnzfVWa2INN3OUiyQ0PO8kvAKJLsp5Q8snVRa5TPDyzRiemM+wPAsHcQHFeb/uSEZdOi8KxHuZw1Dfvd0X0+d+/BXmScD/sAPz7Gb7f4EIKuBNGn3n4VCLdiZjqJSC42Fiqz+ZsjnxNFz7muQGRRrmRrdPTJWEu5H/OYfjTJw20YU91GCm91+q2GEG4sHZdBqm6mDTh4ZH5XKDL7SqACILwrifSciovH2yxfT+HcJSAAiyLSBc1K+zurTw8sgTbtGHbbkZOwJYt6goOj2Rr1XBM+htxB/KAwY7QaqpL1lJFz14S/7MYL/uFCylK0/Dc+c/AdRBQBYFDRrU1UwtoogcwHNhUJg6JDXiQog0wM/b8IOFLc1w9BCjlnAlyl7yI9ddtLqqj3YHaE4CmJHk9nEswMd0inr0/5TicwozEUf55UKZMg3J4bjmLTWWWpAWC4b0YIMbwCYWL2rDQoeSnRqOh+v/NgI4mQm/udJ1L7oAw80KuDWDkzideNqJBP3HO3W+GkbJ0d4El0CuZUNGXoKmtvGj4mvdQW/TODXl8mYsfHUdRNjHlUNLABbLauM61mdQJuMzkwqnbSc8p/a2++G1Wj33laNPphF2xXupdR+WGXEfk1musQBdYEHhjBZDL3uV5eYtk4TGnwjgRLYHoNIrNrXcWwaYpIAJrhR1E1M12Mx+NRl5jmIqY8Ws6MpXtK8kn4X2vY0ui5SmJn/yJ1bBaQhgEe+11jrLclm+baf5Z6rRRSdvi3FHkGJQoisYoLu3gRQP1Q5vdA4e9oDlLo2tqWlfbfGEPg= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 827434f2-2d6a-456f-1421-08d9d4f599a1 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:29:16.1057 (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: uyF9BketE2cpkIeC/w5OvkG8GgrkwSeIKg+g8MGl7slQkoHw4c29Esd7Sc2b1CNz91r0RK8kpbnXjOnKqPmq8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.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 | 1 + arch/arm/mach-imx/mx7/soc.c | 11 +++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 67f6805b13..06efe07b1c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -888,7 +888,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..4f9f51c9b0 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -68,6 +68,7 @@ config TARGET_MX7DSABRESD select DM_THERMAL select MX7D imply CMD_DM + select FSL_CAAM 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 Jan 11 11:27:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578384 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=WOgO3vpP; 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 4JY7lV34vBz9s9c for ; Tue, 11 Jan 2022 22:29:58 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AD324830CE; Tue, 11 Jan 2022 12:29:27 +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="WOgO3vpP"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7F3B283082; Tue, 11 Jan 2022 12:29:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0622.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::622]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 944A9830D9 for ; Tue, 11 Jan 2022 12:29:23 +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=b61BSJreZlomwrSme18MyXFass24057pAxH8QcMpS8XuivMj7ZH4z/hqT8TFTpPRiEOyOj9j62OHgO0975F8vfJsNFWAu8S07W+q+CzkVPKqV5rmHiBdbktYQLOKBsCqUdJPqbpdSi+kmdhBEP6bmX4fF1C9glPuvboZEQr79Y3xeaEYUbCTuIM3f7wHvvSW5HnUhUzH6NlJr83fA9/HyGSxIFEsssy2d9QrH0I88X2xbE5Ai+nWxhbQMKUeGIs5KrLxSK3aiQV4L4zZmWHA2yNuhwCj2ZdQOanxswoSLmWehZLXny1pRuqNiD9/x4U7NsCOw+nS53ztp4D80GCwXw== 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=zP5lRn+O/+N4hIvOr/B4ueERZwiRstVTZzZZSNgYtkM=; b=ZrfXt+cymYWkFHssShpm/EGOtGT83aE8OSKIG04aHL/IauYEVeHkW0d+iNR+aU1I2aWe9PG2IxEJt0Wy4Dt1gegyTi9kXZd9w6aZd4JwIdwee+EnW/kghfcp6lXitjiTkl7T7CxINAtwilZLQU+xiux37YScfjbf95tuyJceRHs8FauQ6phnAbIQsIl7hw54vsOuRUuvVr0oTimbCR8w5iijHdj3oQoWiNRp3iEj2EvLhy5682YT1UkCDVJjeIRVaMu1ok4euCYuhKgUk2/jf6o0pe55Y5jue9DZ6qt8na1WfDTJ95OnaEIyWJ1Vk0j5d63pvs53psqZ0ZlBFUjAiQ== 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=zP5lRn+O/+N4hIvOr/B4ueERZwiRstVTZzZZSNgYtkM=; b=WOgO3vpPIStPS0kurc9zf2IWKExsxuUre1nZGPI9mqR+8fozER/1O+ryUi9upyUQIh0ZDSRTqnNP0rhuVrUNmBoQQQo48C96y4d2FsgYJc0TSitD76Bf+P46MJAM87epfw4bldd1+fSKn1fOL4jI33V0EwCbn2ARv9wYEWnnml0= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:29:22 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:29:22 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 07/14] i.MX7ULP: Enable Job ring driver model. Date: Tue, 11 Jan 2022 16:57:58 +0530 Message-Id: <20220111112805.3566-8-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b398428a-55a7-45d3-602c-08d9d4f59d6b X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: zT+C3Kn58MIZruEdizph62piPj9azRxCK6aQfi3bFZaAzfxzWZtTg5qXBYeYcljIZlwN5Up/yIkMf9g3UpCbzvq7hzq3R9hYmvJlip2C/xPKXEWSDglTv3M/tlq8OsN0Qez1dUIyFFsN/QgqtrYE9yYiSwgX1GcjXO5/Hx+0EsS64Butom4yaWTCf6ZldU4zC33NC+RxZKwIewxF0udGHll1b2gRxC6d8hHreWxnFa6LRvv0/Nv7PdE/HoQZx5Gt2HD8ZXvahSY/YObdZUDBa4x2Ar5zt/D38vUclqFhzOgFFCub19XTtnwhF/YmIV67DXlFTu9XCJR4XWAheUzf2c2ccideScKCfVFAjnjSfc9UslC2Glhxn04Op5QdXjvhZGW77tMm99jkjd9lhN7ftAoOSIR7AF3esvALTYQ9brFxY0MfP2HU5QdDqWuuaI6kSUlAa6BUu+zR8fq5V27usMRvfiUlJDTS0rdlYszhi7UXZiUmP++MXjzK5aVE/6IqDYMzVyPBB2YL8ZM9yjWuINIRpV8IDh9oK8BiHA8H74TZQWmQEW/WwbgATB9CzNC1jmuMJFYejWIYCnoz7skMH1oQxf/+cFxQIzdsI+AAYFdG8yZqNEYTzo7FHU/TlOxkD1NUCUiZG9luYwyZffMInZ/t0EAQ6CfBd20z2bm03cUBB1o4i0LVmmBWQ/bNufzxNzDoTW95uYgFpxw17LFBRvN8FtvYPWmn4wr9JrA4r9g= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002)(2004002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ScTxmjkGh5MIU8QJXGr48FTE5s4pKnBgQ4yC226BPjezQIDVdNzsBMp4rUf8KmnJDqyCB8ZV1U9splCZQ7uhr2k4tDKaUD6+xz7FRYLTcr84l8miSI0ylyIfEKO8Ca+jRlZu+/ET/6LulCviA3KrgLNJBLMi1G2tRUGWyFzUmglC+5MoCVtMMET1PPZ5kkUtb3mWCIcoR4tpkZIYzdkkAWnUQFYVfxicMANBlrtdPbPH94+5fAxkijmT/FEIj8r5p+Nm0BhQaGRnDekW8/wsfIBVUmcds8s11mxsMZmn7oDkWULC+X+z/b81zOImuFWx7A9qzp0XGvFVUpM5wnexY/4BEytx0+UTOlBsQyuxJwJNblxtAQOqnqbZhiDIBAHr9jdzIdg1pahC0HngAGRzgB8/7MPAEKViLGHbts4gMdTdBaOENjucT6JUtftXNGCVwz/sEy3piA89fbwLsfFdSJ+jng3qX4HucvsVSx7IgTHJ/C9jE3UmccXR8pXp7SM+1BymxocHRj+tlA7RJSiyoVvWNfebgs/KFRg0dqPP/X1hS0LzweQGmxy2/Ci0YWRdZA4CcOebZnR2PBsLxtO9UUI8ZezagK1wIdwB8b7EZDlTC+TpRBxKMYkpnzFq1x74IlWXEumzqUeIEw3E3qSRY03zQEWuD/8t+4ngSKuZ6bMK1SjV5m3rFGCGjISM1GlOfmFo8pi6RG1FCMIigT1mZmSh/hkBwIaJCTT3fZTURqcQzqGwtbfWM8AAYtYb+4Jq6XuKPvwQywlgP25lwcuS52rav7hPdWjQkaIey81OFwxzHPX+JZK9lq7teBJUSwcdweovWf2485bNnSbI3ePDOVLtq45fToHqBaScg8GSGsU1MJpwyC0uI80v3I5IfWjHfvJWhgdm4U9bE7e9JarmfapnV5+WlDHa3OX7mX9aeJ+L2EO9suRaTATBL8ukAmSSXKe0iK/a5JyuFOlNeKNP/hCqI0IbmvwG1LyB2Ax8hy1On9vlCfSOVOYczsA1mCMHc6uSalzH+aCKfKlOsj+vYF+qGCU1dflGLQlyPwe3dBhTxoVQO9q9VsOjbmDyTomDhwg/21wAJmXpnRXjR59anEa+pxBpk4+BZ5z/QcoE8Hfi1LZxWbjtmFlNTVEnCvDcP9C98jcfNBak80p2rZH517U19c2ZijtxSu4d2hrR4H06kg/vSSV1PsRsSGrtHscZo8AWNn1GZ3Bt7uW0DJvt5UCw4/3dyshrI1N7MI6PzGLGuCq7CGkp4oX0Jb35CW/WDjRrzhBU/KH3TeHTAcFhjlyueqM3+3knDvQ8s67iB3TzaTnMJMh6GW9kEbQqeaDLvflVBgV1NpPeL92Geq4Up6pyI4jsJSTC8xgBp9GRosGuWDoO9umsFMmbQ3AWfxdVGoXIocRG3rueGQjbArKZ23veQmPLE2NOVL2COgtbK/0k9JWg0Fpx4y4vHEvfHe5+q1p3E6qmNCjWHrGNtXQ4wpZhL6/w6EJGktj9csnE6Lx5RW332JF1KlLhVautowVnRbxG2EIR/+DPD/LZJp2c/BZORNFONxMSEEGONbEn4zypekrnn7in3z5l3EkBMUnQWHv9jX9IO/sctY57nxrff/mChGU6l6647LgvEbGI0oU= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b398428a-55a7-45d3-602c-08d9d4f59d6b X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:29:22.4646 (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: tm+C6JboyEZQM11wPS0sWelnkJW5+/ahPlr0LjzZ1JqhHEoKSmXoIEUnMG/hr5YSmtsGRo6PQxLjcI/RUyJDSw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 | 2 ++ arch/arm/mach-imx/mx7ulp/soc.c | 16 ++++++++++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 06efe07b1c..5e3c2ed3eb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -875,7 +875,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..0d238d2557 100644 --- a/arch/arm/mach-imx/mx7ulp/Kconfig +++ b/arch/arm/mach-imx/mx7ulp/Kconfig @@ -25,6 +25,8 @@ config TARGET_MX7ULP_EVK bool "Support mx7ulp EVK board" select MX7ULP select SYS_ARCH_TIMER + select FSL_CAAM + 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 Jan 11 11:27:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578385 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=Qbpqjj94; 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 4JY7lk0yHkz9s9c for ; Tue, 11 Jan 2022 22:30:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0E1548313B; Tue, 11 Jan 2022 12:29:38 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Qbpqjj94"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2E0A783025; Tue, 11 Jan 2022 12:29:36 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::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 187108319F for ; Tue, 11 Jan 2022 12:29: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=esYCqOtslR2eYMjDlpxPEDGO9qk4hX39ZS9HAXbpFWOVezaIZOg3It3bE28Mc0s3ySX6+Avjhm94ey7I5Nv6rJsR6AyCDnPRl6MTRtVWvPX8oNrQ2D/DK+sTMpHhkU+Z0ze4OHOnZIJ+jZzio/3Y6UwOjhK2t3pB08iRqfdIPvZOaa1NNnzhDLJ7fwcBf06EjOg4HFSqlLCzv7UEa+r7XsgQ9YbsrhyPq6P1hyCcCWe/cmedV15nQ5bOg5sSsnWXc7zxsR1qZoyT94j3tt9O9nCGv8fF6zVuGoL/y4PFn1iQp/yn+z/mxSJ+z+k0P8iK6bA7jTdzv17wpzXAW4ht6g== 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=bxEKob5HJdoJgsAWUDLjELKglUyiCM/aa6k/8hddmJS7kdqksSk1ETA6v9mtPmioO4/wAOCUWyO/yRR0Mn+1g/fu7ZyOIXtMJMvJ1mp3x0DxIheVb21KsdtWq8CkSEZZMGVOUxPU14K3T46j92ta7HQpuvaZE17KzL+C0FbC4A3Pug51qkZcdWx9Ycj5ZmvpDfcGqEKrcEZxq5fxzoWLG82iylQYat2jFKvB2FsUK1pXVhgT6SXtyiX75JyOwJyFT+dBColAz0FiP3qxwUwKfq06xWhA8l7EnhnuMJR9ScBSx4s/R84zuJNMje/6b90zVtWn9XUfsU9/BWm+byP80g== 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=Qbpqjj94pYX/zKXTPQizZqf+nPOJI82bDeqyrdD7c2tQAl2EMBTADcmPZVZexXsc301KP6fXX/f3Y2ET0Opx24L4k6AHh+AJ9wcWC0RjCmgG90WCoKIwpkK+lW9ES0ZWRSJFW9VPsIceARfmOPO2dXm7+ua07UfM4E6dVnxokxc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:29:28 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:29:28 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 08/14] i.MX8: Add crypto node in device tree Date: Tue, 11 Jan 2022 16:57:59 +0530 Message-Id: <20220111112805.3566-9-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 43092694-46c6-4113-0ea8-08d9d4f5a138 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: gK81EP4A9YNMyNw5/Z+133awG0NwSMaeoy8vnJNDGseWoWSsWFTtWgHJ7mPw6SF8zOJom69GoFDh9pq5PRLSYxiYsb7QRIMjRzgxBJtyhdVjLO0OV/y/tj4GavnIhsdDgwy4PzoSsofHChKX+AVc78/sNp71eHi1iChmsYyyNv4fvo2YEgcULmAN+q0A+X4VA1kvtZT41nfLIHaQGYZmVPqSVtdOz+QyH+WXUw3lcFmFxyaQC2/T4ev2e9m7oiaIKefln94Bq4fRmMc3LLXk5alsc+ohD91X0jp02ZfuDwZYzDN+6aADyQ90x+2DBMFDujcPlrJDh0PCf3ALxqA+dOi/leBTbV5jmWpzIK7/y2vapIsfmX+ht2FKHSDJH+3S5XPfTDl0GocO+ESF/jRO7ujt+U6apacKQxgOwpgq4Kc/rWXjGOT1pOUkjuycFYLqOScAz0HdkYGlUVURqDnvcr58+rjqqGNtwaz5szbYqScWVSyH+2wuFdWx+TpnkWmTYEzqVhPg80ZbUmGpHu+FOak5tj+fJzPXxrMarnMDtFBktpwPdrwVufsVvQu1Ye5KytOZfKp3yp0dMczHzSwD7FDp1Cur1A92epuHhgOxqAVOTyWfROZdbqTbreDbKahRhVeZXFBVafDBCY48zhaeCr/GXXoGo1RV+OQ8169S/E4hTw3ujIUjnU7T6Y0QkjVF4JOOU3ISDrZDVRRiBZnq8g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2GZUWqYbQbB7WHWO+nLxSZRXF9oQ5QuwzQ9nZ6FHV9UPWhip1JaNU+6W48H/l6V1L6SXrRR4aqxXZczv082+LT9xq0N5i6ii6+zQQGRsYmE/EmKd6YdfVb66pRQ8fZW0rCKhgy1p6NxXpm51ClK4eo/dWGiCWaHTq031is68fpGeVCPO80jnUJCUBcItmhZe7FOR+yKpJVWwdoezQRrmUY2kNfpBBkikwIJhJmLYXfqlntDsbDPOfsPrTH34UDHMoKmcfVKOVmZAsV4AjwVvTGyKsZSzhzn1STvSnEtCLrj2p4c/t2Jk+iNMjrgvUM8XeypkKfiiuDoqvVjwaDsaJ3u+3A7E8R04/464uvXLyKjCeceEWQVNO/khOrqnQuWyqemN6mPOJ+N1OoWRpNvrGI5frOabADLANY1qi2IIixBdz4L1lIda83iqxAfLnZZ8bVs701E6nKiZ5D3UhP61CdJyRBMjvlRl0xD3/e0u9pgfFMydpAebW0XvKK14gMRAezJXDwAbV/mppkCVoe/9eahB6DdwPv9gmuxeZagSC0rHSS7siVn3GXAVeAGgjKxCHDWHGC1tiY6zS0G/QHrdABMJsZfdyFExWH+kvfylKODvxgbybj5K4YQsxuqpZmEvIvOqirLiVgwXAO3Hu7b3Grjk+psJVNWbQJvsAHUWJ3a3cmvRAsjBsx+i/39DLv8MsH6H4JgDVv5F5o0yGJ0dvri1+cMAIyzxZCuAu6Q+mWd1QgSl+JYgKo11lwEgwgoruFQt+QH/CFUvfNxm3JzsYgvomSX/pw735Ys/kZyibZ2v1BhO9rUL0dMoMREnkS+RA8TCyTKmmR/fFeuFy+7Wnadv/sWqXr8QPVUbsPtENFKlKAEbdY2laTlVzXy873o44LcJpDZqsT2v5kkb+LSQstkr90JlOHcRGg0s7q/R3TcZsJh1OF7EYbMTSiaicv3dKqga98dHtAXcM9FU9H8SwPqlDrgGXT9+Nu6tAKqxX3c7YK05kmnuxBCcpL5odSptJhq39ElD/1H+nNCZsrZsTnU4GlOLmROLP290wQyijVEXAnnghAVlLOEu97nkw5zeP9u+LYHo3lhXlN0Prh3Cntxlh3Mss5V+Zd55IOL6PFHbg1FmWuEzx9bfq0cHoD5LLpFJ/VM20ilzm01jOKkhc/7/Jj+CHQe+efLvvEj902W98/DZyiigbSjkCJ1tu7bTfpyUsJR99Pib8W8TX9F0Vz+4fyKTUzhyTGBCzfcn8itQu4SoXbeR9/VIkmOhE+IrvSRXQKI/kTFXGT8fsUhBnE6aI2wmmhKEm9lHK8CVYEYRsWArK0nsnzU53IPIuwFUqx8I5XfjfmlF6erUY+jE3/cdKWImdE0O9egH4mZFmppUOoy4xlpnQvK9XDZhFVosQmpa8+RKQ55NHH3VCP690sgf+uRu0edMx2VGYTU7iBBK46vrKbHWtLzDGE1sdTKQCzGD8bGeM9EuvN2gUWL24xYkeEiGAEU7F8yZpUSlZgqAeqVcWmncAhEdaTU0do0V8h0+/HoP07yMmNq8wuHzlVwuQPOQsSRzZ66VYXwVsBiyqdB52X7FpzeiXkdUZMVU46jn3Db8Bq3BUDf8Ooqttq9CAPEYGazcRwcP+MXzjwU= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 43092694-46c6-4113-0ea8-08d9d4f5a138 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:29:28.8236 (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: q8VE7NwmLjyfMbQGyp3sB9kRU2Khl0mf78qmGZFiL6FpvT0XLhP53AtlvaXFiQ/apsqjpPxAZqPJGDSPPknWVg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.MX8(QM/QXP) - 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 Jan 11 11:28:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578386 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=eHFD7jVJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JY7lz4Cc0z9s9c for ; Tue, 11 Jan 2022 22:30:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 578A383105; Tue, 11 Jan 2022 12:29:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="eHFD7jVJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7D2BD831B3; Tue, 11 Jan 2022 12:29:40 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0620.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::620]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F182983102 for ; Tue, 11 Jan 2022 12:29:36 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B2K0+RXafLDzXS+mu9wyHaFrrHD23usJt2Alora6wCqH3FITq8v7tQ7PSRu6RH+CoyoqYdGyW0jvSQv21SUJ10EZIEHIOL26AHemqPKL0XeEMuzYraT1OTUn2jux49dIEKFpPxO8Zdv4PVBa4BOeFSdxXrLOyWWIhNn4NHllLPxlcitz7bj9TdWtA9BsYJ6/Nn0kDk1A6vM/1iwQyf5m4TqtywO7AjNDnd+ZGDkHCcnuqNhg1Lwlj37QLeq53uUOO6gF6DIV0BQsDbak66kMS1R0pL2Pu+sNRuZwhz5PgtL5y3YsQJpYbH9fnFihesqbGlaGdrK6a0jofatFyiWalg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QFoJrJS8AHgNQTPkLR7CHWQhFSlUTlqRP+S/zOosMU8=; b=oaz6gzxaFWTICDLD7AX80FIsFGJaZq0+MhiqlYIfobjvijwLG6WPk+2x2XcYumf9yqrZVSjA6jXuZ02B2ifbaCnp9fDeZq5dawQ4NXcfteyztHEjztgfWbrXesEe5kryHvRathVPLcgZp4HrZ2Ar2diK2Dx9Qk2U3IYpKfzlKOZIfiY6fhJd7ShQWtemdIMSBG1m/8aUtB4964KwnRhY4+SrkjwANtrmy3Jh0zt6ggASKNJUVZ+yC+C7EJhuNfcg+NoKxpn+iTjF3QRvmQJ9VoJU+LvRY3cOUtKWIWVtdY3i3vzDD+KljGe3zMD7K8gniOLwjVCeQ98Hczw6HgMWZg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QFoJrJS8AHgNQTPkLR7CHWQhFSlUTlqRP+S/zOosMU8=; b=eHFD7jVJ2VX611WHGQZkRgpLmDwdQVxgvOkl0B5ZWCDc078sXWuqSizjq+gm0VPpO8R4ijJGAahV6KYv3u6yUpbwJE+OuTu0qjfzw0iOQuTDNy69l5myTO6za07o6uQaamnGsv1aBbcMef3SrmqJ18ufp757fjuTUAr48KSHuTs= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:29:35 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:29:35 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 09/14] crypto/fsl: i.MX8: Enable Job ring driver model. Date: Tue, 11 Jan 2022 16:58:00 +0530 Message-Id: <20220111112805.3566-10-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c7306c9b-735e-4349-1b5d-08d9d4f5a545 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:16; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: O00iH9hd7FmqCmcFE/4sJGOPijbjfNlVXrINd1FpEBMqRQ9UZX9vGpNjQ5mFG2/vSw8lEA9nNuP6jEy+a/CHmxmlfXwGNNBQdDv3rLFVwxO6TnpBHdI9e2QhJOI65b8XFQ1jlQmFJaHTvZG3B6FLaj5fcwaqDA5L6xVjLCFwd/P4IVM0o8tW/SMlvYFp0MYteqiibo1WY9HlRHh4U1sXmW3AeS5d5rUH/aybLVEqkbq5C5KHYFsIE/dJAJtFMNZkAj90LzS3zyfp9erRHl/3wKqTsm0VcYw/L9b3Zn/IQYKtO8psjIrjc3rBpdkulQXm2vrnbX5qbsYw4fqIHFL50aTWm9+rvnpml/oym7oEIb9p7dmVw6y9xsQI11aVXhv26Z1Ga7bNfd4BIB+2WDEc43azZzZaA5lEsgRD+MLwNE/eITvvTdbJ1WWFx2z5c4CZSkxtT3FkV5ZnG//+U8gIFfG2Yz5KpEKeeXXirxlPm+0QiKww/CxfPY/MWCq9OGccZ044Jr+F5tfENVUbfaQ27Z9N6YZZc8hXndIwsLwSeOSCtyKLUBRS5YXO1i6/UHhQXEuxJyiN64fNR7ZInJ/Wi3aqlvsinLdU+ZYsB+tIHzSElQAxFbezqkee//1BX5bAErLu0pr2wLJ3CJSH66Fi0vuBru0KROFVWfpigSbpz5Bf4K6td+mrkv4pmeqf1pnx1jYnzsDMsNn0R5ogswZY1g== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?bcF9wFMp2/NomlRQ61Qkwb31bRlx?= =?utf-8?q?Se7Lq9Qecxj4Z81Z/pKTmEHAeThoHiaLBJuPkvPRzLPHeHZyit8oNTzTgSjw2LCNu?= =?utf-8?q?Pw95bwCFqdgl7zZv6zo2YcPB7pDdl9wLovOEDNR52DeSr/ynlgji5ePr6COXey0gk?= =?utf-8?q?W8EB1Qzxt0bErU23gOINSNkvwUzV3ZxDKzjX/eUPMHhnbEzE8NpR2rh3n8V85wVoZ?= =?utf-8?q?pRskECsQPqekPWeI8qJHRtQU/58IR9CT20H+UsLBiBjB8J/eZEQyrP/nKbzFRUMKn?= =?utf-8?q?PcXioTiScuBXHjRvqnVTD2ZQkCa/CNeq2WitL58dCO3endZwQ12OcMB06mUk5lowZ?= =?utf-8?q?7F1yd7lPnyntYrGOFkPZDMy9so5VTndAcbvIpW9Tv0joz72tR6Oj+qd3Vnysxrsq2?= =?utf-8?q?Nuc89j9Rk9xTEpw9TiDhFvF5bmfw0nNrcU78DE2tErbEcYoixEzhcEbxHhISJsQlM?= =?utf-8?q?WADGUf0o2whuV+DQqixkh7fekNPQPCwMWah5UXIJWKAxuyp4zdOCo/w9AXvx4HvZT?= =?utf-8?q?PWcYCunvTY0IMD85qalAXbZvQImag3VjU5F2cBb+szeV1JZM+kb9392tegiueTT8V?= =?utf-8?q?xcYPcd31u3nOjSAEW4MBPOPEMiiS0Xy3HttdCj+1i7EtGZKa56+yxeXiJ54Uf124L?= =?utf-8?q?44YiZ6yxT33M7TFGqkLXVIv5FTWibfoT+MkGEIjg+mN/ZE2qPMrkbSmOu59Xul+XT?= =?utf-8?q?B6Xw2eYFB5ZUePT8bwadzBOWY2CZet3ako2eWkfEtIiPD8g23s2nc+tdKVWahDnt1?= =?utf-8?q?zodPURZ8Pfu7may01O0q+mjrEo8/BKrz26MAwZffsZl+8ysICHIfRItFYauZv92as?= =?utf-8?q?soITtx2LCk52ghME6rziSLc1yfc2nKGSS6DRtwVJOAMVEPzwszmq3tq1YkebZ0F0s?= =?utf-8?q?/J3/NF2tYBQDVWjZL8pG4+HrT0zX55ziteQYP7xJhmGnTklREySPpphtpY8IHHpL8?= =?utf-8?q?3v6PB13ls6O3BPMgRmF97AxBKH5C9hZiz2hX/VicCZgUyfQFtZ7n+m+qP1VOSgP71?= =?utf-8?q?+33Ineq7/XVWBrdxmt830vMpzEndK9NPW9kRD+xu6BblXNv6xUFUD1FQByIptMJm/?= =?utf-8?q?PpHLQ55XllFcXa6eqnswubAbHrP0fuEnqeND+b6dGiko4FlPiCAVFGViZNjb4dZwo?= =?utf-8?q?nPUNbVHeGJwd20kv28zptB3OCYcfyTv58lg1YhmeSxE3lQavfTW3Q3gk6K58vwd63?= =?utf-8?q?YVgaIdRBhJZM1F3qgmi0W//pHLdzSzHMK+d81mMb3GfNaXCENLGEezk+QMsbRDFDg?= =?utf-8?q?R2iMxC7FdTFPcejw+rTU9+l6eHgjNp5PXBlWxR8YpHUOlP38KrqlFVtDMPEuUROAC?= =?utf-8?q?Mzbkt7Qb+xgENa+R+UStQ8fsXi396HE+si9523zQXXhzrj3fD0CUQWkZuP+l1oPag?= =?utf-8?q?daegQUuekh1hqs002TjtGXOXGjDHr9pnopuwpSIZXC2mPMoEgFTTKXQSij6chXmmx?= =?utf-8?q?23f/ph7gDP3skrf2G889ONMxKdFDZdiyxx608dTm1tOdPTCgFk8FL69Y9FXPot40A?= =?utf-8?q?bJR/hv5Hiv+2zQOiFq9J4MbyHzsLbGsWpmD5qxvtX+lV07F1wxA1wh0=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c7306c9b-735e-4349-1b5d-08d9d4f5a545 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:29:35.6200 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: luX3edsvp9JSOgl5FFDrwxOFRKqIA1T9RCGTn6B597dSP1Orc7832YDK9sYo0x2wX+8W+5aUHx5TdUiYTdRF4w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.MX8(QM/QXP) - added support for JR driver model. sec is initialized based on job ring information processed from device tree. Signed-off-by: Gaurav Jain Signed-off-by: Horia Geantă Reviewed-by: Ye Li --- arch/arm/Kconfig | 3 ++ arch/arm/include/asm/arch-imx8/imx-regs.h | 5 ++- arch/arm/mach-imx/cmd_dek.c | 1 + arch/arm/mach-imx/imx8/Kconfig | 7 ++++ arch/arm/mach-imx/imx8/cpu.c | 16 +++++++- board/freescale/imx8qm_mek/spl.c | 6 ++- board/freescale/imx8qxp_mek/spl.c | 6 ++- drivers/crypto/fsl/Kconfig | 2 +- drivers/crypto/fsl/jr.c | 47 ++++++++++++++++++++++- include/fsl_sec.h | 12 +++--- 10 files changed, 89 insertions(+), 16 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5e3c2ed3eb..dd01856b3e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -809,6 +809,9 @@ config ARCH_LPC32XX config ARCH_IMX8 bool "NXP i.MX8 platform" select ARM64 + select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_COMPAT_4 + select SYS_FSL_SEC_LE select DM select GPIO_EXTRA_HEADER select MACH_IMX diff --git a/arch/arm/include/asm/arch-imx8/imx-regs.h b/arch/arm/include/asm/arch-imx8/imx-regs.h index ed6e05e556..2d64b0604b 100644 --- a/arch/arm/include/asm/arch-imx8/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8/imx-regs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #ifndef __ASM_ARCH_IMX8_REGS_H__ @@ -47,4 +47,7 @@ #define USB_BASE_ADDR 0x5b0d0000 #define USB_PHY0_BASE_ADDR 0x5b100000 +#define CONFIG_SYS_FSL_SEC_ADDR (0x31400000) +#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 + #endif /* __ASM_ARCH_IMX8_REGS_H__ */ diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index 89da89c51d..04c4b20a84 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index b43739e5c6..f969833bab 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -8,6 +8,7 @@ config AHAB_BOOT config IMX8 bool + select HAS_CAAM config MU_BASE_SPL hex "MU base address used in SPL" @@ -72,6 +73,9 @@ config TARGET_IMX8QM_MEK bool "Support i.MX8QM MEK board" select BOARD_LATE_INIT select IMX8QM + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_CONGA_QMX8 bool "Support congatec conga-QMX8 board" @@ -89,6 +93,9 @@ config TARGET_IMX8QXP_MEK bool "Support i.MX8QXP MEK board" select BOARD_LATE_INIT select IMX8QXP + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL endchoice diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index ee5cc47903..5140c93a37 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #include @@ -89,6 +89,20 @@ int arch_cpu_init_dm(void) return 0; } +#if defined(CONFIG_ARCH_MISC_INIT) +int arch_misc_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + + return 0; +} +#endif + int print_bootinfo(void) { enum boot_device bt_dev = get_boot_device(); diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c index 944ba745c0..332a662dee 100644 --- a/board/freescale/imx8qm_mek/spl.c +++ b/board/freescale/imx8qm_mek/spl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP * - * SPDX-License-Identifier: GPL-2.0+ */ #include @@ -24,6 +24,8 @@ void spl_board_init(void) { struct udevice *dev; + uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(imx8_scu), &dev); + uclass_find_first_device(UCLASS_MISC, &dev); for (; dev; uclass_find_next_device(&dev)) { diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c index ae6b64ff6e..2fa6840056 100644 --- a/board/freescale/imx8qxp_mek/spl.c +++ b/board/freescale/imx8qxp_mek/spl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP * - * SPDX-License-Identifier: GPL-2.0+ */ #include @@ -39,6 +39,8 @@ void spl_board_init(void) { struct udevice *dev; + uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(imx8_scu), &dev); + uclass_find_first_device(UCLASS_MISC, &dev); for (; dev; uclass_find_next_device(&dev)) { diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig index 231eb00b5f..e03fcdd9c7 100644 --- a/drivers/crypto/fsl/Kconfig +++ b/drivers/crypto/fsl/Kconfig @@ -12,7 +12,7 @@ config FSL_CAAM config CAAM_64BIT bool - default y if PHYS_64BIT && !ARCH_IMX8M + default y if PHYS_64BIT && !ARCH_IMX8M && !ARCH_IMX8 help Select Crypto driver for 64 bits CAAM version diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 4e7accfb89..a84440ab10 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -11,6 +11,7 @@ #include #include #include +#include #include "jr.h" #include "jobdesc.h" #include "desc_constr.h" @@ -121,7 +122,9 @@ static void jr_initregs(uint8_t sec_idx, struct caam_regs *caam) static int jr_init(uint8_t sec_idx, struct caam_regs *caam) { struct jobring *jr = &caam->jr[sec_idx]; - +#if CONFIG_IS_ENABLED(OF_CONTROL) + ofnode scu_node = ofnode_by_compatible(ofnode_null(), "fsl,imx8-mu"); +#endif memset(jr, 0, sizeof(struct jobring)); jr->jq_id = caam->jrid; @@ -146,7 +149,11 @@ static int jr_init(uint8_t sec_idx, struct caam_regs *caam) memset(jr->input_ring, 0, JR_SIZE * sizeof(caam_dma_addr_t)); memset(jr->output_ring, 0, jr->op_size); +#if CONFIG_IS_ENABLED(OF_CONTROL) + if (!ofnode_valid(scu_node)) +#endif start_jr(caam); + jr_initregs(sec_idx, caam); return 0; @@ -681,6 +688,13 @@ int sec_init_idx(uint8_t sec_idx) caam_st.jrid = JR_ID; caam = &caam_st; #endif +#if CONFIG_IS_ENABLED(OF_CONTROL) + ofnode scu_node = ofnode_by_compatible(ofnode_null(), "fsl,imx8-mu"); + + if (ofnode_valid(scu_node)) + goto init; +#endif + ccsr_sec_t *sec = caam->sec; uint32_t mcr = sec_in32(&sec->mcfgr); #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_IMX8M) @@ -742,12 +756,19 @@ int sec_init_idx(uint8_t sec_idx) liodn_ns = (liodnr & JRNSLIODN_MASK) >> JRNSLIODN_SHIFT; liodn_s = (liodnr & JRSLIODN_MASK) >> JRSLIODN_SHIFT; #endif +#endif +#if CONFIG_IS_ENABLED(OF_CONTROL) +init: #endif ret = jr_init(sec_idx, caam); if (ret < 0) { printf("SEC%u: initialization failed\n", sec_idx); return -1; } +#if CONFIG_IS_ENABLED(OF_CONTROL) + if (ofnode_valid(scu_node)) + return ret; +#endif #ifdef CONFIG_FSL_CORENET ret = sec_config_pamu_table(liodn_ns, liodn_s); @@ -781,6 +802,23 @@ int sec_init(void) } #if CONFIG_IS_ENABLED(DM) +static int jr_power_on(ofnode node) +{ +#if CONFIG_IS_ENABLED(POWER_DOMAIN) + struct udevice __maybe_unused jr_dev; + struct power_domain pd; + + dev_set_ofnode(&jr_dev, node); + + /* Power on Job Ring before access it */ + if (!power_domain_get(&jr_dev, &pd)) { + if (power_domain_on(&pd)) + return -EINVAL; + } +#endif + return 0; +} + static int caam_jr_ioctl(struct udevice *dev, unsigned long request, void *buf) { if (request != CAAM_JR_RUN_DESC) @@ -793,7 +831,7 @@ static int caam_jr_probe(struct udevice *dev) { struct caam_regs *caam = dev_get_priv(dev); fdt_addr_t addr; - ofnode node; + ofnode node, scu_node; unsigned int jr_node = 0; caam_dev = dev; @@ -818,6 +856,11 @@ static int caam_jr_probe(struct udevice *dev) jr_node = jr_node >> 4; caam->jrid = jr_node - 1; + scu_node = ofnode_by_compatible(ofnode_null(), "fsl,imx8-mu"); + if (ofnode_valid(scu_node)) { + if (jr_power_on(node)) + return -EINVAL; + } break; } } diff --git a/include/fsl_sec.h b/include/fsl_sec.h index c4121696f8..7b6e3e2c20 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -3,7 +3,7 @@ * Common internal memory map for some Freescale SoCs * * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #ifndef __FSL_SEC_H @@ -194,12 +194,10 @@ typedef struct ccsr_sec { #define SEC_CHAVID_LS_RNG_SHIFT 16 #define SEC_CHAVID_RNG_LS_MASK 0x000f0000 -#define CONFIG_JRSTARTR_JR0 0x00000001 - struct jr_regs { #if defined(CONFIG_SYS_FSL_SEC_LE) && \ !(defined(CONFIG_MX6) || defined(CONFIG_MX7) || \ - defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M)) + defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8)) u32 irba_l; u32 irba_h; #else @@ -214,7 +212,7 @@ struct jr_regs { u32 irja; #if defined(CONFIG_SYS_FSL_SEC_LE) && \ !(defined(CONFIG_MX6) || defined(CONFIG_MX7) || \ - defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M)) + defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8)) u32 orba_l; u32 orba_h; #else @@ -248,7 +246,7 @@ struct jr_regs { struct sg_entry { #if defined(CONFIG_SYS_FSL_SEC_LE) && \ !(defined(CONFIG_MX6) || defined(CONFIG_MX7) || \ - defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M)) + defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8)) uint32_t addr_lo; /* Memory Address - lo */ uint32_t addr_hi; /* Memory Address of start of buffer - hi */ #else @@ -268,7 +266,7 @@ struct sg_entry { }; #if defined(CONFIG_MX6) || defined(CONFIG_MX7) || \ - defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M) + defined(CONFIG_MX7ULP) || defined(CONFIG_IMX8M) || defined(CONFIG_IMX8) /* Job Ring Base Address */ #define JR_BASE_ADDR(x) (CONFIG_SYS_FSL_SEC_ADDR + 0x1000 * (x + 1)) /* Secure Memory Offset varies accross versions */ From patchwork Tue Jan 11 11:28:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578387 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=BgAdsrm/; 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 4JY7m61b2Rz9s9c for ; Tue, 11 Jan 2022 22:30:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 967C68310E; Tue, 11 Jan 2022 12:29: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="BgAdsrm/"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C4519831E2; Tue, 11 Jan 2022 12:29:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0624.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::624]) (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 2635A83107 for ; Tue, 11 Jan 2022 12:29:48 +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=EKL2H0uuwpHvW08K0K1vxsyfsQCGJKJJnEGA6PjJgAc1HEE3Y/hYjxP+q1yRqZ8T/65mtLFk5fnet6mtXCEUefiJ4k+l9BHJ7mA2CcC1lEc8PkeTqf0tOBFXlmUlEDS6MMpyHztRrVQyc+IeInuGy5k4wEyvxBGk8g/SEWVyEUIvZHW8MGZSquf7rGu3SqrPR560RSyQRlEzdTTrEotWAJctiVnQEovDJXOEUrxZ+sIOX73utckedKc81okgdwYpPkRYYrKXFrQ+eXzv/Q475ghuDqf6A+CbRNJT/z7fh3WJ79kq8EfMIhKttGtCQx3UUYCv3R+Wl+mt2a8tJhn3cw== 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=VE6bn5LcGtHXWuCTowxg2vz2NKvOXNsMg2JrMxhb/vyL0Sur9ZsToI+PoJ4WKz8qlSIfs8E7yKqLI8N1jcZsULr2yRwLyBjuScnhYMk795EXfAvpNdx/WNihcAI9JK1jx342XTZf+Dgyjj2Y7tk/Md7kEiUzZ9FTH1GdqdEpSZZ5APqT0BEN82HPDZBPtg4MF3blgVN/2LjDHt4sg8d/iInO93H4hSe8fsM5sXyETeBOLqjT0b4ihXvSdUqVvAmmsaHks+Vvud3J/si0x3RHmhwfvQBVN+gLdNPX/h6nB6oQPGOU5QP+BRbr+AePKtMXh1TO1QdfyM/L7Qfcf4eZMw== 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=BgAdsrm/sExCXknVrDbfmoSA2dWTcV7VO1smOPSBFUvbP8S2T3NxqxYCB9pwnQLNqABc+Cx7uuEsavf0oEr5TQnDlPGxr68HjD4cV0kOAQUZEUrvlVxorcwMtGTiTBAAdCXFJI+OEGb92+1Wn8gCToHlGMJ1M1vm5ha7/qROiyE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:29:42 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:29:42 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 10/14] Layerscape: Add crypto node in device tree Date: Tue, 11 Jan 2022 16:58:01 +0530 Message-Id: <20220111112805.3566-11-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9a1b6c3d-1b5c-4202-c5e4-08d9d4f5a94f X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: L6KmusZ219FS9bWGw5PZgIvXiapp5Z30NzsdIsd6uPZLjCaBcATRadwwD8u2eFHn/G/VBV262PlGnulcmkSILnelH1iWtdGYoDMNqgiM/DZWSkX9eTf1dU2rCUEi18Xt6BFF0VYXYYpXu9nvYyPrGLLmaAiiz/9APb1QhrTMG4nD9KPOWVNvy+8WFfjooadOq8/ydyLB1xj9WfZ4lbLY1fEXcCI/2kt5VF5jRtyPGzQrCf21GU05+gudnwDiu7uuvCnI8SWTuo5nLuH46+UpeLdXg4z0cPcvQOyhUpHLppsvuld/xlqVg+aW8y6/CqC438R/bo5FbPwf9BqXRb5YgvuWLrriZ45v13JDHd77ifYhABWI1DYsBPpRwqWSrlhTcwfDhwIZ/Cn/UGf30QWDBq+e5matXteiEBo6v2ZWbLjw2d6c0XlRVX8OORHLyMr6p3udF6qwcQ0dXYWAZwnz7SU+M0/xL8u0fKYNllfvN4Fgt8hx1YCTJ+MlrbEBC6HvS7aHjcibGAzoB41zp3A73isVhyqIFA+dXSYY4ved6xX/jZ3gQSgXSlDMTEB9RaA98He3qr5ykJAaIhhJwDvl+DSzNdBJ0lGwVHw0FqaUQkTFYAO8Zl1kLypzCFSca9jeJAXC7sB59oOmFVrYDqh3nv3ngQ+bQH2zF2VcvqgEa4Zs3s7XF66JNJyCdQeN5rD2NXypbQY/jUn9iO1FgVAG6UDZbVT8WK8FMmEcDDzOB7iZ9FtG3ggQA3u9hgxPuKYH X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(30864003)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002)(16843485002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JAv0xqcw+OrdXnSCmlRhiUTT4df0TLxg0NxoGwO0Jo6gSs5pPQPkuwYuQHerQPZ5FVUbJCVoGVsnB4ckREMT7WoEq+8xbB6CQ0A1xtGKp22zVWLKZQXY2qQZyNUBnUmusCnsOuyUrlPrKGx7AKa7gY1Mz4vu+a8rPhmRQ7lj76XHKHl5KCJS6TA3k2Q/beBxd30hXsWcsQgNxWVXV1Eel4mgA1D7Xft0kMrRAS3jzRwwx+BTtfskaG760+0R2B7qe7MGs04h/ZoAHUe5zkoVh7cvP+Mu1nX7PGjjFeOZvNDGsgywWq4dMvjhLFQML2DUa7QWNaPV/yjWeNjpGDdunN64VpolfhDrNZeufQyRxctjVgFuPWmU1ZlmJJkmSWMEa/6TijRgOzxoI5PTnmw4lOyZpWYI+dogw5apPI8drVIRtO16pvTKVh7aHkCnLt7FeNoXgYsEnFrFVevdmhJKlc6pvIS/MouKaimQdYAQv3+XiEUTr44+JAZWjLodEDDtjUw0Lm/ctXTb2PUOL1xiYz4CGpSRHeE5pvAbQ1PPfP1E8M8MU/za1hGtjviNbjBuDnD/TTcl6wvSt9yNC4Z+1U1xDBKvKbKcj0TRnyPZyOfOqhKsIIOvqjQDUCBDAc1pn8/bO8Ubo9aafXL6sHKc2/D1WqbcfNbbTOH1muC8HXt1FUqmbgggpZemeCe5Ey4Lixl95X66xn2kUoDuc7V6Dclp94GOUMKU4/SSkVtlUSvyfAmiITxJ1sLD0bmpireDcKzQh9/73KD8LrQW9017kk64tmAP4+4L5AzpjhC11ubKHGwprehwgmVbB899nbgZG+Oec9vCFl9aiUYjc7F8lBzJYlsxSQCdDVEhqmjNHQCEN4Gh0ED+RadYs2UjsLiARkF1x57f3cgOrBPD8ho4l7ucD8hcXQ3wwYtAS5ab6K9m2rmuYoVDe5ecjo1BAzPY5hSkVJumbVIFcxz2D87udBhh7vRYpVJNe3rmpBVFryM1UlQvT3rLzv1t6yyTLQnKmnnMIAU5KlG2CPiZytDdgnzbKT4RRyJUmpGFKrRNxWd/qY94s0i/G/DUcfJGmpxGA5UzkpqRr5Hu5mENu22XBM3O8DiPl1AqOYMg3iRl1m6ljggCRX2RiCTXhCsfiQ9prf1OaVIwr7Hho6mZvCaGzBJAFg+V3kO4A7V++FuiuD9em/XWp/OZ6jc4x7TrHs/MLB6x6bpENyJJUXh+mVmHjjSU7G60QD2m4exLE4qXuQnMiiaTu4+xDdoktaZgHSH9O8PRzHy88+broViYlFuLOMnSWsBmAAfmvmrKXW6E2K9FrKIcu/6dM3sk+xZivdFHfonhIP5/LM5cJ+SASANUKFw6YyZgJvP9q5C9dlriHpOBAehcClJimQPZvtX7JNk7lpCyBT9L+n7IBhjWpTWKuyrMAoavis8Ln9FfzAPGdKMDmvfOr/AN1HlylwFvd6nMibwB/rtFaN0tiWaBFMt+XxPPVK9+Wd1f1NaRXmshQi9zZsOLMOxZSeNW496e7FHqtmk6rllAeC2EbToDZ5sk3felZwaQ6OMmJcLFczeSqJ1zZeOWQ4xNA26/NKuM9w7Nl6zYnZ9u5HbtdihLCWwLOAY/pGfjyjZRhH1Jq7v+EpQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9a1b6c3d-1b5c-4202-c5e4-08d9d4f5a94f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:29:42.4632 (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: ROa9MfYlmNFNy8nYaHyCYstEmR4sW0+koKig/26S8H9dX/sLpsTc2Lg5NZD8b1NOsAamEUEJtktbBJb8gJ/hXg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 Jan 11 11:28:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578388 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=UGjAVmRb; 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 4JY7mJ0jhjz9s9c for ; Tue, 11 Jan 2022 22:30:40 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 781E9831E2; Tue, 11 Jan 2022 12:29: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=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="UGjAVmRb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F07CF830D0; Tue, 11 Jan 2022 12:29: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,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on062e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::62e]) (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 8CB42831B3 for ; Tue, 11 Jan 2022 12:29: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=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GMCWCQ5iULxlLentz1QGKdXUmN88amJ9ZJOLLMFvwLxQ0igi4POaadKaLk/Ky9vPuDpMQwM4X4hC9xKZB623oRXzhaXqs1gSEz5e4/jY8riYslae9P7d2VeHNrUCVjdORhV5xD+wa7n05jtAR3CVrP8OVvnKGA/04YSXUh/OwQxAQCo+Fs2Q8YzFt6r/GEWXWc56Y9PhBpBrINiu8gjeE7Y/Wo97MhXyJs8emqv4TeWFzpQhL71wqRniGXenPd4bwOicgNuMb9ZzdPTmGbhQ8qCnkkxSaqYXvsnWqnKdy24+Y2/df1mQHavN45gLCyVGXMzD7WDCkjt+xqmoJYRKfw== 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=2IKnhQ56qoQWAmF90tAVvSLBYiO/2FRpED1/kkRbBDo=; b=RZdnkC2DgQnA8ys2uaABZ7g+Ya6xFzudrB4SqNnu4Zk5t7o9Bo8UVv3SApCoDryqeG3NfSjeruthyh8I9pU/6PNDayFZz707lcw9Z1YIiiGuAVlvQJJhJGevnNfTQaXANHOpX5zVqy3mWPDKxA0hpCGqINJDZW+aQe4wwt66BD5VloU+5Xqhd4iIjdbL1FgVwC7L3UOpXBoqNOqALE4RKM46zO999xDbRerwOBXicZeIbo1nB+R2KS7GXTA9wBDXYUaACtVkgCmoub1Aa3XIoMZGLrmaJCyhBh7GL5kZOiWUwmpRJebUNgupHQQteWVz82ZKlA7WwwbLPkffjC785g== 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=2IKnhQ56qoQWAmF90tAVvSLBYiO/2FRpED1/kkRbBDo=; b=UGjAVmRbZZAw0nnWfFrSvC9ClA3A0/TNVMQsoOJGsRK8Wp55zWjzbudNs1Y0jxnjV2fy8DMmSik0A2JuCXTBBKCwy1X5g9uaVyxthJqSJuGCWjpocQuDZ1SH/mcx5H21dgRvqX9sWrpgMwreZRtqZ4LVLhFymiS72ZDQXAN4/9o= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:29:49 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:29:48 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 11/14] Layerscape: Enable Job ring driver model. Date: Tue, 11 Jan 2022 16:58:02 +0530 Message-Id: <20220111112805.3566-12-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 38d9664d-3ea6-4d37-5fdb-08d9d4f5ad28 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: ieSeuHovTLcMywjY1/eemP5F2nnHbivs0ZfZwx04KzsMYWYQAbfSdI//2npYT7IgdIr78uQ05pSwS7vs1yCFpUaButVjWFUUGzvxlE2EMM3jv3XtO89wqLEcZNmti8MhmcA1ygvg6LOVW0d9Jd3tBsX0iDtjIDN4j+Q2S49Xx23ypmYWkU6A20/k8U1EipmlZ5Dst3uFkRe9FvnrctXf4W3Fd6zqIILCyB+JKVnuLVtzHdtF01LsrK9lFGY9kdiIvvmGSqkYGwZ8Sx90dyomCq85hr9p9savcQrYUHjN4sdqU7Q2O72hKxjXa4IqnB48PcTv2B2/Nfl/dJG00Z0ENlB8AyH5drFATMXZm/KpzqLDu3A/4AyVvQpEkO6KNsAszNLB7C4uh9vwl+eaUZKgwPYBBTTpQv8vjrJNNYI9vX09t01137uqod9a4YukUg0AfsL0/L1Q9AZblUrpspU3DhrMgDhzkgwf9USKJ4gG+7jnQsl+oneeMVPEyywOkI9h+jr5dHxv+uAjM2HULkzXfPP7oZMkmJQ/wiUg3yOJ/KORsIYsYM35ZBanNKgKcCymL3Zf/X7x7ck+ea8fvTDcX7o/Q+98x+DnOJqmfSb94GuwIELe/8dx5QkGVsRkTwnvM6yGFLocmeLcLWn1urR1bIj38dJt7HOsn5N3lQl1k8pXIhCoyxpd7ttHqvFoGKmAmekpnTLgsHHBgnDyH8GXTfhYDJEtuFCAyK92/JjklP8na8LvGfPiXnjc9LXekpgu X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(30864003)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002)(16843485002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: m2VllvGMEOoOyxJY//BNx8TgvH+lcxpQ4wlegQCiO5bakNeZ9wAzoiBCmsAg/OAiKzDuuL8vvdUpJso1dXh7jolvbGfdI2WBcCxgqMNR8tl/ATzLQHC7/x/l8vVZGnQQG2jPPHVAZdizU/VgD0YslOApxlCPLpiGSrV8JoF8/FTRcwgLjmPfVbB8JZwGWEdKl/1v779r80ZKz2VtMB8iqIBrb7qBPKUW1ERsYFYuOSK4fFCV0WjV918+rK6qohmhTeVjuw9kgI/8Y4+Cdcs6dUumiyLIeCM651QMLE1Wg5ZSgYGDXVyHskrTanQ9oxZ9zx070BA2W2ioINrWZUoCGFuU9sKjNkRK5QNe+8rWeXZ0kkNPWVcUaGIfQO9KVq3S75weONJCeyCs5B8MCNoMNTNs8XeyJDgX1AITvl5jhzGKXemC8/YlXil1enqZpqPsW29Ei92FATR/ns5a9YBY1bvs+/dPAXnJ3BD3W1JUlmO6LIV+dy3BjW3yp3vUBT018DvSaN+toicxeIhO5jCI/H0OIodRg4+cceoSCubEdysstXAnIEUv1xLVB6aN9bn+wZUTP+p5e5uC4DzlNXWSNaIPTLAo8tId3zs/6VJqVMTfVySRPQn5h682Qm0BMcegkzk3fwCZjPfLFy0YQk5y1dVPC+MCAtPjBPNZAvbQMz9OXSdP6xrOhxVbn+DkqeNZ21+7lAxZHT3MkgzZqMgpIMe2to1iPCE/6lMIcdk0JYRovQD1mJPQ2du6WG0I+qaVegJEjAs9sImmmvjEePwlFwSdMHfLChLX35NZPYRlw7CXppRsM1dIkn9En522gFSCovrsTS38zCiEC0Ne/K2CS+x0GHetfEB8f4nMnl6GSWDCfHH82fxky+gg7RrYOMLt259E9aj1zsL+YXpX0/VL30CEMARbjO82doSgBhvs7UrW65Do7mk42xXl1oYjgUItzn+Ul0j6ouOGmXeHRP1PDdYawJd97XfEPDzlEPDd/i6U3Uby/mn89S4f2C5YOl/qq1wZgPSuPn3ciZciuT7kjXqS4cwOFDhKtsW2OqJQIjKSOuVO3RlynjATvURz2VezKYu3ItVZEzBtbBrSdHViAVFqQV+4mpHGRyRw/ug3UMXtvvi06hzV1Z81IYnkfYwQy6sM3dtIkDDtF/hd/R+o8ns1vVJFq6bLiieh5i0AchFIqK2kTO3Jy3Ow2bVhuPX3YHbXR3+Zi4iuBiHfFJvY4prEvlPBsJQnrUPglTJ12Q4GutCj3ZrdFySULktIy7j1cWlegCElh/Ou9zL+03x8bZ5SfeIwVKcPOmaPZNiuibbU6n+fl25l5t4AJ2/ezMneV/h7lLxb9elXSvK41xnW/OIjTNZ2B27tvorWTSCkyiVRIlZGMgTM+aTLSww9nmJI7wJraqHeTxvF69C3c/TvtaSoDq6fvjcORsUNiuEy7RxZnyxpOBNoqvQn4VGAJ06Eet9lODbU1rzeGD7SpxWWUL5ZakxV6tSAW/stjoGbFnTf8+iccguBKXj6qfP/hpowlPzNRuufQFJ97HdLduzShm7JaK6M/O/C6tCfc2TrFMBGuy1Yn+t67MiXdFqzxg0rP+qgqUr+BhrhMa79pSfExXv7c3hgQhMn5bIq9Jx97TQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38d9664d-3ea6-4d37-5fdb-08d9d4f5ad28 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:29:48.8847 (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: D+9qvwo27zao+WZD6/1CQBZ9myFSnLCa68Po1N9wwG17QCvH73sajVcqoU0mk9FjwoJSAqOwqEgyASgN5/EZTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 | 31 +++++++++++++++++++ arch/arm/cpu/armv7/ls102xa/cpu.c | 16 ++++++++++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 10 +++++- board/freescale/ls1012afrdm/ls1012afrdm.c | 7 +---- board/freescale/ls1012aqds/ls1012aqds.c | 6 +--- board/freescale/ls1012ardb/ls1012ardb.c | 6 +--- board/freescale/ls1021aiot/ls1021aiot.c | 6 ++-- board/freescale/ls1021aqds/ls1021aqds.c | 6 +--- board/freescale/ls1021atsn/ls1021atsn.c | 7 ++--- board/freescale/ls1021atwr/ls1021atwr.c | 8 ++--- board/freescale/ls1028a/ls1028a.c | 6 +--- board/freescale/ls1043ardb/ls1043ardb.c | 6 +--- board/freescale/ls1046afrwy/ls1046afrwy.c | 7 +---- board/freescale/ls1046aqds/ls1046aqds.c | 7 +---- board/freescale/ls1046ardb/ls1046ardb.c | 6 +--- board/freescale/ls1088a/ls1088a.c | 6 +--- board/freescale/ls2080aqds/ls2080aqds.c | 6 +--- board/freescale/ls2080ardb/ls2080ardb.c | 9 +----- board/freescale/lx2160a/lx2160a.c | 5 --- board/kontron/sl28/sl28.c | 3 -- configs/ls1021aiot_qspi_defconfig | 1 - configs/ls1021aqds_nor_defconfig | 1 - configs/ls1021aqds_qspi_defconfig | 1 - configs/ls1021atsn_qspi_defconfig | 1 - configs/ls1021atwr_nor_defconfig | 1 - ...s1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_defconfig | 1 - configs/ls1043ardb_tfa_defconfig | 1 - configs/ls1046afrwy_tfa_defconfig | 1 - configs/ls1046aqds_tfa_defconfig | 1 - configs/ls1046ardb_tfa_defconfig | 1 - configs/ls2088aqds_tfa_defconfig | 1 - configs/ls2088ardb_tfa_defconfig | 1 - configs/lx2160aqds_tfa_defconfig | 1 - configs/lx2160ardb_tfa_defconfig | 1 - configs/lx2162aqds_tfa_defconfig | 1 - 36 files changed, 75 insertions(+), 105 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dd01856b3e..aadc915de3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1293,6 +1293,7 @@ config TARGET_LS1088AQDS select GPIO_EXTRA_HEADER select SUPPORT_SPL select FSL_DDR_INTERACTIVE if !SD_BOOT + select FSL_CAAM help Support for NXP LS1088AQDS platform. The LS1088A Development System (QDS) is a high-performance @@ -1312,6 +1313,7 @@ config TARGET_LS2080AQDS imply SCSI_AHCI select FSL_DDR_BIST select FSL_DDR_INTERACTIVE if !SPL + select FSL_CAAM help Support for Freescale LS2080AQDS platform. The LS2080A Development System (QDS) is a high-performance @@ -1329,6 +1331,7 @@ config TARGET_LS2080ARDB select FSL_DDR_BIST select FSL_DDR_INTERACTIVE if !SPL select GPIO_EXTRA_HEADER + select FSL_CAAM imply SCSI imply SCSI_AHCI help @@ -1359,6 +1362,7 @@ config TARGET_LX2160ARDB select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM help Support for NXP LX2160ARDB platform. The lx2160ardb (LX2160A Reference design board (RDB) @@ -1373,6 +1377,7 @@ config TARGET_LX2160AQDS select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM help Support for NXP LX2160AQDS platform. The lx2160aqds (LX2160A QorIQ Development System (QDS) @@ -1388,6 +1393,7 @@ config TARGET_LX2162AQDS select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM help Support for NXP LX2162AQDS platform. The lx2162aqds support is based on LX2160A Layerscape Architecture processor. @@ -1442,6 +1448,8 @@ config TARGET_LS1012AQDS select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM + select ARCH_MISC_INIT help Support for Freescale LS1012AQDS platform. The LS1012A Development System (QDS) is a high-performance @@ -1455,6 +1463,8 @@ config TARGET_LS1012ARDB select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM + select ARCH_MISC_INIT imply SCSI imply SCSI_AHCI help @@ -1498,6 +1508,8 @@ config TARGET_LS1012AFRDM select ARM64 select ARCH_SUPPORT_TFABOOT select GPIO_EXTRA_HEADER + select FSL_CAAM + select ARCH_MISC_INIT help Support for Freescale LS1012AFRDM platform. The LS1012A Freedom board (FRDM) is a high-performance @@ -1512,6 +1524,7 @@ config TARGET_LS1028AQDS select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM help Support for Freescale LS1028AQDS platform The LS1028A Development System (QDS) is a high-performance @@ -1526,6 +1539,7 @@ config TARGET_LS1028ARDB select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM help Support for Freescale LS1028ARDB platform The LS1028A Development System (RDB) is a high-performance @@ -1542,6 +1556,7 @@ config TARGET_LS1088ARDB select SUPPORT_SPL select FSL_DDR_INTERACTIVE if !SD_BOOT select GPIO_EXTRA_HEADER + select FSL_CAAM help Support for NXP LS1088ARDB platform. The LS1088A Reference design board (RDB) is a high-performance @@ -1564,6 +1579,8 @@ config TARGET_LS1021AQDS select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI select GPIO_EXTRA_HEADER select SPI_FLASH_DATAFLASH if FSL_DSPI || FSL_QSPI + select FSL_CAAM + select ARCH_MISC_INIT imply SCSI config TARGET_LS1021ATWR @@ -1579,6 +1596,8 @@ config TARGET_LS1021ATWR select SUPPORT_SPL select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI select GPIO_EXTRA_HEADER + select FSL_CAAM + select ARCH_MISC_INIT imply SCSI config TARGET_PG_WCOM_SELI8 @@ -1630,6 +1649,8 @@ config TARGET_LS1021ATSN select LS1_DEEP_SLEEP select SUPPORT_SPL select GPIO_EXTRA_HEADER + select FSL_CAAM + select ARCH_MISC_INIT imply SCSI config TARGET_LS1021AIOT @@ -1643,6 +1664,8 @@ config TARGET_LS1021AIOT select SUPPORT_SPL select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI select GPIO_EXTRA_HEADER + select FSL_CAAM + select ARCH_MISC_INIT imply SCSI help Support for Freescale LS1021AIOT platform. @@ -1680,6 +1703,8 @@ config TARGET_LS1043ARDB select FSL_DSPI if !SPL_NO_DSPI select DM_SPI_FLASH if FSL_DSPI select GPIO_EXTRA_HEADER + select FSL_CAAM + select ARCH_MISC_INIT help Support for Freescale LS1043ARDB platform. @@ -1697,6 +1722,8 @@ config TARGET_LS1046AQDS select FSL_DDR_INTERACTIVE if !SPL select FSL_DDR_INTERACTIVE if !SPL select GPIO_EXTRA_HEADER + select FSL_CAAM + select ARCH_MISC_INIT imply SCSI help Support for Freescale LS1046AQDS platform. @@ -1718,6 +1745,8 @@ config TARGET_LS1046ARDB select FSL_DDR_BIST select FSL_DDR_INTERACTIVE if !SPL select GPIO_EXTRA_HEADER + select FSL_CAAM + select ARCH_MISC_INIT imply SCSI help Support for Freescale LS1046ARDB platform. @@ -1735,6 +1764,8 @@ config TARGET_LS1046AFRWY select BOARD_LATE_INIT select DM_SPI_FLASH if DM_SPI select GPIO_EXTRA_HEADER + select FSL_CAAM + select ARCH_MISC_INIT imply SCSI help Support for Freescale LS1046AFRWY platform. 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/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 2ded3e4efc..29aa9a3f10 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. */ @@ -49,6 +49,7 @@ #endif #endif #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -1650,6 +1651,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 0647622cde..2eaad9e742 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 @@ -388,9 +387,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 8481c45a58..e5b5441e2c 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 @@ -28,7 +28,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -421,10 +420,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 aa548b20d7..db94ee5689 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 @@ -13,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -820,9 +819,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 297629d5ef..5bdafebb6b 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 @@ -21,7 +22,6 @@ #include #include #include -#include #include #include #include "../common/i2c_mux.h" @@ -222,10 +222,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 1975b0f47d..f5ebb934eb 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 @@ -24,7 +24,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -288,9 +287,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 @@ -299,9 +295,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 e84b356918..7f2a8aac62 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 4705e34e1d..6e5ce2ed92 100644 --- a/configs/ls1021aiot_qspi_defconfig +++ b/configs/ls1021aiot_qspi_defconfig @@ -38,7 +38,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 f4e2274fb8..ab3276ca54 100644 --- a/configs/ls1021aqds_nor_defconfig +++ b/configs/ls1021aqds_nor_defconfig @@ -51,7 +51,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 f967619ef9..6c60bb384a 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 5c8cee3ea9..ad199ce482 100644 --- a/configs/ls1021atsn_qspi_defconfig +++ b/configs/ls1021atsn_qspi_defconfig @@ -37,7 +37,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=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 02c25cda7d..e7ed10cbd6 100644 --- a/configs/ls1021atwr_nor_defconfig +++ b/configs/ls1021atwr_nor_defconfig @@ -45,7 +45,6 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x60300000 CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_MPC8XXX_GPIO=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index 756e072f9c..8a3233e54a 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -62,6 +62,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_MPC8XXX_GPIO=y CONFIG_DM_I2C=y diff --git a/configs/ls1028ardb_tfa_defconfig b/configs/ls1028ardb_tfa_defconfig index b58254dc65..dbe2ed37cb 100644 --- a/configs/ls1028ardb_tfa_defconfig +++ b/configs/ls1028ardb_tfa_defconfig @@ -49,7 +49,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_MPC8XXX_GPIO=y CONFIG_DM_I2C=y diff --git a/configs/ls1043ardb_tfa_defconfig b/configs/ls1043ardb_tfa_defconfig index 99c125731f..262082f893 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_MPC8XXX_GPIO=y diff --git a/configs/ls1046afrwy_tfa_defconfig b/configs/ls1046afrwy_tfa_defconfig index af07b1cd46..548b95a300 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_MPC8XXX_GPIO=y CONFIG_DM_I2C=y diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig index f706dd6179..3858746d69 100644 --- a/configs/ls1046aqds_tfa_defconfig +++ b/configs/ls1046aqds_tfa_defconfig @@ -59,7 +59,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 149091af4a..4c636caf6d 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_MPC8XXX_GPIO=y diff --git a/configs/ls2088aqds_tfa_defconfig b/configs/ls2088aqds_tfa_defconfig index 61e0fdf113..f652c9860a 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 a28b45b129..5230d7ead8 100644 --- a/configs/ls2088ardb_tfa_defconfig +++ b/configs/ls2088ardb_tfa_defconfig @@ -53,7 +53,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 de8dc553d1..74314c0be2 100644 --- a/configs/lx2160aqds_tfa_defconfig +++ b/configs/lx2160aqds_tfa_defconfig @@ -56,7 +56,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 59955eebbe..3af38a68d0 100644 --- a/configs/lx2160ardb_tfa_defconfig +++ b/configs/lx2160ardb_tfa_defconfig @@ -55,7 +55,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 203554b61f..8fa5406678 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -58,7 +58,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 Jan 11 11:28:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578389 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=AVLd40L1; 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 4JY7mX0wKhz9ssD for ; Tue, 11 Jan 2022 22:30:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6656A831CD; Tue, 11 Jan 2022 12:30:07 +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="AVLd40L1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B73C38327C; Tue, 11 Jan 2022 12:30:03 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on062b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::62b]) (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 08824831CD for ; Tue, 11 Jan 2022 12:29:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hrXqohYhEtKGB37U5gNKaaHhUK5aplKMM5wZi5PQz8nE6oMLMjEASVaopfSVnR1AA9M6u1lj/ir26AsZhxVLIXcHC/Ua4rgYsZa3aDyPEt8NeZ9Jz2s1lQ+4Q5neAMMk2IdBSnK+4VMqxVJq8/oB7xCFQymmZu9j7YYwcy0V35evP53DWuuVOwx1xJvIgbc+f06G8J5SNdrflfqhgPjFOdUxcHxMIP5oEq8zhsJLUcqqB+9rEpnuCtV+ci/JR5zyOcPbP/296Zp3h+hzfwQ1Tktrj4BxsV6NpueiawdmtF8JKoKfvhbg7klQtfboigxhfIF732qiMWPAqJamnpaRfg== 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=L6vRJEKhjRVAzDD/YQPQsZ7Y19CPiGkF2yNNSASdaV1PWZrKbqnWmas2rOih4Iex8GwPAXgM/at1qLnvbBFuJGbIbg1aTOUy4Lma/2rTo3xiDfcz8pLqpdeBN3NYqoNIV/G9YrHSKo1Ws5fzkFvjrTE8ehl9J68Sgaa3VdJrnmc6ALwTV9W/ynca7deWtXhM2k+lILv54Q4sILaOwfWYwi0H5MtSFFSZdA/rT8rtGUYjOddgaVYNLt5J0kgg9FT0R9Qa1KHhIPLg8NFfuVgalt3gLANIY4a3xVUmbgD5iMQo04RSMEJ57SI7sLpoaY5hR70jNPy4HXrKalTUv2OGeQ== 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=AVLd40L1rT5ROczV+j3K2KSuqziDFl6IYwOnrK1SzPtqUA7rcRvNbPnf9uep7kj0rCWjLCH8xw2HdSb6vscgnwpqiZbuEg7TqdycohqltShVJZ7A+xVdIcgX1CIp4SVizp6lp08fgfmQ5vbJonta+C0eFpvczjgxBe3X90Q2Guw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:29:55 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:29:55 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 12/14] PPC: Add crypto node in device tree Date: Tue, 11 Jan 2022 16:58:03 +0530 Message-Id: <20220111112805.3566-13-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 36a5ea2e-e60f-410d-5a14-08d9d4f5b122 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: HdYL+Pk1D6Vc+zZN7zJr7mojpNygOZjhDZeFT8p2EtbwU7Eu6bFyhBxfyiexOF4WH53M+o3RvbrJQCpcJqiA9Y7rtaJyHD7etEKH9rroqY3BglVKcv6Z6UAtNu3H84UDTmXZY+RFiDq73sBpDUZdkt8kS7+/ny9SHR1SDel8Z2Thk3/42zoeyZ9HrYV62WUj2Sz3y1VwMTLVo8M8gEOF7efFS/P+zM18h9F33kZ5NWEfHNEpt7UYZ33u7eMHaNVt4wa2hIPPDuLW2l0wJZKjhYKvijW0akf8hAOH0TGIWg+H5jhlimvdJklT8yNqFXumMyjOpORx8T5XM7ucgdiCe0UMTX3CMG1iZxvYUb/H4BTi0GMb4p6INveQ5T4prUUIFdcngFR5GbO+vkuJWJaglR2XXDMgSEEV3GiOV6YGP3rk8f8HbgY4uJLbXPahwChtpkkk+JhrmsWJSQ+e0WmobvHI5jdAGmK6+jWIV/14SLx2uTQqKPxjHLlC26NKQ6Jx5NMoE8YPK67ahWfndKiOqtR6eelQ45EaozT3Z1iJ9nUbR9wxSWCnQpNWw93pfbqb+Kg+TlCesAsNZ5rMBjXszuLcI6sEVHjH+sTnqNFilFxJ6WF0+C0rLFXTlAvWc9VG5wNZ6tEQ60LaAX+77NmEXj9DLVtD6CWY7rz/pGcomTBzlfKHf5fm2rHnte9hSNfUxK6zhrQY8MTXar+j/qrK9w== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(30864003)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z2yivQJAzfpAybnIeDeeE7A7ZwrF6U5+vrO3aWi8OhWXYjCtcF6DHfmq538NZ5S9CIMaK2JSbUdPhtrIykKNaQXAagBsbrtH36fFlmP8/N8gypRUYkgD5VgabRJ//agSi7E9C3X1xKN67ydcO1blShkH8YL8Emq8P+mmZu+nsiHADQ3D68EH51XbClPtlMGyfX6qFXhyKpnzHQBlPkrG1hRKu3++2yhrKc7Te01FO1Q3g1xXn3qjVhYp1g+tfLAaA3ddvcj4Jrb6/6jESOqIIjHZhqS6sy30ckwD3eUf6sZbix5dwBPgqErCberz/5yZYkWRNbhpDq2/JyVnOjJU0NJtb9BowePkfsIXztwSlVZrkGO15whgRMEEONGIJQB84AYMhQkYYzn6AIYWD8/lOJbrkxvu+DLLK/Wm1/qkEBdj+Rvu74VuYEYEYjw5WdyPYNcTek61uhkkMuSVSFWIpl83PL8BzeXiV0c96MIneKek632cGSOLq8o9P6PxPYpuzcNbhKEylxW+78zYCbb37dZk3kHmiw1MYKAtHw6Oto073RiYzhQpI5YNqn64bJj3wmmtRDbthUbA54HQHfFNC6DcDxDBF/KmRYbU024LNgWiiWbAHNq/lHenTnMtzAu5EN0NeYJ+xQBgsGI/7d0yDZ50NIbtihcrZScotRDkzwpEqOnl1eXSfY0Uc1grQgDDgK4p/y65Lpl0D+gC+x/4/Z8MWDyuZvLooGwjNCIBPxolAphBhC70l/djPAYJiP0eDTygSE/b4HozHTvCIc85SPy/POJwpUUHK2N4fqNr18SWI+Q6SBkasAUUJjrUjhDMaBUb6USfz+sKz5LBLc1xVto9cOTupkexRkVOZvcUVkqLpGDAsmatddhVKhhdVjrgEKXYysmxfSF2EH2sSF/u29uHH8kfObsGcVERXZBXetm9HFACoY31/cBOBPQfouXxgb5Tn+ZBKdi76WiJmUJf2yjbm6h7TJ5Fum7kCir/DQ8NolVBPVzbbzzgo0YI4ODCqB6HO/VRpg7aj6bi4gtKaVr3y2H+mW2Ci4MQlQD9TSKyNmeuOjlb/7Y9N6G0ZiVf1d6mXmwL+UKGDZVo5JA3ukt0MezKP+6OwTXv09Od8PII2LWAqhP3cfdJ0LXChGop5XR5YDc+oj3wVFWI0A5ztTCilA9HZqbair3+E+kvJhToZHzPGaJHiBfpHLkpOpO/joNccErZjxgZBTCB2aQggAxMqFpLAIp7Bv7cbH0MWJW04jRZxAvkwqmmp4mZgwEvwp22dCOnNN5d0WoUmNFt6W/OL93xWu7hNek8ezwN6V/Uidnrg3iXCj7BatgRyJQQ51X8bJai3wZfPuWuOUkaOVgtQZ31bYE5dLbm5zn/j1TgThHOFYv5tcjT7PrfM5WJG29CISNywxdxnlHA89TuKe9hs6yjhY2Sk1Dg5OHZCV8kWTJ3uMAteakZ7+lw9hFnZMOWQsFbE3u9b6n9MuBQ39FCqRo54wWHy8UpXjXH8apkpWyTA8PD8xI/qATwS2Rx2ZoNdJnWf0s5JwnLxfOc5cKcY2Ab7dTBmxcEqiaoFb5cQxRFDc1dVPWBGPyU1+BJINpsq1t2AXvkhMr89Qmdn/7+w1HBo2uN16VA4H6h7/E= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 36a5ea2e-e60f-410d-5a14-08d9d4f5b122 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:29:55.6967 (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: l9ba8l6b5ANJOvWo3PNtzMLIiddzXxMeYB41MzqecAiJMcCYyN/PFVjQzeadggTOYk2evqaURb9N0MyKf00sLA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 Jan 11 11:28:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578390 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=DmUPYJfd; 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 4JY7mj3bWWz9s9c for ; Tue, 11 Jan 2022 22:31:01 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 82C378321B; Tue, 11 Jan 2022 12:30: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=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="DmUPYJfd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8734E83267; Tue, 11 Jan 2022 12:30:10 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0616.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::616]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8667283214 for ; Tue, 11 Jan 2022 12:30:03 +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=ENYHIjg2oAGPTlJC0tSMv9kaCoPQryRiMsncthj1p2XmFk2a3jyoNKwF8onLWAv4akgU9onNL1MTiAeuXjqTsNFdi3VSODbAjaqIm6Sics/7sAodX0RxkIhq91ppt1aHn3K0PzEo6d2VPQQ3rnsNKPVbRRb9qVg3mylPS5UzZldTTYQuNm/mctHC+pTB9s+QAtjW0g0eox2av8Gl8BQQz3v8uz7ZLNZM3PuaH0gUhsUovenTpscYSlnOirrBzaZS+jMKpy131fx0SUNKTjhmt5wlSMQ4eQ3MpG/xOoXpz99MgXqc5gyOc9y0qdyQIBwF1yEhI75tM/aWQvvDQTAO6w== 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=A9C3izm4g7ubR2P90pJyyFmpx8IoWC7IAvHVFYY+1js=; b=CxtKB5SdZxy+PF5kex8iKBZuOeHyVcLekxvMN3WMspVLeaaz3z4EcSFAEpdwsg690qxFEwba6T/8x3mCxIms4hGS/eDY6kT0JM7nHFUgtQxCGnFvq9/4/FQ+doHoNtWnJDO49FnQUbRFuoI0yvubUwn2gXam8p4Nc83G8AVp537SsI8AzBYp+OU0PixtySiKZsTQYbUQheSPUOLopnWL1gJB+I5lXmb9rXyxUBgdHXAC575D3tne4iRgkcNmEqUS9LyGUWdtRjUCXsA8DpSPdWttZ8TkY7jmqA+UZiuZTmL3vYaF/Y7kY2rdBqfHceEVDeZtu+XLimILdo2VTw+2/g== 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=A9C3izm4g7ubR2P90pJyyFmpx8IoWC7IAvHVFYY+1js=; b=DmUPYJfdOGfK/SqkoLhFzIfFvLnRv0zRARF0Z9FslAdXPseqyoEWofDWIpgvQDIRNuvcH38tMDssLdd4UvwwoUlCQ9R0oCESQXx7O4XFQp7HmON/Xlz5OpB+PpENQmweQAKXzNxCiNb49+QxNob6d0BZvP1yskBy4naOGmKpGDE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:30:02 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:30:02 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 13/14] PPC: Enable Job ring driver model. Date: Tue, 11 Jan 2022 16:58:04 +0530 Message-Id: <20220111112805.3566-14-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7cd1a44d-8100-49a3-41e5-08d9d4f5b509 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: OGcE/FP/valvu1uamxb/aNAIUGooTu+cQC3tdRtsK7OEJDmjx/7Fu/3H6T86UM2D3bSkV7d3GD/NfwdxTKLhqbBunrs9fiCusDLpVoJK3mDcjoN07wXQ/OyXc2H3+mC2KzqeLl+Nsn2a5g7nopEMH8gTqVkdXRYWG39ma6Wuvf89nO7NhMouIHYtzZf4dljioWRzJa4g7UUCCOxF2TDRSEzQqyqj1JaefJZK4W2asRCWxYRNSANWA0NEWEfpv/UN77705u47wQ8HsgwLklceAg7w15girRp/eS9dBMQa4hA72KHoWLI2nihF+ab00OlAL80MOhn2hCcSbXLqvZQDiSGszAhScGVv79OvtrhmgqfkTePIef2UVWkTVgqs2PC7ymebkb7xHmcpmokcIos6ulFcgjKq2gx1KvBlFbnjb0266o7zPJ+Qj73sYTrMWz7t1hQMBL9/7fQ1ZQiAtBL7JbC45I+CBMsg1UJi5nkKKqOM61JRpztkOeG/BuHABtd6jPcSKBKk78N1tzo8gni/c/b2Nmam4tYAlthJxAUHrau4/zn3D121DLhn+LLEng5f+K1W2T5qiB80+PodXcs8U33OxAlfIf+imqhIC66ABeLIi7DFZbsqII7tUc/F5pkfNbnJTV2lc6ylwEEb3Rt5V1YZdd6y4RZ+zuSAkxmzFaJAvqme7hO6zzbetZ1/25I5gNRz7OIMptPsn09JY5FVNw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(19627235002)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(26005)(52116002)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: DAgxiIi5rdzOMRixs6p+36AuGLtOtkh37ur6pCqkfjyLmhsHWUUPtk0vqo3oN0o4Uu5tYkZXppn7SyLSlTDvcnYgXeVDWULLZMLnQm+GgYnu2r4GzSkGWlDyPR2e/du9kUL6+Xabi+4Cd4O0ouyWqvdmFTUq0X2tvAyupt3GUWnpkUbkxRaplgjxM5fwCj7FdG1Xgwfdd3THgFhYmbfieJHJjMk+cHn6Yv4woPhG9Jq0+sIVUPseYT17Lsj1N1CUiPL5KBctPaahzN6K6xhGr/WrY43FgVGAdV9lnMFN5bZWTLeaXfe+DSuFpKu8LbKQPsAiZw7y40gNnM3ayRVO4XkTx6JaWBms+K1jJ03zYXCbTYAY//YCdX4QvwhoDbJD7eylOPmRKf8XRaZWnZFC6/cKu0WUxuACPeukDOfdc4RLGacv/TEs1Xm6Vfsil2477cg3Y/iR09u+a3lcliZ9q/0PKD9Bc5ZaECX4KQycT/1+CAVM5u30M0gMdg/o6xVFhDDIG+O5liU8cTsxYO+cCneZcGmcCE9X6/JyAusXtTO037xK8ff4/bmWMbl212a/x9WUJhAxTxTjhPM+5QNnnK0YjCm4S4X0Vcf+bvClqGvXUmhmFnz57v8JvMdvPiwP7yda5MJMw3NjXRaEDSK/C11QOtsLAWRDdLTSn9u9pmqnTD1WcLu4ebbj2aZVHBsldl0P8bIgT/IXtoxxyIhehsdX7ghiY6MWzJJoXED7vFxMWl/GqjLSrlb28aFgWrhgUnVvddmngNzD+rbmynBo1VxwLHuD7MkiAnDT7Ll0gA+DR85Od9ozq8unCoTIrL2MKF0ywZRXL6/ZE/gRAKUTshmbPFhtUfEN1bDv+A3PID6u4DG6BikSn4I3XUFJ2TXDeclThhjMzjuPUFXSgF+LqeDH0Ax8NQx7PCqjhNBO5sFiF0UtUPVgkCY3JAFO7xhiunBWZRgVQYADR7oiyXCIpKKFEqjBb1AviyXQiBWkLlF1N6ayDhRqWJI+AiHC7jMrLPkYsBypApDw1f379L/nll9b39WzaAoBHvp1pA57lHFZ67vy5T27vVZTA3vkBNC5dCucmApXx+PLg4wszzNOac6Y4MLjzuIJ9OaYI4oE2VX3YnqpdL2yDD95TGnxveYLoknCsOn0h2LEvlX2/UTEjv6Gpqy6qD/jh6SVmUCmzgMiFW/jAAfPmbynPXuEptHuSEnwXFyrw8nsUVE2os8dnBwk2qy78oo6z8LFNBk3qYzbqZg5q33Rwc11V0NDHWlR1JiZBpN4gDJOnfOWmxKjHnEBrHcPWl4FELlwEN4yPVlyQcc4VDH9tkiyi1W7wotIUXckhxCkr+TxMnBh1mWNmheP6pIzYcskDpJ5bdMZtBRFVSTPhgcgkbrKWt7OYHg7eM6H7ClQ/Vx5D3lmLav4I2XsmU/9wb9RPvJ+cl8YRbtmokgL2WuiTSIW6I0EYgJGQAbEIpJad+CVqIszShaVEIRWUzNmzUQ9IU3/TkGg2hdN5nLhEc+KadIhnN/u1Bgt53WGGPnEzmfvjSRGjbwrvYw7Uk7NdmzB9HaemWmc3sCvTYmUj6uo85PVpocYkDNBAEbLyqbA3B9/HZY2qxj1la0k2Q3eiMZ7KLK4MR+slFQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7cd1a44d-8100-49a3-41e5-08d9d4f5b509 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:30:02.1025 (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: FFlXxXb1bK6bM6xRGxHfZyunuXkFnCr6YpMe5/47RTd/ChBGXdrmF1Ix4g/5t3xtdRL610ARx68Sutxjs1fTwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean 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 | 22 ++++++++++++++++++++++ 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, 55 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 4471754d02..6a30b91026 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -25,6 +25,8 @@ config TARGET_P3041DS select PHYS_64BIT select ARCH_P3041 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -33,6 +35,8 @@ config TARGET_P4080DS select PHYS_64BIT select ARCH_P4080 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -41,6 +45,8 @@ config TARGET_P5040DS select PHYS_64BIT select ARCH_P5040 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -102,6 +108,8 @@ config TARGET_P2041RDB select ARCH_P2041 select BOARD_LATE_INIT if CHAIN_OF_TRUST select PHYS_64BIT + select FSL_CAAM + select ARCH_MISC_INIT imply CMD_SATA imply FSL_SATA @@ -118,6 +126,8 @@ config TARGET_T1024RDB select SUPPORT_SPL select PHYS_64BIT select FSL_DDR_INTERACTIVE + select FSL_CAAM + select ARCH_MISC_INIT imply CMD_EEPROM imply PANIC_HANG @@ -127,6 +137,8 @@ config TARGET_T1042RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select ARCH_MISC_INIT config TARGET_T1042D4RDB bool "Support T1042D4RDB" @@ -134,6 +146,8 @@ config TARGET_T1042D4RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select ARCH_MISC_INIT imply PANIC_HANG config TARGET_T1042RDB_PI @@ -142,6 +156,8 @@ config TARGET_T1042RDB_PI select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select ARCH_MISC_INIT imply PANIC_HANG config TARGET_T2080QDS @@ -152,6 +168,8 @@ config TARGET_T2080QDS select PHYS_64BIT select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE select FSL_DDR_INTERACTIVE + select FSL_CAAM + select ARCH_MISC_INIT imply CMD_SATA config TARGET_T2080RDB @@ -160,6 +178,8 @@ config TARGET_T2080RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -169,6 +189,8 @@ config TARGET_T4240RDB select SUPPORT_SPL select PHYS_64BIT select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE + select FSL_CAAM + 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 53130ccf82..20bbb9b20e 100644 --- a/configs/P2041RDB_defconfig +++ b/configs/P2041RDB_defconfig @@ -37,7 +37,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_SYS_BR0_PRELIM_BOOL=y CONFIG_SYS_BR0_PRELIM=0xE8001001 CONFIG_SYS_OR0_PRELIM=0xF8000F85 diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig index 39dd70888c..834523633c 100644 --- a/configs/P3041DS_defconfig +++ b/configs/P3041DS_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_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y diff --git a/configs/P4080DS_defconfig b/configs/P4080DS_defconfig index 43f16d45e2..e0a9eacffe 100644 --- a/configs/P4080DS_defconfig +++ b/configs/P4080DS_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_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig index d614917385..e1e0cbfc67 100644 --- a/configs/P5040DS_defconfig +++ b/configs/P5040DS_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_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_SYS_BR0_PRELIM_BOOL=y diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig index 98f1d6c794..1cc1d6141e 100644 --- a/configs/T1024RDB_defconfig +++ b/configs/T1024RDB_defconfig @@ -46,7 +46,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 4797f2907f..88fe9e6d02 100644 --- a/configs/T1042D4RDB_defconfig +++ b/configs/T1042D4RDB_defconfig @@ -37,7 +37,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 db9e970e64..8af552f5b8 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -40,7 +40,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 6b076405d6..f53564e478 100644 --- a/configs/T2080RDB_defconfig +++ b/configs/T2080RDB_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_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 472463fabb..a5b632e2f5 100644 --- a/configs/T2080RDB_revD_defconfig +++ b/configs/T2080RDB_revD_defconfig @@ -45,7 +45,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 bbaab35fd8..e1544ea25d 100644 --- a/configs/T4240RDB_defconfig +++ b/configs/T4240RDB_defconfig @@ -36,7 +36,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 Jan 11 11:28:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1578391 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=pjPaEnM8; 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 4JY7mv6wgcz9s9c for ; Tue, 11 Jan 2022 22:31:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E35E4830D0; Tue, 11 Jan 2022 12:30: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="pjPaEnM8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F04B783281; Tue, 11 Jan 2022 12:30:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,SPF_HELO_PASS, T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0617.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::617]) (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 A8B9483278 for ; Tue, 11 Jan 2022 12:30: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=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Psn1kPxBJ5s8uPSBJ6YKwh6bUnnZrmbcPhQKQcI20haBH5dchDY5DvldVNRnSg3R0xRzWeksxRJz6gZuoQVPDnF29p7SdFCTSH6YwfCZwCiHKmQ0aZtWxL+LLVMmEYbA2ftKgpGnHJZvLW3NdO09H1XnfOTJhBREeGxBop75iEX74R0uKRBmZzEBmTGlohqqMnNWgBoEui6I9z4jTC1SC1YX++SaF9orDnZ+KLQQaMQl7bsmErtRSunTDMBsJyaZ8hmwygnSAeAMTvYPIawMW+kx7733BYRPfIPCx1RVzbKN9KI6l+DKm0UWBZHoN+Q9iD+lLAMyHxdUWxwCsOCryw== 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=NN2TVjbikncSoltEpFog6Cg1359YjMPIWQPl9ad8tYM=; b=SxzCj85RNjIiCixN/QxNj9sEoJqQe+h6guimA+1lpGr7Jw9U9gkFdAJ0SfKPm4JRombbEG5wNJz0Stjq2t8AZbhiiCMcR2ozgqkW3NHPKCK9EwQrJd9xVEyRHoTeN7EqMPDFOsb59tZDdNCwAARH/BNR7BbtZ5etSvYYY/g4lnQxq+RThfuQvQWS/eKHr1DfYPJDJP46wEyZGUngyL/1vVR3KxDVfonOVeIotsajq8XkLF6N4YCon25r953v7NoIZF6nlWOHjDSGZdftQJP7TW/EsTgcObLlWcM6L+WF249UyuSto7qm69/HJ14KlON8tEIoOb4A6q9VukwSgoBh+g== 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=NN2TVjbikncSoltEpFog6Cg1359YjMPIWQPl9ad8tYM=; b=pjPaEnM8agmuAAkYCGYem03odP11mEYgpFbjVTGJ5c1BOMaHHlqKxK1hU1f6NJWbwAuhuC9RN/6gNT8L7XSdxW9+dlwtXuxdfkvVZGtsqBmI5ntmMdxeThxxawG9odPFtS3KgvXaeYamg2QRYvrHkJlh/MMoWSZ6cPGK6s8Qbow= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VE1PR04MB7326.eurprd04.prod.outlook.com (2603:10a6:800:1b0::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4888.9; Tue, 11 Jan 2022 11:30:08 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::ceb:f79:2700:ba2a%3]) with mapi id 15.20.4867.011; Tue, 11 Jan 2022 11:30:08 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Michael Walle , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v9 14/14] update CAAM MAINTAINER Date: Tue, 11 Jan 2022 16:58:05 +0530 Message-Id: <20220111112805.3566-15-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220111112805.3566-1-gaurav.jain@nxp.com> References: <20220111112805.3566-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR04CA0209.apcprd04.prod.outlook.com (2603:1096:4:187::12) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 064baec5-13b8-45b3-8df4-08d9d4f5b8d3 X-MS-TrafficTypeDiagnostic: VE1PR04MB7326: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: yI7jdclWHrHFk3l32evLeJr6utfMV8wfxrs6Q0HOTrKmRgmdwlc7qeuZ7EFRRnEnQyxnulayuVwjSvOqb1poUI8v+g8jSkZfQv21sXdlkyjBXijO/RHsVotISTkF4tzmIl6+OgYwB6tBrT+HZ6/xNUee/2f1ZpKGGFzefrNMu/uq3n11MuE4L0pd2dJOhY4BQvAdjupTvYtgp372YWpd2CL3Zc4G7FdR+zm8MMBq4vTBiR06oLlO8fIZ+fifkvFbsK+svnj852OEV0PMnBMiyuDvfSRwE/eX91Lr86H3ig5rFeqAhnmcGNvh2M5LmUcNLh0LUlsN4uHLS6U6uKWJJq30o62pwBK2yvftcZaYSG8g6YOCXsHBg0OoEChiCQzmNhg0FfgmAIHuR2kXbCPUWOq+Tgsc1ki4B4o2lMvFaI7JK6LkWloVrS2mdfgjR6s/6TMZqaKandNqMNIO+dlAWQBiHCoULl+Q3JoMxMLFBe1SUiDmR6fgE8xiGalvSMj1mQFZWVSxf+fdB3U1F8uAc0RbXoHvXLtGy6YElzhWNlbQVjU2A2ZyPjKhKOr1mVtHo1d/H4+5cFgzFqbdIxUk7aTmSU8pJMGLx/MHiYCeDOuPu9K5BHznUaCHWvKUvCm+Czj/YpYZr6bQNrwWTqh9J42+jhR2LDNevf4vSMhC7fCVGNSDaLySurftO7SvNMFjjr8PzkVG+plyLjqJ55r1Nr5eW5fAsuEttXIzTBXhbI4z95fg4G4tbrDx9+hwWwnfszTxg46Gxscr0A62MzqTPhxDLFwxsaAfyuRSgUSM2GE= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(44832011)(2906002)(2616005)(6916009)(4744005)(36756003)(38100700002)(6512007)(38350700002)(1076003)(86362001)(6666004)(508600001)(8676002)(66946007)(6506007)(55236004)(83380400001)(15650500001)(26005)(52116002)(966005)(186003)(5660300002)(66556008)(6486002)(8936002)(54906003)(4326008)(66476007)(316002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Yavl+CvkAumWqWRBPLprkCE5qkmqYxVXVEkqYtF+twi7UrbWY8O9liHHVW8S+d+pvt7QqNHNwncHDBZyqcLBWiea7QtbZr6M5RYaf3/fuBlwDoWcmrZbVuv8qbNmXKqQD9/nmF50rY0kQ6e7E+qY8ykKwGwRq09ryS0GmGUNx7hnauOqb0D2YLEalnjTTAkBPulHIrmvrS0LP0ohgeBrddOY2BtlZTRGnjX+dBPZmsrUAr2iuyipqRcJI3Fz+VuniJwMPiK4ohbRilZ/OdG76EQVzemJ7aghTCs/6kyZvkCR+LGqbrQM2f7c3+p7X6yQY91zMUk13gZAvppuwroPzpI70EEHw+GW/r0m6fo9528WmEuQkxlq9oDyaUZxT4fOPl+Csmu6uNCOe8GGpMKbLnfjOMhk2gZPCFYclaV2SZRmxSce7rVNBT8n2ij5RsysgA96QXsFEnYoPwCZcVAgCNdcsGytel6aexQYa/cggQ5+5T787wC9N2GFDTwTRSk9Qvqfh9CkWrIEwKDzNBfGgBjPwqCINvV5oRG1rYyGW/Ai7LEcRGfQxHmujiKINkrrqIkIs86SBJIxCl+DgIwi2lJCqH+AYHcETZrhfAYEi+sGgidwflMTYoPMD4CfayJJQHFXDr6zBJDW8VsP5GyR0Cyz3cdUpwqknfp+TAMWozVQT12i0un8PuAXDeZyPxt64BrOcdcl+Y2LLkzeSf9aXjN/t8JqNMDu51DW0lL+KwrOrVpGRQPEDwqz2p4CtAxSGSqUh2AzgS3NFDOpEAXUDcz3eQrJyyzDdTDuOpWZHd+z4MZLawK2y+pzMkV8sntmB6Pt2iOvHLDr+PnBbp9Kh6AzwJfYg2MYIItC4vVPaShKqe/zMAAiIZZEZU+5onymuFXGNMQMnZMTaQmWla4UnKmMCCAd/kAZblBevC0kBujPhqVSCKvRUs4AMx2FBFgy6Npne5IRtVzjDwML0lQJpvqcy0tTsQ/hvtErA1hdp9UYXteAf833zqs7qz52mede/EXomgxB4I2jXVDDe8rVOr4syzGrebc8nlbqdHxifS50D1kuOf+YmwtemEb6XFw7nK/QgyUGVc2bY64Z3U6/401GwYbsYxsUXcuBClpyeF3OBPtjAQaUrl30//cy5vMgp/0jdQFPVffpp+veAaY4hXTNQp+Mdohl7MoAyp79vEQEZZAVGHH5xiWlUISPfslx3AcLE+q4+NTvFj4pRJkjsV3eLYwEaNAsJBX0p3d25nN/RXfNQQ1lNEFPbRYvm3AqY7Ea6x+vcyjp3kny672OVJDISta5wpcpi9xG62WZbr3mVf2jQT382mytW6HI9+JTqT5N2c8/crdbebFavbtHa2a/jm5dOfGDjhMT8/n3AkmRSbQR0QMxQjnGLMI/Stbtsr6ya37ZAXss3weI+/MdA927uRsvvaRcioXmCva6sQ0bx5s/cfpQVn+zRNk1g9dtBxbxfaMcm7uT3TiX4DsB/y7Ugau2ySZeocCL/NI7hq/AqKMpM8jP0vVEx3TrPXhYQrfqv5GYmZJp13QOyHGdRWGeuZTik8+GQBvwcEp5Z/oEkRb7VTK+HwPVuqOVHQVoFAlizPDnGEcYf7ltP8M0LZD5J4O3Ywiko84P9TNGp/I= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 064baec5-13b8-45b3-8df4-08d9d4f5b8d3 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jan 2022 11:30:08.5865 (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: 6icwcsbuZmFrdWW2h/fO295tAJQidfmgGbyLZfpHj/JL56j9i4Q0v5uzMF73oFS4S6G/0ZIr0Vh7f0AU5NzAUA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7326 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean updated CAAM driver files maintainer. Signed-off-by: Gaurav Jain --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index f4bd3d79e2..1c912b2c65 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1334,3 +1334,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