From patchwork Tue Dec 7 07:41:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gaurav Jain X-Patchwork-Id: 1564518 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.a=rsa-sha256 header.s=selector2 header.b=FsxyL2N+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4J7XNL3PXgz9t1r for ; Tue, 7 Dec 2021 18:43:30 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 27E73830D5; Tue, 7 Dec 2021 08:42:54 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="FsxyL2N+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BE81A830DF; Tue, 7 Dec 2021 08:42:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, MSGID_FROM_MTA_HEADER,SPF_HELO_PASS,T_SPF_PERMERROR autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on061e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::61e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 446D482F56 for ; Tue, 7 Dec 2021 08:42:42 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=gaurav.jain@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nffnyWjasgGJVOJsfnDNRU1MU0eYQrAii2APXTKTA/3CNKBJ36HyT6iZfaNoPBorbnrO3cqiE+dO4O9FsuH10fvo3oR0zp5wnmfUmXLT5HTlpmLj4EOd/wmHrEZoKp2fadWTbEviM8c7vaMt9jUx98UqPClrIrr1tIyLEwOggCutONhe5N1sUDI36BZRVnpDIcpvV6ySBtbdCvB0DQwgeTbNCZEZfFAWTUJxi9oJPZE5WowoxiMimxUldPmppDQcxg215yMbSxRT7wC8O3iDfx4C2H7ci9zS1TyLYYuTY22EGw/LqmZlv0iR+RPJlwrxXpHTinaf8G7mW2ABDz7BIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kCAupizY5yefzEq1F3koxOrC1zdnUIV5QvJepTDtwpQ=; b=HlJ8utT3dk3RSa4YWPNMMaI/8ZqTB4HNo81CuSeWu2tCy0Srro11C9U87xcQJcUttqswhKoTeCDS4qt7BhZAMXlctdZ/J0kfDbXjHZTKrR7O9R7Zu3O97+OHFxulMKaUG797JgORW+WkKs2PVq17O/m7hXiCZu635dOfnfOFH4fq7Js8sEMI8b0OtR910Zn2fd7aDKXAeSb0H449Yho5AhKJgyy0mbfRqxNXIjXkOSPXkWjOmXjI4wQF0i3eiL6RdJgMKBCRP4sEuWKstIUJ/1u/JKQ1zED30Et8tsh3pz4lR0/bOgP1VXos38nSRZLGnDvSEN9RGuojtqZZOtsTgQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=kCAupizY5yefzEq1F3koxOrC1zdnUIV5QvJepTDtwpQ=; b=FsxyL2N+lPVFqGQDBB5jwSiHWaGvapdC9qaIkcn7bfYRz1aE5S6rmOEs7XV5JfWMQY+vPr45baHCxvHw+GFieRyqV2Qqgi59aaLs2JVYashKtlgfhZLhI6A1G2YcPR25+5CNClTE0kN53OdfoY8cwz56UjHFpYMHoBwtMYOUgCE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) by VI1PR0402MB2864.eurprd04.prod.outlook.com (2603:10a6:800:b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11; Tue, 7 Dec 2021 07:42:39 +0000 Received: from VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb]) by VI1PR04MB5342.eurprd04.prod.outlook.com ([fe80::9c7:29fc:3544:10fb%3]) with mapi id 15.20.4755.022; Tue, 7 Dec 2021 07:42:39 +0000 From: Gaurav Jain To: u-boot@lists.denx.de Cc: Stefano Babic , Fabio Estevam , Peng Fan , Simon Glass , Priyanka Jain , Ye Li , Horia Geanta , Ji Luo , Franck Lenormand , Silvano Di Ninno , Sahil malhotra , Pankaj Gupta , Varun Sethi , "NXP i . MX U-Boot Team" , Shengzhou Liu , Mingkai Hu , Rajesh Bhagat , Meenakshi Aggarwal , Wasim Khan , Alison Wang , Pramod Kumar , Tang Yuantian , Adrian Alonso , Vladimir Oltean , Gaurav Jain Subject: [PATCH v7 06/15] i.MX7: Enable Job ring driver model in U-Boot. Date: Tue, 7 Dec 2021 13:11:20 +0530 Message-Id: <20211207074129.10955-7-gaurav.jain@nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211207074129.10955-1-gaurav.jain@nxp.com> References: <20211207074129.10955-1-gaurav.jain@nxp.com> X-ClientProxiedBy: SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) To VI1PR04MB5342.eurprd04.prod.outlook.com (2603:10a6:803:46::16) MIME-Version: 1.0 Received: from lsv03326.swis.in-blr01.nxp.com (14.142.151.118) by SGXP274CA0016.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b8::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.16 via Frontend Transport; Tue, 7 Dec 2021 07:42:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9d1fa9de-dec8-4a64-adbe-08d9b95524b9 X-MS-TrafficTypeDiagnostic: VI1PR0402MB2864:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:480; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5otqkn+ApoS9tqWyl0xd2kyVbSg4y+sauREYsRoz/cpaloYHGSNvYn7vtxFZ2tK5JZbb3Px+YM+kU+VSQqOI5/T/nu2XkjQ70rLSud4Eok9HYn6tk3pgkpFvM4oHTAIR0JGwi95q2emZ7XbFIjCVZrQThdgCVoS6tzmdC7C2ZnyrVWxtDGselSTEE5jwusRnANjWbVHu/vAxOxkHLvXrwhRwVoMcxJALP3md9hySY8tUAAp6V12YAUj6EeVzEPNxW88fB/qCcl/8oX1RTeOn0SajWNoTum3VaMD7XThiczAQEaAWL5JpmDCCxcAoluYlymA4PHxxEkYuXIfaR6CWKoWDC+TwH5hLsV1/6zpIPAsSLQCG6wSalubxjNC665Wceljl7OcAQmGQf1Pqa7jvKMFZ9VKUv39D3qeBCERWYCRI6/DtB6SwTUnjRIJqrL7V9OV+FOoCXbI09COKua7+TBCZqCX8NRUvEQqbrkAAdfu1RHAo/hJmFTstz6lWkbZEEzD3uLj8vZO4yPpWsbsVOEq0tN9sppb3T6yh8qtU9DpqdVsPSt453C8w3ja5lHvG//DQj4El8LhCBfknmBPS6UTlyX6wHwlF3x3pKjUQXlmDG7u33vKQBkPDMYlN8mWieXDIeB1ubYH+TfPm3gAuUjeFsiSRGy40psicoxpiuOqK9zp5kKlUyEJu7bHqA/YiYYLmEPKBIGtkoyfmyYjlkv/5Ni+YeI+7ULAM6f8KOLdEudKx3hloGKG5wddvgy1g X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5342.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(8936002)(44832011)(66946007)(66556008)(66476007)(6486002)(8676002)(86362001)(508600001)(38100700002)(38350700002)(186003)(1006002)(6666004)(55236004)(2616005)(956004)(83380400001)(5660300002)(4326008)(26005)(52116002)(1076003)(7696005)(36756003)(6916009)(2906002)(54906003)(316002)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rn9mvVLeXOA+UYjyQVKfWx0T0oOibfrAHgfd+nxv3dVs1wAOPKy8aIIil++55wXRAugytIED0HYeVTK5YnANKfmaVOjTFeLrGhkYY/wOseRpGZNebOvT2kWL1pfv2qfODktGBxDK6rTT8aHCtkGcua2dnTZCxMbru1Y57sca1GofGS+lGe4lqdkDX/frgUfDBhwRRPVGwG0R03XgXculf7utDfZqeeDQiGt+jkqHen1z6n79NByUuM7YM7CTIj4WXH0MbwyfCz0YYfcD7cPqR4qDSJ+jjOTz3+FyILycN2seweZyjZKX0gBELiA125gfhYnzhTlulZfECcg1U8H4jJ9T7kL1gXmUuIe4iSb/9LcOYcykbZ1Cex811yT+tzU1PkvMSCNL5I9JCLLlyKp2t6DKu3dAlwUEhKLWosGIrEpIG6BG8ZlbnbC4t8lMI0owS/hqer4+ySI4bO2uxB3aoGTPm0LotrVl4WZo7qps7XdCfcXa5rntArhHuzZFXQ03I/gM2VmAV+ZXc+MxgVmtg+GGTy1CHIJLTQcbLGciFqIe+hXg+bj8W2TJZI32XQJhptnnGR5iPXMjO7ix+Mc+Ut72V0VZVtTwloP65sWlPpbCGqUkGwO5vIjtdF5j+Fwgs+B1yj+RCZs+VYnV1XL5nk9UgWwAV43qxs4tLB/6cVnVG3MVF0ANIG1ZNbugZNEMdJykDwpADmb5jOkDx6MPgq08v0XTI+1GWY/jRtORm7YwikKIjWEAt6QiOqOslrIgs0X+YWxmGrNP9935hyrb+TcPqN11JD2N5obFnyFraw7ICcYwzo1uQNOukqoT1La8HGb3Bz5L5psDItbaZP7fsys7BasBMSXnvyrAXtPePenRBmggSor4k4eMLEEMuNTaeS0pl00MYoQ3oeyS8A3sxXDAIGDvjJ2Q9Amfox2T3IQR43wJ7QqfxaTwoswVm1utSiWR36MjUKCfOjZVOk3geBFKhWOLG4iySrIvz2sofrR+cBGasBrDVw/aEpHbR0uX4D4gizyd40i3CvGm9sE3EozNgT33udtooqrY1DwXV0nhq0+eVH8nNGV/myo0qRw4yNuN8GPriLdSYdmyEmyrF6R8YTqp8u8IB73OMySYJZndFJ3oyehFh2D1DuPbnvGNWvFIiDa3YaaRYAdhMkoAPA8qIO1jjk/dFyvJpxUQ85n8Lh1ulL33rczWi3exNWAR0gHyeOoqhdyQvRLDbYHIb9vmzXqfB6OvbqsVMyO0TPtrucH458ansA6CjFnwVb/TBOegSaRn2/X4W6NToE8xKQt+HarYsEt/6U7AZo4vxpaTZx68n1cZc/hSPRj9pqH/Te50zShXtcDnPQXwrcaveYf+HDujmEUBQk5gJbnx3t3QxOfn7Rr70ZAlmgh8MpK63QMGhuik1rLZqtclLX02SV8NN88IuEK13RmjcFT1WKF6Om2N+XIji8RGwSZ1DJQAbZjglgb9yLAUSVI2r+yYTyGL+X60pONJspphO9RxLdgnMZU9XTzZFWhlR5nX5UpM92XrY82xVlEdvvB1oYb8qz2uRKHPNPRxNu6cJFPtZTztqRDfp6GUlOXFaaxxuKCg5y1UsiYxg4GQnSa/1SYqjL4/Ru1CjsTi/Mi5JVASeIc= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d1fa9de-dec8-4a64-adbe-08d9b95524b9 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5342.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 07:42:39.1411 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YMetnLUEo5Y10UaMVUvfeZ9g+W4QFaMcRnn4Lp8ipLw7dXOXrhK0hwkJgp8zoR6EXUJfU+gxrd+ygBfcDww8QQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0402MB2864 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.38 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean i.MX7D - added support for JR driver model. removed sec_init() call, sec is initialized based on job ring information processed from device tree. Signed-off-by: Gaurav Jain Reviewed-by: Ye Li --- arch/arm/Kconfig | 2 +- arch/arm/mach-imx/mx7/Kconfig | 2 ++ arch/arm/mach-imx/mx7/soc.c | 11 +++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 550f884077..516e1b5a8f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -883,7 +883,7 @@ config ARCH_MX7 select CPU_V7A select GPIO_EXTRA_HEADER select MACH_IMX - select SYS_FSL_HAS_SEC if IMX_HAB + select SYS_FSL_HAS_SEC select SYS_FSL_SEC_COMPAT_4 select SYS_FSL_SEC_LE imply BOARD_EARLY_INIT_F diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 0cad825287..b2d532dacd 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -68,6 +68,8 @@ config TARGET_MX7DSABRESD select DM_THERMAL select MX7D imply CMD_DM + select FSL_CAAM + select MISC config TARGET_PICO_IMX7D bool "pico-imx7d" diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 21690072e1..6c991a6cb1 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0+ /* * Copyright (C) 2015 Freescale Semiconductor, Inc. + * Copyright 2021 NXP */ #include @@ -19,7 +20,6 @@ #include #include #include -#include #include #include @@ -337,6 +337,9 @@ int arch_cpu_init(void) #ifdef CONFIG_ARCH_MISC_INIT int arch_misc_init(void) { + struct udevice *dev; + int ret; + #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG struct tag_serialnr serialnr; char serial_string[0x20]; @@ -353,9 +356,9 @@ int arch_misc_init(void) env_set("serial#", serial_string); #endif -#ifdef CONFIG_FSL_CAAM - sec_init(); -#endif + ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(caam_jr), &dev); + if (ret) + printf("Failed to initialize %s: %d\n", dev->name, ret); return 0; }