Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 59351C636CC for ; Tue, 31 Jan 2023 08:47:35 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 556ED859EF; Tue, 31 Jan 2023 09:46:26 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="Y/FShJ85"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 223BC8599F; Tue, 31 Jan 2023 09:43:12 +0100 (CET) Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2085.outbound.protection.outlook.com [40.107.247.85]) (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 D4AB9859B9 for ; Tue, 31 Jan 2023 09:42:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ye.li@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JY/8A3jm11u/206qfZ70kMaKJx7C/rXvUN4Xu5N+pLoaKvXD4hA5K3AiYv8WHCK8Kx4hZXkAi66pzL9qrFCeOHUkoZmrs4YXGiXiTSa5Ba/xdtjYzfDulZ4JLZZXcIfla/65q5g6rajTL9A+sAkSh/aPJOcch/cYydeGI2oo2m55Q3+D7rrToup6IQYDnuk292N00I80932liIfASc0bwZgAqhX719y1W71u4F7juW6vQg7MPUU4zYeJIDcldSd8YQ91PlJVJED82wnDqei5MoXvJ4QgN9UvAH3n+MSRjuwjHUqDZ9Azuw2JgBzVRaK9/ePX5tcDRmLo0s219J/9bg== 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=5xdw3unmXhBeqgGrmbUUgvXRGq4D+3B9PiyuFgmS86s=; b=NTCFl7vrNBEr7xvNoLjOa7gei0PkDMmRv0VIZUDSn6rSTRXeF3j+F5BCl/hJf0SEA6zqoHUQkw/ohJ84AOSrairvkXZFnOQvL1x0WS8HDEq0qrNWIQk01kbBFbun8NuRPZs5uc1/7F/VxW6mot2VSjsxGIffRk40t8nN1EIZUBVVI7PDwZOsa1l16RphXmYGM17xTfDSSBovqYIhamlHfhFkHpbpA5pKAdDcnQY+2mwA68b2U2n0KjUyGC64ZTFUGDkPFGfbyj6kDZEa84sBQZzKedqR5oervuXI4nBeJ9Yg0d6h1j2nSToHWIYF5L1feEcZ+EMtm1HLT/uBjgaVEg== 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=5xdw3unmXhBeqgGrmbUUgvXRGq4D+3B9PiyuFgmS86s=; b=Y/FShJ85IhzebdCX1EmdggIgt4F6Or/Ckri1P82G5Yru9RyIyjJru9ZIUN3v2o+fT+Mv6hlX89f+WEYQgYq7lEN6OUQ7MvqbjqowIsHCiR8TBIT5Uqwqai3I2Oxm8zV6/EUW/1OfJpNFBG2NPitNUP4i96lIQIiONgyWoJV9Rac= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM6PR04MB5302.eurprd04.prod.outlook.com (2603:10a6:20b:7::20) by DU2PR04MB8998.eurprd04.prod.outlook.com (2603:10a6:10:2e1::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6043.36; Tue, 31 Jan 2023 08:42:58 +0000 Received: from AM6PR04MB5302.eurprd04.prod.outlook.com ([fe80::1582:1a4a:3dda:50c6]) by AM6PR04MB5302.eurprd04.prod.outlook.com ([fe80::1582:1a4a:3dda:50c6%5]) with mapi id 15.20.6043.038; Tue, 31 Jan 2023 08:42:58 +0000 From: Ye Li To: sbabic@denx.de, u-boot@lists.denx.de Cc: peng.fan@nxp.com, uboot-imx@nxp.com Subject: [PATCH 02/23] imx: imx8ulp: Get chip revision from Sentinel Date: Tue, 31 Jan 2023 16:42:13 +0800 Message-Id: <1675154554-88217-3-git-send-email-ye.li@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1675154554-88217-1-git-send-email-ye.li@nxp.com> References: <1675154554-88217-1-git-send-email-ye.li@nxp.com> Content-Type: text/plain X-ClientProxiedBy: SG2PR02CA0065.apcprd02.prod.outlook.com (2603:1096:4:54::29) To AM6PR04MB5302.eurprd04.prod.outlook.com (2603:10a6:20b:7::20) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM6PR04MB5302:EE_|DU2PR04MB8998:EE_ X-MS-Office365-Filtering-Correlation-Id: e1da66d8-89aa-4317-198f-08db03672792 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GfnoK3MpARDeYlnjKqcx6aqh+mZHFY8JwgvqFe9edGRXMh+sUmwpV1qgUBBOjJeUXvEvV4iKNffgZ+XVZvv2WUMlIba6ajubqzl2ujFZJfN7S+CRV2BfZFeY9A14fXUz9jTxApSCnm9HoTZbZPPSqJqM2fQVq4BvuMjWpbjJjq0Hwsa8pttmaP00rrFrZkQY5DAqNnx5mIGbcEOv5g+IwJvIlRxI+gawJCYSchQthDeElJ3F8CghXYDkRbQIJ1pRB7lSo8ybUMKpfHqDlKU7SVuSKKoPUHTC7tDgfTtYstJgoTL7bMH0wOjzuMJM9YcsQ0AGMH9h+5e63UBkDTlW5KLhwKcg0JrAqTkAMsc90+wpApyOKGUejm6QBMiXdaFt7vXl9Bgp0Li2pG74qhMsMfV6jndxToiDsEKPKP593v1ciUCeSrC5Q4BbMr4CMtLOF7GePsBL15EBKnVZbOOdwN5+4OXcNNUGM7Gzci69eMZD87V04QotEpZPgTP6LHW/b3uhn3GHzl0L0jTZsakzM575SHN6nEfDcvAFqr/mDc4vUZjBwCsx/Vtd13B96Wr5J4HBzeHGw5elRjTA2b4H3Fefy0WlYowhC29QiFb2Hd7IW0gZOSx+8H2sSm98QRDZcmv1XF2DvyeGiieDFLOOQ7BsucpfgdQnaRGePL9Fq3GFdjXvF3kzxIBaCFjhDBXOhhguKSQab5usb3PDwaupDsffHCnCAEqpLbTGJgmJg2E= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR04MB5302.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(396003)(39860400002)(376002)(346002)(136003)(366004)(451199018)(2906002)(44832011)(83380400001)(5660300002)(66556008)(8936002)(41300700001)(26005)(6512007)(6506007)(2616005)(186003)(6666004)(66946007)(38100700002)(86362001)(38350700002)(316002)(478600001)(4326008)(8676002)(6486002)(52116002)(36756003)(66476007)(32563001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dXhAHMet7eAkDyFcJRKKDmXLQ4SijH8xS3Be7Bs3RsWcXizQpxa3zkwiyjI2?= =?us-ascii?Q?6T1uffBvj9UoBm8D3Ewmif5AkHUfqDvRHu3q6qswPh1FclGV/Ky6JyG8sPCZ?= =?us-ascii?Q?q4bT6ayHypg+wT7in1Wh4TySG6xCbYseIzUlpGe5eEYl7x4FLcwYOx5H76pS?= =?us-ascii?Q?9nnI1vMWMkj/nFSQsTiNqmTPCobW1Pk5kON+37ZxpC84YZcHbin/unskwgWS?= =?us-ascii?Q?ME+auK2DYRDIFURWO0EhJf0HBacyFqa7uZKbd/DZVc6JKt9hedzS/UicTLr2?= =?us-ascii?Q?9XRq710Hy7MMzlz57ofWSNjS3B2KXTLb5m04TMZznw2U4uHw6hYQYcQEHW+o?= =?us-ascii?Q?Zkir7ta3Az3KQqhf+NUSmJoCaba7yp5FUOO+CtxFNSSUDr+uyparPpG5Muaw?= =?us-ascii?Q?6eqL3B/PqJwfONakfjBKTs5Kx36iT8TQHPmlTvZp+LhUHvBbDhv1bpGd/U7u?= =?us-ascii?Q?LXYdNRNN7FshmPCu8TifMuuaKin0lYF0OIoFNhzrUBdAP6IXyFWyux8Kj7zd?= =?us-ascii?Q?vwmKyGoofEkgDdl9gFACDZ08bHySmhYtWQ4yHttmvyh4EZA9IrRV6dI+zBZs?= =?us-ascii?Q?VhbmGqt65LNabSfmzC7K75xjCnVhKZT4K7x5KnL1UIRaT1/uLsBkqlObsI46?= =?us-ascii?Q?drfNPiPaQBuV21qeyUap+5RKJQFEjIUt2FZh+/sJFur3uXbM1Y7VsOzILLW8?= =?us-ascii?Q?VvTKsmveY0X8RHkwe+aBEAxxLDyAiPocdSjDSZcKHEHzMoUN1qSc3LByMZ2u?= =?us-ascii?Q?3Kcu3zgV3aPv5LLemz8U5VPleYT0BWP1TlUFIrsdgITP8CquGLyjlx3IAoZK?= =?us-ascii?Q?/cBblInspY5DdprxwgjT1bBZKdQK0LslWLQRQeiZby5KdE3/nK/iUIs6NK3Q?= =?us-ascii?Q?Foo7dV1dxOSE8vKb1N8rSYBwFGnFWWtjaJwZIqClkkqAsDlYvvM2nV7MVuNf?= =?us-ascii?Q?Qih0Xh496+BUMdDxz+UqVmwClEZ5x4YRTAFftOolJqBofgy4F3LoWtA2679j?= =?us-ascii?Q?hdBOgDK0jCLl4JcnVOAdJ3T5BnIAyGeJOMPnLci2w+ti6BQOIDxgsMiQ0ZkV?= =?us-ascii?Q?dv5NBE7Y+ZYytp1RlzOlQc6PwEQ4kRKoZ7HPtiewWbYEYzT/dCFqUhlCmRav?= =?us-ascii?Q?rPKa/eWiyKfb3C0ha374TvAnuji0j5LjVH0VHih/aQHQ/UFJKkEV4H1JRg9L?= =?us-ascii?Q?/EIgEKF3s+LMnuCCVEhrnI8p89oEbpkTfSoycgUqZW0Wg1Mm/hD6+rJcORC8?= =?us-ascii?Q?HTNEbIQC7l04VIsO1NYn4NziYakzzIiG788BznfyEapVGBfD1g9iiGQWP+y4?= =?us-ascii?Q?5tfUvCfJDQa6V4hn19TWtBQDBeJuBITDJTXedZFlWPjyD869I2M1u2raLgLu?= =?us-ascii?Q?MvsTmcuPpDTp7A6695oMRhAefJajMqljfuSet9mKqPkEbyqxLILq/9THVIZZ?= =?us-ascii?Q?9LelWKmqltMHBChYSmHagN8cpjQOF5sChjSZ6LX0QARZYCBX0B8n4ZDoMZNA?= =?us-ascii?Q?ScqgNgkHidnYI6umNudAeweDfVM4/79sXFpcK9qADZuRYk9IhQUN750suhW2?= =?us-ascii?Q?I+9LE7lhk9KDvNnFHFpfexHFMvEvSCakMCTxjnaP?= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e1da66d8-89aa-4317-198f-08db03672792 X-MS-Exchange-CrossTenant-AuthSource: AM6PR04MB5302.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Jan 2023 08:42:58.5958 (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: ArNTlD3ZYwzDFdvxqUv+tPu3MyWvu6/cgJuUoCD+afwNg0Ujt3o8zgjnBV/0XWcx X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8998 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.6 at phobos.denx.de X-Virus-Status: Clean In both SPL and u-boot, after probing the S400 MU, get the chip revision, lifecycle and UID from Sentinel. Update get_cpu_rev to use the chip revision not hard coded it for A0 Signed-off-by: Ye Li Reviewed-by: Peng Fan --- arch/arm/include/asm/arch-imx8ulp/imx-regs.h | 1 + arch/arm/include/asm/arch-imx8ulp/sys_proto.h | 1 + arch/arm/mach-imx/imx8ulp/soc.c | 32 ++++++++++++++++++++++++--- board/freescale/imx8ulp_evk/spl.c | 10 +++------ 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/arch/arm/include/asm/arch-imx8ulp/imx-regs.h b/arch/arm/include/asm/arch-imx8ulp/imx-regs.h index f5a2968..a038cc1 100644 --- a/arch/arm/include/asm/arch-imx8ulp/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8ulp/imx-regs.h @@ -10,6 +10,7 @@ #include #include +#define SRAM0_BASE 0x22010000 #define PBRIDGE0_BASE 0x28000000 #define CMC0_RBASE 0x28025000 diff --git a/arch/arm/include/asm/arch-imx8ulp/sys_proto.h b/arch/arm/include/asm/arch-imx8ulp/sys_proto.h index a7869fb..ff49c62 100644 --- a/arch/arm/include/asm/arch-imx8ulp/sys_proto.h +++ b/arch/arm/include/asm/arch-imx8ulp/sys_proto.h @@ -15,4 +15,5 @@ void set_lpav_qos(void); void load_lposc_fuse(void); bool m33_image_booted(void); int m33_image_handshake(ulong timeout_ms); +int imx8ulp_dm_post_init(void); #endif diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c index 3498cf9..9b12d3d 100644 --- a/arch/arm/mach-imx/imx8ulp/soc.c +++ b/arch/arm/mach-imx/imx8ulp/soc.c @@ -70,9 +70,18 @@ int mmc_get_env_dev(void) } #endif +static void set_cpu_info(struct sentinel_get_info_data *info) +{ + gd->arch.soc_rev = info->soc; + gd->arch.lifecycle = info->lc; + memcpy((void *)&gd->arch.uid, &info->uid, 4 * sizeof(u32)); +} + u32 get_cpu_rev(void) { - return (MXC_CPU_IMX8ULP << 12) | CHIP_REV_1_0; + u32 rev = (gd->arch.soc_rev >> 24) - 0xa0; + + return (MXC_CPU_IMX8ULP << 12) | (CHIP_REV_1_0 + rev); } enum bt_mode get_boot_mode(void) @@ -670,10 +679,12 @@ int arch_cpu_init(void) return 0; } -static int imx8ulp_check_mu(void *ctx, struct event *event) +int imx8ulp_dm_post_init(void) { struct udevice *devp; int ret; + u32 res; + struct sentinel_get_info_data *info = (struct sentinel_get_info_data *)SRAM0_BASE; ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(imx8ulp_mu), &devp); if (ret) { @@ -681,9 +692,24 @@ static int imx8ulp_check_mu(void *ctx, struct event *event) return ret; } + ret = ahab_get_info(info, &res); + if (ret) { + printf("ahab_get_info failed %d\n", ret); + /* fallback to A0.1 revision */ + memset((void *)info, 0, sizeof(struct sentinel_get_info_data)); + info->soc = 0xa000084d; + } + + set_cpu_info(info); + return 0; } -EVENT_SPY(EVT_DM_POST_INIT, imx8ulp_check_mu); + +static int imx8ulp_evt_dm_post_init(void *ctx, struct event *event) +{ + return imx8ulp_dm_post_init(); +} +EVENT_SPY(EVT_DM_POST_INIT, imx8ulp_evt_dm_post_init); #if defined(CONFIG_SPL_BUILD) __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image) diff --git a/board/freescale/imx8ulp_evk/spl.c b/board/freescale/imx8ulp_evk/spl.c index e672f6e..2a96bd0 100644 --- a/board/freescale/imx8ulp_evk/spl.c +++ b/board/freescale/imx8ulp_evk/spl.c @@ -77,16 +77,12 @@ void display_ele_fw_version(void) void spl_board_init(void) { - struct udevice *dev; u32 res; int ret; - uclass_find_first_device(UCLASS_MISC, &dev); - - for (; dev; uclass_find_next_device(&dev)) { - if (device_probe(dev)) - continue; - } + ret = imx8ulp_dm_post_init(); + if (ret) + return; board_early_init_f(); -- 2.7.4