From patchwork Mon Jan 10 12:27:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577865 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=GvzOueap; 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 4JXY560T0cz9s9c for ; Mon, 10 Jan 2022 23:28:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0C7F9830BE; Mon, 10 Jan 2022 13:28: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="GvzOueap"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B6B36830DC; Mon, 10 Jan 2022 13:28:04 +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=-0.7 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-am6eur05on20606.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::606]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 7C070830B7 for ; Mon, 10 Jan 2022 13:27: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=BjZ0jCfkD/YRGmrVqT9ruy2zp5EURpWhjr9Aqu8qtOF1zYlbrAjD+hMD7+pR4lJXGwSzmBvzu8ck6F/r7xHFcyl8sqO00wwM7ro3F861LgGBkqW+zqSzlIix1hufrdL04vMc11Zwbes/Tf8W/BVZYZ+0PN+0u1K3w3txTkob6hzkKCf+JUFn2zm3bmzw8D2MIfoIwoChxMOD55006WBlYjzghbp7IMFT5Ut4OeuAqoU+enmt6gCaVspyOrqD6eOFd4h61sMB+WKf1i+Iizg82eeSBqgDx7IgqgtCZ0hQv9UyNyPHKBiiXZqb62SXLgPlsJUKTg9PIQS74UCX5jExPA== 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=oB1BU2/KTScufYcns2pW6whrnFPEC+K0itYuNKmau0k=; b=fCyhBLuzG6LQ6KrrhCbCgSx0CqshPMg3iuwZsnJp9e36a5MBBcsJTBFb0IYF+xPsals7DIbWVk3U5M5CCIs1ZEta+pesmsFmga1XyctOOmYw34e/DrYs1jx9Q2b2Gp4CkLDEViLnFGpERAhgcl8jl8TDX4beJO/WlxgcNaWtrch57JH2qHII3lLBJUlM5PxuGrkD2AeB9zpYqKu9LbSLY5TxNpsvHYQ0CD2GhdA9ZFO8bhG4u6ebNhuKPZM6ALluo6kZBqjaMvmSfMXM/FV2h2z9DvKMa9tNRybaCNHd+pBM/Eu1/r+K8dYjfjyB3pZoLUMMrSz4nlXZmV4JFxZm8A== 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=oB1BU2/KTScufYcns2pW6whrnFPEC+K0itYuNKmau0k=; b=GvzOueaprrxdOnZkerYavo7XO80ONKhJ1wdxh2EwuzJ1Wlzqm0jXUADWMO22dowPt4MfDsPrTlWxn+SJcFYT68wFG6qXAeds0qmudZOFkY0xiHzi1AWc9Auz+4mkgU4al564dCCqEYGlMOZeL4+HIg795dMBhXzqUFRpRY9188E= 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 VI1PR0402MB2863.eurprd04.prod.outlook.com (2603:10a6:800:af::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 12:27:56 +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; Mon, 10 Jan 2022 12:27:56 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 01/15] crypto/fsl: Add support for CAAM Job ring driver model Date: Mon, 10 Jan 2022 17:57:00 +0530 Message-Id: <20220110122714.20744-2-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: b3176000-dbaa-474b-fddb-08d9d434a11a X-MS-TrafficTypeDiagnostic: VI1PR0402MB2863: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: M+WLd1JSJfgEHhvAkMuFhq7ZVNl9LIz7o/WQwmBD6dbY90OKWJRalhgOnPVE9DX4yhz0f5v13bE7pBCQRXTj8WX6lNx2hSJGQYWt27N7XzIzdLq4BCvgb7Po7vTWrEehmzBhoe+FgEE/PDOsLUFH67ceMnfo9vO7j4uN0ctlE+KwkwEkqu8KsGloGIhy9cff8rh2zAmXpbvtu0dnL51o2dzHkSxQhdENe7f10GOrd8QjS8EwuKuWELc2BCZb0WA/H2W9c4e4xUwOutlOdzhHoEI3XM07EzjIQ75gkOWnN5MwNg4V1ff03/ztwvLDd59dYdUP/Cov3MdTeir2FaoBqXz5IbovkWRk0Ws1DB4eosTaQraOiaUNYAv6TJK1GtNJZ9awOKfnRq8qMvQpvcbYuZDnJIRBnPNGlI9JM8AcVXwBJQMBYF6H47+iagQQemS8e4PPGEMvW20wmYnqD5mFWVKC0zd/3klTLQMpElBqxXNmRZdY2yk1Yx4RAisyz7er1+uE4+4mt7wgzXvFpGpUN7JnvgO1Y2hUdafOGNz902B339sHn4zA00O/T0FliRXsTxWSXTP/3o77E4xlxyXfRo9VaAZF5/NdKdZ/4RbhpIarcIyedb+NGHMFKhK9UA/2+glx2RE674xs8ps5SSLA2suPmMdlkAYiiKL4ZR/BsrRn2DhYS7bv1kGBbycupjMpGz7MLD+ni9vOfP/xm3JiKA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(38350700002)(2906002)(86362001)(2616005)(4326008)(38100700002)(5660300002)(44832011)(186003)(508600001)(26005)(316002)(36756003)(52116002)(1076003)(54906003)(30864003)(6916009)(83380400001)(6486002)(66556008)(66476007)(6512007)(66946007)(55236004)(6666004)(8676002)(8936002)(6506007); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: jamYRiGx4r8gVbRoFUVIEhGtVTYAMIVjQng90h+r3c+33gQKvkLpUyYIVb97OT7IcnG5VE2LtpNEe+KcfUEY/gG9AhGEYpJwpmr+HZH9clijv8dAs5QMK7Y9qkpiWvskIgl7a2lXjqxBqc0GrYZeujogovCb75Kl6L9Tq1mJosFqU80WmHgoySG7gbByuocuIp5V/2yevDSTAVMBZIqAYvWZApHFjt0ApMv2MbTIlSDcgmcTmFMVRejoFUHHKEXy9EddYSV4wkFOuNwoHDF/Q9VJwmGggY1kqeV3Q+W80bcyK5lDoff9SzSB75gROinHVepZvLZ7tAdfMZsREipEqfBWm6wD1Y4o98m0U7o98UOM5UI5YU/QO/VvK6DfnBgz68RVd9fj1tTPTCcgZqwUSxNLaaT6LJz+2WOYqAjUG1+/g0h9jkG/6AlNsKSP8MBAbo27VZdH4F2QeLUJTWyYyaPiSZ6f9mo7dGWqHq9GVqsdkTV0nNXfG1OXxPTqxUH12yFhN+Y950ukGWA6D8xV7hOIw4VGICNcRWKoA77ayCxe1lv0JoU9xQPyBlREky6cOHqOVDV2O70Ugc1lQac4US16T/2QnrqN2MtJFJ4GWGdPzzpSBREwwRPmR5HpU6PlP2C4F9cPqU0+srDCwdyL3CoZk444wZ5V2/fylSdTB4nknYB2uUAFbA/2MDsG5Y+H+vQgpNJ6Me9ZWNHQAAft0/o2d2VBw8BDEgXz4qr/1iLpurDsMs8fLRslVQfHEVAM51XSZG0UjFgfuUYfR5dKwxsBk5VcWCmsTwZtzUjY54qCG0L7H6+wVja1SGcAmKnx0Mnfm5yIN4n+gtntYAbdXoSdMhV6uvqF3j8FGUMKmyps/uwN7T1bPAbTC9SOr8I1P/SAXOzaxYXkGWcvxQSVQ6HiD8UTgPOCNiISgh9h8woMA2k4WAtdaX4umCc4DQyi5IkYYBox3e3zt2qv1K5XN+2nockrvimxAHRJ2sMx8SrZEIl1cRa0O4/pHrt9Iyy1QBb0dJlTpIk86QmjEhgqVnNo5kuSKHjt9YVpuiO4PW9GUQYOXjVdp2wO8QZI8Mhmoo3WPGgQ0mDXx2YXkUzf9GRg28imlnYONe1E84kTZwTq99uC/Ou7jjafwHOJ0FtgwH84pded31Be7UkI9dJdfsBFbMWn/6CS2KkgF6KUR4/WfHMFXXm12nQwgFsPAhE2I3F9fqjZ+1dRkJLCRd9dmedHkB8VdFNpyOsgdvX2i9C6lmD+vpdVa7fIyi/4v50oNbJVkI9fldUtHyEzFswYbqCKWeDdtVblqkHhx2yi8SEMZXcYCD4vYPrQmIG1ggn89g+Dqb6BDOpSgyvHkAPd6TDVr4F6fb+hnBfGAuSWrakRb2dvI/tU1F5kBZ/3s118uH0aNeZ1/6Cx2mup2O8EuYgIVhtjJqNK/FVQR1DYxGHqyCHQQW/CAJXNbeHgecTWTRZdvmCpwrwyt9RI3Rw/BBMwuR1nSGPojAh0VUmELDH9uy/2rk+Ikmia9dCnd9hg3BnR7S1U2LHbGUy161jLsKuCvbhHx7fzTryg4l32gVZcoqgnm0Kb7Lkwp5Cs/OUffaK2bYPZBjBH/KT8jAYjme0bUcAHUGx+ndoCSHLuacM= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3176000-dbaa-474b-fddb-08d9d434a11a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:27:56.0299 (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: NxhW0BWgMxMQO0VxUC7t2MhQX53sYcv5TuMDrwWbwLR/Lyb1dHOvpNLBCgbl860LdOWolYU4H9HZfT6DC0Rj3w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2863 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/jr.c | 323 ++++++++++++++++++++++++++-------------- drivers/crypto/fsl/jr.h | 31 +++- 2 files changed, 240 insertions(+), 114 deletions(-) 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 Mon Jan 10 12:27: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: 1577866 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=AooPeMGf; 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 4JXY5M5ZmHz9s9c for ; Mon, 10 Jan 2022 23:28:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 20DFE830DB; Mon, 10 Jan 2022 13:28:10 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="AooPeMGf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5BE8F830CF; Mon, 10 Jan 2022 13:28:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::600]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 71B0B830DF for ; Mon, 10 Jan 2022 13:28: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=EknO12c1KVsWhFdH7TbKLOYZe5i+p2mBmuNFlexWMQZkr4Iu3FcsByniwNB4OzznrPg/pfFgiGcQa3sdZqpmbtS5N0xeB2ohTTpskPM+NFk5SksoiC3wrLVWQtiMdkHs6vwPcaKx7mdgVINRajiUZtPODakaIEGPpx3bNSAdF5WpJVMKgEI2UEiZa3eG1v//xrcYJ6ewY4UUCw0z5JtD3sy/OXTxacsx+FVWiudxT1w5qNSDBsCfHBueZeGP0OdtoSdo92845YqzhmH01Kzp9Ay3WjRarT5fcKssRkFcGgiURz2dFQCDSKoCC+5QQxb8mGGq3VkbvFKffsMcZBNELw== 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=Q90ehYacI7zxp3RnKDw40dAiI2375Kix39oKnyi1ZqvjpT4h+9VuTiurb1ff19sqqwGCmpGYeFAE6BuOixjGI5flX7cSFWdRmedFTgX54s7R6sYRrYSMkkiFvg3rShPpSnr8O2J/094Oe2v4OMHR5+EHhs+De3uA7P+G9sLnZdPfQn8SytLFdsBQWgL/YwL5qEFBD1OIz2sNtIftAtCvt/vU6G14o/cn0MelaKKzpoCZqV0QU4uktJ7K2Pg6Ew9NUXHu+/fHBPv1OJrIyOCP9gvw3BSaZ3X2pLHFjSAt0r7ZnxtfJoG8pfnSPqHzsLagurUg/Ujlw6ouezd7/wRBJQ== 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=AooPeMGf7SvIh1ju3Q3ingg/SlEkeXHl6BJRv1WJ51K+yIXTnu2MC67HjFGfTZPvjXiTUs/VATNDWPpEpt8AbEfWCnBDrIR92TuhidMAauag6IwvQXUBMcpGG4pNOlEs06Wbq8LB0liObA/ISf40VwEArsWKdTEa/8aNI2sqeB4= 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 VE1PR04MB7374.eurprd04.prod.outlook.com (2603:10a6:800:1ac::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 12:28: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; Mon, 10 Jan 2022 12:28:02 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 02/15] i.MX8M: crypto: updated device tree for supporting DM in SPL Date: Mon, 10 Jan 2022 17:57:01 +0530 Message-Id: <20220110122714.20744-3-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: 858033e3-b942-48cd-d366-08d9d434a4ee X-MS-TrafficTypeDiagnostic: VE1PR04MB7374: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: MyTjp9iiUlH0Xj3KACyLWqLLYbmG19vQfaSBVzolwuuHikGEurd5zHEiOG7ewyIQ/SGxhM15OCau5uiMpLAKrS27N7TEy03PyDjO3HmCI/xgjQySlEevYvHJvH2GvzgxFV2VkAvE0gvy/Fx5hRBQGor3Jx/bPsB1XpaXEf6nr04T61zvImultx27jUqF4mT8hg4BTSK6YH7HmFwbzrVf0yVXhHtUUDUEEqGDoQX4Auzrj8jhBS+psjdMt1RTGKz4aBfCGzV+ZEtRYkgi3Kc759Vq4qHnW/egVNSWFhFlBGHIhg8P+YDDQMB9Icc+xG4ojLCvk+S/QUryAeqBihoPZS7RcPjuDoTNc2dWKnYW94wIMK8bzxIV5Z3j50h+2vzR0myWgNWeZRtryGuYypsHHuvEgIPwC0fedTrIerWdNF48lLIHO606JmROF+PzxNMtRWpgn3U8KKAnTWOIdcC941SDdYosNNsTeZoLuvck0bxITHVtXfMLgwCErsvoWSC+iAKPKzW2czsm6sIFfvZzeDiA/8NT3AVXTUxQ1LY7f9JYVEnjNe1s1T7JZwzgXMQc7g56fhNCVlxFOZzZ9xJ0BebWh5EEZHxf4WktQCbAOdEnOE5+CUvSb3hI4eOOYPYzb+iWLMv6pn4ZIzEaXOeqe/gGiTr6yHm4bAjjgDlNCcwSMs9+8EWF9Brgez1ptz+6rxl2i60E/gi/O12uUkBjLA== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(38350700002)(1076003)(6512007)(54906003)(36756003)(6916009)(52116002)(38100700002)(5660300002)(66946007)(55236004)(2616005)(66556008)(66476007)(6506007)(26005)(83380400001)(186003)(508600001)(44832011)(2906002)(8676002)(316002)(4326008)(6486002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4OKseXRpGNhHBJ6kxQ/DfNDiSv8peSMT5JpwAPf8gEIb3PIw+Ub/8eU0qVHxv9g2VlS+ItjcRwNJCYflbnonn6OaycnC8Q3b+nqoAtFo2O6OWpnfUairI+NDH6JrvWL4y5vUNWOpcKbVGujd6/4q6XjLZEtNLh3jgPRykDbHPtD8KXh4PWRYKHpy84PiFCKcmPMwTyp+Y7w7sg5pwYD4gwPMUQrfuV3t2mzwpXdobu31OkKUewVhnRArYBI0baqix/RFu0bkQgUrZakQZ8nw6As8k5sgfwRNJWck5wVxCp0n2p7rwDGhsrcEaZzOc8JSxD9GhsjvRloT5iBPjo35BAZgVlhe5ZJQC22Qe7p6Zg6jBQ9ez+5VsWHYVaWtIFHCGcuXdzXe26hvjfR4iD+EKK7a5SMrWnN6zHIgyrlMJJSLuGAVYXOlDvrRSFE1OcXHVV9htiwOyUwbp9suypz2NntbguaPlMzHpvgdSSSH4MUEZZMCYJ51WbJFzo/crP0az5ysqXaKJsV6XwFa/Mg0yOsoLkw6Sm4Vw9fHbR9L6HCmBLPwnStLng0hCFtsTAN6A8WXbv0yY9LTiPkAA/vUKoaqxIi5/EsyQO6sZxroLZXu/NHgHMs+DEO28OT8Uis8v8jXee7PoWy6DfP/r+0tluhKsNMbyGHc/rQul0qtcRcSJc3PTtswoKkoSwnvFKwVlFvHhByJ//XpXIKjhXqwKNE+h90Hdox3YcCwxA+YLE3gkDUGA7R2ACMlZ2obLOXChp+P199ai64HQAlR2Ra9Zuj36fLlBsFCNqP/Nn7tIg4I+NCP/IWd8lYrr1Nmhityr7iTKVu14ALVEP4vzNhxDUFYunpjX2T1bq1K0dEy481Z4+5hzq6wqBWQnnOehVHrsC6BZ/7v3AB+W99HxXO3Vj/qN7EjSIuB6HleyyL2COT4b2f879TujVNIMMuShPaFIEoZqTgDNDf7GP5zmAhDXAv5flUbl/ky6+0wusM6xNjq5xHB4dBT9PNx2U3lkeYdbcLhMXVArSBoeV4OanDmVvsQlVAyWYcpiPH3wNWfhhcb2/zMFPQgsTDXgU9veL23gaDKSD7gRgnT29Y1P7v94A5XYATvwP7Zp8OIOtsmjsSTgrZdMppzlnDQT0vTepRmTlfu0ST4lIOHOHdqdUaybKruS7KVkqp0ZwrDjQu/6ST77wxFoH4S4Fi2EBLOhdqDGdF5VvXmaimDs6QtKqw1pFOGt+p8/UV7ZeBTpQjzq1VyGOLzFgqMVrGSsT0wpAgl7qcsGMD38WbFz//HQ3W+BpDUDWjfmCtrRCcCIotj8uAZyzLsmfD8cY/NX/aU0ytZcZBv7k6wDLK3qrkK4ewUostaOwxNzbmActLGjvEQZdRmX8pgWexls7ovI4KuGlWl5I/AlGVVGCf2pjpFngIQ668c21rgdHVT319Tt/f3ihwr+6SUeFVOBR6yZ1m/VlKK8b6lkH1ZtLGdUn4z+VCg/6rPoYmDF43Qz+6LdUcl3N3xHDBogR5wgxdt9QDLrEduVWNg9wZCt/DL5/v3+YFAI6hhhnv8dIK4Ur1/RlnUQGnHdECsfZrGGVzav5p8MERwMhLFk0Y12/2WsOpoM9tnO2s+Ah54CDeDYVGsrIo81iU= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 858033e3-b942-48cd-d366-08d9d434a4ee X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:02.2794 (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: evA4fYg5H3OD3xyHY6HoFQV9SJRBWo31Vamyb9deTbRxdW3afgX4fIgVk/UB37L5MoASRJD9neNeXqODnmw3Qg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7374 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 Mon Jan 10 12:27: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: 1577867 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=Ds1UXn/c; 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 4JXY5T0BhHz9s9c for ; Mon, 10 Jan 2022 23:28:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C8A4E830D0; Mon, 10 Jan 2022 13:28:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=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="Ds1UXn/c"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8F62783103; Mon, 10 Jan 2022 13:28:13 +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=-0.7 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2060a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::60a]) (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 7500581E25 for ; Mon, 10 Jan 2022 13:28: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=mDnC2CzLUDMvDtXDeW/17pVCGMptQOwEXABb8O1t0on5E+6TXm+ADIqGHowyq0+51qyb72rfuFOG6KTF22uZFlOBJWnf6J3m2hZl1MCkxtFOURSiLrDLfst0PSRrVODqQGvH1JhkVM9pw+qQFZlhopCPmFQVRA9XZ+txbpuTFum5JYBicc+DkQkjwHlLBV10BEangrQxMGrfmtJGSQj94rey/FFR+Ya6RyBsK1Q6Di9YY4UkAQB6dreituMQTTIM/acsk5Hu1NKtrnWm8yGTMUxz1H75IEsChz5w2pSU1cL3INNeZ2w7MtEGjNb06iJYtODqpYtaN0NlWOmckFJ+cQ== 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=k5Xjzsh646CtyhOidBdUXPIx07LxKsQYaC7nUE6muQM=; b=TR96WMawUNny5jjwHYZh+xDYrm+2juyvX51jGajakOgHGkCcC8Jt/OOwqRKeuIsfPwuUxaNg1Ze2rT9WUD2tIT2C+ZM+eMWzs6CAHzn69rKnpwNao5wOiLMi4s+FhhPzW5kyVpe+c/SDGnxs4NLr7M+GBrUyizNBIR2aB9sWSfpiAtCK5rjjCZnoMsAE5EnkPF9+bc1Mhn9DHHv/pMP8iB5tjyu14bf0lwd7A/tA2GLk5lx05QkyZK0cntIek6LMKbIGwgCYPhcdU/tHaxgsn9O5FtJwtlGBJbUQnJBimO5Vc/aqhALi5axtTmEivNxQcLiD6AIY9MFNzgIuMNXFXg== 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=k5Xjzsh646CtyhOidBdUXPIx07LxKsQYaC7nUE6muQM=; b=Ds1UXn/cVTNrB0hqW9qQpBeacV6Q7CeddAMj96Jo3Qwstlf6dyqxnd08JD0Fz82PQ1NTvzUm9HlHt0wqex3ztEnd7T86wzyWARqO2uYkkyrY7FMdHwC7N5bBNbeBhO3sJWo4yoWODw1S+llwVEanZ7LCqa7wpsA4gjcsQVZe4kw= 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 VE1PR04MB7374.eurprd04.prod.outlook.com (2603:10a6:800:1ac::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 12:28: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; Mon, 10 Jan 2022 12:28:08 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 03/15] crypto/fsl: i.MX8M: Enable Job ring driver model. Date: Mon, 10 Jan 2022 17:57:02 +0530 Message-Id: <20220110122714.20744-4-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: e9678518-3a07-4417-d1cc-08d9d434a8aa X-MS-TrafficTypeDiagnostic: VE1PR04MB7374: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: RxQZcZ2oDiDn8uxZOtzn+oKRlMIUThh0EcrMkNd5oyS+q+i5d+ww50EMFMXu16OBcd4Ki5UYnNsdKztEUvV+OsFH0ePhlOopba2WfOUlEflb/o+pqydAtYJEsTFpv24lKYrfUaol7SzMCvli3+ltYirOljNgCsuP0kn9lc5T90u243U6vXrvVrmh1TumDOJT7GrfnipEQET6exbyo6ofs3NFqIcQAwQLAjFS/dWk9db9wIfVYrbgqCfb3ykcnoAe91QXXPfDbkYn9AtCoZ0BseWxw2oNOD+Q3ROLLtQhP8MbeIJ4IDjJF6O0WXGj7NrpSG9BMbafNYbHGM35gVGLv+u+VWtu741IYIEtmd21zMM5DnSTtZYzg9veOhnpjJ1lrxDNSiXflAuZweha+xFqU2lo8OaLuFvBp9m1yoEy6iPrTKZwmuG+/ozEVPJJmFwE0iAmc4irWWGtbYaMITtaZArfqa35PL9xgDq/CcdxvVQAkhqWH8vTag/+84ZQ5ABo/CWqKVnfv5KolZFfQOQPkYBoj6DiL+wkN3Qy1ZKEJpSLisRzOGmnPxDYAd3ib7gHkvNWhTvlrN97RK+q7OpA5bJVZYJJk5k45lW7CUvQ5ct85EMhPbhxsQ4rTT4NSqkmQyZodEQXKVGZH2V/HBPe+v5xa8UAOP7na/kwDlj9h6cnxLtLegwXkAFVdc9+lEi3Bxn0RAhEjzHgC+dd4nQWdw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(38350700002)(1076003)(6512007)(54906003)(36756003)(6916009)(52116002)(38100700002)(5660300002)(66946007)(55236004)(2616005)(66556008)(66476007)(6506007)(26005)(83380400001)(186003)(508600001)(44832011)(2906002)(8676002)(6666004)(316002)(4326008)(6486002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8iijiePtqtL0N9YmkFOsYeaL/orvXAk2Ty4w2FF6PtKiRQMdDv8r266yCEPbk1Z6yHQHkBpNXVFYE/m4rHIpZCOIkdRQOr+AB8atu7fb4jBS5f10wpec619uWn5uQF/RGc4ORGuimALd+3sMN+AK/DMwMjDO+D1S9w/6ahcIrnOeNWZ/wgf3VejRF2EOoxFD+cBr8CokSN3MsA3UezTEfVjOinAcDYQPiMSGyiPaunDF2cFC1J9W3E6u8UpwM5fpzy8Prv1WXjQTeNx/NsK4YNYl34sbI2MvrZBjIbBj6e3c5BGw711sMhxyzG73og5cWFsHTCRcllZc92UdKPSu6g6Q5G0hyjNKhkL+rBOMYczgAIJBZb/0O5bS8Dy9nZzaMA33cyHhZuNEKsImsNpp6OKekOutAJIL6XZb93tEU28Mn+a1SP5kdeZ6E1ODP7yfXiNKU0ZEUmWSANjjCkzGYrUV1abgK2L+Ym+1muTjv/ZbWvzL/QGBzdiJDTsdkGtdOC/Wp1XjJHJOZdySI7/BQx+eUA5HnboUBlWv4Gsg5VinUdr0Lw6aSdsWIW2BGc4Tou5nEL/bP5MaC5VFMyIgezrswPFyPyL+3mWTMV81zUs0DbWsezLvcOiv/9e7AvTCTUkeCSSx8TQ8gno0RjL+le0vbyepkKDEuDVYeMTZQDfsJA0Qo0tDeo80Hht4O4fkevSFASx+NAzyJmWVo/rbW2Hpr9IpHtRl64YVv9jv1I0myxCSlD6g2bb19KQnhxyn5+m1QE9Hu6XaISaSZ6k0O4WYadD4JzcEaG2UvJEorK9kuiN/qMAkFfbClw8K2GLjv75Qzfjkqe1tPi+KOKvxx4yCOZCcA1DgEAYgl5CGXlavG3UvijTdqIeek3utA+kxQ4nhXjYNK6qFt10WntdTCeRosTXwV9K3cyTkYZoncNvMLSAgryc5SyQe2cMV7PFOB+xYx8GAaeWB/uHQaIsc323iN/dVHlVA5wAonSadzKUaUSB9deRQk8RlPS5dJAhNN8EAq/VOo0+48l9Xaq2zbgGH4qbRJ5IBTxuKv3tigwzB1Zp4oVeL4t7bWQOE5KCzZnAsCBJIPVa71odtFfp7AaiiU6EK5/xTneEJKIIJ+FvnVsgrOT16HS+ttf/XT/YG3sSOHY+64pvGsRaoe+GllRmzd2Mw2qZbkG6x9KHYIn/V8bK44IFCt39nKqwpoyymkyL+3HNlMxnr8T7LEcjfAcz3SprlC7rYE458/T9AJLrawl0sQaylFzSZOP9ubvXkSS9LzHJx8wN4NTN3Z10GBxl0j8OxSHUwftMW5KtBGB3SX0EJr8At07nOJugBKatO13tqD5yhAhYHickU4AS6F4yM3h6AhoHYrW/y07kIBC32YIeaq4Bx8WvbIVORYJPlL8Eyb87f8D8gosTxNodkbBtbGESLMvU9O+IU00ed1xOz+30cyopOHvtNETHzJkyezHvamFBJjpoSrpRCMwgmuMn9vYBJLUGm8zBR0R2VZ3m+dK5PHlhz+H5JdE+1BZfcaLaUqSRanI6CuXO04fc/ibuNy3VM3rHhguMR0EV1m+VQeHmPAXoCxhnUbF2NwK7km52Ezq/sL4UXzrQaPvQz+Ia5l8FMS4fQI7u96Hyr7pM= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9678518-3a07-4417-d1cc-08d9d434a8aa X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:08.5290 (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: QUwvU3YLVBMalo9j7uBHZuLn1EZs3UAcZ4hzrplQ4Z4w3aSkQqd5Qe7H5QhrcubV1zWUcJlpqgQpuYTx1Nf45A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7374 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 | 18 ++++++++++++++++++ arch/arm/mach-imx/imx8m/soc.c | 10 +++++++++- board/freescale/imx8mm_evk/spl.c | 9 ++++++++- board/freescale/imx8mn_evk/spl.c | 8 ++++++-- board/freescale/imx8mp_evk/spl.c | 13 +++++++++++-- board/freescale/imx8mq_evk/spl.c | 9 +++++++-- drivers/crypto/fsl/jr.c | 14 +++++++++++--- scripts/config_whitelist.txt | 1 + 10 files changed, 73 insertions(+), 12 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f7f03837fe..550f884077 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -815,7 +815,7 @@ config ARCH_IMX8M select ARM64 select GPIO_EXTRA_HEADER select MACH_IMX - select SYS_FSL_HAS_SEC if IMX_HAB + select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select SYS_I2C_MXC diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h index b800da13a1..ff8de53f67 100644 --- a/arch/arm/include/asm/arch-imx8m/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h @@ -72,6 +72,7 @@ #define CONFIG_SYS_FSL_SEC_ADDR (CAAM_IPS_BASE_ADDR + \ CONFIG_SYS_FSL_SEC_OFFSET) #define CONFIG_SYS_FSL_JR0_OFFSET (0x1000) +#define CONFIG_SYS_FSL_JR1_OFFSET (0x2000) #define CONFIG_SYS_FSL_JR0_ADDR (CONFIG_SYS_FSL_SEC_ADDR + \ CONFIG_SYS_FSL_JR0_OFFSET) #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index d6a869068a..95506afd17 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -39,6 +39,10 @@ config TARGET_IMX8MQ_EVK select BINMAN select IMX8MQ select IMX8M_LPDDR4 + select FSL_CAAM + select MISC + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MQ_PHANBELL bool "imx8mq_phanbell" @@ -52,6 +56,10 @@ config TARGET_IMX8MM_EVK select IMX8MM select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select MISC + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_IMX8MM_ICORE_MX8MM bool "Engicam i.Core MX8M Mini SOM" @@ -91,6 +99,9 @@ config TARGET_IMX8MN_EVK select IMX8MN select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select MISC + select SPL_CRYPTO if SPL config TARGET_IMX8MN_DDR4_EVK bool "imx8mn DDR4 EVK board" @@ -98,6 +109,9 @@ config TARGET_IMX8MN_DDR4_EVK select IMX8MN select SUPPORT_SPL select IMX8M_DDR4 + select FSL_CAAM + select MISC + select SPL_CRYPTO if SPL config TARGET_IMX8MP_EVK bool "imx8mp LPDDR4 EVK board" @@ -105,6 +119,10 @@ config TARGET_IMX8MP_EVK select IMX8MP select SUPPORT_SPL select IMX8M_LPDDR4 + select FSL_CAAM + select MISC + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_PICO_IMX8MQ bool "Support Technexion Pico iMX8MQ" diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 863508776d..0f9bd77354 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2019 NXP + * Copyright 2017-2019, 2021 NXP * * Peng Fan */ @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -1197,6 +1198,13 @@ static void acquire_buildinfo(void) int arch_misc_init(void) { + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + acquire_buildinfo(); return 0; diff --git a/board/freescale/imx8mm_evk/spl.c b/board/freescale/imx8mm_evk/spl.c index 4ef7f6f180..c81128f442 100644 --- a/board/freescale/imx8mm_evk/spl.c +++ b/board/freescale/imx8mm_evk/spl.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -51,6 +51,13 @@ static void spl_dram_init(void) void spl_board_init(void) { + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + puts("Normal Boot\n"); } diff --git a/board/freescale/imx8mn_evk/spl.c b/board/freescale/imx8mn_evk/spl.c index 03f2a56e80..ab19dabf7b 100644 --- a/board/freescale/imx8mn_evk/spl.c +++ b/board/freescale/imx8mn_evk/spl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright 2018-2019 NXP + * Copyright 2018-2019, 2021 NXP * - * SPDX-License-Identifier: GPL-2.0+ */ #include @@ -49,6 +49,10 @@ void spl_board_init(void) struct udevice *dev; int ret; + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + puts("Normal Boot\n"); ret = uclass_get_device_by_name(UCLASS_CLK, diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c index eca42c756e..bcef96caa3 100644 --- a/board/freescale/imx8mp_evk/spl.c +++ b/board/freescale/imx8mp_evk/spl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright 2018-2019 NXP + * Copyright 2018-2019, 2021 NXP * - * SPDX-License-Identifier: GPL-2.0+ */ #include @@ -20,6 +20,8 @@ #include #include #include +#include +#include DECLARE_GLOBAL_DATA_PTR; @@ -35,6 +37,13 @@ void spl_dram_init(void) void spl_board_init(void) { + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + /* * Set GIC clock to 500Mhz for OD VDD_SOC. Kernel driver does * not allow to change it. Should set the clock after PMIC diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c index 67d069b2b0..8a47dd01a5 100644 --- a/board/freescale/imx8mq_evk/spl.c +++ b/board/freescale/imx8mq_evk/spl.c @@ -1,8 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP * - * SPDX-License-Identifier: GPL-2.0+ */ #include @@ -22,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -199,6 +199,11 @@ int power_init_board(void) void spl_board_init(void) { +#ifdef CONFIG_FSL_CAAM + if (sec_init()) + printf("\nsec_init failed!\n"); + +#endif puts("Normal Boot\n"); } diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 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 b9c1c61e13..81de1a3793 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1848,6 +1848,7 @@ CONFIG_SYS_FSL_IFC_SIZE2 CONFIG_SYS_FSL_ISBC_VER CONFIG_SYS_FSL_JR0_ADDR CONFIG_SYS_FSL_JR0_OFFSET +CONFIG_SYS_FSL_JR1_OFFSET CONFIG_SYS_FSL_LS1_CLK_ADDR CONFIG_SYS_FSL_LSCH3_SERDES_ADDR CONFIG_SYS_FSL_MAX_NUM_OF_SEC From patchwork Mon Jan 10 12:27: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: 1577868 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=iIlPQ1cT; 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 4JXY5f6JvJz9s9c for ; Mon, 10 Jan 2022 23:28:38 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9A7F2830EF; Mon, 10 Jan 2022 13:28:21 +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="iIlPQ1cT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 86448830C1; Mon, 10 Jan 2022 13:28:19 +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=-0.7 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20628.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::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 ACF1583107 for ; Mon, 10 Jan 2022 13:28:15 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NT2es9d79Aw6lXgo6o0FvYfgGnM40kTTN9aVJkx+WxniLh7Uyf2EmDiI6xErc4+vETlpjCD/b4FwZ+wkpODeav+i/ZeZXl4yyb8uCtHL2/tOuu0KTUHDZkpMZMVfzILS71OLXcdgr3BtYYgoPzLRAzOhg4CvJlJV4Ycl63pm9w86uAMUUTSMx1+RoWP8rMnGjveQxCdKmdXiZWzbV3sx3TtscfW3nuU3NELTxgsaLzBgCQNv0Q6U1p+W49RFi62wtcRvYE5xgkBSl3+t02PEZOmn/smB7EYC7Wbg86bsYaT3VuMXiysSC05fTg7zTqT0nc1ON6X4yFOKEnM6SIMpIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nUcyiC9wMchVcTPK7AEtTwgo/pKy8WbXdWospDEMVM8=; b=BKfy8DVgqvY7tusqXzSklrFCpuKOaWlyIhkcEnQmnwTYwMcgraGhUHu76pA0KLux26LF1lJqLkfpp0ghCYaSsHhTbLnvDEY479rrozSphV0difHxjvM1Rapb+0KNqlJ9xo/WeYIt42YCX/EPKMQbFIn6nNn9x9RYypUeuURNITQEc6fAIdBL+8b6a17YpzOtnhGh1L9WlkrXtUFaxzhGM8jVr/a3yiGv7zn6111IVsXyo8KYBjmqtvEtS4cADIR52SNHV8S3HRPLP5v8MbJUGJ28xpCqM6wow1eMURzrAvhtezo4K1xnx0inVwhr0KrC20jQy2pGmfO9xAKBecaQ1g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nUcyiC9wMchVcTPK7AEtTwgo/pKy8WbXdWospDEMVM8=; b=iIlPQ1cTkMikuW6QJdFnSPymdC3TEnm8rnRyCDW9xx8UdlH0E+zVuB4yqr1b2Om6rJ5+ZGTju021GQMwIDc6A4gyXkKgviXcUMoI7pw5GbqZd6V4pX9zVe8g1ISgdrq9j8gP09zd3tnj3MLWWbVO29hrJXqRSdLDyUsTdu0YH7U= 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 VE1PR04MB7374.eurprd04.prod.outlook.com (2603:10a6:800:1ac::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 12:28:14 +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; Mon, 10 Jan 2022 12:28:14 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean Subject: [PATCH v8 04/15] mx6sabre: Remove unnecessary SPL configs Date: Mon, 10 Jan 2022 17:57:03 +0530 Message-Id: <20220110122714.20744-5-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: 3d95d9b2-ce73-4e41-bdc3-08d9d434ac53 X-MS-TrafficTypeDiagnostic: VE1PR04MB7374: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: UinjNYFcgHPy2Yicdb//RQxXs/7PytakyJFEVK+AFPJaCH4bujWhSis/KK6XV0bgepeCFNkdsgKj1guaQ+Dcj4SX+AeBDLQf+VSitVMyvOMB/st40ASuOF4a6ylqlu6gqeBdfLi+0lyFfDJyvbDU3WyKq1KWuUSp7NmKCGOydnH8cfLM98bR/3EOAUvf99ELpzMWC4qsiTqKLDQkdLB69nw8XOJky4lrcw8ZMP4M1oG1RO1+VILIiUoyoqr+FI5z+dtrl/92S8JIrbfGoDUD6Feb/UPaWI1DGRRaQlwoRD3eqjUM1miJwku+5QBM0KFp62u6zuvbsbjl7kET6kq4EJIS8A8R6tQGTsNPu1RcUNygdrOEQLF+1X9lNzdkTxtfvCajL5pXm4X6a1YV+BXElzxAOIFonyrrUA+uuQhHREQD+I0KwFvsjeE2dYkJtOyBaz/XZa9swCLL0wTrh+u86kTpqpNJnbVzZQm+NR1qv7VhH1AUcXLe/ubUQpwuhpZki+IbgIhNCDl4ZVlQQJRWGXq+a8+DHf6E2KwD+re3E+9Rq2unhWpgEWKGwrCaaDao6cep3jd1yerb8iwvzVVDjgXJJnWyY29cBliz+ci2W4ritvsJx9dL0PUCgYV1s3sZJVGJOH8MYldjZrYx+e3+L1T3ho3WsVCq+UI2bTlbuirwgpv7rOHxGz+gMDoB6vp/kYofkq81idGaL75Sklc45252d3nh6Bow0IXrsx9KiOU= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(38350700002)(1076003)(6512007)(54906003)(36756003)(6916009)(52116002)(38100700002)(5660300002)(66946007)(55236004)(2616005)(66556008)(66476007)(6506007)(26005)(83380400001)(186003)(508600001)(44832011)(2906002)(8676002)(6666004)(316002)(4326008)(6486002)(86362001)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YMuWB23hl7ZoODVsJCpy5voYfzH2qmfrDXkCd5jhiyCpaciMMlqSh5rGlh0092VLMLyZLkvJKuZAeZ6tyfkZNdE6XFyUp4FaTQEno22DLo53+g2HkJGjOzGLCagb00qVdfNffoeVdvU7cuRRd9RXNNgwyEJr+BP7VhFB6gIXjY7N9Gyyxmj93eCBWBV27OpB3CvU8jgFXQXfuC+kylqmpHPKdKT70U5X9PWEHla2p/9M5YGh6LVWwmmPmPc6+3MVCYW6w9WrNShtRJFJoZdIUrkXcv9PSWPPqvXPzs6uB2hrnNZ/1lDI4/5hJbv7Okkkp0QAcu0Rhgn+g7SlaHH4/eJTFfeJk/OFHfgIl9/F9BbqnbPxrNSKt3Yi35ZZe7+yYZ7aaf1eKJL6B3h7cGArMTm4W/vsDbtE/7HS/yxbfchE0HSFr65D3CP9GznQNXJyeErTZGz3D0MglKC1gDzaOTQpooiYq8b8gbfgMNLEWl9qVx2nASaXd41bhGhmMO4LqasOFPiiy3ogr6VMUA9Xv4WdawU2wixOjrrK0enF04Y6pSOCzaAlodtKQgo3kUjcluha/FPyOgpTmKeOZ1UOX029O8swfJhKbjdyLhU5JiOMPG0vLsq18gtTG0F1hY8mr8v7dIEZV6iWsErKI+fXbKWasQY/zlxQbS7mVz4mYr7YymZ5yUD0yA85R80UIIVVB7AebyY0NcT7ff31rV8m8/qrJ+qufUmnH1Yn8CJl9f2CtUH6hc4lntlH3Jyl4+qj4wB5RSypeVcyZcn1pEgu27tNkTYWgZlaUCNmdSrrNLyx5pD/nQy1y9Ic014NIB20849XzaMmCM4VYmZIdFo/pzrJRH31DCh+q4pO1BpBYquxKNhjaqBLzBDZs+rxWlGmQFBYT8F3NKtbnxaFJw4ssq+ZNitVeVxBNY8yVgQDFzcQz65K3S6xcZEujdfHEc2Z5bsK26XxnQU69Qtlao+BNH3/MBUfhg8YT5rJLLYTBEkKg3abf63/dDcKc4P1iVc14LS2ux9/QJBllCADPeUw3CJpjXvcrHHBw8YskrYs0C8sP4KPsD/jQPvIDjr5wq5wN9OeBbg+VLo2MbvkhWzx3FrMWqpIjLFpJN00l++xb1W8zBuaVUDr7spiFr6soZ62aISeV5T9tnHxjwewIyW85W9tW3UwzLIuq/Tk7Qs3cmgC55PBst6CCCtMPWau/UlAud0eAPYD47CgUX8JxxjIadmW22145uJMIewha6VHFYt+3l188fEp0t+IO4gbg+JQA8b6oqHm2fQk2q5MsuJIqLYLVvQ8mqm3TDxxZnjQaOsnZBmTMrs7aOWsXboNIn6qcUsC/OuPS8B+wtTKQK0oVjqLZJ8RfGRG/OK+gtu6ZBte25c3ITrLyAvmLLqQH2PslubKbrABen77hBjAuQPUoOEXNOZvG/klTaI7+E508GDQAQf8LlzuAA1QVcHny+eNolIDxaVqNR3WWY1XFmHGZZhlPBLqcHUf968Or5VTe/U6J9hy2XWS5tgK/22Nn2GXGSmPBJYT/o9DaUoVnvlsjq1n7AftgVob/4Dmqfioy2E+oVvilvcMojpeoJPKimxAPgixPs4wNmJAo1J0oJab19foD7AHGXsLCgq/OuGVjiY= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d95d9b2-ce73-4e41-bdc3-08d9d434ac53 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:14.6692 (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: r/VIqLWWM9pQTjAOg7igp3NIPOpADlW1FN2BcZDMTCz0cbtEL59zv0IF+lOMqu5SVUyto22W4QM7liDDDE6ofg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7374 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 c5cdc3ac17..2b8b4f6b9f 100644 --- a/configs/mx6sabreauto_defconfig +++ b/configs/mx6sabreauto_defconfig @@ -60,10 +60,8 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="imx6dl-sabreauto imx6q-sabreauto imx6qp-sabreauto" CONFIG_MULTI_DTB_FIT=y -CONFIG_SPL_MULTI_DTB_FIT=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y diff --git a/configs/mx6sabresd_defconfig b/configs/mx6sabresd_defconfig index 6733038060..f40401d279 100644 --- a/configs/mx6sabresd_defconfig +++ b/configs/mx6sabresd_defconfig @@ -63,12 +63,8 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_EFI_PARTITION=y # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y -CONFIG_SPL_OF_CONTROL=y CONFIG_OF_LIST="imx6q-sabresd imx6qp-sabresd imx6dl-sabresd" CONFIG_MULTI_DTB_FIT=y -CONFIG_SPL_MULTI_DTB_FIT=y -CONFIG_SPL_OF_LIST="imx6dl-sabresd imx6q-sabresd imx6qp-sabresd" -CONFIG_SPL_MULTI_DTB_FIT_NO_COMPRESSION=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y From patchwork Mon Jan 10 12:27: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: 1577870 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=R0sthxh9; 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 4JXY5r29sSz9s9c for ; Mon, 10 Jan 2022 23:28:48 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8A55A830E1; Mon, 10 Jan 2022 13:28:25 +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="R0sthxh9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6FD75830EA; Mon, 10 Jan 2022 13:28:24 +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=-0.7 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20624.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::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 C13D583108 for ; Mon, 10 Jan 2022 13:28:21 +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=MCXaUtxCnxS/uDzIirzC44VMLBuGJ2FbpQvSAp23oiT+Rq0hDsm3TyjqhNrOUAaEK9iCrqIXn495rnQEblvtZ80xo9ppi/HHbY/LZLBTIvxDZOXw5nHQ160hqzlXxj0DKow9Nfnf49BHvDNqOeG4i92oJQJ2uKD+2i7PuZmsueEKiF4ugF/UMJiMDbwBgn8sTgD3+r3xWFRqaKOpIsQ7b0a2y+CaX3HGYMJ7gh6nmRpOfApqEq7Hsp7Cw+UTkWNx49zQnhPkX5x95qkpv4wqBhYi4hE/4T8wWjQuS+t23YG2BQhaU1GvkI67CCLNk5ECyMfRNq6K9GhrVVqiMmNWiw== 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=s0ekiGpYnHlkESfLRZQ2zVNR8c0WFFTwnPUDRETwT0A=; b=jC2IOkX3sc0l3ghR3GijKyiZUM4B2RTMzMgtq7vuyMo9kLTThIoAnoCVlxJ1pwKUDQXpMz/gwHJkXnMvFGlpjOme9OnuWPUxjCT2bbbovYygHqqE6giihF4nc/Z6l83Oc5f2/mUqCtUhkedfbgtVGW6dMhlh9dQjLvo/Bkh6U7KgVIhdkU1U5OFK99/UloY6BvXY9/z2fdl7Suvma0se/UW+Nelo/IGAguFPP8SrEBCgzL+Urj6iXkwi94SHzsFHPHpkDSAEBK51p6UAeH+V8A26xfXwFRXxaZTPTTmEUz1qRLQ+jc+6P2rpLA1D4uOiGAC7TYYvfpT6hMiepDbhVA== 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=s0ekiGpYnHlkESfLRZQ2zVNR8c0WFFTwnPUDRETwT0A=; b=R0sthxh9Kl/VcdJVvCbwVi4zX0MtK8Gl47tUo1VQKU9NDY7rjra95Lh5jtzB9V+8uLPzZRmJdLtmJgj2D7uJe2LsvYjqWY4hUHaE/0oD7OSm8oqjGeGJGTIX8b8PP4M0V3MTt+5/caV2UuPdEpxcrDKc9onKbXFHnbyOKku3uS0= 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 VE1PR04MB7374.eurprd04.prod.outlook.com (2603:10a6:800:1ac::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 12:28:21 +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; Mon, 10 Jan 2022 12:28:21 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 05/15] i.MX6: Enable Job ring driver model. Date: Mon, 10 Jan 2022 17:57:04 +0530 Message-Id: <20220110122714.20744-6-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: dad9425a-6d40-4db4-e31e-08d9d434b016 X-MS-TrafficTypeDiagnostic: VE1PR04MB7374: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: gjSA+NhgKcWgIAk+mlZJAVoYOoE7iSXxvWlqYCr8loqi+BXbpbPVK8BnrOuLOt2sgiKIpauz0ek2f4fFZZqOqg75B/7Qxw6sZY8BKkafsv+1IcK9IWj2JgDnzvVm80QcK95qCHAjUQFGXJruWgYGGk33kuJgsvjzt83zBWUb0+zgUW9xBEJmk99tIajuZ6dGdxyQOseO34ZgM7/oU3T+Aa9IlxOrpu7xG58TpRGTdNixEOpJpVN/Vt+3u4nlQ2XtdMkqSeAEDfu4yhUukWNY0HgtYuQ7badCIlvFckWTbWJzlBi4ng4dnl+ZSh5DtN3AS6N319/GpiilfZ4f/5x7e8xxbJtlfkyx2wbFAfMQN+IaAVY90O3It5OUmWTFo2gAEy0Z8Uwz6WnyXgsmjR90sWCHhYnRtfE0DICfxXVQnAcPi3scqWBk3sYpSnK3IDHORrTKK32ktzX+ChbkDMjwtBiVC5scFvNX906NF+DY4IFIom45pnb9zoalZGJGIzW2FnPb2zEbGqSF/ASIC+pVlgyWEuFMcToiJiJBzU8Ewv723NCi9SjVcfXpk7z6Awf3gnmHFYA/jCeeeQvuJYrJ26v8d9WBcRyR2yEiZxzK7J5yNfk96DcLveYonWwBWuJSFIyey0Dd2lcCVsCcIhi275igp85dpydTb7dZsvc9Z1DI+Gbop7Go354aDv3eGZeiKoWLJen86l7BKmcM44PrKQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(38350700002)(1076003)(6512007)(54906003)(36756003)(6916009)(52116002)(38100700002)(5660300002)(66946007)(55236004)(2616005)(66556008)(66476007)(6506007)(26005)(83380400001)(186003)(508600001)(44832011)(2906002)(8676002)(6666004)(316002)(4326008)(6486002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Hd6pWxyNpAVn+pcVuF2vGf2OlEX8Kv9pVSYgE/6z69IixUxbcsg1SytmadxOPhAAx5lvVmBzco8sgZlsHLmlNlNVliKwuBt6EtvZ4As7hMzh0VcPaUdP4ydderoBJdYWF62k39A5hC92pkbrWYEo54Mm0FBQrFCGCYI0nPuyztmVF8xZAI+qo6rugeDc2xQ2U0/H8jR/FkPnch+oTsys6yBIMIb0UlWngi/zCCMiUWgvDy9Z+CmafpTJ/IT3TjPA53SQKqHeMJvVpn89cSLI8LvnWvjTtpeUW2CbvKze5Lr4KRcVaIt28fPN4DYVNhnebOoOvD0F/eT0+LwPZ6mBnmvr3328PgRx0wOzlBz+L6b/zYbKshcOHtT0y5H9UkWxWCOAdUd/54ChLtxqnsRGI1J1El9YPN53dA5CeixppJByloQ7GjEC9mk74O0bLmEqbscK3sTR/ES0xwMZl3xL5GS+eGFpIKomKGOJrm7rMvkGUfoaZc1C0zt9gyek53rs6F4LCkIHXepUS5Ib1fa0M291/SG0R7kYY6MG6OPo38gQU6QaJVey24A/zZ43c7ZRdUoiAdc2/T/B0hRqXR/5lVjGO8kbpPsgNRhlc4YLDK0R5vs7c2aLFzsYSAoVpKBF+JgELnM7ou/35CoK8IEp9qbLpHKgEuGJjWbJ2iZxYpolVbbOZ3zr8kNZ1xyGsm5dluFN+EMkZV/G6goFCmt6Bud4xSO0456Ewf9zyaaS8DGBZGYvY7ZNx+I2/q9zSaR0WgIlqTf2SppFCCXA99ezmGKM29iP8iL8s0lH4FPicAkZqXDRe1tmdy8ztOb3M6tMettwLcM8sJPQq+NJxaZRVhVM1v+n1rQ5Q9mwFBjfMNpPgRV6ufU7qNmEsow0+m8uDhIbZUg2VL316dO8xdgPMmuT90mNPoTZFIw5/mq7Tuo6vgzjRf2nfgv6YqTL3k9IGF+I4NDNE8nX8WWKyo59l28KeCuKbk6vqkrRRQxwIpgHbR+JUNfVhAcp8Qqhw8tvilo8ObSlQCqXpuD3p6BsaVfA0HbF/QmCy4C8zw3GNVX7OjTWFu2EUVkbahl531aD0K7pDZJXHMzWhgiSdsLOYR+JmEOnl/s2aHFh/6cOpFf6opZLRrShi152O8jdLa8Q9fO8S8rmOJLPpGrgIOzColsxbMH0b5Q3T4zV1JmRYNHPRSdS/NNiGYELpl+Rw+cU1Y9HHEnkR+furf+/jVN5UknNKwtZuPHwWCZa7kEt1ncVro4RJSvZgXpv3jP5ZPI+HTOwV+zNLME6W2mChOlAZVatHZk17GwsppEyeMmkP1Otiao3Y/dV8WmxeXLPDzZryLEmxrojcd4I3bt/sw3jwKkf3+AY9txXH0ZnGiVnhmcxpd7ymvBO7FM7DOAHpPmOxwb3UeDwvXYu7BrjukhoISgWabuBLFN9NLMsLzTClaiYauQFjkxcpIDO9P/c6KzqzOfPpz/LT7TShOHRbLAJyhvjmXPVwZYLC34cpOE/aCMGpu04k1K3sacxQLE8r9SatdYuZPzYhJ+ql49XDq+E1EdOgc7jKTP4YO/s+AJJlFhqoRy+D7+avAbWGcsAYT2KDA2J71SclxwiKIldopWOejHt7ymtw1LSbWgiKrfWsu8= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dad9425a-6d40-4db4-e31e-08d9d434b016 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:20.9813 (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: WPZk38p4rHg4krYbqXDiHPZtexq6TN8uAD0Tgrv7/f+uQAdcJGFjhZleF9lyd6l2D03w7qcONW15KTDkp+tJNw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7374 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 | 15 +++++++++++++++ arch/arm/mach-imx/mx6/soc.c | 12 ++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig index 98df4d4e42..05d3fab6cb 100644 --- a/arch/arm/mach-imx/mx6/Kconfig +++ b/arch/arm/mach-imx/mx6/Kconfig @@ -354,6 +354,9 @@ config TARGET_MX6SABREAUTO select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_MX6SABRESD bool "mx6sabresd" @@ -364,6 +367,9 @@ config TARGET_MX6SABRESD select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_MX6SLEVK bool "mx6slevk" @@ -386,6 +392,9 @@ config TARGET_MX6SXSABRESD select DM select DM_THERMAL select SUPPORT_SPL + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_MX6SXSABREAUTO bool "mx6sxsabreauto" @@ -404,6 +413,9 @@ config TARGET_MX6UL_9X9_EVK select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_MX6UL_14X14_EVK bool "mx6ul_14x14_evk" @@ -413,6 +425,9 @@ config TARGET_MX6UL_14X14_EVK select DM_THERMAL select SUPPORT_SPL imply CMD_DM + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_MX6UL_ENGICAM bool "Support Engicam GEAM6UL/Is.IoT" diff --git a/arch/arm/mach-imx/mx6/soc.c b/arch/arm/mach-imx/mx6/soc.c index aacfc854a2..fa6c3778bb 100644 --- a/arch/arm/mach-imx/mx6/soc.c +++ b/arch/arm/mach-imx/mx6/soc.c @@ -4,6 +4,7 @@ * Sascha Hauer, Pengutronix * * (C) Copyright 2009 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -23,7 +24,6 @@ #include #include #include -#include #include #include @@ -734,9 +734,13 @@ static void setup_serial_number(void) int arch_misc_init(void) { -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + setup_serial_number(); return 0; } From patchwork Mon Jan 10 12:27: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: 1577871 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=oJxfE7ig; 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 4JXY610XGdz9s9c for ; Mon, 10 Jan 2022 23:28:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3DCAB8310C; Mon, 10 Jan 2022 13:28:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="oJxfE7ig"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7678F8319F; Mon, 10 Jan 2022 13:28:31 +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=-0.7 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-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on20619.outbound.protection.outlook.com [IPv6:2a01:111:f400:7d00::619]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 75BBC83107 for ; Mon, 10 Jan 2022 13:28:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oVy0/luVsJ1Km2mGPERm4DNGjS+yzjDqXll/zL89XworYZ3FqwUuo2bTPajOUyh5GyaCvTqs8tvI/bahX3WFG2Ipf6/ZANtoZI00gffPzGKBOD+j/tJi4jtxeZJzsKXWNagw9hIOM7FfRt75ubZwIIRVnGJYqj93JCXCdCNwxRTGU+xr9jif1Ij82bSRdr/EWqZkD5pxdc2rrqmpgHKYkVZFOHXSZnMWNwjKxJamtIqfMWq8H/1YN5otm90cTduy1eQ9ND+ko7o3HGFdW/gASdc9Uw4erjWJh5gU+VZUXI9RV4SNXw2RUmVShEowsiNyREdL0+hwnbZho0y9evZyeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kCAupizY5yefzEq1F3koxOrC1zdnUIV5QvJepTDtwpQ=; b=EdDoZOrzngNv+5UjnjtCW1FxoLSIwhZVGuiDoDELVyKcYLO5Xkua6LTI2bA87iFxywrDEUJi5wqZ5U7+1JFtIj1b5t3mY8zmX4c3Bck/IqDh3a+RJNFSeao/ZKeTJNAGLqZQKRoDej6mXD8ZdEX2TWQuvTbcEDqL3afBPq+KWq+L08fMCaSWv6K6ruVHpnmevf3X34Qncgiy0bBfiovb+fFohQIoOgJ/jPnSQpXuP3rdp1jU6ReAqJ8lcHjvc0qbtJAEnWV27GxUyOSpnP2NdpGul4y62RVEtDmf12ewG/Pa5Zk7kKvs8F+xdNxygXO7R4hs4mAqVxZnM0MwndDJhg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kCAupizY5yefzEq1F3koxOrC1zdnUIV5QvJepTDtwpQ=; b=oJxfE7igHwWOjXA/PV9ubjHJCk/ghpOZFsW+gBLuWrDwIp+wauAdU7NCq3H+xPlRYv8R4w7BKvShnhRe89WQJN5Tz5Hlt0bdL08r6N6s1+fGJQ2R16PMAnPiUoG0s2q6YXad0vWn+acvG4iVCWI6uXPWNAUqxuthbuD5hHW7Yuo= 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 VE1PR04MB7374.eurprd04.prod.outlook.com (2603:10a6:800:1ac::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 12:28:27 +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; Mon, 10 Jan 2022 12:28:27 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 06/15] i.MX7: Enable Job ring driver model. Date: Mon, 10 Jan 2022 17:57:05 +0530 Message-Id: <20220110122714.20744-7-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: c1ba7b55-cca4-40f0-6ac5-08d9d434b3dc X-MS-TrafficTypeDiagnostic: VE1PR04MB7374: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: x87MilIr6mA3o30/uPVSNrDL+aRYNBZuPBhGCZ7S27m/6XWc9OSe7zIfZn7uxfQ+mboOl0nT45vkL+6y7dSJJS6pa5KtZqrMEOPIUVN3XmXMTarsM+PUN+52cgkLYBeuUp1XQX6P9lXFcoLjsGfDXT12odDZ7Q4MxTEtqmhBedcQ9rCKEx08OTkXdMIy38znvv+7UcaUQ7zx1DTqBIVRoWPFimAkamN3gJDHlbV4RXMat7REfh68+wjbqeRDQWxmzH/n6z08E2NAmiHwE/IVY84OxRnqz4sQ09jzppqH8YbO5oHmssVl/+fRXNUOPPVECq0Q9Oe6HYS468/HDK6hNo3ufZnX04es0hJTYP4QNva6vyChXiKyxAheeJZuAPdgOPxkG9QiwW88OneCftNifXcSSMBcB1MhpuLEVHIEllzXpo3FhFCke0T71kKcG0gWgLk1G1rGsTMf93KRg/XQMwQCYTAKqIProfJb8rtnq+b7QlKnKC9jWXqLfuGvmOvhO6sKyLr+qbyvFouX7Xm+xTEUS4CCq1/1mHmzig0hmxPoyWRGUpEp+sEPbLYLCnCguup4qARlJ1+L97/cv4w6JhWXZCnCqNbeeuxAeB/5D27x8puFRjo/YzjbJCM2hgyy3czLBMiqWFlvb84OtYT7bSt9AoqLN0eU74I6hntNPkHoHtqswa5+cdzoyzTiSyYz/oI2XEe7N9fHzLoGqfQ2uQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(38350700002)(1076003)(6512007)(54906003)(36756003)(6916009)(52116002)(38100700002)(5660300002)(66946007)(55236004)(2616005)(66556008)(66476007)(6506007)(26005)(83380400001)(186003)(508600001)(44832011)(2906002)(8676002)(6666004)(316002)(4326008)(6486002)(86362001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Av8EMwFL+FJlX2LN7JB1Fmv9jMWFFLk7dqx4d7PK8QlutHS3epDRKM8K+yaaHhOYI76KfGV46JxNm+pngXsybPm+38IrYg42KzGyjSc9iQjzppzIQ6g3q3hnnCbRGAE5fNRdd5w+BL10+0DPdlbQjSiRnyi0Lei8OkpzF7bamOMT4ctN62oGYBlw1FeUgKbgPYfi9hvUaYL4ZggMxINSyKptFT9HSYsbtsOAlw2tEr+2dvg0KSCE2iYZUQOOdzsx3i0PLPS4jov5WIYn7RvNmG3g2gaDHbV8qCyfOecJbKKLR43ltZYU8e3bmrjRNRB4F77scHAaGwDg7KV8a/JzBnZFkUpppT8ZTz1MmNLvdnGsL1L+/UNgTh2ZWrHufMDY9UzK2bBmlsitfNmHfIQXJtLdS8RhWlfGdp20lC1PEXMAWsJ/rapBmyffIKzhYQEW2C0/lIoSkWYUiRcxwP1Ewajbxn/jycxe0Svrl0c1n1MiDniQy7itqQXIZ3b8j51qJPcdzKAAh7fyNArjBp1IfUg/uNdBJ/M8ydOazJmKLojOM3eNjyNMg6AFTiRuDw2xv9l9yLsLl3uwUsbp/jS7NAvdjoP1hHgXdtehDbdZ5RKRZt3aLpWxPzUo9lbUynewV3Ky5iceJ/yMBGqGwIbier1eabRedRmYWlk4JMyxiolm96JWwyn449QDcT5kjNJMiyKAngs8zvhzjh5SHGSvh00F1/dgfKBegxrURWXbEELpTMfwXQXz6Or7fjShly65gFVjq8i0GaPMF3JkYwGUKKorRqVMUMvJTNNrGdIS6ZH1zJrBWa7DZeHmvm/Wnbz8YmctmKXYOhNKYpk9xFyhc6IUwvHkwjz53pICrQqeDdsTo4Kow5ewUklQxoTBd77+5dbpC64PuRA03Ff1DoOIvpFMv9s1LC2mpqQc0t2OgmDCYO4dB1gejxj3wVPm+ZJFnoDsFq4ZprH2TnsHTDUExtpQptCgZIEvAAnAbSidTODKjQHzPm2bdq2DTadjmu91QMqPRYxBy+7pmwqM6R9feS5oYAUENUbS1HItPWtYg2AYEyIvOZxEMXwsCI8s+PNzWS1tfhddBOwBpBRoHDJCs7VU+6j/cmUNAEj1jbPzGLeY5aAEXv031A9ZhFXlnmcINM9di9L8tDPUzWwmt/aRCNIbyeR9ooadYECZ/3SvjMsC0GpKurGRFCg4667Jo4iTk421p1d4cT3XjcmfhiMC5IWaDm/7aRemgxj+fONx+aACGYDkj3SLP2b6ALY4Ya2bV4bEgBJDsgxcni1SEW9UFPFjmBv0Ch1gfFjvFG+P1K2rOkL81zh/9rsE5HSNI7409QC4ZB3+4Wx695igxdTkxlPyLqjzMGUyxK4b4FyDMI9vAXy5m0FM3AUlZCl3zWmABU4sXy0cceKPOz+em2/V/h0qiby32J8KrRzI4J81+R1fdF19LPOBQswgiTHsitIXTI+7AdvG/vx9VWXUu1GgD1rXJ+EemsDiHIlZWl+gnw5hkNqDiyOkAG+zevmZN3JUeVmR6QPe+dmZ40w1AnGgFsmeYG5Lu+lHDu9ar6qPzXmq9QOjjADzsCYTyTgd+i+dyWNR4pISgR1CU2vKkTLPsx5mkRNP6YDPW67kqVqox2s= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c1ba7b55-cca4-40f0-6ac5-08d9d434b3dc X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:27.4340 (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: HRWOAs/cFKz2cF7CQBI7Tp1WK2DNW4LEYEkn6aa233J5d6CNBmDFcv+Ltpg5wTjfGuVEYjKS+LU01y36q/JF4Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7374 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 | 2 ++ arch/arm/mach-imx/mx7/soc.c | 11 +++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 550f884077..516e1b5a8f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -883,7 +883,7 @@ config ARCH_MX7 select CPU_V7A select GPIO_EXTRA_HEADER select MACH_IMX - select SYS_FSL_HAS_SEC if IMX_HAB + select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE imply BOARD_EARLY_INIT_F diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 0cad825287..b2d532dacd 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -68,6 +68,8 @@ config TARGET_MX7DSABRESD select DM_THERMAL select MX7D imply CMD_DM + select FSL_CAAM + select MISC config TARGET_PICO_IMX7D bool "pico-imx7d" diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 21690072e1..6c991a6cb1 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -19,7 +20,6 @@ #include #include #include -#include #include #include @@ -337,6 +337,9 @@ int arch_cpu_init(void) #ifdef CONFIG_ARCH_MISC_INIT int arch_misc_init(void) { + struct udevice *dev; + int ret; + #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG struct tag_serialnr serialnr; char serial_string[0x20]; @@ -353,9 +356,9 @@ int arch_misc_init(void) env_set("serial#", serial_string); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); return 0; } From patchwork Mon Jan 10 12:27:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577872 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=N8+gFzz6; 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 4JXY6C5WzTz9s9c for ; Mon, 10 Jan 2022 23:29:07 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1EC20831B3; Mon, 10 Jan 2022 13:28:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="N8+gFzz6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2BF97830DD; Mon, 10 Jan 2022 13:28:39 +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=-0.7 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-db8eur05on20609.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::609]) (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 7D8E6831D1 for ; Mon, 10 Jan 2022 13:28:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ic+RoirHV1MdsEjee5CdO0p707VGg07GHP6+x/y9EwHccxtK8eXnRU0IDSNiYCcLN6KgAd5A9HM5vBh5hd0TeRj1gIIUVqW+Lyvd1OxXyUMeiNse1hV83z6WB47gQ0MQCyuyPOYuTBoKgCeWc2ccyNlYlPVpbEkJnCO9yaM18U/FLlD7ZYCYCVwrItcwlceDfsY+p10/zMUOX3bhuFpDGkqL9o+O0UYpv0L0KvzWt81qYSUdIXK7p4HC6zNVMlg1A3oaFkArJQ+IzFJKK26jFUIYB8Vk2bN4cQU9Yswr7WiWZyp/3YMlip7QCF/IdqxviifGv/dCepOWWEB2W1VfWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=19i8k6CQWo+8v5V3J1OJdfnYX3ZM/rUGrLy4lnZlW/w=; b=Db/0cuxKvsY6Ydt2DYwDzbf7hMnUOvIzmMRXms1dvQrYv38fpKJc/9YXIIZaS3bO6ViivBPTb+eKeARgVADfZ3dZAzvbIP63USB6YSq5slr+ebWEB/znsPKw+BkMMLuIxisYSTO51AaKP8h6k7H9JASw9vKWu+iOdC8ughKdj8Z9KLk1W1JPorRRXDv2NjueVLHR4le8vYKDlTX/oVs6kR/d78rviiBvmkqPIhBDIT5WeBgz8/83gaoP8gdOkxh/hvgBCC2MYF6nA24lY646LDV/XqNZW2646LzDEicfBaSob9K1lOlKPHs+o6GwVFcskQbPZO9hNrFDtldMmwqoAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=19i8k6CQWo+8v5V3J1OJdfnYX3ZM/rUGrLy4lnZlW/w=; b=N8+gFzz6t3N/0oSIoJWkOMNYovUhXL2kMhM2h/al5rnbd2smc0hZcJ4NQj7qHLgdywtMCIBKdSXy0XG8UYG5yDYkRAgItQs0c5ZTTA7LG4kTcdhDh9Hs90P3Kyd1IS6Ph2hmBGK4eMtYS8laBwHTbIoHNIVFjv/300Rd+Bcc5II= 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 VI1PR04MB4221.eurprd04.prod.outlook.com (2603:10a6:803:3e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 12:28:33 +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; Mon, 10 Jan 2022 12:28:33 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 07/15] i.MX7ULP: Enable Job ring driver model. Date: Mon, 10 Jan 2022 17:57:06 +0530 Message-Id: <20220110122714.20744-8-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: 7ac0de1a-9abc-411b-b520-08d9d434b7c5 X-MS-TrafficTypeDiagnostic: VI1PR04MB4221: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: oKm/lg27zFcAUE3J3Lc/iAFt39RksT4telbttUZyYkZq0k3WWVrc/uzYtezrBABTIfhePNFswO60op1bq3XNpG4ZX3RS/iCdugdIK2Y4yEdtzsRFKw80+HkbXL/aS/Bv1GrbCjUumHQE0gBY0mu05Z/H0bNW7IWxmRLrd9bDNinrvGPYD65djRa2r7IWcQxemLtGlu7arGXZC0MPJyeKNteTk3JyzYoTsOOrDuKBxldLye51I+10jN5FpPCL2DTS5Cgn0lpWa8oQixYUBOeOZLDnEL8XrVG9OCWNAq5u6rT/HvgzSThoBvXCnt7cCw7v4SurNNTlqO3Am5tbnN86lfd8lkPIREDmTsW8vgsP6GRWR9GLsx4cnf2NPwuSRNB3cwT5WeBndIfQ+BTRcYLMSXaR8T9EjdsY69YoP1BKxyLz2ooBJOJN05370xxk7J7rulNOOLgoMRYqfTKdCIzRhUuqB8hiwbJ6xteWzHbHodIdiQUyWlt+4Sc/M2iOmHN+ALbAadZzFNJSi1daU51DQ1uOCSXLQKJ84BxXrEtdmjxlzbX8HRkwsU3Cu2WP/WsEDFYTqkZfubyzkycBNsbVu2/DMZo6ed5pQwPAhxwgBjaFGfSl1dZH/Y0k200q6KksFK0quAZUvi194N4RCHsU9vVBRXl5jnP+EHAsKRui8/3vfm+WqQpl8bf8VOh71DIbmvCyXc6HE6atrHCQ7vPOAlQCQUno1zMEdT0KKUWWVV8= 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)(54906003)(6486002)(66946007)(83380400001)(55236004)(2616005)(508600001)(6512007)(2906002)(8676002)(1076003)(66556008)(316002)(86362001)(5660300002)(4326008)(6506007)(66476007)(36756003)(44832011)(8936002)(52116002)(38350700002)(186003)(38100700002)(6666004)(26005)(6916009)(2004002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3BxoLoFzn3RoR+orQNoqBPYphEYGAyaahgmRiNKMR3jWDDnRWDWAFV38VjrkikRcqA/1+l7586KXlNmd945+oqg1H2sMPIRqPxhv2Z1eopfVYh2nThoCvtY0T00hotSeyhTpuZRJZnEfBsgUYftwYbFhuwpeCQkY47DsndZDeMEo0n+kVtr5G1Y5czXP3ptlF30eJjaAbaOhLlSatfMTGG9jk8SxigdKY2ELLzPmO0HJMwYezfFLiPP2RkDi5xFyiU+bAhikEyTvI5dLTgvGtu6Xthi3ZrBPnRxA0YExKpLvEpKNgjV7RF+yIf02mzU9GOTTz86Rr/L9rSS02j9m0BeO8e+HcEnJHW6GYEi9y5+1kAa4f51UNImsJSeoPiaHmNgg7nIsHLBh6y4ahdI2Ku43uI0HZ9pjLi94iyrQzYUdv5g9D9UtpCpEfeBLpnZPaL5QJINMEVn3REjecjcuDZYAjVtRVjLxy/GQU6t6L0FiUA7NVYEIrGELm4Ji2PrDfP6iqOHjsNYUR/CoFb4GwA2o6erXzmWnDkdc7F2M1+DuvkGSAwswI8/GduhHofnra47RYPb1EkcMzH29FOfE6mzK2UqQQB57sS10EwGXnhf5TfIYILlbBoFpnC7QiinpM3w+1+2lyxJldv1lWxBOAow0zMBJp2AhRAf10NC4pxrG8k+yTELCWd/rtdd7JZTgh1Cjdu8hn7CzD8tmVKTQ3L6pQRJ6pM68OarmZN+UWK0c0FLCfStfte2uwsGe6VCzIDlxl53D1WNwRYC+ir5JJkL+s+/SalZJINDDepGOfEoNAUfP0CBQaialtjjAQJXOQjN6zmczYsJv1vACUnaRZq5PIHqebGgEbP5fE1qb540js/Pos12BmxEVDjGEHBi3ttMOHkM3ww4methyz8hge/ncOrPGHkRy6m4c5Pz4lahPlZhGESdti3mH++zmhlMjueToLE33EsjB+IUYMvbAJROt/ExpirB5JmAYzr01VVAmsb8L22BcwBKzjW3GMK1q4GLJikGsUH4Aj0LaNaSDIIqMAyiX6hz2/dmzPVvWGBCPjbPoGnEJhLbIsWSMF9GMSpaEv4z3V92DccijTJwupBUUVlP6G2kxRexkWKD0vHZSnyyQpLMZ7NclwvT4XUTblyJjHyYXRQ7X2GIA76w+hm5NVxwyHTYQXuvf3NeoivOEM0fQA+0yDFaGXHPkn4sH89eTnpoMlCMjOeL04ZwjYh4hk756i1ijBCBJlwLlSovYtKsCa6JTiFbXV5Hbd9S8qPAZKrRtrj9zd5L2+ZPXvdJFIILE6z++RZwpgYZNSWk8I/Cm6lYw/TycEqP2sknD/qfas2za5KwVVRF/JJRtMeusPA0Dz42bEKzJ6Er7MI8H9fvj88U57kDKurAtLAOlQQDurSjPUTF7z/jhZ3/eWs1Sbg0iwX+Gzeymk93TrVdsyjGRuFQHp0w9OR3Rz2gx+GFUlr4jQr93UIyDC23EJmEb98DcOmth19ZdTKRADMEeEPmodDoRlQDF0HMW9MUDBPYDCHuymamc1AvgLGg4x9SSuYBf+hoH8vqtKC2KATiU6BG1E+5Vl2JuUSlm3lr8ozGRqeglMO+eFM0vGE1Gojloh8OX36ar2iTwQ+AWiJk= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ac0de1a-9abc-411b-b520-08d9d434b7c5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:33.8398 (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: ZmbEUdjJcsBYpjsUu5Lg7f4O9q6e5BcURcbLLlEUxcW1lDdfFHSlCroEYFNu08VKZ8HfPuUbjs97HRwLrxxCEA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4221 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 | 3 +++ arch/arm/mach-imx/mx7ulp/soc.c | 16 ++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 516e1b5a8f..524a2204eb 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -870,7 +870,7 @@ config ARCH_MX7ULP select CPU_V7A select GPIO_EXTRA_HEADER select MACH_IMX - select SYS_FSL_HAS_SEC if IMX_HAB + select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE select ROM_UNIFIED_SECTIONS diff --git a/arch/arm/dts/imx7ulp.dtsi b/arch/arm/dts/imx7ulp.dtsi index 7bcd2cc346..494b9d98b2 100644 --- a/arch/arm/dts/imx7ulp.dtsi +++ b/arch/arm/dts/imx7ulp.dtsi @@ -1,5 +1,6 @@ /* * Copyright 2015-2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -198,6 +199,29 @@ }; }; + crypto: crypto@40240000 { + compatible = "fsl,sec-v4.0"; + #address-cells = <1>; + #size-cells = <1>; + reg = <0x40240000 0x10000>; + ranges = <0 0x40240000 0x10000>; + clocks = <&clks IMX7ULP_CLK_CAAM>, + <&clks IMX7ULP_CLK_NIC1_BUS_DIV>; + clock-names = "aclk", "ipg"; + + sec_jr0: jr@1000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x1000 0x1000>; + interrupts = ; + }; + + sec_jr1: jr@2000 { + compatible = "fsl,sec-v4.0-job-ring"; + reg = <0x2000 0x1000>; + interrupts = ; + }; + }; + tpm5: tpm@40260000 { compatible = "fsl,imx7ulp-tpm"; reg = <0x40260000 0x1000>; diff --git a/arch/arm/mach-imx/mx7ulp/Kconfig b/arch/arm/mach-imx/mx7ulp/Kconfig index 2ffac9cf7c..fbd2de5e3d 100644 --- a/arch/arm/mach-imx/mx7ulp/Kconfig +++ b/arch/arm/mach-imx/mx7ulp/Kconfig @@ -25,6 +25,9 @@ config TARGET_MX7ULP_EVK bool "Support mx7ulp EVK board" select MX7ULP select SYS_ARCH_TIMER + select FSL_CAAM + select MISC + select ARCH_MISC_INIT endchoice diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index c90ce22404..c1e55e7260 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -15,6 +16,7 @@ #include #include #include +#include #define PMC0_BASE_ADDR 0x410a1000 #define PMC0_CTRL 0x28 @@ -80,6 +82,20 @@ int arch_cpu_init(void) return 0; } +#if defined(CONFIG_ARCH_MISC_INIT) +int arch_misc_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + + return 0; +} +#endif + #ifdef CONFIG_BOARD_POSTCLK_INIT int board_postclk_init(void) { From patchwork Mon Jan 10 12:27:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577873 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=Qa4QHXSx; 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 4JXY6Q1hPGz9s9c for ; Mon, 10 Jan 2022 23:29:18 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E7E76830DB; Mon, 10 Jan 2022 13:28:47 +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="Qa4QHXSx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 83E5C83093; Mon, 10 Jan 2022 13:28:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 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-db8eur05on2061c.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::61c]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D4ABC831D1 for ; Mon, 10 Jan 2022 13:28:41 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jiAN5S2PSn6CSZDrDlgaPvsTAe53ne8700EWm16p/Z+UNSQQUmWQygZWryGsmHpKrREvHnARHZk09itu/B3j7Ox5gQEDX3Ik4FGtYoznHN/h2cft2BMymYnKQuq1OfCx4qrVJuIbbK0OnCpcMIqpqZtSTIUUv33laIL3tXzckaLrXL06scG7oIkFqKOosXsSFsCCz2iLcHo2EwoMplzSkprDOWrhR0RfoEKbzzovNsFMfN/NzsnNEkFGl6t0K0+YtfnPZFAZwlgkBzDwRjtVNdnXmYChYNV9Nz4roEPooRLB9JZ9HAeNk2BNxIISQg6P+wpvA8QF3IU1yvvagP/fmg== 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=b0tFMRqDl6aPCvHgrmcZ/qyB7PrLfkA9NXIeyOEiwhQbNaH7W1v10VUP/dUlvlk27N7PldXUC7Y5dhgtO9GPueIubwLJnOL34TlaAqswBMEokVB6lLtYr8TuVN4va3o1VAToKmdbSBj/JeR1hbovmXhB8ItcjfBZuRT4t5qdY4uBOw8pypYRTMK0u9STUMZjEzxqftopyjfK2meJ2mpcQX+W2krXNw9Z79zhMwZ2cV6PK/EfzPSMrT2x9Qk2P+L7gheVszT+ymmhYxq5OtZjIUhvilbse2M0szvuuLfnyvs54mPVo4bxjxaKcloaOi+dIgpuY/rQsG373BfgFE20Vg== 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=Qa4QHXSxaSRZ2vwQN6/VwVF2wouEnnMclrJH0KNzN2IB/O/WNIqWQSLnVMjcoMS0we6+Yc3rR3bk6fYtrMxTtN4ld4hJk+zpndvL40kkNIkHCPm0MOIGyCnlDmm2wqXMO8Z4WmoDzDl2tcw79tLOw+UpctnXDasZSu1zt34a5IE= 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 VI1PR04MB4221.eurprd04.prod.outlook.com (2603:10a6:803:3e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 12:28:40 +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; Mon, 10 Jan 2022 12:28:40 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 08/15] i.MX8: Add crypto node in device tree Date: Mon, 10 Jan 2022 17:57:07 +0530 Message-Id: <20220110122714.20744-9-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: f823a2e3-d424-4789-63b6-08d9d434bb92 X-MS-TrafficTypeDiagnostic: VI1PR04MB4221: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: sEsALZOeJ97nkIy3Mho2XY0dbMvD2A1lsqMDzoiEHP7c0KVHhehO69mZfrS0zo3UPDr8MMMvMxXg9F7DZCKrN+TEBR6WRgFPgCzg0phCuL0edHK585CRhfL1bODj+PbziJsax2oV8odtSxJpTu4c8NmC5CJYyawC/oT5kZCeOIPzfQOPnoTlIDwXINfpZcFJerOdRf0cQY7VCCpcVamua2Tt4/DkdLQw32l8a62t9LSF+H6d6ttA+uTQxum1D7Y4Tyx8wBZvxkgYxBNgXF2flgO/SCjp+vHKuTANyQ18yyFp7BTlPdy+hnxUez7GIaG6TVhtQFRNJ+QPzb1Pt+qBFpqrW0gdD7G7LhFTODEvJyWiAHDUHSa+q8SfPkF68assnTJSzj2qKP2BtYDWUYaz9HqaCBIMESCgMrk2RCME2B9cyuWfzcdJ84JIMQFYBdR+PvBNsFg4/iUn8YMrmvqq+w7lIfVWK/ftciIibNJn7AQxilqpkBUgY+fuoTEss3zZ5HVOl7NsD8PQOHTfWGG+yFyCTRig7as8SJr14O0XR03HuGuMKXQVoan4vY/YHh823THlEiAkYyoGQ19eho0S0GkEZTyBgrb56UVoQDL5SEaGqLDpSEQpVkX52AUbSD026ugW+KdUOfc6zms8H1PljsORs2dTj1MhVd9elOw+yiSrfv5Kt9moFZtSz+0+03w9GRbTPBonOb03yS5uWYXxwg== 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)(54906003)(6486002)(66946007)(83380400001)(55236004)(2616005)(508600001)(6512007)(2906002)(8676002)(1076003)(66556008)(316002)(86362001)(5660300002)(4326008)(6506007)(66476007)(36756003)(44832011)(8936002)(52116002)(38350700002)(186003)(38100700002)(6666004)(26005)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RyiNPMyPg6+DGbArrhVyxXVDD43ymTaNzCcswgf5MKoSr+0yLpf3Juj6jVPUzbBatJoILN8LkU4IJ/B11YjGK7DN96sBgtEG3AjOQi1yvo0UiC3lap7cYUgTu26a5CsijlragtXkihBmH6kjtCXARJ79RmmvD6+Qa2NusoSYiGV71y+4WBMbNOB1zBGvGHo2TfcDB0wK0I0ufmvCEJyyYivbR/t+PU26R+8iTMC9ogPZP0blZiiKu0yxlHBVShLwNLa7odmvR5n+RsfwrW2Cpxp+mYWLOlgo6viHkyHOeAdxXIFoMu86eHGaD6BPOlZI5mOnh+5S5w8JWYX2kbdiqoxwHbjtdFvWV4IoohrbSNiowfYMTNqoVCANyhqLaoWnVA9HhVD95FF9dLt73MsdxZ6BxAWj0RiunTHh8eL+xuMN33zZJfA62E6A0VF7Z6AXSaZHkigAnQwohsQAdlb5si2QBJGsFxiC1yxT7KG9pGi+lit2F8CsbFKP7kg3ez58u4NaPWMTQorK0M5PRDwfTJAuCmDPPEa00CTQ4ezpGhxo6buXMuGSy/19HcMod4uxPhtRCWgQ8697KlBxnRe4J74BKzUtUYEMfRsLIbTdAuZ1nWnUb9sqztKpKzKOB9CWUq29iAl3p9UPKVJ258M05uV+/IiFTAX2RHNLL+t+xhgaKmR9Y50Dzk6OfXov3j2MAi65ZZTCHVz7JGxyn8JPDzTfXxv4AT/wZc+qsTlU0QTJVQWIljXLuVZQr1omLVlo6FPR24Fav1G8kKdfQReRWQIXuW/aLJGf6fohJky0zLebsonSpFp3C2gNcLeiOy4B3m5tIhZEkuv37vRYnoH/L57j+toDo+Od9pJXajK+q/TnNbQ6GQJj0DuWKNWC3zp7uSrp5M1b6VjSkGVEPmS00FnO8pBwMsZu4N4PImxrXafDDzF641XEWLkTcsYlXuEwsRgozqfbeexPIo/mCaI+e8Pu3UPmkbEVgGzttXpELYLYX1bhFzsuxk4WUMf62+abaWPk4vXSH4wuX5/Li5CgW7iiDYt7qlQbUmt04DfsTQy5E4O6QLyUCNBloPzdtCTQiPfMaoOdP3AP1GU6VkYQRBCDMk3g0YDoESPsJ4+2Y18BeTifbDzP6KPXEzwNFojyz65X3sJgBuiuRYcSNj0asVDYFTND7Wv898MXi1dO/TEaTV6XnGuk8h+CMN9FF2ujoeavCAxW1IAwYKrJP1bQ5JgHJ7gAmP8Whu+EguqWZx1RZ3uHasISWYxCEVoAo2+QkIbJgfAU7BL3fyFcuVybvSO8pdR4eEqVzJEH+3gXrBzs0gUl/L423Uo9PoCDyiDd7li1fbi+PliSylz1gzvxauDLEncFysUGGJ7utiIUa+sGCNStYdYbXsRp1mPfXwJJJ6ZHUdAQKiCrUxNxPKZ7RFeHg90xlDgQfPwuDeDZrPiE+m48+T84jn6f8O8jTGoH/1u8ZyJDml2YMI+DSRuTIwELi056WMMdafeeqgrqEsa1clcfa19GUpvaDFIg/HHVI5z7cdLLvAKQ8HnxCamJNQtCFF4DCJU67oqlv7WBjbIENOwt22+SOPQKNJeMGePhwpgF/xFXb2flBTCIfcTMQs+nJUo+UyIyL+F0WjVQydE= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f823a2e3-d424-4789-63b6-08d9d434bb92 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:40.2300 (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: k8ohv3a9CZ/J7vxx6fDj2h9QTb0rKhAX4XteQpR4A6NH86xUjlxL2urVE6t9w8Qb2AZwgLLfMNdZoAJaBLSMxQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4221 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 Mon Jan 10 12:27:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577874 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=g8dMedVl; 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 4JXY6c19QHz9s9c for ; Mon, 10 Jan 2022 23:29:28 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C30C5831EF; Mon, 10 Jan 2022 13:28: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="g8dMedVl"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6615083107; Mon, 10 Jan 2022 13:28:52 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 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-db8eur05on20626.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::626]) (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 908E183178 for ; Mon, 10 Jan 2022 13:28: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=oNxZsTiwXG1hUSGeV6m4M0dxA1SXKIgfafxfLlQpYXLTIPB90QCXxF9ZMxsFy/u+QPuKaB0+4cKd0XFfIo0TFOcVnww7x/GFVnjrNBGbTNK7MaOj/Uo/nTbJkj2y/IKagPWle3Rbqzz0zwWiZm54himUrYm7NeCg+gsWvgUwacifCiR4nf9D2PCag+QGGGWidz5CatZfZ5pdiFpuMhjMbwsaufkHNkclPEwgT2og+Ilo+kTQ2Fq63FseRHjJaLQwSRJCkqozAB67Qn4EYdAqTDm0ZBMkaMEeY2b7tgY2Z2zx0dItRO9ZheikBwINXsdpqLMHyJ/aeoax5YBnks8zqA== 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=UrjJSGynFJoHK4hx1iVsPHFD52IfkzDlW6IWX8sIbzE=; b=ZuPc52sJyFUebRn++QDfvpN5ep50PHUIrBTV9OcLNn2wq/dmNIDpdmMQBPXGZj+VG9WynxnqNCaWOJ4epHTpiTXtLlx2FyTjc2MQGTGZgDu4Askje20BSdQq7IQUP9Qd4lypHJIgeU+cE8mZut1fdQIaFXf4aoTdW4dc5BFFTRpBh8L9QkaTh/G20IMMfienO1eBUyFhq+e0vIFT9V95WZZCPWQpfxQb6uwv3XI/dqOao37p7rm/4h+8Eq4NN1tXG2Zyc5j7ZNBozkEkdMdx5KEKfG+iSjTC0R7H+Sk2Bg96Knlmp11lSm4eX/xfz/yDcVXobK69ZTZZmtljhAkXfw== 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=UrjJSGynFJoHK4hx1iVsPHFD52IfkzDlW6IWX8sIbzE=; b=g8dMedVlYlaE8+WLz/nF1VqD1HKzuEi0cXBn16OF/+U62gux26v94NJavmU9G6bFFoebCNU6jLsDCT/fOIZCMfIWqdxh/o7S3hLkHgK0qgN82ja8DHWOVgZpkNy7mpryLyVAUNE2vPIaR2Xvle8EH23YMlg7fBxfYIu3F5nSynU= 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 VI1PR04MB4221.eurprd04.prod.outlook.com (2603:10a6:803:3e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 12:28:46 +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; Mon, 10 Jan 2022 12:28:46 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 09/15] crypto/fsl: i.MX8: Enable Job ring driver model. Date: Mon, 10 Jan 2022 17:57:08 +0530 Message-Id: <20220110122714.20744-10-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: d516ad19-3652-4e54-8907-08d9d434bf55 X-MS-TrafficTypeDiagnostic: VI1PR04MB4221: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: dRdWXF8So3/0bfAYPEHH4HIdT8fuYws49DH04dP7urcXpKaSNd2S7ja6VV5A6QhytqMYk1mYtcDIa/O/2ZtuQ10Gs+Y3lmTskrRPNC6H/grIvDh9Cc8iteGrmYPPFd90ZRk30+ETnPdNW9c5uLoAbOlDk5Y0VJ6ekRqjW127KHlZGYJ7xRxohsGzRDa6QMkuISis9M7d+Eq/Uieg6LUykv73aARi9iSQBbEwwQbkTcBfKGchaUmItRHRR1DU3y+2vb1VJmJMck1pGSgUAb+On8FJMXTqRlMhKr+D1hpSE0sJNCmYLSF0nV2Nd7q/dcUM1bU5nk8HRTUvmiDBtQOPFwEcgq5uckEpWstxNznPC6yvUFlj6Wo74V6F70BPObRPctoGPiPrjwt0D4y8+yPpMUdRvUYvqyhjB/oUrdEtXdtxs27AJv8VG3urI0pQL5r8A1/iCxhhtYmmP9oXPZmJ/WNgJ7PH3tz6rnyunR2Rd5LaUprwXkWqLtQcLVTJx1I2QUet41IAEdxQ5YjrByJH+7awqdflpkU3R5g7kRd+P+T/EVovSJOyOZTaGyzzYahLnuyEjptV9hcQSsaY6POv6OwdvR7j5s3nJ844xhFe0VE/5ZzxRvGJhSj0Rd5XHhflOor3n2KNjri26PZAz/SnJtdPSLGWSo1JbyWS+4acWToPEORSEBor4DcIFTVU+nQXWtouWqsLZLcMaNwJzciKug== 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)(54906003)(6486002)(66946007)(83380400001)(55236004)(2616005)(508600001)(6512007)(2906002)(8676002)(1076003)(66556008)(316002)(86362001)(5660300002)(4326008)(6506007)(66476007)(36756003)(44832011)(8936002)(52116002)(38350700002)(186003)(38100700002)(6666004)(26005)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?BvAwTTj7XSePLI6PbRBGkQbUqXtJ?= =?utf-8?q?ossgjADuH5+JZ/qCXWv8aqYLcKAfStVbFFc1h+QeGd2L9fxYpKPOtHC0HHczzH/2H?= =?utf-8?q?Gl+8qYsqqlvhB8OyIy515lH8hMWWSqHN2pzaIFR2CILimkUBorjLzRf6m3t/mGq5L?= =?utf-8?q?XzQAk9raZpuA4bmjTmNiI8Wxs21ry5jVv3oI3udS48z/qWacOMxi60ObnfO7jOKLn?= =?utf-8?q?524ecsvdWnixw15ITPjgdDTMqpZZzYTqgr7Cp+Am05aAiLpgGvO9hR6837uJVpb4v?= =?utf-8?q?yx9HxFzOo+3Cjoxd4bEFo5LIPto5cCkmutTqWSZuVVaqfnLsTcPyXELsJdFeT2E/8?= =?utf-8?q?Ek4UkxeJERGajC8gZK2euLGmnK9V5+rsLlWwXUU5Y9ArUJaT77JxR13z9lpvZ9k7p?= =?utf-8?q?eSSnAOh29BA1G/qcc/3u8Qu5SmSLekd6JAuqv9e8jYpkdaCsEKMw5M66Vf9w4ta7s?= =?utf-8?q?VbKJcBIi6Krozs7P+umiJIu+l2YBrL5hNDkf4mKhLUhrFml9UeMz9mgYqRNaPVpmG?= =?utf-8?q?37Kyh09iSTjkCNJGanMXXGA+6M6s+1jOtbkv+sNOp5gRAmdBUZBogkMWZ/LLKVi5/?= =?utf-8?q?ukjsx5wpXBmwiK85SxKDX5W7jAUpTWfjHrWzcV7krA+nT1iUTOel6VgAvL0SY+kvz?= =?utf-8?q?12yLRUBSWFwfsP5EDlK1Y3dwNWNksqPe+U1qYNi4Oks3ZpkufyV4yCu1E9ddH/mme?= =?utf-8?q?4PLg383o0mXNapN7j9//hJp0K1MDlXnQpwkyUkUx2MRyUMJhV3DcMUI25tiMzmkBU?= =?utf-8?q?UegKOFsx/OIUeX5HZ/BK79bwr8eyEv+cOzAhUhHoXSV/orViDQixIOyJzM8YbiqSZ?= =?utf-8?q?3OkMLwoDDKam/A2SsqQCdEJi5PQIqMYWl4cNqHWAmHF96l1nodJodL+gk0dFcx/62?= =?utf-8?q?mRsQX37YqoXN+zWw8ASmnr/++byedCmY/RA/MMDHuk9kr/hfY81fL55Cek+ibKMLC?= =?utf-8?q?R+OSAzCGr3duCxrtUZ+iiTKWQM+FRmsBltmdiI9irQMRwq/yn9HkBBKkNhkgoRuBB?= =?utf-8?q?lysxfGx7AynxZ13jAk1DqUi+VOOsHN4QIf2ou3GNjVJnHxXu9nm9KpDT9AuNKSk3y?= =?utf-8?q?c6FIaW7JQGebjtzqHou8kxTR/bBOdVtgUGUmxLrPY5zC3XO3GqNOqrnSDvlywjsW9?= =?utf-8?q?eJTHRfgTf/IderY/NjkK80yPIGTeGqV+kZl+/KAA6fEPvrEakwMcqZnAx89lMjJBH?= =?utf-8?q?s+X6XpgEvIWFvXQslZPUdT9wr0bAYDQkIfq4vqI3mzOX/EcZbM0Nkbgtgox+7GEHp?= =?utf-8?q?R3sjQ1/eiqKdTcwOXWV1dnslLXTLRwrT/fCv9MV5nrJJN/MAX6UI6EZh7m0jRPjs6?= =?utf-8?q?ppHhoPMVgnVMoJrcCKxhO2wVwbTs5cKRk+N0b2CCpc2HRjckmueAA2z+VkfYU5oLV?= =?utf-8?q?jh0e39eBQ8CRSf2i+idwcUUR3auKayvCyfXXnBL/V/3J6mURgASdKN4qdXM/irLP0?= =?utf-8?q?fBZ4miNZHhvG2QW7/RryWHnAq/eigoDzZC5ei8kh/RyDTKI71Hb74DamjTSsNliOG?= =?utf-8?q?G3sv9OykTTOCIlnqpIEP3RXI0L9aawSD6/e1J1WTn+nMcAoqcXTqdcI=3D?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d516ad19-3652-4e54-8907-08d9d434bf55 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:46.6046 (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: dR13mbv8jNfWCXGcf/j6rfdWT/eJvlkeQyd51Uaau7nc+cUQ5yHqGNFD2nv2pU7grJKZmqqpE6Fztl5TmlXkkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4221 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 524a2204eb..7ce2bbc954 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -804,6 +804,9 @@ config ARCH_LPC32XX config ARCH_IMX8 bool "NXP i.MX8 platform" select ARM64 + select SYS_FSL_HAS_SEC + select SYS_FSL_SEC_COMPAT_4 + select SYS_FSL_SEC_LE select DM select GPIO_EXTRA_HEADER select MACH_IMX diff --git a/arch/arm/include/asm/arch-imx8/imx-regs.h b/arch/arm/include/asm/arch-imx8/imx-regs.h index ed6e05e556..2d64b0604b 100644 --- a/arch/arm/include/asm/arch-imx8/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8/imx-regs.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0+ */ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #ifndef __ASM_ARCH_IMX8_REGS_H__ @@ -47,4 +47,7 @@ #define USB_BASE_ADDR 0x5b0d0000 #define USB_PHY0_BASE_ADDR 0x5b100000 +#define CONFIG_SYS_FSL_SEC_ADDR (0x31400000) +#define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 1 + #endif /* __ASM_ARCH_IMX8_REGS_H__ */ diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index 89da89c51d..04c4b20a84 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index b43739e5c6..f969833bab 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -8,6 +8,7 @@ config AHAB_BOOT config IMX8 bool + select HAS_CAAM config MU_BASE_SPL hex "MU base address used in SPL" @@ -72,6 +73,9 @@ config TARGET_IMX8QM_MEK bool "Support i.MX8QM MEK board" select BOARD_LATE_INIT select IMX8QM + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL config TARGET_CONGA_QMX8 bool "Support congatec conga-QMX8 board" @@ -89,6 +93,9 @@ config TARGET_IMX8QXP_MEK bool "Support i.MX8QXP MEK board" select BOARD_LATE_INIT select IMX8QXP + select FSL_CAAM + select ARCH_MISC_INIT + select SPL_CRYPTO if SPL endchoice diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index ee5cc47903..5140c93a37 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP */ #include @@ -89,6 +89,20 @@ int arch_cpu_init_dm(void) return 0; } +#if defined(CONFIG_ARCH_MISC_INIT) +int arch_misc_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + + return 0; +} +#endif + int print_bootinfo(void) { enum boot_device bt_dev = get_boot_device(); diff --git a/board/freescale/imx8qm_mek/spl.c b/board/freescale/imx8qm_mek/spl.c index 944ba745c0..332a662dee 100644 --- a/board/freescale/imx8qm_mek/spl.c +++ b/board/freescale/imx8qm_mek/spl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP * - * SPDX-License-Identifier: GPL-2.0+ */ #include @@ -24,6 +24,8 @@ void spl_board_init(void) { struct udevice *dev; + uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(imx8_scu), &dev); + uclass_find_first_device(UCLASS_MISC, &dev); for (; dev; uclass_find_next_device(&dev)) { diff --git a/board/freescale/imx8qxp_mek/spl.c b/board/freescale/imx8qxp_mek/spl.c index ae6b64ff6e..2fa6840056 100644 --- a/board/freescale/imx8qxp_mek/spl.c +++ b/board/freescale/imx8qxp_mek/spl.c @@ -1,7 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright 2018 NXP + * Copyright 2018, 2021 NXP * - * SPDX-License-Identifier: GPL-2.0+ */ #include @@ -39,6 +39,8 @@ void spl_board_init(void) { struct udevice *dev; + uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(imx8_scu), &dev); + uclass_find_first_device(UCLASS_MISC, &dev); for (; dev; uclass_find_next_device(&dev)) { diff --git a/drivers/crypto/fsl/Kconfig b/drivers/crypto/fsl/Kconfig index 94ff540111..82f929c294 100644 --- a/drivers/crypto/fsl/Kconfig +++ b/drivers/crypto/fsl/Kconfig @@ -11,7 +11,7 @@ config FSL_CAAM config CAAM_64BIT bool - default y if PHYS_64BIT && !ARCH_IMX8M + default y if PHYS_64BIT && !ARCH_IMX8M && !ARCH_IMX8 help Select Crypto driver for 64 bits CAAM version diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index 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 Mon Jan 10 12:27:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577875 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=aI/WPT/v; 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 4JXY6n73fNz9s9c for ; Mon, 10 Jan 2022 23:29:37 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5BADF831EA; Mon, 10 Jan 2022 13:29:00 +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="aI/WPT/v"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8B0CB831E0; Mon, 10 Jan 2022 13:28:58 +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=-0.7 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-db8eur05on2060e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::60e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B431C831EA for ; Mon, 10 Jan 2022 13:28: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=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pw57JJrXHJKMbYmrps48Mbr8nCGFREUG6LFC1WQzvJQm4EqF/flMr9zq12ob7omcydilua/kKV1L8iZF9RCRrztaYqiUymGFXtXptWZPMTpwslFVPpR8mmgSJRoJhLc1kjCo7YDXEDrZ+ncnAeK6yOVcm3SRJHZYaA3Bj86P8C/3yjBz69EBxS99yXsUaWUwTZHDQcwh8T0uQCqUkoBOx47Your9ItWpXTIOBvhfi3Fn75Pk5ErD/LExLvrZE1w/H+c3p8WJiLs9WHGPUcN4Y940ESHzc9TXMwwx8JvkBNYWdKH/+v1RudxPQtqWgDGeV5wfmJmBOC0QdsSfywbDyw== 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=kZsMACTj7vp65MJtm3Xoogepyh6RcD/bi/ermLwHnc4=; b=Mnekh508WtpWojUPhbJQwD2Wq8FZlcOG/7bez2ceNYmV8rBXJoEfkNicKY13T5eEk2QSm+uYceYOTv1P6a+p1DCRxtzXCOVCvvti8GVhnriHVzS1feU6qIrVEbBR75/uAUn2E9hqW5zHpqEsvcjINvddRAkJfTt2GUo3cDvIPhaqV+38UTMkZkBR+LeId1wI+BYrfyKm/S8RABIluYgdH26kt3hrcThQYBytH58McyDjMb8czKvKV9N2C4Mix2KOWWsD/xybDyodj11GWkAJU8dRuuM2dEAm2JQQJTuLj2japsDWk7Al9Qphckvt6XdFBCtmL42CyM4LLBQVWeFuQQ== 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=kZsMACTj7vp65MJtm3Xoogepyh6RcD/bi/ermLwHnc4=; b=aI/WPT/vYB2IjWFHDkume8AQ+bfHoLTtEf6P0RghMB+znmkdDi99wpVWkq54g0PZN/h+fIjwoY34EhLb1QOBf6qgZu9Hyl2Ww6Vi6nOBBgN87xalOlQfZvpdZC0n+mDQxRuUr0D+WceHz4N1y+LNj7JSGgo82d9wra6z2GskdVQ= 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 VI1PR04MB4221.eurprd04.prod.outlook.com (2603:10a6:803:3e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 12:28:53 +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; Mon, 10 Jan 2022 12:28:52 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean Subject: [PATCH v8 10/15] crypto/fsl: Improve hwrng performance in kernel Date: Mon, 10 Jan 2022 17:57:09 +0530 Message-Id: <20220110122714.20744-11-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: caa0f814-b1f4-4c04-fe39-08d9d434c307 X-MS-TrafficTypeDiagnostic: VI1PR04MB4221:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1284; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: STityjKt4jDeolW3VujPu7N0Ut86v7JvMyIAaab//aiQiY02y+eu4URF3FnGGx+FMyn7oBMTOIjIGwZzrpYGFWqnnTc/+S/cWp+B+l4MqI07DaU176WS7B2WhG8rdKshHE2UonHPYYCkDR0PrQnaaAyt2N5N1tRRbiHVAr0MeKoqPcFigRsdojDjPZ4YuIUxZ0J4yyAHA9en4S8rGc4GmIN+0khAGngo9eYbiqY+hUk/1zULanwgYJTAknfKbhEJJvEqYiZX//LuXWVdZ6lWl6e1CarpLQiUA+CYSWT+ZM7OPlGgf4S6KwYgcOqsotERb7FDDIWnSQLuWn5Cnij6LC4PcpkfDDNxUrlLnNJQ8jf/NUoKWdocShYCfAfbUwMA0nRayNXyIdOXXYqdpYGsXrgiUphKa7PVWFcdZuWqelJj5y5WX5uUkSFnh5vuDo+rnaIOUWOSb/2LmK68NrzeKXyE/NII30GWrg5mOFaNnEAoW9Wf/JsucXd5N6VP266xs5ZiOn/4JW6RvOq7Dz2Xk14q+iqFxTwMAL0f1OofqwbJLPs6iX4bZ78NM9rarzVu4IhL0EjElR+R6CFfcsLHvbyObEkwsufEmPdzKUvvM0u/EaV5saBBM3qwHEBuZ4CIfdFQPYzNvFXoeizOTsHxlbSyOrKJ2zGHMP9pmJXnnG/z5t+ankNtoZakylDfy4r0HdW2m5eqAxUaez9/IVyEaA== 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)(54906003)(6486002)(66946007)(83380400001)(55236004)(2616005)(508600001)(6512007)(2906002)(8676002)(1076003)(66556008)(316002)(86362001)(5660300002)(4326008)(6506007)(66476007)(36756003)(44832011)(8936002)(52116002)(38350700002)(186003)(38100700002)(6666004)(26005)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8w8GFaAlR18WKP1myMnfyMozvA/yadYRghz3cHDWAw4svYNIxuvfCPzvh7fFEeiBNjFoxdAIXK+rbco2yDw3LLFixMDeWeWclBsETjLrwSS5vv/r226kGHMXul5jKtzIeg2DwwbAXtZKzMMLnoGmllIOqcv+Bb9w3fDOfJboOM3q2U4OvEFLCZsFkL8OxDGn+W5t4q3faDcJZ4xUL5mAthg8T/SH1q+B9PHEAhVJz07VT1uSR1wCgBk1dmPVj/di4d3QqmM/7ezu3rBcAiN356O1Hp64bJYBMUYjNKpPmDNZYh/x/QUz4o7UEkVwbEWY49jDF1wJmNR/YoyfKpXak3e9/JV07rf2oKkSph0DyMhFOpL6PcOnxRicmetTLJNEyyd3VfQ1CpEEiXb3515T14DD1Yd8aeqkim/rgp9bZIT/x/MZ0gymvoF0//8wJEf6qKIWZzlb08sa7Slc/TtZnoTt3kbZ42SSCELQohnMtxvG7e0CtG9VVss6ApZcVFxpnZtCdGSsEbK+C7EtIMY5yZb1YBIWMzxjrAYZhhcm4eshNZqBi06hRpqgQLMLUhXs8bIcpd827G8rZjuoT5HkegglUNNMkzl2xTAN0SaqBF5Rd8vcJMf0NhycXYfB3/gxFNjbxDNNjvkzRPj14ompDgQHQQYaXkodcxpiy0t6YrnFV4DCw10fIDR+fwsX2N5CILj4ozBWIxEb3NcMF9ChMLpyCCPphwq3ZJtj/ex/1MgfkDhyve4C83Ap7rX1xEipu7ZE//7i9uiTcAYJS4iljQJaOk/qHUIc7Zqp4/BvD71VDIysuL4PQGwC7GcC5vetCNVKnUZtFKQ3pAEoyp4G6nRxu0Tq/1n5maHazk88SG14JNlrFaXtbz8J+hyY+oU2p042ujAsjb0ywY0D4Os6WlXofGP+mqH5dgwWkeajQNe47rUCQgscrDvsFQ4pK4kXs13sm5u5EN5PQpKlbLtrCzLjzYhsjUidI2C0msBisWrsmDMSAGkB5YvXF7yJy8TYHKvpWykJm8xeQBT1eUHD8uDEAg/W8x6Xu6c+PXQi5OymXQJeitolYMN02BUMK5QyOGF/h+CH1BKdaN5XoJiZ41oxazobB5pKB6rNi7Ujh4elQQ+0kVKKq3rumO2VcGFii3c5wAuYrkknadn1s6wIFg0Eownu/TWlSzbI83z4Fu7AOBrIRppGyqSMwCO7bVEwWUVtosFp0lMhKxW4yecev6StRfwL0IJRzZ6OYYHtHzWuHGIV/3iY3oOqtYTHtVtylYe45ui/ebXI7ZoakFno4JzoFR80ZETLh/QJMrB78F+EW1D58XmnqitkcbHS1Fdrp3e60KcQznX3LmZkE9L8mAhHQ5gjA+YeViYT63vO8PlXyyoBN0/rugLJ88SrOUeXoq+vUXbqGBDxJ0v8+7XNYyI3feaGMFtA3TeqYzKhwxsrb4w8yHTR9bvC93rxt+rWKr9Muuoq/3Z/L8PuldMjyB+bNp5MOEdF4Qx4fHX4wnLT5cL0PTlZyvQZgGGb3DlpL4cvanJSNfUFcFUw+1JRA6xzcZWcmlHLmr+I3WY/ZzM5TyTpar3kJ47gD9DbT3xUzaFW+rMyszPZtRaOa11d5qGnsfXEujqW64nALtSWZvI= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: caa0f814-b1f4-4c04-fe39-08d9d434c307 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:52.8698 (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: SphROeF7QLG6EObOh6b3zzASC+2U61YlQMtKylDHMfUotgf3v3Q8/02AJaGGUiK90TL5ZYEuMJImDBZjQyFPyw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4221 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 RNG parameters are reconfigured. - For TRNG to generate 256 bits of entropy, RNG TRNG Seed Control register is configured to have reduced SAMP_SIZE from default 2500 to 512. it is number of entropy samples that will be taken during Entropy generation. - self-test registers(Monobit Limit, Poker Range, Run Length Limit) are synchronized with new RTSDCTL[SAMP_SIZE] of 512. TRNG time is caluculated based on sample size. time required to generate entropy is reduced and hwrng performance improved from 0.3 kB/s to 1.3 kB/s. Signed-off-by: Ye Li Acked-by: Gaurav Jain > --- drivers/crypto/fsl/jr.c | 102 +++++++++++++++++++++++++++++++++------- include/fsl_sec.h | 1 + 2 files changed, 87 insertions(+), 16 deletions(-) diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index a84440ab10..e5346a84a4 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -603,30 +603,100 @@ static u8 get_rng_vid(ccsr_sec_t *sec) */ static void kick_trng(int ent_delay, ccsr_sec_t *sec) { + u32 samples = 512; /* number of bits to generate and test */ + u32 mono_min = 195; + u32 mono_max = 317; + u32 mono_range = mono_max - mono_min; + u32 poker_min = 1031; + u32 poker_max = 1600; + u32 poker_range = poker_max - poker_min + 1; + u32 retries = 2; + u32 lrun_max = 32; + s32 run_1_min = 27; + s32 run_1_max = 107; + s32 run_1_range = run_1_max - run_1_min; + s32 run_2_min = 7; + s32 run_2_max = 62; + s32 run_2_range = run_2_max - run_2_min; + s32 run_3_min = 0; + s32 run_3_max = 39; + s32 run_3_range = run_3_max - run_3_min; + s32 run_4_min = -1; + s32 run_4_max = 26; + s32 run_4_range = run_4_max - run_4_min; + s32 run_5_min = -1; + s32 run_5_max = 18; + s32 run_5_range = run_5_max - run_5_min; + s32 run_6_min = -1; + s32 run_6_max = 17; + s32 run_6_range = run_6_max - run_6_min; + u32 val; + struct rng4tst __iomem *rng = (struct rng4tst __iomem *)&sec->rng; - u32 val; - /* put RNG4 into program mode */ - sec_setbits32(&rng->rtmctl, RTMCTL_PRGM); - /* rtsdctl bits 0-15 contain "Entropy Delay, which defines the - * length (in system clocks) of each Entropy sample taken - * */ + /* Put RNG in program mode */ + /* Setting both RTMCTL:PRGM and RTMCTL:TRNG_ACC causes TRNG to + * properly invalidate the entropy in the entropy register and + * force re-generation. + */ + sec_setbits32(&rng->rtmctl, RTMCTL_PRGM | RTMCTL_ACC); + + /* Configure the RNG Entropy Delay + * Performance-wise, it does not make sense to + * set the delay to a value that is lower + * than the last one that worked (i.e. the state handles + * were instantiated properly. Thus, instead of wasting + * time trying to set the values controlling the sample + * frequency, the function simply returns. + */ val = sec_in32(&rng->rtsdctl); - val = (val & ~RTSDCTL_ENT_DLY_MASK) | - (ent_delay << RTSDCTL_ENT_DLY_SHIFT); + val &= RTSDCTL_ENT_DLY_MASK; + val >>= RTSDCTL_ENT_DLY_SHIFT; + if (ent_delay < val) { + /* Put RNG4 into run mode */ + sec_clrbits32(&rng->rtmctl, RTMCTL_PRGM | RTMCTL_ACC); + return; + } + + val = (ent_delay << RTSDCTL_ENT_DLY_SHIFT) | samples; sec_out32(&rng->rtsdctl, val); - /* min. freq. count, equal to 1/4 of the entropy sample length */ - sec_out32(&rng->rtfreqmin, ent_delay >> 2); - /* disable maximum frequency count */ - sec_out32(&rng->rtfreqmax, RTFRQMAX_DISABLE); + + /* + * Recommended margins (min,max) for freq. count: + * freq_mul = RO_freq / TRNG_clk_freq + * rtfrqmin = (ent_delay x freq_mul) >> 1; + * rtfrqmax = (ent_delay x freq_mul) << 3; + * Given current deployments of CAAM in i.MX SoCs, and to simplify + * the configuration, we consider [1,16] to be a safe interval + * for the freq_mul and the limits of the interval are used to compute + * rtfrqmin, rtfrqmax + */ + sec_out32(&rng->rtfreqmin, ent_delay >> 1); + sec_out32(&rng->rtfreqmax, ent_delay << 7); + + sec_out32(&rng->rtscmisc, (retries << 16) | lrun_max); + sec_out32(&rng->rtpkrmax, poker_max); + sec_out32(&rng->rtpkrrng, poker_range); + sec_out32(&rng->rsvd1[0], (mono_range << 16) | mono_max); + sec_out32(&rng->rsvd1[1], (run_1_range << 16) | run_1_max); + sec_out32(&rng->rsvd1[2], (run_2_range << 16) | run_2_max); + sec_out32(&rng->rsvd1[3], (run_3_range << 16) | run_3_max); + sec_out32(&rng->rsvd1[4], (run_4_range << 16) | run_4_max); + sec_out32(&rng->rsvd1[5], (run_5_range << 16) | run_5_max); + sec_out32(&rng->rsvd1[6], (run_6_range << 16) | run_6_max); + + val = sec_in32(&rng->rtmctl); /* - * select raw sampling in both entropy shifter + * Select raw sampling in both entropy shifter * and statistical checker */ - sec_setbits32(&rng->rtmctl, RTMCTL_SAMP_MODE_RAW_ES_SC); - /* put RNG4 into run mode */ - sec_clrbits32(&rng->rtmctl, RTMCTL_PRGM); + val &= ~RTMCTL_SAMP_MODE_INVALID; + val |= RTMCTL_SAMP_MODE_RAW_ES_SC; + /* Put RNG4 into run mode */ + val &= ~(RTMCTL_PRGM | RTMCTL_ACC); + /*test with sample mode only */ + sec_out32(&rng->rtmctl, val); } static int rng_init(uint8_t sec_idx, ccsr_sec_t *sec) diff --git a/include/fsl_sec.h b/include/fsl_sec.h index 7b6e3e2c20..2b3239414a 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -34,6 +34,7 @@ #if CONFIG_SYS_FSL_SEC_COMPAT >= 4 /* RNG4 TRNG test registers */ struct rng4tst { +#define RTMCTL_ACC 0x20 #define RTMCTL_PRGM 0x00010000 /* 1 -> program mode, 0 -> run mode */ #define RTMCTL_SAMP_MODE_VON_NEUMANN_ES_SC 0 /* use von Neumann data in both entropy shifter and From patchwork Mon Jan 10 12:27:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577876 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=KJbcjbLq; 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 4JXY6z3LXMz9s9c for ; Mon, 10 Jan 2022 23:29:47 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 28E0183224; Mon, 10 Jan 2022 13: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=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="KJbcjbLq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D60B83264; Mon, 10 Jan 2022 13:29:09 +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=-0.7 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-db8eur05on20604.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::604]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A4A978321B for ; Mon, 10 Jan 2022 13:29:00 +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=Kj1C0/mFo2C2Y8NFMUfZeFqOTYknnIynTTE/bBIV0/6vU5yTvx1sYNYY97SNCqPvLnj1YoZhEok5M1Xw6nanhodd+5v1499AJKRtrke5OwHKzKIbdYaA/VaVvoxhHvpvbMZADSHoZd+fALjq0j5aWI4ta4QZIuQEyJygZKCd1Cp+rzgUEA/7e7VrYgUqOiQpyZee/hs/bRqFw+LXgZ35udd66hACCjxs+uqXLHQKmuJqEu512oW7luDegpSb9CL+YLffxV1riCUV5uv9XxCxB12d/dhAGeWezaLoQA97VwT4sJacn/pcdmwL8jHyF9nVGUz7T6qcm3HmWJ2osX49Iw== 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=KAkQqX5SrWBnsrtoO7aywHyksjyVQ07+pjlmyF2atcH8btUWQuU2Ntom4I7Q3wsu2SZCoSpQBnzSlrDba9aytilD4FUMlfoi4B1en5zlxOVw11Gjzkpv0BXIF8ejxe/Bk8EcrZ65HxChMC3Mc30fvLsVpMPcvHyvKA9PeRikpw8zlTHkDV2Rqz3GE8SFAUweJU2qX5GIS0Qsrz/gMeBhocfqkOpvorutQFMWxe11seU2btIe4+3SJnRjwXlTnUWnvZVS5aHkSNcY1KsM3SLk4vp0bN1W1f6BNkQAvxVhFVuy0EW58uGe8DsHXbzkJ0ihARfDxCmQIHRVcYfk1OzEhQ== 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=KJbcjbLqbfWJNorZzIfqIDvBLjHFibY8u5S1/RsY5vRWknf2P5thKuqA9TUEwYKWZJ2s60B0jjGgZJajBd0zz3/mbpGawN+O4bLHmynxhta4Jg1GiSI0jCLefL4E6qs5lacSEzz0njxJM0wb8VkyZoEl7f3VOJzI34Psu7+xecM= 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 VI1PR04MB4221.eurprd04.prod.outlook.com (2603:10a6:803:3e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 12:28:59 +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; Mon, 10 Jan 2022 12:28:59 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 11/15] Layerscape: Add crypto node in device tree Date: Mon, 10 Jan 2022 17:57:10 +0530 Message-Id: <20220110122714.20744-12-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: 8b858f66-32e1-4793-bf45-08d9d434c6e7 X-MS-TrafficTypeDiagnostic: VI1PR04MB4221: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: bBaiYIwV976yDR9z68ShlAO15OlDxfQfChPSgipZHmE0A8Ga4UH2Bmz3epgTFARAO6W8ZTeQHQS8MwRcYEHSuuWRj4CDQHVTRuGyt0iTLUGZPmI0h8uCq5zPrSIxWW3nkqcMXKB9ZgiKjdPJJSU+NKa+35jk+vQAtw/eIg0F5GRKcfRZIGHRxOnlmQfoHLExc+anIt1cdktv8FDpCmxrXlm6doXb3hYXvzJ0cWu50Ke8Nbowk+x94Km2kfMmWMc5uOX9zHG/VW35xe5jbHh1WV81djwNK9/NL1PzyPq/5RzCBDFTNwg69AOShER8D/YQAHgvCx/mFfm/keI/NGwNUi1YdP7gTVNIt0v9Nh6XOKJiZtpsYODDOUUhyFwZ4PiE5XzVfC8CkRw6Fx2I1xyU9x8B97JdxLxsgVXlTfcGXEtoKE/W+d9BIP6mw1ZFg08MvIAaL7qHeGRWeUSs2Ac96uEKf0lXDNGu0dCmycUPkmN3eqKMM8SDSWvpLxOQXzAGNz7rrVAjpK2+ihXfwd/+9YqUwp6A0hoAhdnJqwhXrwyse4igq5fuxfoEo8Gqc1wzt4qUXIBIaPLOxKbcRCQPudpblELUjNKE1aZmtJ6EmOyr/xkDFiOVBVRYNM3uoueGRAONCFzqnjgVTVCk/diobEZGnWsDZZx4EwSv5ylQKNHTv0LgM2lW1AHmjQX9flcQ+IAWqkaDhpZQWrhtJaAUJ0anNL4O09b8J6tlnQSfQMXEYbOa9owwk1H8h5viTnrd 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)(30864003)(54906003)(6486002)(66946007)(83380400001)(55236004)(2616005)(508600001)(6512007)(2906002)(8676002)(1076003)(66556008)(316002)(86362001)(5660300002)(4326008)(6506007)(66476007)(36756003)(44832011)(8936002)(52116002)(38350700002)(186003)(38100700002)(6666004)(26005)(6916009)(16843485002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0KGJcaLK71tiIUKxe6wjiUbpt5qeDPnhw89X7UWb+dIUoctG7k/prES/ATU4Mt0D6HO9V1Krrzg/7Zz+kHFmMByf3ERkQIifHpRR4JZSCaI1Dq1RELas7oekAPeCnjfeePS//jCvPaLd52lg6h6LcSzI4E6KMMge6BOYQ9vli0DMEO1UeIamhMl7dyb6+Sjuuu1q0JLvL+sDwRbrnUkGYvh1/B/QCa7POHb8xayptUWY+c0XPYG/4V9ATODZqOrVPUQotaam9qjT9JoUYwrLDp92DSdEJ1nVQhajIZTRoZjNy8jjhOltSg3HdDZRWDMwxs5If7GWGaI7qHKIZz2Uf0CuNQDcsUuX7sxVCSeOdlltgPBdQSZZMnzPORy+i8ATdLkohHG0TEq3gQZTR4VOLRFTfEGScCf7o7plLckio24VtxPdMMUm9BuKfi18sQMTUYretwQ3Go8QdIIYYJIc94a0AyTBrpR402nxmRrcfEL5FqP7UxRy51Fk9I8/qMnZ5j1Wf9pb4D7CoTWHtDxU8zEx0JVndKFV0o+jmZ+s5KMSReanEdGUKnxLqKSaTxdb9fLwfYBikY/lKDg9DJiFtAQCFloZAO34jNs0Bpc20tFkpfHYdB6v0ay0Gdwn4wNFIcWY7WDxZ8TA+l9wqCbSfuZiKO/jSkeYZHoMKPIL9n9tza/5lBzCt7gfmXg0ZvLdzcHcHRNpJhSQ9RJKNXia7XzPKvpJyQIjQ2LUik55FrnOkDoo/ApF+FqgOAhgqlu7K48MqBWYtyL1KCwMORqUuT+X1awl/fAgRCLAE9CllWCXuDa/3m4GTptAqGFNUe35N2CKRnpKwiFnwNuBrWODgll0yrRQaw0KyFGVFOAo+LiJdovRqHVyh2BTcZUZo+LIi8FIKTsqAncg4rYHYMZNaFeu6GbbyZ7vWwchKauiDD8YY3Ytpb+y5ar5m/oiLAe7fegcqeHf2ZIQ4NRdzRCAOU8jiFFFOOjreA5+sSIa9qIA0MEucS6kCLpqcyEwEHWpzAucRTF6hx7TJ3Ur6kqjWG9rK/4uDBsrb+n4VXqh4gIVd/8uHYAxZl45BRExH6SMYRIpqzSIqJyjMqGbO3fksc4h+6uW/Hk4d0nQqzFfc9jJXYTtqdfZakfdZ1a4D9ycSiVO0vN+48Xms36Iht6f7vjD9yLZJHKH3URnq2Mm2uR+1VDCmOYo0PyS+OGfKogd79gsrpYpgbwNf92ZXhaz+yhpzLI3/j5pQqJIMoUq9u9flzt0WZFaT3BUDdby63klb+udqB+MuDm8JJMqyi7x9xd/o+dHw41X3/eH5G4bm2O0EAEb4+Wqg7F0Jw/1xapTnFLdJR7VyX2qkesUutMLI4l4J51weXx71pJR9Vewv/8v0atCEVx1+JuRrUgXVEKCs/qofKJY5QPitOXzjhUz3gLX8qyeQhKBXoOE+Bq8IBJSMlc7MmXO4qM1pLtidFEMP//7Y07inny2u1Sr1LJnUYfXAtHvbMNtYKDaiDIR0s4Gf84Vw/HnS2b+r3SoETiA27ERShSxS9j4QV20RNyUkPkJAh6hCGbZO0XFv6GJux/7Yp25aT+j2E54Mc609aOw/zucVI7N+6vkWjxaK7+xp0n6GPpgKmkxlfqUkGnYpg0= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b858f66-32e1-4793-bf45-08d9d434c6e7 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:28:59.2443 (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: CLaBzHmWLrQ74moLTKkimBo7tPb5YG/IgMnw+MQLneAUJ3G0tcN5SuNK2mDC4id+iXMMbBRARNaZe6yZNGqq4A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4221 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 Mon Jan 10 12:27:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577877 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=hc5jx8lN; 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 4JXY792WqFz9s9c for ; Mon, 10 Jan 2022 23:29:57 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 55ADD830EF; Mon, 10 Jan 2022 13:29:18 +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="hc5jx8lN"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CA5948326B; Mon, 10 Jan 2022 13:29:15 +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=-0.7 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-am6eur05on20608.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::608]) (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 829E783209 for ; Mon, 10 Jan 2022 13:29: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=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cGbtgn3Npm1FPmiZgtAOY7mWw+ZNi2HR6yGc1ioSQ59QiF7ZB4U6L2uDn3pKp5SltCL3hyEE46YvoU7IEROeG8/4v6At6BBFiwQj2V9pHam8fCtYcq9uFzrC/ib16tzOdGZxSyF6HL2kH/Cfwd9PehgfBLx9mkWOn5GWVGZYizGiOdQ1G8EffJ300spBErB0DYx2cyrEhBZzFZWkD0nSpv05oxutJfImF1p+VepupNN9NIaI55m2F5R37y1ur4CmLBvQT+lB2upSDeXz/dCkliW3wKEEZGCqgKYQ67gt6YjzQ/X9Y9JgLXr4YQQI/6bcWe3ppAo5dnLKgW1zW0LJWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=WuJ63NMgfWfdrophgocrkrCeWf7p6xmtOGvKaoQW1jg=; b=GWRczhqRFj7NlBNRxexnVoFvceyybRWYF6OwHRIC0yo8PNVjTNsbtdolYHkkchYTqZqdz8cSYhGp4mdnTgGwybeuSOOcrstRrMFXx0pmsiCJq8qsdYkSH3Gn1RcjRnxpRYBArBLc8BojO+WbthDobbemRbkjwpmcETmmlryf1dOD78d8WO1tozWgSZpTudVQFI+NeG4bwA3VQNAyUFzrAjYAMsujkEQwSyzQozM4KFty8OE+bLtjAawbzrL67LFo+mUNdsl1XOiTR2kzO0nF50xO66Oq6LgCE8a+eL/X/W7dsYRaIeIXEXO9Xfi6Lt5+Q+zqnBKA30jU6EjJk3oELQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WuJ63NMgfWfdrophgocrkrCeWf7p6xmtOGvKaoQW1jg=; b=hc5jx8lN0tgLMVK0BxU5b4NvHRSK48syuiUE1AGJctUL3n0Wz2KFlEz4ktOQ25LIX9n7i4C7pNIsLqj5NNPKugpExtvW4NuXbyltPeHkVFk9tbzITx/R2FTPaqzlkzmsx3UBQyomDiYKLkxPHdgIgq3seFm+aw19YIfONR5NKrQ= 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 VI1PR04MB4221.eurprd04.prod.outlook.com (2603:10a6:803:3e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 12:29:05 +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; Mon, 10 Jan 2022 12:29:05 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 12/15] Layerscape: Enable Job ring driver model. Date: Mon, 10 Jan 2022 17:57:11 +0530 Message-Id: <20220110122714.20744-13-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: 1b551a8c-2792-4954-6dd0-08d9d434cab4 X-MS-TrafficTypeDiagnostic: VI1PR04MB4221: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: FajLsBFCxb/kcGCUJ7nJ/w745T0pSTh5pD6qXODMJU1OSNn9zWlVcQaePSeN2QH8jeYisuJuwvJCVH8Byil4MwaUJjgfRRdGRoRPggy13n8PvSVqsyMPz753BO3exBIcmmiZxC4DVgx+04SSyOPp4DWrVny/hDV6ken2n/BurkiX2NtJYJfULLJvs6bmo8vKqo+covLJvTVbH+y/nw3QnDB/wcx6mJXywn/84LU7ZBB6uYna27km9i5zjlJlXRG3ridWI5sIMrA5yhj+ftqRtKhQZLzjoRIPfUjmnIRL9YQJKZBrJh+J3mWnJ9ybv3s+U65YC9iQWx27AHMQYGOkBVznW++BR+p5AZEaf8OddNIQO1j2N8cRPuoMGK8A9do179nHFLK9K0flD7bJxq4d5dEzP5pf2nWHm6GuNdF9R0tPqgMQc+VKi8r7zpS/0jAc/GIsAlP9e/qklSovM+yz2l4beL50+GYgLxOZOQm4Xc7tZ1azo//w9qrM+ANKbcYx9FSQERi9Sbfey5kZoxhUXWQmDhp0A/fA4WpnQh1DS7RPLz1k3pwnv7k3WUJYb6qS+Oho/Z6Joru/7o6XYpbQIz1Onr2N0yZ74Ti06q//R1UVIu/AFfEDiMpjm0Z+QIGbd65jU7SRaxU4sFErNl1DjB7EorM7RGpymke1jUOoCQoTz9etti+nm9VQ/y2GkrsohS5IWGmt//EyV9PKSd1OMDwH9NrLyUO99NQFTEDSzdB+puIBjVphw5z+uAaDZpdX 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)(30864003)(54906003)(6486002)(66946007)(83380400001)(55236004)(2616005)(508600001)(6512007)(2906002)(8676002)(1076003)(66556008)(316002)(86362001)(5660300002)(4326008)(6506007)(66476007)(36756003)(44832011)(8936002)(52116002)(38350700002)(186003)(38100700002)(6666004)(26005)(6916009)(16843485002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TjSi97O2CK4630xZYJal/G5CXMUpdbvsE4GAZYzD+cxY6ngTi7Hht17IHOOCA9FwzSQs8UnV50JH8ffRi3Xc20rCgvMsxvYs7ePfsCfpwSBID5D3qZKaeRJ7Eg68RTKOwRGCTNYnwfhk2BdM/s7OcLJOPJtaixdhHbFEc2D0O4Bc43RxDMvMXCHP1bHNCMwysLvjAj3pZqS8zjEvOrvexBeHFm3nCYTYxRBfrseKxO1b6B1SebyvxgdWOPT7d4gUdKFUcBomDyUQDmgfRvjhI3MCnduuJBh4g0t0Dhq7f1xp0iDnhd51KRF/E6cNaqTzDFO8hS6l6amYit6tBBbmPqUR2sYBvQqJ1GkRXKsAguDwE4vB00DbroeXcUJS10n8uW5mnppHXAad2zueG2BBqIs7NHWYppYP/+q0hXtO6rpp55/jwrIQQye5eFnc1xGcxANJQx+h7wxjXNFtjBrBNVSGdZULS80fz15CKbhP79SHgZGnRzGj3afTx4GEbAVvFhCSqnxKJnZNlOBtXDJgvCgRDPP7CR4qAItEbh92gErsyMu/rKWzzQnCyZzj/8ErJwZ535PcqY3rQZskbQk6Gqn0wSKwVi5SmV35vLopUgkGX2+Z5zQp4c8Rvs0wfYDS1Rqc1cFHTd+bHydvAhZaRVdaEwxl2xeuvz6f/nqv2X1D/qonkRzFpS8m7c93LoiZPcgX8/HXrDzo1Uabq7q1lQIp5xV8SCmazAF9DsirALIqK4cFjLS2vPtZTYIpsbgXCszX+D9UC7wGzVG2OLdr+rBB0XaUmt3FXdw9faJVDNXHDhbUUTHLe3D0IE/xaFm+UWThv8ejFo34OaFCoon6+eVEQhOzNFOS5kmZ3cxKMF601MrYQmz3ZJlwKVYmirhRSfzZOsFzOV9ri09MjM3UhMvbjZYOVqOH+8+995+iy+FLPVv2mndPIPEsW17LuDefg0TEl9GTUjqaM1kaRmHRvFIIzstNjmuGe+xVMlgnp/57gXoHKVbyjp8Tpgpq4BWEgm2MTYe1hdJSw9Nf+l8jwHQo/bxaI1GSSfKzQXKGClDvKENIEvfxz1IsAFi+YrWLfM2AXSbqQJrOlxhoNupkuTalxac7WgPE7ccnqi5vIJWTZGKjSm/q+kuEpcrDJ+LCLX+i7T9bM0/mjCW9eihT9iCVmjQUDR2l7Vx8mdks/PnzsvynxQJ/R+Pb4fCGJcnMo27STTRdgdUovUAXcS09B0uQvW86ulg/J2XVS3x5dD14vFNHlqQwF28KWiwM/o0nfN/XAjJkP6Dq80tM4Hv8RjEjWlxQ/eLl5FuZxktPHeYrsG2SPBcGBiFtRgU8SFgRy4VWVJfAg36j/D4Amre/P7vF4+all10Ezhb5jI2bWGqtO3+qO9WxzFK6ByhSxkvjy6NE2xhGI5IsQu9I5Clz5jli/utbw5doS8LTffa7S3AVxH8riiiheitRgw68LSb/FJnghaxNVCTJiYRYCdRrHdTJwzy4DmNjIg5aAq6WGezoLpXvVP1GvG/scIBFStv7c/9KJ95ERrYkh8P5CnHBr3fKh8Ns8M/60rF8Y+KSes8Uvb6Epuk7QCtWmqQW7XBjREbF3l3X4frfYnC7p0ZcRpjSFNKRYHtr7oH4+FFiUZ8= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b551a8c-2792-4954-6dd0-08d9d434cab4 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:29:05.7283 (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: 4M7pGBqPjdccOt5koqHkbD5vahdnCcUQPpvG0YimVJbX55D0LlB8bpRgX4GkCnalPixXXt1eGBonSFjF3p8LpQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4221 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 | 4 ++++ arch/arm/cpu/armv7/ls102xa/Kconfig | 3 +++ arch/arm/cpu/armv7/ls102xa/cpu.c | 16 ++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 17 +++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 10 +++++++++- board/freescale/ls1012afrdm/ls1012afrdm.c | 7 +------ board/freescale/ls1012aqds/ls1012aqds.c | 6 +----- board/freescale/ls1012ardb/ls1012ardb.c | 6 +----- board/freescale/ls1021aiot/ls1021aiot.c | 6 ++---- board/freescale/ls1021aqds/ls1021aqds.c | 6 +----- board/freescale/ls1021atsn/ls1021atsn.c | 7 ++----- board/freescale/ls1021atwr/ls1021atwr.c | 8 ++------ board/freescale/ls1028a/ls1028a.c | 6 +----- board/freescale/ls1043ardb/ls1043ardb.c | 6 +----- board/freescale/ls1046afrwy/ls1046afrwy.c | 7 +------ board/freescale/ls1046aqds/ls1046aqds.c | 7 +------ board/freescale/ls1046ardb/ls1046ardb.c | 6 +----- board/freescale/ls1088a/ls1088a.c | 6 +----- board/freescale/ls2080aqds/ls2080aqds.c | 6 +----- board/freescale/ls2080ardb/ls2080ardb.c | 9 +-------- board/freescale/lx2160a/lx2160a.c | 5 ----- board/kontron/sl28/sl28.c | 3 --- configs/ls1021aiot_qspi_defconfig | 1 - configs/ls1021aqds_nor_defconfig | 1 - configs/ls1021aqds_qspi_defconfig | 1 - configs/ls1021atsn_qspi_defconfig | 1 - configs/ls1021atwr_nor_defconfig | 1 - .../ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 1 + configs/ls1028ardb_tfa_defconfig | 1 - configs/ls1043ardb_tfa_defconfig | 1 - configs/ls1046afrwy_tfa_defconfig | 1 - configs/ls1046aqds_tfa_defconfig | 1 - configs/ls1046ardb_tfa_defconfig | 1 - configs/ls2088aqds_tfa_defconfig | 1 - configs/ls2088ardb_tfa_defconfig | 1 - configs/lx2160aqds_tfa_defconfig | 1 - configs/lx2160ardb_tfa_defconfig | 1 - configs/lx2162aqds_tfa_defconfig | 1 - 38 files changed, 68 insertions(+), 105 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7ce2bbc954..30a34bdd08 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1504,6 +1504,8 @@ config TARGET_LS1028AQDS select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM + select MISC help Support for Freescale LS1028AQDS platform The LS1028A Development System (QDS) is a high-performance @@ -1518,6 +1520,8 @@ config TARGET_LS1028ARDB select ARCH_SUPPORT_TFABOOT select BOARD_LATE_INIT select GPIO_EXTRA_HEADER + select FSL_CAAM + select MISC help Support for Freescale LS1028ARDB platform The LS1028A Development System (RDB) is a high-performance diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index f919d02db4..ca006e069f 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -21,6 +21,9 @@ config ARCH_LS1021A select SYS_FSL_SRDS_1 select SYS_HAS_SERDES select SYS_I2C_MXC + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_PCI imply SCSI imply SCSI_AHCI diff --git a/arch/arm/cpu/armv7/ls102xa/cpu.c b/arch/arm/cpu/armv7/ls102xa/cpu.c index d863c9625a..4904592703 100644 --- a/arch/arm/cpu/armv7/ls102xa/cpu.c +++ b/arch/arm/cpu/armv7/ls102xa/cpu.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -20,6 +21,7 @@ #include #include #include +#include #include "fsl_epu.h" @@ -397,3 +399,17 @@ void arch_preboot_os(void) ctrl &= ~ARCH_TIMER_CTRL_ENABLE; asm("mcr p15, 0, %0, c14, c2, 1" : : "r" (ctrl)); } + +#ifdef CONFIG_ARCH_MISC_INIT +int arch_misc_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + + return 0; +} +#endif diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 1a057f7059..75d9876dfc 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -20,6 +20,9 @@ config ARCH_LS1012A select SYS_I2C_MXC select SYS_I2C_MXC_I2C1 if !DM_I2C select SYS_I2C_MXC_I2C2 if !DM_I2C + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply PANIC_HANG config ARCH_LS1028A @@ -88,6 +91,9 @@ config ARCH_LS1043A select SYS_I2C_MXC_I2C2 if !DM_I2C select SYS_I2C_MXC_I2C3 if !DM_I2C select SYS_I2C_MXC_I2C4 if !DM_I2C + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_PCI imply ID_EEPROM @@ -125,6 +131,9 @@ config ARCH_LS1046A select SYS_I2C_MXC_I2C2 if !DM_I2C select SYS_I2C_MXC_I2C3 if !DM_I2C select SYS_I2C_MXC_I2C4 if !DM_I2C + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply ID_EEPROM imply SCSI imply SCSI_AHCI @@ -170,6 +179,8 @@ config ARCH_LS1088A select SYS_I2C_MXC_I2C3 if !TFABOOT select SYS_I2C_MXC_I2C4 if !TFABOOT select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select MISC imply ID_EEPROM imply SCSI imply SPL_SYS_I2C_LEGACY @@ -225,6 +236,8 @@ config ARCH_LS2080A select SYS_I2C_MXC_I2C3 if !TFABOOT select SYS_I2C_MXC_I2C4 if !TFABOOT select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select MISC imply DISTRO_DEFAULTS imply ID_EEPROM imply PANIC_HANG @@ -258,6 +271,8 @@ config ARCH_LX2162A select BOARD_EARLY_INIT_F select SYS_I2C_MXC select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select MISC imply DISTRO_DEFAULTS imply PANIC_HANG imply SCSI @@ -294,6 +309,8 @@ config ARCH_LX2160A select BOARD_EARLY_INIT_F select SYS_I2C_MXC select RESV_RAM if GIC_V3_ITS + select FSL_CAAM + select MISC imply DISTRO_DEFAULTS imply ID_EEPROM imply PANIC_HANG diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 1a359d060e..ccd9116ff8 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2020 NXP + * Copyright 2017-2021 NXP * Copyright 2014-2015 Freescale Semiconductor, Inc. */ @@ -48,6 +48,7 @@ #endif #endif #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -1649,6 +1650,13 @@ __weak int serdes_misc_init(void) int arch_misc_init(void) { + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + serdes_misc_init(); return 0; diff --git a/board/freescale/ls1012afrdm/ls1012afrdm.c b/board/freescale/ls1012afrdm/ls1012afrdm.c index 5dd19cfcd9..bc37c553a5 100644 --- a/board/freescale/ls1012afrdm/ls1012afrdm.c +++ b/board/freescale/ls1012afrdm/ls1012afrdm.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2018 NXP + * Copyright 2017-2018, 2021 NXP */ #include @@ -22,7 +22,6 @@ #include #include #include -#include #include DECLARE_GLOBAL_DATA_PTR; @@ -172,10 +171,6 @@ int board_init(void) if (current_el() == 3) out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER); -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1012aqds/ls1012aqds.c b/board/freescale/ls1012aqds/ls1012aqds.c index 68578e81a5..361bd5c582 100644 --- a/board/freescale/ls1012aqds/ls1012aqds.c +++ b/board/freescale/ls1012aqds/ls1012aqds.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -28,7 +29,6 @@ #include #include #include -#include #include "../common/qixis.h" #include "ls1012aqds_qixis.h" #include "ls1012aqds_pfe.h" @@ -150,10 +150,6 @@ int board_init(void) erratum_a010315(); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1012ardb/ls1012ardb.c b/board/freescale/ls1012ardb/ls1012ardb.c index 064fb4d39f..456609d993 100644 --- a/board/freescale/ls1012ardb/ls1012ardb.c +++ b/board/freescale/ls1012ardb/ls1012ardb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -27,7 +28,6 @@ #include #include #include -#include #include DECLARE_GLOBAL_DATA_PTR; @@ -173,10 +173,6 @@ int board_init(void) erratum_a010315(); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1021aiot/ls1021aiot.c b/board/freescale/ls1021aiot/ls1021aiot.c index bfe6137604..5ab03b3340 100644 --- a/board/freescale/ls1021aiot/ls1021aiot.c +++ b/board/freescale/ls1021aiot/ls1021aiot.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -209,10 +210,7 @@ int misc_init_r(void) device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); #endif - -#ifdef CONFIG_FSL_CAAM - return sec_init(); -#endif + return 0; } #endif diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index fbbd27d9d7..f84b94d946 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -386,9 +385,6 @@ int misc_init_r(void) #ifdef CONFIG_FSL_DEVICE_DISABLE device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); -#endif -#ifdef CONFIG_FSL_CAAM - return sec_init(); #endif return 0; } diff --git a/board/freescale/ls1021atsn/ls1021atsn.c b/board/freescale/ls1021atsn/ls1021atsn.c index f31e16c419..f016088670 100644 --- a/board/freescale/ls1021atsn/ls1021atsn.c +++ b/board/freescale/ls1021atsn/ls1021atsn.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 -/* Copyright 2016-2019 NXP +/* Copyright 2016-2019, 2021 NXP */ #include #include @@ -238,10 +238,7 @@ int misc_init_r(void) #ifdef CONFIG_FSL_DEVICE_DISABLE device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); #endif - -#ifdef CONFIG_FSL_CAAM - return sec_init(); -#endif + return 0; } #endif diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index f0b441db63..a2a87eaf35 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 Freescale Semiconductor, Inc. - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -555,10 +554,7 @@ int misc_init_r(void) #if !defined(CONFIG_QSPI_BOOT) && !defined(CONFIG_SD_BOOT_QSPI) config_board_mux(); #endif - -#ifdef CONFIG_FSL_CAAM - return sec_init(); -#endif + return 0; } #endif diff --git a/board/freescale/ls1028a/ls1028a.c b/board/freescale/ls1028a/ls1028a.c index 486a544d35..71a086ef67 100644 --- a/board/freescale/ls1028a/ls1028a.c +++ b/board/freescale/ls1028a/ls1028a.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -73,10 +73,6 @@ u32 get_lpuart_clk(void) int board_init(void) { -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1043ardb/ls1043ardb.c b/board/freescale/ls1043ardb/ls1043ardb.c index beef26b084..c7f214c236 100644 --- a/board/freescale/ls1043ardb/ls1043ardb.c +++ b/board/freescale/ls1043ardb/ls1043ardb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -20,7 +21,6 @@ #include #include #include -#include #include "cpld.h" #ifdef CONFIG_U_QE #include @@ -211,10 +211,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1046afrwy/ls1046afrwy.c b/board/freescale/ls1046afrwy/ls1046afrwy.c index f1c08a13f7..5a298cd311 100644 --- a/board/freescale/ls1046afrwy/ls1046afrwy.c +++ b/board/freescale/ls1046afrwy/ls1046afrwy.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2019 NXP + * Copyright 2019, 2021 NXP */ #include @@ -20,7 +20,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -135,10 +134,6 @@ val = (in_le32(SMMU_SCR0) | SCR0_CLIENTPD_MASK) & ~(SCR0_USFCFG_MASK); out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT, 0); return 0; } diff --git a/board/freescale/ls1046aqds/ls1046aqds.c b/board/freescale/ls1046aqds/ls1046aqds.c index cc95d441b6..79658693ab 100644 --- a/board/freescale/ls1046aqds/ls1046aqds.c +++ b/board/freescale/ls1046aqds/ls1046aqds.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. - * Copyright 2019-2020 NXP + * Copyright 2019-2021 NXP */ #include @@ -27,7 +27,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -420,10 +419,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - return 0; } diff --git a/board/freescale/ls1046ardb/ls1046ardb.c b/board/freescale/ls1046ardb/ls1046ardb.c index 93ef903f29..2e9a6d44eb 100644 --- a/board/freescale/ls1046ardb/ls1046ardb.c +++ b/board/freescale/ls1046ardb/ls1046ardb.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2016 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -23,7 +24,6 @@ #include #include #include "cpld.h" -#include DECLARE_GLOBAL_DATA_PTR; @@ -85,10 +85,6 @@ int board_init(void) out_le32(SMMU_NSCR0, val); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls1088a/ls1088a.c b/board/freescale/ls1088a/ls1088a.c index 7046fbaeb5..b8bc8f0d5a 100644 --- a/board/freescale/ls1088a/ls1088a.c +++ b/board/freescale/ls1088a/ls1088a.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * Copyright 2017-2018 NXP + * Copyright 2017-2018, 2021 NXP */ #include #include @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -815,9 +814,6 @@ int board_init(void) out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR105_IRQ_MASK); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls2080aqds/ls2080aqds.c b/board/freescale/ls2080aqds/ls2080aqds.c index 2f0139edef..5cc5d06823 100644 --- a/board/freescale/ls2080aqds/ls2080aqds.c +++ b/board/freescale/ls2080aqds/ls2080aqds.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor + * Copyright 2021 NXP */ #include #include @@ -20,7 +21,6 @@ #include #include #include -#include #include #include #include "../common/i2c_mux.h" @@ -221,10 +221,6 @@ int board_init(void) #endif #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif diff --git a/board/freescale/ls2080ardb/ls2080ardb.c b/board/freescale/ls2080ardb/ls2080ardb.c index bf660a8e65..e657097ba7 100644 --- a/board/freescale/ls2080ardb/ls2080ardb.c +++ b/board/freescale/ls2080ardb/ls2080ardb.c @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2015 Freescale Semiconductor - * Copyright 2017 NXP + * Copyright 2017, 2021 NXP */ #include #include @@ -23,7 +23,6 @@ #include #include #include -#include #include #include "../common/i2c_mux.h" @@ -287,9 +286,6 @@ int board_init(void) QIXIS_WRITE(rst_ctl, QIXIS_RST_CTL_RESET_EN); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif #ifdef CONFIG_FSL_LS_PPA ppa_init(); #endif @@ -298,9 +294,6 @@ int board_init(void) /* invert AQR405 IRQ pins polarity */ out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR405_IRQ_MASK); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif #if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) pci_init(); diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index bda665624d..c8a47c6bae 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -596,10 +595,6 @@ int board_init(void) out_le32(irq_ccsr + IRQCR_OFFSET / 4, AQR107_IRQ_MASK); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif - #if !defined(CONFIG_SYS_EARLY_PCI_INIT) && defined(CONFIG_DM_ETH) pci_init(); #endif diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index c8ed7ac81a..d86cf308f6 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -28,9 +28,6 @@ int board_early_init_f(void) int board_init(void) { - if (CONFIG_IS_ENABLED(FSL_CAAM)) - sec_init(); - return 0; } diff --git a/configs/ls1021aiot_qspi_defconfig b/configs/ls1021aiot_qspi_defconfig index 2a999e8798..c59ccd37f3 100644 --- a/configs/ls1021aiot_qspi_defconfig +++ b/configs/ls1021aiot_qspi_defconfig @@ -36,7 +36,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig index 3a2fe03139..f0236e35d8 100644 --- a/configs/ls1021aqds_nor_defconfig +++ b/configs/ls1021aqds_nor_defconfig @@ -50,7 +50,6 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x60300000 CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig index a787ce0b7c..73c78753f9 100644 --- a/configs/ls1021aqds_qspi_defconfig +++ b/configs/ls1021aqds_qspi_defconfig @@ -50,7 +50,6 @@ CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/ls1021atsn_qspi_defconfig b/configs/ls1021atsn_qspi_defconfig index d92fdf4a15..5abf6cdbb9 100644 --- a/configs/ls1021atsn_qspi_defconfig +++ b/configs/ls1021atsn_qspi_defconfig @@ -36,7 +36,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig index 548ec897bc..10026d0549 100644 --- a/configs/ls1021atwr_nor_defconfig +++ b/configs/ls1021atwr_nor_defconfig @@ -44,7 +44,6 @@ CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0x60300000 CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_SPL_SYS_I2C_LEGACY=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index 404b33f938..e6c12c9104 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -61,6 +61,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SPL_DM=y +CONFIG_SPL_OF_CONTROL=y # CONFIG_SPL_BLK is not set CONFIG_DM_I2C=y # CONFIG_SPL_DM_I2C is not set diff --git a/configs/ls1028ardb_tfa_defconfig b/configs/ls1028ardb_tfa_defconfig index 035974afd8..d447358107 100644 --- a/configs/ls1028ardb_tfa_defconfig +++ b/configs/ls1028ardb_tfa_defconfig @@ -48,7 +48,6 @@ CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_SCSI_AHCI=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1043ardb_tfa_defconfig b/configs/ls1043ardb_tfa_defconfig index 7e741c7183..a0474ac2e3 100644 --- a/configs/ls1043ardb_tfa_defconfig +++ b/configs/ls1043ardb_tfa_defconfig @@ -41,7 +41,6 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_ADDR=0x60500000 CONFIG_DM=y -CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/ls1046afrwy_tfa_defconfig b/configs/ls1046afrwy_tfa_defconfig index 85db989f96..9d60bd199a 100644 --- a/configs/ls1046afrwy_tfa_defconfig +++ b/configs/ls1046afrwy_tfa_defconfig @@ -39,7 +39,6 @@ CONFIG_ENV_ADDR=0x40500000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y # CONFIG_DDR_SPD is not set CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y diff --git a/configs/ls1046aqds_tfa_defconfig b/configs/ls1046aqds_tfa_defconfig index 4bf413c0eb..0a2d317c8b 100644 --- a/configs/ls1046aqds_tfa_defconfig +++ b/configs/ls1046aqds_tfa_defconfig @@ -55,7 +55,6 @@ CONFIG_ENV_ADDR=0x60500000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/ls1046ardb_tfa_defconfig b/configs/ls1046ardb_tfa_defconfig index 3501764e6f..10093b59d4 100644 --- a/configs/ls1046ardb_tfa_defconfig +++ b/configs/ls1046ardb_tfa_defconfig @@ -44,7 +44,6 @@ CONFIG_ENV_ADDR=0x40500000 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/ls2088aqds_tfa_defconfig b/configs/ls2088aqds_tfa_defconfig index 6821ed1a45..fb2fc3d0f7 100644 --- a/configs/ls2088aqds_tfa_defconfig +++ b/configs/ls2088aqds_tfa_defconfig @@ -51,7 +51,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/ls2088ardb_tfa_defconfig b/configs/ls2088ardb_tfa_defconfig index 8e76f59b92..6a99143e54 100644 --- a/configs/ls2088ardb_tfa_defconfig +++ b/configs/ls2088ardb_tfa_defconfig @@ -49,7 +49,6 @@ CONFIG_ENV_ADDR=0x580500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/lx2160aqds_tfa_defconfig b/configs/lx2160aqds_tfa_defconfig index ddcf681255..9b6c7323cb 100644 --- a/configs/lx2160aqds_tfa_defconfig +++ b/configs/lx2160aqds_tfa_defconfig @@ -51,7 +51,6 @@ CONFIG_ENV_ADDR=0x20500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/lx2160ardb_tfa_defconfig b/configs/lx2160ardb_tfa_defconfig index d81a4b10b1..9bf92881be 100644 --- a/configs/lx2160ardb_tfa_defconfig +++ b/configs/lx2160ardb_tfa_defconfig @@ -50,7 +50,6 @@ CONFIG_ENV_ADDR=0x20500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/lx2162aqds_tfa_defconfig b/configs/lx2162aqds_tfa_defconfig index 2028bfc524..441932417a 100644 --- a/configs/lx2162aqds_tfa_defconfig +++ b/configs/lx2162aqds_tfa_defconfig @@ -53,7 +53,6 @@ CONFIG_ENV_ADDR=0x20500000 CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_SATA_CEVA=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y From patchwork Mon Jan 10 12:27:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577878 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=GyQSUwA9; 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 4JXY7N4Fzcz9sSs for ; Mon, 10 Jan 2022 23:30:08 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0BC458328D; Mon, 10 Jan 2022 13: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="GyQSUwA9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5C15B830D0; Mon, 10 Jan 2022 13:29:17 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 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-am6eur05on2062a.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::62a]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 8FAC1831D1 for ; Mon, 10 Jan 2022 13: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=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B3TlIhcpZhSqmxC//SKpkWxB1Va58ZFx3YFcEy0hxos1MQVoU6TgQr/XuhgAk2P2Y5d7Ujfh3C232jRBF3i4SPa0AjSxn5mayqPZLXTPdvR4Ifco/b3u9/VRSn0FWyR60OVqgnqXTxWajWROvRbTeAaD+gaMydRsgKovLfEywb1/J8MJ+9yf5A/yQNqel8cX0pMtEHuax1ktViUx279DZ3VNcmjr3eQ2vG8+A81t2yUq1umtyJT5ILagSVUa8yJpKgfOEfWHONQ9V8xfTwR0PnVpMTeQWv4FAmqcH21JdUBUtnRLrfkpNtH7LYQZKaSEI/J3T1XhWQGC28Sg+XvebA== 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=ZEqHrAsV39oHGtMRD7yBXuPbt6liX63UWc6tusecEOp4CFADu3uvgQ5XapDl7sFrn/RvpQUGzk2pn+AemQ8HQm+/SaJBEKJJTSz041TyE1lV3BFczgLMRP6HHaETF7XT22za+DapW5BrQ3xPMC0UWNKzoUUM5f9fGcx8Wy/AfVGx928bwLOkMhp13WkjB8Be3AijccjvpOg6GEPzQKwImv0RPxflzgoH+xiPcNDQPa+XooIsZc/NM4j6I8ulmW8iVu1vrLH8CsV9dhZKW0BN8sZ+uIDQ/Diek5JY7W598n/2SLNKHyksPQxj1QCOIAxC2eGRh29JQkpScRGOhsemNA== 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=GyQSUwA9YCzIvExVuDd4wH2HLIepwliIXg4jtzt/bAbmWHNf5x7Z+0cuG+jUJez/+VtVBIbUG+1PfXEykRgXGf+q7p8AiZwxvN/+OlV2U9UsYGppNPWZugeggQMjbc1NCSlfED0LgmDm2/XbssZoht3NI7FbflenwRkKInwyd7o= 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 VI1PR04MB4221.eurprd04.prod.outlook.com (2603:10a6:803:3e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 12:29:12 +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; Mon, 10 Jan 2022 12:29:12 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 13/15] PPC: Add crypto node in device tree Date: Mon, 10 Jan 2022 17:57:12 +0530 Message-Id: <20220110122714.20744-14-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: 88ae36a3-f263-428d-6a4b-08d9d434ce8f X-MS-TrafficTypeDiagnostic: VI1PR04MB4221: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: tgq1bI/YChoVDlnEZXAdQjctiQISOJ7cvlq1P9erTh6aEAGTUmalNDbh0GFWL7fVW/q2YuUlIBxdD584cFMu/sucLirKAJ7chh7N3i0NClidUi4qNfRmEqBKZSSE0SAfChic4+22ubOb/0wcHO11bsd0NGgWWM2Kjl2MjCXeJk/Gtg60Q98asf4YkEPIeJ3t4fpmXnWUHeWqsuvul52AEkNvBwyfyB2niZjbpNnGg6WWzCsQk2hV1Rgg/+6CZ/0PInE9R0RVy/dJHeVddq2vl4XcFBcIOKqXtWldkbXp4L7vBCm07BijJSzYl5wpOSRlz8qJZAUJ92DZ9K/AtOuZCqULqsM5mGpHE1YwXjzk0RKHXh9Azg7r9Nd1lwTNyi/U1+MJnRdWxomgeqfmZZL33ArMvwJy244iPk+X73+T6WdD3SBDckwN/M2/SzDyO7BsUfasn6fd0IaqquKwdFHjHBbB0AI0aAKAL08kYJm909VYwWk/n+in01DPH2svAyk8giOQC9aRfUb84z4bapSm07G4nKbMJcRhdQrLAzLJ5fl8Ibx+0CTZwqeIA7TEJzVLX7RWl4zKJ5L5xm68mfI/fuDC6fu+N0opZvd4lWrI1ZImJzb4vre/7i4zswd7OhMbcU+1/RMNAQIgHwkQEMfvWA9wdUA89ZNQpqlEhsygTgWkAINz5V/hnJlNVC2Jpbao6QMWbyyGQkkkqLVgimcHUQ== 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)(30864003)(54906003)(6486002)(66946007)(83380400001)(55236004)(2616005)(508600001)(6512007)(2906002)(8676002)(1076003)(66556008)(316002)(86362001)(5660300002)(4326008)(6506007)(66476007)(36756003)(44832011)(8936002)(52116002)(38350700002)(186003)(38100700002)(26005)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8Ubo8gj1N4r0dSqzNQb7HMZfDcA0hDE+plXZFqXxZxD1IL0q2JzKs3MH9gvmy1u92YM6rDJwctDsVxpJCu0wiSUA9mSoieNPq9dCzIKIBIH2nc5c+lIZTDEeqNb+9ek2rG3zIQUlpLADCQ9DYpBKYYphSqgHwNFmgsESgfxXKKt+lkI5AD9T9JfTOM3b2m5G5vec+t6YJrWCMdC77mRqKGUwXmIpktI65PJTLF/W/p7qaPjdaAEZdVrLaU3vP8SfS2JG9wUQlxh0/IHTWovipjTgidCtWeDKsQuhd+W+YvBt78lkY/2ZJk27DpcZOeUfqj4EMeQbzjRhI1Ji27DYrbwXUT1TKj1UYNco3NB3IjAEif5MMnomW5nCrzpA2U3kGT2hX450cmyRdssQFUR9bun7CncKjK/bYs30w+8aARfmTQiNMDv3dK+j/PF6Wy7wyokeiF1v/oysWITauCAhQAuc8jafilwPz4HrsbY6cfLS1uSUwyVp05au8P4nsZ77HZnrjFqUKP2uGoVgS/nqt3NQO5IpoxjWmDCxescGNqpl1uPsqqHi/db9v3DeOFHAZaEkYx8H5RxqFwK31mHqhZoeoqIQXbOWbCA6gV8a9XkWb7344mIRbJAHOXdedEJY0oyV1UJln0NYdHrDpQmyqXUSXbVtAJhX/x4aWQ0Mi6B6ywxethbILFw9sKY2X9a2KwFMzvYk8yQF+PJhfiejgi4d9KH9RnEJOFaGGuLc69HoMMuMDYf5T9O0wRetWTA9x4YMchp3HufdcT2BfVV0YufS3njbtiVF3eh7aghwUzQGZiu7uDA8BhgdXEharcBhn/6wMuM9cf8PxZIy5VCb+p74nTzAyl+EUNpsiJuAv6xPOYuI10YfQ3ahbZiKscpaByf8H2Kx7ULtbzFeyr1m6LMpMe6+nFcypeIsTUq84iu/j+2d/iUN5zfgb+KO/Vi+eqAJCzP/0py05t+YedwPraUCLiorZwwGdANcgGNOpYUwFngi1OoNOObq+AqWy4qviuPVXYwJ0u7ryabwOAJ+t/X1V+NC3+oUT8D431p65US9KLtcy5Y6I/EV1o4I4WJj8douJCupAKn0agZvu20ONsomNpUb8IYkbHMCbD1YxSmwp8AsknukChkZ/WVyb4Uo7FYFRbiGcEtCISJNF8LSPYpFh30A9S1h+0LaFwFvcGGSmxTSFfa1hiZ3oqb4MaXbx6Ps7QHqqpV8Y+fSj5m4GEwKAgvn4aeNTzMnuZzbkq3m/qEK5sr1qSyMskgebmPekUUCgeyY3bhNDmgRbQsi79GV9O2oN34xeZHjQN6fPOTdhlVq+MbHhkXMEOkFcMHYflz/GHCjSLlbV92Dx5V1y3yJpMadI4rNUs7xBkTSpuEQX/Dlir2sj2CZNn01QONVaYuw4FgPDsULYnX0PN7UN4vgnQKz7kUJe4CoETHCYbmabW2lV4pVJchCLTe+2fWaWj/NvaSv55PmjtL3D0Rgf1/FMz9YsupCThAIBMGcDsljD1IAn7VH5rt1BNHRYr6cWpUSbGqTjtKA1CJ8+q4KpS0Dj7QzBeujC+FffGLKa6/J0jya1dok6cengeeA82sH+qxpkWLXaHc9DenZP18/v9psQBSDWrFjSgqmvgJwuz8= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 88ae36a3-f263-428d-6a4b-08d9d434ce8f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:29:12.2747 (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: 9IUmvykB7fdUjmK331Kl4ADJmpoqNnAudof4Yucsd2KAQpXAPQIXaD4RALYquKYg5zPv5rPHKYAbL3MKs3JXcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4221 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 Mon Jan 10 12:27:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577880 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=GQFpIOkT; 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 4JXY7b1wWcz9sSs for ; Mon, 10 Jan 2022 23:30:19 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 46E6983248; Mon, 10 Jan 2022 13: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="GQFpIOkT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id CE1A68310C; Mon, 10 Jan 2022 13:29:25 +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=-0.7 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-am6eur05on20600.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::600]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 24E97830D0 for ; Mon, 10 Jan 2022 13:29:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nUcq4lyvNJZRrZWalyyNXY/jyLokUccpqBFFxfEVQiaP1zAwImTB5Q8GXBJlXhTfjotBmfDJY2bajMbXu8OuZZxVs3yRO9FmTN4iv9aRKywRb1oThiSWXGAsHyUn0dvePMLByf4IWN6x+cVjARjTPVaEZBdj4xprOLBnxfJaxjUhg+pV8ySYdE9sokrXaSmk6N8iymV160/AhguLObToiu04cjXtageM00u2LWNaPU5OOEvQHE037FR0F7N4iUgu/ixcM/hLR4NuG5LCLFnQ+Qd+jbwP310XjnwuPd+0UYp5VXeC4zTS44CQfZHUfcXTdBc4UhXZ92uHZF1/vLCxlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YgeHWlT2XCBz7zw1eqVDqneGT2PCLpv9t3VcMhVFkr4=; b=cA7AZa3SPQCKaesd2jy8wjDd9zPG24vdRjZRY05BzjR6+fvqa3OlYa0/otMcDcl3Hcg5Dnj4J8bM/sdekNtOR2dPtwwF7OLzzc8Cc5B795TbG5e7lpQh7cNYPYzOYnpX3sVZK55OxCxWXnUbqyKt7s2zyZpmg0DLCwjfKOouRf8O4TsclG3IgWEY08B5QiDdCJSSlTewksXhMBOoF5zdY6DoD4jyPSra/4wmlj0+2M46y7jeHZ4iaqGh4ZkHLN3FC3TarPU2z1e6gWCwyMncJeBKdwKJ1ot4cYI4XshHVL/z8OdMZimLsKtYEMJzUJ0F+nwMk4qiIEBZtq5RSP24xA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YgeHWlT2XCBz7zw1eqVDqneGT2PCLpv9t3VcMhVFkr4=; b=GQFpIOkT49DQDsZoc4vH5nFFHDm5RX1svqhIm1GbYQTZHmTE9m9wX2prQ3t1Le2BtifdQMijuBli0bBNg6eAPlSr3am6jCokOJTQ0gS/V7jpLLN2wVmVe/HKobn5PWvk0S4jcj3lo5HbX3SUNuthzBhR98VgpSbIUAH6DiqNGHE= 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 VI1PR04MB4221.eurprd04.prod.outlook.com (2603:10a6:803:3e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 12:29:18 +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; Mon, 10 Jan 2022 12:29:18 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 14/15] PPC: Enable Job ring driver model. Date: Mon, 10 Jan 2022 17:57:13 +0530 Message-Id: <20220110122714.20744-15-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: d8bf607f-1f3e-4565-8ba6-08d9d434d290 X-MS-TrafficTypeDiagnostic: VI1PR04MB4221: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: +GFbFd91JyaDY0m0kb4hci4W5blH0hUWQr/NOBonDzypGIPD6108E31ffLR4YzFiyV+d8Lln7HO2v9XGXxxfGom5LlhQaIgspOuu3ZapRXKpV/h3l9v7vWbYDqmCfU+75FiWtO2i3zF7wkniWaOGfN9bOelSrBLi5GOUFyx4f9U+QBFeTqIPBtIZer88YUV3K8oD08U3IQLTEw9bRB5p72k+S28LUkdZ47ncUpbvKNdvFBHz6QVlx8OuJb6lsq+RqaCSy0RbHq6NDleRusW4Y2W/tSFZZZfj7GTjxnNwgwhx5LfH4ESD7lyZoIBpv8UQ8n23A93ZP/EkWmg5bV2aydRZRYh0zup8jrBeofQEJm4CZvGeaU78YQFwTm2CYJhfDzWZX2QbfimlTVTSH09WBp41sJRvqbLmt41EZCXEXV98kBUVhINWpdpb5SZoQ1hu284XQVlkBaHN3atjpFThYB408ip+fbtIWV64qo4K+nLNv6aWJLJ7NObDWdadMNSn1n1JybgyIe5n/k16jZuGRKhvpADeRXRewd6MQLFuodwNi18lWFnWtVPIEEAoT4eVZETY1V/1I1ZOETq2JoQJwtGJmeBfi0e/CemQrZT7iSTM3G+ndJn+VKSRyahSg2AMsnzOt/Lv1e57HqoJwEuk+i4uXm6LuGJ6eNxuWrbuSI9HtBdwa1BN3WfhlMS5HzAXnxFtre9ZNIZGYWqQ2YzZUg== 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)(54906003)(6486002)(66946007)(19627235002)(83380400001)(55236004)(2616005)(508600001)(6512007)(2906002)(8676002)(1076003)(66556008)(316002)(86362001)(5660300002)(4326008)(6506007)(66476007)(36756003)(44832011)(8936002)(52116002)(38350700002)(186003)(38100700002)(6666004)(26005)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LO8QhcPkaG6maBlmSFM5GVPNbxW9FLoyQ7NgLVe8FLqWG44z3yU862GTKHthCci1cdf3S2imZDwKH9X6czEq4weuTFgPhDd1XWtK6SB2v/b6wVcXtk9ZkPhByUb2829r4QQd3Fx6j3OMCo5bBiDmpSvx3nM3hkCFyGy2oygpbM3WgkX3j3qmZe0R33BNa3oof/YL6DVq+1rI0cn/1PQauyFA29Gis/FBhhpKH7XR6P9u7PU1zrWARB2D7hSdr+nPSxgnB+CCPdPVQidOgerPEZtuAiUllIzTmOAqUsmz1y3Rq0z/zxX3VBX4VVFNDA4B6hnd2mLNwYMgf492lYohfLxVmBzPoIJ4TmcURi/MZhUYLWDLVmaLR+yfWPpAhze+mRZ+1OVpKYIyGA8ZRttdRqkqi5RlGpMlQDIklxvTm9LWdHWmRPBdj8/EeMvHA5AGsrc4w1DQTwBqG5g+qSQG5frS1+yJfYjgchvYzRdd27QHeTgiFWJB4gIGyxhvA6JGKgF9/yyGqDEtvqksAkpLqd7FRHHVLBHiFRZMbRRXzrXAR9a387TGCbuAt6Q09AZlP0iik3yUCQmeYlgh9E70nqRh2iqvKRMId1DhyJiiSTHqzqn7XkvOipJOHk4uZzLbTC3YV2Yk28iRYesqkEVAS4AqGwAoQ5Ds/EPGlUuawlEB2wBudX1lbwlWyl/BY1oOJekEqtPBBoNbmpDyMCSQT8CU+56PgGtCjNFukXCYV+1AlY/K7gxB6KYrNoYKkzTxmrNNhzZxr3/msmP4bjQXWkCmLNjCIwCcl+NDCuImik8qzcdzCPfi+r57GAqt/8IxQ4VwYeIhL0etiosXTf7EhFnJVZ6f74i4CzElg6Du4s3gxfdBTbZSxQJDyj5CKJ2EfjYFipWpBtM8RaLOdof9ssW1eajMiGNtzTDWw9Nu9lRGZnK1l2V8HkiC8Xvg0e23GxbVxWlRTixVzJxyq3Gtzzb9FHxqVFzTQ/j0tejSOCCDFp6w6MgTY+Y1M+j6bMcZINKpGZxoBZs2pM9I3SJ3h/z6oC3oSYwrt6nT4OCmvagAAdNDX/GHZjgVLEV3l+Ugg8dO8Jft6acfKpqbdyxhwAprNRs7CFQ9N79QXnO9Z7kfrfvvCFffbDsrgSPtZoD5oq8vMONI2bkPVSdcGQdWjlDsH8NkIu6p1Hcjdd8+yrV/wz8y3JnCr38Rvw+O1R0KbVbFNJDgNfYS/7MWvL6wvW63GzWiicrWtQr0+mBUV1FhJNjyf6Ko6B/L+AcP0ytlEzx7dILiitrHZwUWZ4LtYHXTFg4gXaQ6CHIOo9PdN+rajqXWN+tT/40k5r2s3dE+9+VZXpwJYkmgZCpS4nB65u5bJbEp1IPbUTjAk2HC3oZ6Iae7kJfP1SIzZeogEm9lKUdo/JgYqAeyWg1px6NWRTAT6Blm1U/PCPNBI5PvuWEbqYJ0pafaXElny8qfwGGHByC/3x10AzBoQeoohrkCg8NqbVwbx3mB0pQFZnTwm3S3v3Cog2yWCWxqqc4l6HfTzyzZWmghRkgJ00Dg4kByJZr4QbAepEE64ae12grWHkj2rJqE4bleT40wWzNDD+/jP2FjmeEq9IgYVTQDke9vo41bWsHHAUswqCmQJun4UB8= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: d8bf607f-1f3e-4565-8ba6-08d9d434d290 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:29:18.8055 (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: FdcvbtbZKlW4vBwwB4VA9udIsJfT3XfkECS1hwoG3kJa026CAm+ndAwlus4+rmjWKYnzchRI23aXHahqQ0z/Yw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4221 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 | 33 +++++++++++++++++++++++++++ arch/powerpc/cpu/mpc85xx/cpu_init.c | 17 ++++++++++++-- arch/powerpc/include/asm/u-boot-ppc.h | 17 ++++++++++++++ arch/powerpc/include/asm/u-boot.h | 1 + configs/P2041RDB_defconfig | 1 - configs/P3041DS_defconfig | 1 - configs/P4080DS_defconfig | 1 - configs/P5040DS_defconfig | 1 - configs/T1024RDB_defconfig | 1 - configs/T1042D4RDB_defconfig | 1 - configs/T2080QDS_defconfig | 1 - configs/T2080RDB_defconfig | 1 - configs/T2080RDB_revD_defconfig | 1 - configs/T4240RDB_defconfig | 1 - 14 files changed, 66 insertions(+), 12 deletions(-) create mode 100644 arch/powerpc/include/asm/u-boot-ppc.h diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 836aeddbe2..b05c372086 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -25,6 +25,9 @@ config TARGET_P3041DS select PHYS_64BIT select ARCH_P3041 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -33,6 +36,9 @@ config TARGET_P4080DS select PHYS_64BIT select ARCH_P4080 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -41,6 +47,9 @@ config TARGET_P5040DS select PHYS_64BIT select ARCH_P5040 select BOARD_LATE_INIT if CHAIN_OF_TRUST + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -102,6 +111,9 @@ config TARGET_P2041RDB select ARCH_P2041 select BOARD_LATE_INIT if CHAIN_OF_TRUST select PHYS_64BIT + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply FSL_SATA @@ -117,6 +129,9 @@ config TARGET_T1024RDB select SUPPORT_SPL select PHYS_64BIT select FSL_DDR_INTERACTIVE + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_EEPROM imply PANIC_HANG @@ -126,6 +141,9 @@ config TARGET_T1042RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select MISC + select ARCH_MISC_INIT config TARGET_T1042D4RDB bool "Support T1042D4RDB" @@ -133,6 +151,9 @@ config TARGET_T1042D4RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply PANIC_HANG config TARGET_T1042RDB_PI @@ -141,6 +162,9 @@ config TARGET_T1042RDB_PI select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply PANIC_HANG config TARGET_T2080QDS @@ -151,6 +175,9 @@ config TARGET_T2080QDS select PHYS_64BIT select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE select FSL_DDR_INTERACTIVE + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA config TARGET_T2080RDB @@ -159,6 +186,9 @@ config TARGET_T2080RDB select BOARD_LATE_INIT if CHAIN_OF_TRUST select SUPPORT_SPL select PHYS_64BIT + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG @@ -168,6 +198,9 @@ config TARGET_T4240RDB select SUPPORT_SPL select PHYS_64BIT select FSL_DDR_FIRST_SLOT_QUAD_CAPABLE + select FSL_CAAM + select MISC + select ARCH_MISC_INIT imply CMD_SATA imply PANIC_HANG diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index e920e01b25..728c6447a8 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -56,6 +56,7 @@ #ifdef CONFIG_U_QE #include #endif +#include #ifdef CONFIG_SYS_FSL_SINGLE_SOURCE_CLK /* @@ -974,8 +975,6 @@ int cpu_init_r(void) #endif #ifdef CONFIG_FSL_CAAM - sec_init(); - #if defined(CONFIG_ARCH_C29X) if ((SVR_SOC_VER(svr) == SVR_C292) || (SVR_SOC_VER(svr) == SVR_C293)) @@ -1014,6 +1013,20 @@ int cpu_init_r(void) return 0; } +#ifdef CONFIG_ARCH_MISC_INIT +int arch_misc_init(void) +{ + struct udevice *dev; + int ret; + + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); + + return 0; +} +#endif + void arch_preboot_os(void) { u32 msr; diff --git a/arch/powerpc/include/asm/u-boot-ppc.h b/arch/powerpc/include/asm/u-boot-ppc.h new file mode 100644 index 0000000000..372ca3e037 --- /dev/null +++ b/arch/powerpc/include/asm/u-boot-ppc.h @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright 2021 NXP + * + * Gaurav Jain + */ + +#ifndef _U_BOOT_PPC_H_ +#define _U_BOOT_PPC_H_ + +#ifndef __ASSEMBLY__ + +int arch_misc_init(void); + +#endif /* __ASSEMBLY__ */ + +#endif /* _U_BOOT_PPC_H_ */ diff --git a/arch/powerpc/include/asm/u-boot.h b/arch/powerpc/include/asm/u-boot.h index 19b3c0db5f..36af8e5403 100644 --- a/arch/powerpc/include/asm/u-boot.h +++ b/arch/powerpc/include/asm/u-boot.h @@ -21,5 +21,6 @@ /* Use the generic board which requires a unified bd_info */ #include #include +#include #endif /* __U_BOOT_H__ */ diff --git a/configs/P2041RDB_defconfig b/configs/P2041RDB_defconfig index 7b430f69e2..7c82812b28 100644 --- a/configs/P2041RDB_defconfig +++ b/configs/P2041RDB_defconfig @@ -34,7 +34,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DM_I2C=y CONFIG_I2C_SET_DEFAULT_BUS_NUM=y CONFIG_SYS_I2C_FSL=y diff --git a/configs/P3041DS_defconfig b/configs/P3041DS_defconfig index 821a7c3bc1..fcd0214c71 100644 --- a/configs/P3041DS_defconfig +++ b/configs/P3041DS_defconfig @@ -32,7 +32,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/P4080DS_defconfig b/configs/P4080DS_defconfig index 564f28caba..723ef1c457 100644 --- a/configs/P4080DS_defconfig +++ b/configs/P4080DS_defconfig @@ -32,7 +32,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/P5040DS_defconfig b/configs/P5040DS_defconfig index 79c6e466c7..0a13763d71 100644 --- a/configs/P5040DS_defconfig +++ b/configs/P5040DS_defconfig @@ -32,7 +32,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y CONFIG_DM_I2C=y diff --git a/configs/T1024RDB_defconfig b/configs/T1024RDB_defconfig index 3ed1c6db4b..f8fbee2e4c 100644 --- a/configs/T1024RDB_defconfig +++ b/configs/T1024RDB_defconfig @@ -44,7 +44,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_SYS_FSL_DDR3=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig index f1ec400636..62cb8c4a37 100644 --- a/configs/T1042D4RDB_defconfig +++ b/configs/T1042D4RDB_defconfig @@ -35,7 +35,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=66666666 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080QDS_defconfig b/configs/T2080QDS_defconfig index d76547ab63..c5b0c28391 100644 --- a/configs/T2080QDS_defconfig +++ b/configs/T2080QDS_defconfig @@ -33,7 +33,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DYNAMIC_DDR_CLK_FREQ=y CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080RDB_defconfig b/configs/T2080RDB_defconfig index 610f706473..cb8d5eb69b 100644 --- a/configs/T2080RDB_defconfig +++ b/configs/T2080RDB_defconfig @@ -38,7 +38,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T2080RDB_revD_defconfig b/configs/T2080RDB_revD_defconfig index f8f459f27b..b3712be552 100644 --- a/configs/T2080RDB_revD_defconfig +++ b/configs/T2080RDB_revD_defconfig @@ -39,7 +39,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133330000 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y diff --git a/configs/T4240RDB_defconfig b/configs/T4240RDB_defconfig index c66b152d20..b57410bf58 100644 --- a/configs/T4240RDB_defconfig +++ b/configs/T4240RDB_defconfig @@ -30,7 +30,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_ADDR=0xEFF20000 CONFIG_DM=y -CONFIG_FSL_CAAM=y CONFIG_DDR_CLK_FREQ=133333333 CONFIG_DDR_ECC=y CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y From patchwork Mon Jan 10 12:27:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1577881 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=R5244lOu; 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 4JXY7n3dP0z9s9c for ; Mon, 10 Jan 2022 23:30:29 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CC2A18310C; Mon, 10 Jan 2022 13:29:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="R5244lOu"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C8FC3830D0; Mon, 10 Jan 2022 13:29:35 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.7 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-am6eur05on20609.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1b::609]) (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 80163832DA for ; Mon, 10 Jan 2022 13:29:32 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dwrrhLwtaKpRbHsyB4vC6TrEHFKghJkVFh0MJGfbwDsmykbgVYXR9IJTNtf2m8lprXof4ZjQDMgi7Pgj3fBC6UCNeCScq1jMyW+r2f4RbQhdP5QxgM5Jboqu+MQ4pbXg94+875K1ryKnyEu9USbSAF+8KU1VC2D6pQQ+ydxalvMMezqwCHltK++5Iv0Ah4yYlxMmshwviOQPS6XodZPUk0pCUW8jl/TUi6JxXrg8xkCz3LPSInxOu6o8BJ7fvSnMtQwtrKYAjnmU5f/AnwZXuSCy/SIoECbehCdfqjdcUarS7+WGa6lokOaIfDM4SaT+qgPOSpQHVRgtZOFZdr0DnQ== 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=a3tym1xyEX3tpH3n9KHqlJy9284cZCy6v3hxeCejjW0=; b=EyXtoZ0J7zRfgeR+uFVPBG6QCMGNISWrwc8KZOrB/pE/clZlCStaQmIp0Yzniy+nmI7h0jwSq9/tXiK61ofAujjEtWeIXU4eRbTdAffX7xkdbZiDPF9J90H0sDi8ckyBRMQkPXTYwo5rAwSnVcXbfVOhVhYqYs+GQmORxHH4dQ6hu5hnph4JxFbyxq1TnSEesHERahm1EAyf17KTGYXNijBx8RzmVYxjKp1QTyD+ZsG6CkiZVj1b2DP5xEowAqXCeNciWklu59jw6hyAdhlvMy2fThbFl8GPxZWCOH5NVGDCP+Z267hFHg9WsDPih3y+b3A1tAVfNLnO40rCKoM2nQ== 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=a3tym1xyEX3tpH3n9KHqlJy9284cZCy6v3hxeCejjW0=; b=R5244lOujTKW8mDTZWNkBfWHCIOKe7N6KZlRXvbLYxwm35dmD9T4wRQ5PYz03sli4VWBllH9C8HrJlOybY/vyRLTEONEK6qKN3o8I4+7fds+7u1Sc0JaS//tok1syeJ1WW0D34EZ76Mha8TGmdSNKR4kQxBDl58EmJtEwlHQv60= 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 VI1PR04MB4221.eurprd04.prod.outlook.com (2603:10a6:803:3e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 12:29:25 +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; Mon, 10 Jan 2022 12:29:25 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v8 15/15] update CAAM MAINTAINER Date: Mon, 10 Jan 2022 17:57:14 +0530 Message-Id: <20220110122714.20744-16-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220110122714.20744-1-gaurav.jain@nxp.com> References: <20220110122714.20744-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SG2PR06CA0104.apcprd06.prod.outlook.com (2603:1096:3:14::30) 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: f1aa2b75-cad9-4d71-9c97-08d9d434d65f X-MS-TrafficTypeDiagnostic: VI1PR04MB4221: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: 7LvztYynaQy+Y/cRhfic60Ycuwo/5pVcSmeyssS2c7w9XIZYFjCoGKyATssCRzpFqKN8PYZnLLtm8uvA2FqWIpCHmC+3IEY5dEKX4tz8aYIWgWMM4rUOLRFNe/Rjuub9TMVfigYpXNYNR1ceo62HS7+5vZvrj4YerQ9aceQF05o4y2Zvw2b53w5xJBAhHWcLaLtR69ubumi6Px6Xvdni88fxpgSlSjz4ydClBYYivHvA+EbzwLRuwiHVNy16orj13zb+5+qm9yIMTcH1/LP3fgKslXliu6kWVCLuKzqvQoe07rIwVnkMjWf9LH/vlimN4LudV77t5x415I91YUFY9ZW0G+jUVnTmdEfrRtouZ3jyDXpF8syRjr1eNIEAyhH9dcutp+X4wDEVFdJNNDDnZnRoEfEQR4upr5FdDYWB6QercMoHURBGUeYj7eC+XliC0o/2qho+k+fInucRd85rjGwYEwrTHvE2oE/0cI43xm2LqwKdhhQH7SSg35M3vsjW9L63ElBRqVvJncYH0rw+17XousPsr/KFYz8lBSYia0t40dplP1BgOTRCjOE9EpXgW5CJ9Z4LQhv1YJEz2azGgO7ojsn7TLyJIKIcbko+6sGKGzFHzLC4iXf9f2PJTL+Vc44ZSJGecqSD4JxviwGDv/smWyWuIbCnUneSt9gR2gqEra99BvbyRzqwbq5MiauhNN4pPi+kSWVFMpq5VmFPM0hcecLMEaiZD00CHkVXGCwpPDddxNHUknNuIziVC2meie6YFYWLrBZTOwcOsZ6cwaO6uTig1bpbvVHymO+fBPY= 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)(54906003)(6486002)(66946007)(83380400001)(55236004)(2616005)(508600001)(6512007)(2906002)(8676002)(1076003)(66556008)(316002)(86362001)(5660300002)(4326008)(6506007)(4744005)(66476007)(36756003)(15650500001)(966005)(44832011)(8936002)(52116002)(38350700002)(186003)(38100700002)(6666004)(26005)(6916009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: +igtgw176IYDGy7PbDM5Mk5rE38meG3j1KbH5LRl2sgxFfj8vquk9PvdIg9Pc+TjNydvHXWHPugbXVWZBbTPpiT7x/DS1JTRmiVFneM5sINnLhzIwrkppiHcyQ02LXslPv/zJl4X+e4VLcV1sxg2Q/qbeTPhCR+2mOvZZybt24acbYqy1VkGHHXCylSNtZ5DnKDVqmH/Zsby5CyoaxNDF9uk9mgTPEovP+Jl1Wfgcb/BRqJYljee/Ypq6HubNeH2GFSjGyNlKd0jwpQhs0lIXnwYzqWnpArFtlzNKFSxOJpyFjta0y5nC4QcQ9eBRYIzojZoNYpoZqSsG8vyO52k+OXOy6XKWskflnO3i2xpFZ6CzKsgEf51PjhhlemrfW1+nAa3zwd2T4jL7REev8cpR5o0PN5HtILc5oNhr6BIpFt88dMTlQhoTMby/lVH91au5Ffc+6QOMd8TQJgwD01f6roUxLrgud0OaGFyaGvP1rs/9tV5qXI5ocGm3RR9P8LkGTPgPruKfgdbPtU3DnITATz9Vb4JHdbixCcF9Z04sQaOsk2fbiuNCbAGJaAXH6kDA4Rd3EHEHR7Zsw3HpRM4AcjxewglFThNLPkPCWQB3pvt85kUmciJOfSu1/ba2B3C6Ki6B+TFqOvBl+FPaXW7f82FECfMxv0qcUHQW8Gp8nnm610VScleR5rs6x5upw8K/Eul9QXvnRg8wdhzxGQyKryutxhJbL8pMVGldRlTLwapz0Cg+/uIgUJptH03HIg2Vcwq72iL0ZNdMb/4yRL91gJiAWCqkHeJkFAFFXVCD8jHj/gktqxkmeBndpN9vOIvMTmMZ4SOvsPwkifzc95zdGtTGEuNB1+RQzczgvOE785ZztnLA6ogfKRxMiUVC7LCFSCHI2dbYkmUQA0YS3fRXBoYboqausSSB9K3CSBeKLt/+rE1Kfv5EE8cMHPRCXyezhdaPrtlQPQz+2W11jYy0k6Qf8Y5BX333+V9O4QQeBiv7+jHXdC+8FHqap7i0/YNroUhPibAaivKpDx6bN8Yy/bkhE17h+GLDT8d4GDz6QC/f/5kwrwt5KdhUwy0+j3nAnIuK7PxPaRDA4jFkXKa+5PbDqAtNGfnBNaNxjnap5pdEcg5gYZOH7YRlsLryfaaFfGQ+WZecPATqZ+82Kkm8h6dgHJhvbueyt4Xud8gaM9JqK+hWFMJD9lcbaN3ytQQ26x4Y91/JjLYYO7gsTniLbtngBXDQ/Kp5Ss0o7ZIilo1Pqeytk8j2iy22nijA75X+eSrgH2B804wKuFejzjfBprfUCjdLhmAzBX9QpA1yVIt7/v+iEAhnwBkq3HFdEA0SS1bkIY/l0fBzZW3QCIKv+bR2A6bhgO74TOLHdhGE6qG28MNrMpWSzVhnTcZ2R7NRSWB/oevB08Mjk7owbFxp7NN0xGPfuda7GEpq1PZ9QFi2dNsAQZ7Mm23K5/khGsbvTxE/Svb7X4iS+4ZjPUy+He7TZrf0BBf+2soo9dkPHdsorAlCGPRUdliTfFKdYpjRLmfLRyhm8HImIrEo+RB2XRs5TdCN+bELFm2nDj2ApEWPp/At1dfDzpQRWBBrZsIiKWDaaOVTduNa17xlz341jVscVj80cjeyYfx0WVpP2c= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1aa2b75-cad9-4d71-9c97-08d9d434d65f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 12:29:25.3363 (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: HxhayiSCoqECjPQ0g7Ds+ysUhgRduxW+CkXx05bfunlQ0/utVYDfXOHxT1EEtA4S/wbZ4WeOpZGLmOSL02YQcA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4221 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 90666ce376..622725aa64 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1312,3 +1312,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