From patchwork Mon Jun 27 03:24:23 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: 1648547 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=KX5DSsM5; 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LWXBt5bfXz9sGp for ; Mon, 27 Jun 2022 12:45:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0F870844B5; Mon, 27 Jun 2022 04:42:49 +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="KX5DSsM5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C0A3683A0A; Mon, 27 Jun 2022 04:42:40 +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_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2074.outbound.protection.outlook.com [40.107.104.74]) (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 1E26A844A2 for ; Mon, 27 Jun 2022 04:42:37 +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=cjmJW8Jd27nFL0G4NGxFtqo01LvAtI/dVVoLzawxvDeigtqab0ajLKG564+BVZZsXR1iDG9Ssoq+jq3Jf277mGk1Ftwhd+nMUk62/aQO037w3RHeKbnueiPtKA+HQR8LShtgxVanLZsHX7mPmhueUOtfv1ZFFYuvsCb6vthKodo+epKYUXYFcXh0NjGB2ry6nrH0SCGrE5AQifvBaUj2i98AX5alGbFVZ7PG9VlqJ3mVYFxRoMppujipxVdFx3mvXjPG9bh/NfxjQEVPCb+/JxQeQn1kftVol8oxeX9YFyLrL1ShoAXdTVzeEsxaWaRfxW2bGvbE+gltO0bbm7Toag== 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=QaxJQfHIAj/XczovrN3zlbtgQMJlkQP8Gh9AYWUyEnTo7I3K/BscO6rPRQtR/v4RCHhIZpXzy2PlXvoN7w0U15J6Q1Gy1yj5e1k2KBVQz+epM1q6K3k3bKR0cIsHSCkwNgYxCbWwVvFaqTjFfV29nR3Tja05gckSH2wjFHhEpFggCtFPOYXbsPtP7kevWVzd82sCBRGrA51tIof6q0E6bso7LjHweqxYd1L8tpdIs6Luv+2zI//MjCOC2yG9Nv1JlvLWlRFRK9ondJY4mieWHT/qy7UfXcFcQw3t7eichQWJnGmBT7BajwM8XtChudWRYkEJsFgg3kmYAygUc00h/A== 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=KX5DSsM5yRL5/l4uzboiC0N1YOrBLNBsC7D1SxCjXm0h/2Zs+jq9JXdwjOAuQHdUKHbMzoe2KDcSFCXm+O6tZ5dbhro4MN2+YH0gBkDu29wllrZY/+qA+FQAgD6+3anVoH+gsm8KE5wkVcoSSe3XujLo6/yiD1IunmiXj6FQniU= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by AM5PR0401MB2451.eurprd04.prod.outlook.com (2603:10a6:203:36::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Mon, 27 Jun 2022 02:42:35 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fdd4:8557:334b:180d]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::fdd4:8557:334b:180d%6]) with mapi id 15.20.5373.018; Mon, 27 Jun 2022 02:42:35 +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 V2 17/49] imx: imx9: disable watchdog Date: Mon, 27 Jun 2022 11:24:23 +0800 Message-Id: <20220627032455.28280-18-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220627032455.28280-1-peng.fan@oss.nxp.com> References: <20220627032455.28280-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR02CA0020.apcprd02.prod.outlook.com (2603:1096:4:195::7) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4047b29a-a581-45e5-fb5c-08da57e6b105 X-MS-TrafficTypeDiagnostic: AM5PR0401MB2451: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: nwd4TF2vcFnv3jq0KSt/qIxUfFvUGmPBT4zXI1tkbOjLACqnfs5ZVnmZ8jJpXmxPA0f2IzU/qCxChpbBYdnVTls3NvyrOjf3BNFN7r7R69EKswLR7n1dZDhduAl4yUdkcbqr/OWtkdnCgLxNEqyRAVNeLMo5urmpM7LMS6bIggG8m5asd96ChNNnGW7T6Q9CHnE356GBGI/1x8BGCuBLldV97zXBYeGrCygmH0Z1wCBRyfUQJMb+X0zqzudzE9Ou2CUTd7nyjECsenA+A5jeHBKE0LUjmqj9sHe/vbqELXb2TIWKXEwYAzhuV+zFmhVf96JMmFlj9VtqbtEmuZOzECJEoa7nH4Tb/YuD8yfWoYrF47QqfBIDYnbwcvDsDa0hsgpfXsh+3nE1by32r5O7caEa1955YoGsKUSiDrg+4orB1S1IOb12grUA7y/hwu1TDawIbD35nON72uq+DUzTQV22ugm1DZUFrCIGyRy1VhQL0tSMirvYY2lmqbf4JCOuk19akvNagsEOQviPzJRl7vjv0bC+pGz8Js429+LrPSvN7U7Vo+RqnEpEAz6AG4Va421x6oVIY221yBXZfZtJvXY6q1PUTBzcuDzMvI7jHgcbiR70CrSqwc5s79mqCGwVYwcqC1xf5VJANTdX4/h6tsPpndEEgedKF4cdt2f7OjdPwglpo2JuEt4Gi9H36/io6FSeohdnEStu2m0s1lhDMeZwrkvj4VwHCQ5WZmmw25Qhu43gKnGah48ETircEZX7aIWKCKn07m6ZozhmmCJ+0VJwDp99PYuU5qakXq+Fg30= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(396003)(366004)(346002)(39860400002)(136003)(376002)(6512007)(5660300002)(2616005)(66556008)(66476007)(1076003)(186003)(86362001)(38100700002)(316002)(41300700001)(66946007)(478600001)(8936002)(4326008)(8676002)(2906002)(52116002)(6486002)(6506007)(83380400001)(38350700002)(6862004)(6666004)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nMRtmoeF51xG4dMnnoxJEW9Md22u298nOn+ZU3HdFnwjqyKNhAS5JZpYyg+Ic9ssPmQwj7RBCmfwmYIWRh7pT0Ee7ev340VH39+xpRyujHqVr4pnNWWlrgrrHAbzl30bCIMx1eSXEZGbb/4Qf1yLC151d1sp96QZvt/1x8Z4TndeA/km0UJYuKiugRIlYaRVPqr5RRNwnlKEAsu93AsOYqdTM1mPC2pa67Rk6/iEEuRBvFBCavKZoN3vtMChFWLPtXVyTHYaWwOR2CbL9cyaoxO2GGsVcZ1Yn91Ptca+xyfsdX78IFx69hDJzRphF4G1EJV4A0zsgdzSF07/sgxsnJLxaVtKFFHbcf1trVUMzw+MBos8YT0zXBIbTQ8ztjZ7Ibuu3EeqefGT4nwqV8kI8fYAK79FMPT6eUZvPDMLU0QsJDNMl1vBt+KJief9TEQfZWah/bnfxO40S5fyKrCBLLzdFpvkkLE7WOZWlYuGIceztCGcTNAI4OWlAofCfVlEjYUYxHCxuTsHs2r/fC4HMJz/Svq67vy3er20xxsBvUsjPROlQB+6msKtsiCmMMG4S7cmSG2vwU5UdSLVp743+a11mQ30JrInHiCTNeMqWgz2UGADAsVKWdCqVkWGTHo9Ssd/Qk47ITTkHpD48VUIIxz0r+5biDh3fJzs3hzChUSIJ+fA2MOEAlpSd9YBNKa5GUUKY1q8U5DaUPnK1RrStw6QBrE6YeyfMxl7z/llGE5WsbZMwFjK2Ii1GRJFsfJisf5uzlIm4DD/IGrjobaN1sEWGu6muJaKOj/JbfLZti6VIpPzW3UQBNeQ8LQhRE31OfK21DG6mlyEHVwnzB/mO+5TABMzyLwgPyFcKCbTrgGO45Pjz4JlwuD89z5GSQ75ugAct0nKxYAvQjxyZpiGuNFLH3Q+QzFlcTQuOHcMXfwZCgWSRK1P4NYB6W+ROkCXfRjlFptIx/rv+aCY/iMk+qcnGpKF5WPZdKIkbkbRNbTlXmatDj9n3stBH+9AcN9Kt2QtUw+KcIxnVLSWg/dexkLgSXFDlBZb9J9plmapEVLXQ8QMiZjhQKF1M4Km0lNw0GYTZIHsXRLjHX4GyKHEuPPCsGFXjF0hunMYqH1Vmv9MM4eloHM4IV/f5DNujXzq7h0BTpBp7VlhD7KLi4wJ9faTXGiOYFGs/l0q3sFCxcRxo3RJquKicNQ/QCPC8q3Bnb5SGdUxWd7hh6YM4z/Chur9132+6Q2JT7NZCwsTBoYAso7fGsUaWOTQLZ+xzV0oO4cK0/kfpzFEKApmMweJw7CLGTXkF27/0i+NuQrqJiseuJC63n6vVDcLAk4KVcyITvLl9xhjqiJDSnzajIhD4ShOEOAhpsfmEYNLeYd3oxHXT5laxuyZNJKCGjtBa/9QKnzM6xHu04mNN7xYsgsaMUdcdC+T/k0L0cu7jmRccJYoT+GmnaZDYr1fYKZcjgW2G80F/Q/80XisDcoTiTbj5YL2bomDfEEkuoV9qPyN5IWAjt8XMUZn8B+MRmBPLWWcbBtMtVuCc/8CeIO2xnQFuMDatWsSLnfiqeL1q2E3WmgUBwDWbQcPWTqoSpTDhT4J X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4047b29a-a581-45e5-fb5c-08da57e6b105 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2022 02:42:35.2118 (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: cqQbcOgpWMWnCzgunUOHpoomdLcf6QCETMzY7HvT33yE7cmklLds7K+CSCJdnjkceC4HfSwFZKWAzEJbfx1iPg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0401MB2451 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; }