From patchwork Tue Jul 5 06:06:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1652251 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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=SENsoO/5; 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LcWPs47zRz9s2R for ; Tue, 5 Jul 2022 15:26:57 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 11B6A84547; Tue, 5 Jul 2022 07:24:31 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.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=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="SENsoO/5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8473F84544; Tue, 5 Jul 2022 07:24:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2043.outbound.protection.outlook.com [40.107.22.43]) (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 3864284537 for ; Tue, 5 Jul 2022 07:24:26 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hbXf1c7kmjUrXdB9W37dgTaqrUHUUrpQ/6vvluQnXXL/RtpyuNCkob5kJJvpzXj1SLuN6ntlMqcB31/JOemP6zfVmM8T6hjHDqT+gsyTP4rxN10FASq4lg/zWfi0k4l5b0o096e0Zjejwqad1xuJ1QZRSGQ4bhMSFZ+xoLTf/MCOgqcLh1zxl4UxKARa9izbnWsQpKQ/PAYXoU15jQxQkDeOLtr745W3tM8W+3/XCAZi8c1OHs/l+W9Yzx1sZSRF1v8cBYkXSeyer0ykL9GFuKEYNqN0/2g+OL+GRPi2IbC+hR/LbE2LUH/SGZLG4/f0JeGaLVGR5C6aFaVaqEhQTw== 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=6xGxOQJ4oM/0REewJuAqzZJfLA9T/jmejjrz9I3l/lg=; b=N2duNIoy2i98X6ZWYtxHhSa1LbkrGop6NQLxqC0Zx+LhSgYHhA3/wgd07gSdOIwN+SnvlYsrnYYODSFDkU+NX5jX1Rx9yd3dYSiFpa82+I2K3Zpud8HTgtOgw36RNOC7hPBUkvHl+oIQ/tCiwabp7OAHor6oDevwqLsm1FsLN//5cD2zO5y/ctRzRgKl1NlLh3O0yPK0ZJMOaGNwi6OPqkeuy8P+fbTbiFl4BgLOozbx56Uloivxpo1WhONcFC+dt1LHUhXjN2BMWuUnlCBO/iBct4zhJXgpaEmXqHbH2S4yI10mxstDSJ84WeQlelEEgBfEKQyd4i2tliBUEl9jig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6xGxOQJ4oM/0REewJuAqzZJfLA9T/jmejjrz9I3l/lg=; b=SENsoO/5muW3B+CanIIUgfJrOrhZRV9VKv02PdWDPxZadUDchAFsmHRyxher4pMuiZVSwc2WkodoEL4/Tk+7yiTfVJ6G52+phj+FESpbvIRegr0aSxTRZEHKFri5DUehUN+Sf7g7m4Y06mZ71TDwA9kOOBmv0RoCfe7UNqjx/uw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from PA4PR04MB9416.eurprd04.prod.outlook.com (2603:10a6:102:2ab::21) by DB9PR04MB8364.eurprd04.prod.outlook.com (2603:10a6:10:24c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5395.21; Tue, 5 Jul 2022 05:24:24 +0000 Received: from PA4PR04MB9416.eurprd04.prod.outlook.com ([fe80::6da9:774d:eb1d:9ad5]) by PA4PR04MB9416.eurprd04.prod.outlook.com ([fe80::6da9:774d:eb1d:9ad5%6]) with mapi id 15.20.5395.020; Tue, 5 Jul 2022 05:24:24 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" Cc: u-boot@lists.denx.de, Ye Li Subject: [PATCH V4 17/49] imx: imx9: disable watchdog Date: Tue, 5 Jul 2022 14:06:12 +0800 Message-Id: <20220705060644.4509-18-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220705060644.4509-1-peng.fan@oss.nxp.com> References: <20220705060644.4509-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR02CA0031.apcprd02.prod.outlook.com (2603:1096:4:195::16) To PA4PR04MB9416.eurprd04.prod.outlook.com (2603:10a6:102:2ab::21) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c79f3217-15b9-42cc-72d4-08da5e469f9e X-MS-TrafficTypeDiagnostic: DB9PR04MB8364:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ORE6h/uxoWl7zTizqwIYMRlKLxHwn4sUzEyWh8mdvweyulQradm27zMNqJFoTXzfajVGVzNMSq7irRfxtVfnGxMPp/ShQBUr6B+Pw3sXtfADXX0Zsd7kFUvITKgTCdXS5w+rJr4vaAsEYBTgRH1mJ/i+RHl6xN9KjQdH7sLtPne1WZQk0o3/hnTOk6y5l7A/BoHq+olRDBd4F0zoaebDfRbtYh1O0HaJktIxaZ8zssH5Mesqcefc9Dy2t75o1Ng9vQ5BrFdHNAOM91BsBRbVbpssY7Pz9hYXv0v5Fcxf22bgQIxFzu1omYKDJbhQklMDCMAROt/IBEFLlBR3/jWdqTzq+iuDll9rorO6xx3RjdUiUK0fQFSPz+TeF6vJmyB+WtG1NLa2Dz2cv8B7iyIdg8/iqhNdHuRQItzhMctzLrpB6+hTDgCOZDUvp/rxcfaF36Lmow3rCa0+Q7ewEboZYh9ydTLGFrJKE9vB/XYTU6hCsxYS9CbDJIO/suVftnzV9/9kT6lp/KuJe+oB0QvftvfhvqdGo+7byevGH6ggQm1S3jxCqQH4NkGuh57b+x653wLQmoGYyvuIZjX90kRJ8tyMT95ToDWCnzZc5GZiXcE9lNeXq5XKcr7RNDwXrbNVcLCF0GUF8cjqwzO20Bu9pmXNEaQaCJ5nOZ8dPeJLg29MJjLoCdJzCn98ZT8qzbhhxGPae30SWzgxxOmFGuS7UD4UDtOSHEb+MypySO6l7fGkhB1Fu1Zay3i1kN1znm9+fIicCp8iMmH+v8hg0FvGjC4HHbwTJfmZA9aj8Jf60eHugmg3zkVUdWl+vxiHGw4J X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR04MB9416.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39860400002)(366004)(346002)(136003)(396003)(376002)(6862004)(6512007)(316002)(41300700001)(6506007)(6666004)(26005)(478600001)(52116002)(6486002)(66946007)(66476007)(66556008)(2906002)(4326008)(8676002)(38100700002)(38350700002)(86362001)(2616005)(186003)(1076003)(83380400001)(8936002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HVqQ0/Ugc+tFUbvbmACj5LvWXbbtzmG45H1MAZ+xYb4SdgymND3rBRzR6/Cv7cx37+MKvJJesiZ0zQ3f3dZ+15KGfLBku+nFFjULBnd3BeLi0cLAQ2YXufcjz02RQUTkIk1VB/KWnS7E+/UXDzUGgIVSqd3igntgCJEIEEnWYIuxLHR2TyyVibxiHGJaXC2QhpDvmW6U9KOW0BsUuB2sNfn4a8DOoro61c8GgZQlRQWOJSf0zeFHwvV4DTxRWlFrzZs/6FL2zrkwKGMolBXRTTxCc+qyz1atSeiU8VHQNa/Xx1BfiGCTnQHWtefAlpVmOiDPOHgsqsQ5HOBg9J7G3URixhWnPI8/znFWgo5BZQi3RG+QzgyopE5Vc8cfGONYRdwDYzWtM4kHKnCBESw50D+ROrM4oDZEdZrhFJT4N1hYoEDfl/Nw1bDwgCiYFjabuaHqi+WnpQpvP1fYYQgFXAQTpbeKmE/JyXGPbzm0Kmj8gl4YopKAhGRLf3pmd1W56V8AaLUU3v0tM2GlWsE5qlojWhiTQh3T9awdzGRp4O6O7suXLebHSxWJXTGF7jn6h8Aiiq6s91GPr0lWEeeLNFVPotbeaXuRI5hfVlwuC0cJnISNzDys6G/XFaKHUNH9+a16lZ8o3qsCywEWGuGkJ5riY3g4QLpjdkySVsedjE3b6nP+NKGdOwD/S1OjGEfufpBLDz5+A/3VUFM3uO/TmyL8I612KAUyebpK7Hd79oq5Y5oumtNttncv9GcA0z2oYUN5QNIxDSSDTIPrtkQ/2iZOFFufmD7MFatkRWDvs898P1puK1h+bpaMhQOrpwW2NPMjBWG8W3JPSFaF/Y1E3lv+vbg7EQu+jqfU1Nh7rFUFNBEbTLQe9Mc82/sAB2VunD/lCsiW6a+juiMiNTGrmJu1ch79j7YzE3nGHCzkpnTjUtYKmhs7nHkFhvJSx5s+mkzbKulVBMJ2AW2fkdDTehyGJO+eMe8v5FLBfJQT1Pt7iBK9OpoxqxgmYUwr9JdaFFsz6pnFawxYO+420XtJaDGirWWnexR2fn8ziYgr+6rLrEEuLy5cr6VENOMwnfuqd68Ib1Iwn5JaIKGOk5moOx+ZcZPY22GhVcVSQ8ijdUlSYLXV5uyBzygqYpe5Wmz40TYlMn52ReoGXe0DgHUKwQs9T/hPHEYF8XsbtRE6E4B7XKTvLoSqfaCAG5I2o00f86HHAWwAif38Hl4py2TaSy8YMsey0JDMZNtEqEbzOLK27BAKXmrUGVV5QX7ISJTgn8oXywmcduMNuZTa0Nh7O7aLZVhwf0GDFLiR4+JStUiEerhZ4aWJh39uaUTTHvxD+ZJaH7V/J2Fj2aGUA1LobFW+nPkGnR3ICS3W3df5w/NLyIJBLGt22XmqravG2eCwPOSibHsMpDzfWxJVskE1JLGHPG6aYTpaCWQP7S8qocy08XOY2MV920JkZ6Bdx0Slx3ss+IbrI499eBwujqs+7ILvEtayIUsWwkimLOoAe7Y7hlJFLUdUa/RribURzfIHFNHIWrgYXBQ1uHew1jbcfOKIghya5tP49iEluCgna7cfu68Ymo0cAgOKRPwAJMsC X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c79f3217-15b9-42cc-72d4-08da5e469f9e X-MS-Exchange-CrossTenant-AuthSource: PA4PR04MB9416.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2022 05:24:24.7685 (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: WjMHoQGpgtS97SWUHE1MbUswX72xZdHNGTwi7GBY80XP9Xx3X7X/ws3jA8O1AGgtf4rUCR2i1ZUYP4tg0BrEjA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB8364 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 From: Ye Li Disable all 3 wdogs on AIPS2 and unmask SRC reset trigger for WDOG3-5 Signed-off-by: Ye Li Signed-off-by: Peng Fan --- arch/arm/include/asm/arch-imx9/imx-regs.h | 4 ++ arch/arm/mach-imx/imx9/soc.c | 45 ++++++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-imx9/imx-regs.h b/arch/arm/include/asm/arch-imx9/imx-regs.h index 32c76ce9c3b..e4babed40fc 100644 --- a/arch/arm/include/asm/arch-imx9/imx-regs.h +++ b/arch/arm/include/asm/arch-imx9/imx-regs.h @@ -15,4 +15,8 @@ #define ANATOP_BASE_ADDR 0x44480000UL +#define WDG3_BASE_ADDR 0x42490000UL +#define WDG4_BASE_ADDR 0x424a0000UL +#define WDG5_BASE_ADDR 0x424b0000UL + #endif diff --git a/arch/arm/mach-imx/imx9/soc.c b/arch/arm/mach-imx/imx9/soc.c index 4b8f1ca30d5..8b620832b5d 100644 --- a/arch/arm/mach-imx/imx9/soc.c +++ b/arch/arm/mach-imx/imx9/soc.c @@ -34,6 +34,45 @@ u32 get_cpu_rev(void) return (MXC_CPU_IMX93 << 12) | CHIP_REV_1_0; } +#define UNLOCK_WORD 0xD928C520 /* unlock word */ +#define REFRESH_WORD 0xB480A602 /* refresh word */ + +static void disable_wdog(void __iomem *wdog_base) +{ + u32 val_cs = readl(wdog_base + 0x00); + + if (!(val_cs & 0x80)) + return; + + /* default is 32bits cmd */ + writel(REFRESH_WORD, (wdog_base + 0x04)); /* Refresh the CNT */ + + if (!(val_cs & 0x800)) { + writel(UNLOCK_WORD, (wdog_base + 0x04)); + while (!(readl(wdog_base + 0x00) & 0x800)) + ; + } + writel(0x0, (wdog_base + 0x0C)); /* Set WIN to 0 */ + writel(0x400, (wdog_base + 0x08)); /* Set timeout to default 0x400 */ + writel(0x2120, (wdog_base + 0x00)); /* Disable it and set update */ + + while (!(readl(wdog_base + 0x00) & 0x400)) + ; +} + +void init_wdog(void) +{ + u32 src_val; + + disable_wdog((void __iomem *)WDG3_BASE_ADDR); + disable_wdog((void __iomem *)WDG4_BASE_ADDR); + disable_wdog((void __iomem *)WDG5_BASE_ADDR); + + src_val = readl(0x54460018); /* reset mask */ + src_val &= ~0x1c; + writel(src_val, 0x54460018); +} + static struct mm_region imx93_mem_map[] = { { /* ROM */ @@ -123,8 +162,12 @@ int ft_system_setup(void *blob, struct bd_info *bd) int arch_cpu_init(void) { - if (IS_ENABLED(CONFIG_SPL_BUILD)) + if (IS_ENABLED(CONFIG_SPL_BUILD)) { + /* Disable wdog */ + init_wdog(); + clock_init(); + } return 0; }