From patchwork Tue Jul 26 08:40:47 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: 1660667 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=J5btkWW1; 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 4LsTw70nYtz9sB4 for ; Tue, 26 Jul 2022 18:04:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 365FE842FA; Tue, 26 Jul 2022 10:04:15 +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="J5btkWW1"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id EF544842E0; Tue, 26 Jul 2022 10:04:13 +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 autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60084.outbound.protection.outlook.com [40.107.6.84]) (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 347CC8431F for ; Tue, 26 Jul 2022 10:04:10 +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=bSIY9VdAr/A9dA+ANehx+58b9cbLnvj061zMy6mXk7gx5mn0K/mcrMNk0MO9r9G0iHf4aD+bXf1rSSNQZu6tqx8Xtru6tnP1NtBuTZ3xUzKyhnxfCVlbwSVCw4PnCxjABfU5GeTY+GP1bhAWqnKgVfl2ZTj2KwSowaA6tYptQWj/iTtVg0zxiE6iMZVsvdX0v46/kudQyGu9bPFij8YCkpmWLMhXcwKiC+XUeGzPmsYGjAO6akHXbYzqiqIYz0N6+szT9y+RkpRs8YS0VJ8gAcft3vCJWkZiZ18q6Uy7CATeHo/IHlPvU9OR2mtPv2D79k7PJymzSssu5XoE1NPFAg== 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=QxJtJXvs6tfsq6vQnanieIc77/RDJBQBncJQVBhVtm7NBV5Ceis5lKrc9sqOg/+gsvZAjSdi/wMG3LDGszwqq1gGiqAT2L4C+mlwn/pSVZLSXcz+kQedCZe9/rt8BEoxLRc+3LSB8zE6hgiL2JwYHjVeJAHKNxUXyqxy+Ks2XqsbYz5tgVIIBWp+xKE7Fx1RC47xskW/6mj70W0Djq6UMIzZN2fem49DF5lYlR2dWmfd4GhC5vRdiFNIci6IZ6yyWzoS6f0Cp14/hIFWjYeEdVPySJJKCBxPaFYA1EfPVFspANnsFtTEwceHuuKjFUrHoGzVm2e4Ql7GTXAaSsj+aA== 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=J5btkWW1tezcozTxcIWWtBzcidVxeoyk7Bv8TNIscfZeSbVSB4ZtXH24BjVX3TuGvejGjxvOcjdF7AVAgyBDUJnxZ5AGiiTdd9ZGo0lHLLQL/zNd64gubQRbSDZq0IwD2Zbtx/gkfNWqplnnC9XXzn5hUgdyQIISXis7x0rCJPs= 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 AM4PR0401MB2401.eurprd04.prod.outlook.com (2603:10a6:200:47::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.25; Tue, 26 Jul 2022 07:59:01 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c0c2:ede7:3b85:1597]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c0c2:ede7:3b85:1597%3]) with mapi id 15.20.5458.024; Tue, 26 Jul 2022 07:59:01 +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/53] imx: imx9: disable watchdog Date: Tue, 26 Jul 2022 16:40:47 +0800 Message-Id: <20220726084123.2508-18-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220726084123.2508-1-peng.fan@oss.nxp.com> References: <20220726084123.2508-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SG2PR06CA0221.apcprd06.prod.outlook.com (2603:1096:4:68::29) 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: 7eb590ee-30af-4514-89f3-08da6edcb39c X-MS-TrafficTypeDiagnostic: AM4PR0401MB2401: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: XCJn2Ry1qtBzyhif+VPX1JiB4xZ3IE8TjWCv31g2szXzuAQJDLq845X29Y+6ueGo9JjGgo96o6YaIlVNjDXGdSWuPUG1FDd55plXgdNArBlrt5jgJN95N00R4TFxrmp6qo8Dnu/hlJV8DzG4Iob1MJ4IkcocvCIVYdodOWowJm/2Is2Moz6ZD+LThtZFIEPkL0OmafOCl/J0ENaawxjjMkrfbek0dZ4WvXAL8u+ImW0C63Ix6w7HdN6dA+zn4oxWlnX2r+mDG80gCp20Bk2fe3+Q8pQCZGEGeVAqutd9bRIkTGPv6+WQAkpV0b6a4oAkRzgHEde/HsK0SZnkaLyjPBCp30JqVfiATkOCXcEwKuz3o2+Bp5oOrjzyPejcdjAsj8+H5YcAeTd4U/16xsgteE3g6FVoGNsx/Zz7A/tKTidyzDiVNyHOn3ES1nURwHnZ7jxOwwDUgrEr1fI2da04y3ZVgwBne7Dgw1NvqnKWUBwxuLK3DzouicZzrvboqRlSyDOrIWCHuvQQ0pIAhCZmTH8PiNtp1lBt5+/ZGoTNna5/zgGbAixDmyG1O355JcDuJk+am9Hxlw6hxABvN0ImS/wVPpkmV2dMU0UGDPXLPvd9i9gq7vI3D/TZiJnwsrjquWcARzUFrY5DtsEhQ+xNBsWH2v/oohjdISrHsja1eXVy2iw04ZIC5TWvM/lv3c/yIaYI3uFqBqGMXvTzR3MSSA599qidILZI1T89ydIGhI3OzVkK7vaGSCLJDJRfKbgs8+MXdP6L4ksGMQPj5FS6z8QUdiFkdcnyY7rwgZWOn9dCiXJE++/yoj7UmZRg5Xg/ 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)(346002)(396003)(39860400002)(376002)(136003)(366004)(186003)(1076003)(2616005)(66476007)(8676002)(4326008)(66946007)(83380400001)(66556008)(52116002)(6506007)(6512007)(41300700001)(6666004)(2906002)(26005)(6862004)(86362001)(38350700002)(38100700002)(5660300002)(316002)(6486002)(478600001)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z1rcaAXG27kEevRVbIu9z7j2VcEAT6IwsrRUYN1ZSIU0V+LOBHEtr/dIfPyzlD1Pxcac5eDlyTnc1+6tXkCo8YIb0tGu+0rnRkDZlRRWwDEi12+CN4iAzgD0U7IL/v1CjS/brYVSIt2MyukaKwbxGkvjpz8E8Xig5Yzf4ucklyFRQqcmyneT++hkZHXFFIu+/uoaTmdtvptdpI0fYXvdL/Vdiaiykwn5BezboiIf+DHRi13D1QaMFlIs7fkNwxU9uKE7RzP32Sl0/LWT4yk/PqGnpwnmnt1iv5VSVYsokzOed8Et5dWcoAmfduI38DnCDiAjsadJ61nzP5VoTYkygbIWjpdffCVDEs1CKjei3QigCs5QCFw+AtqAaXKdPMnsDc0TVhtR1czSxVTxjiptMl9UeXs498rx2dSswbKPMrlxuqbrNs69DGQnjjPW5CMe1QSSB/KP0T9kJFbjKICF9/DCcGWlNOrFBglCc6W05KnKO8aoffsg8Ca7bCqby+eQkLQanqwk2P5Z5rW5y6Zr9kqL3KPa5JC3oJ2k0vKe5aLVdiAOmrjbkYWfsU14ZAjao6QAFjVuMeGD97lHG3bpiScFR9xk6QkF0Nkyksune+3UvbSnQpSSAP0qzqQhz0kA7+xriDkLdx9YLqIiS7LDgk7VXo1fFj5DgZVsd14q+6tgzwEsl3+rRfH2sfd3X6sDJGDVhCDToIGqm05GixAIiMThbn9RQUpyOkv6hepblaGI+UGPrlu7HQoiJs0JKnbSgFMJn4mmZ47AywIRnKL8X6M1i4dQ0WX+zOnQOKj+VGC5XqotwZo+Y8AC0conhHJfCGzDv/u6GUA3vwY3QY/nO0VzNdmmxSVXgue+o3gDdVTCtpSh3rHCT/CFWd6iNpeE5y3p7Mi3lyawrjbcLYtre1vt5udbH8TIeqLUYYtU3n889lXiv1iLSBFFdSuGyqUbM53fS6BmJSE03gLwR1LvYTHsnPSxtytLi6I10A0LUaAaAaLXHs4b9zniWjqjjjeM/s/yJnyAuyXcnu7g8LWtKjDwAnqeUD42i+SKeVv2QqcLbqLgOAfjP8yr7r30FG9eXHVpkpgrChw1eIPkkZVHSV0zdvSVXAagUoemMoAOHGWFmKRrLb1Lq507ThLmejo84BVyewBDs6vF02wqEJo00jBsymS0kOmXisBpWA0VWXMzzJ+xIM+0Hp9dmy76OkGbaKtlv2kGhhnTv4DgsDsjcp6RP+a0pM690ytr4IUtviuNwz4x3t9w37XmMsQtHkhmQYqsXIyNs+MlPejltjD2nUym/QcnYzEJzs3EexzkNfuVz7NxWMtIXAo3hkMXzm1m579qMHwR0fkCvu/S54m+0bOcLMIyrBVnY4qhHP/octd6wB/nhFq4+ixcY0SbLj+ALQ1ggyDVupqmU/f8EMmx3ecdXY+g+A8+LewRl/IcmRyToljQvyWIXw5nB3d4AEVJzPgbYNmV2MjLenAd2QyzFy7ZcpG8UnFKJYVUKPvBdi4rTaHKEdVmXqM4J2A5HtN33nMA0IaHeaRtJ8bTiYU++yi9iovsIESVu7K2ldfVRzE+sJNXOjnX8eNGXO62gtt/ X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7eb590ee-30af-4514-89f3-08da6edcb39c X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 07:59:01.4087 (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: nMkm06gPC+8pDquZNkBQfK4PMu9gDE0yMwA6WIh21XxAbrdT8drth5GPmQ/AbbyyNKkF2gml9LB5dVDtJsHpMA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM4PR0401MB2401 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; }