From patchwork Mon Jun 6 11:23:48 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: 1639210 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=gap3YCiJ; 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 4LGqrM6Blbz9sGZ for ; Mon, 6 Jun 2022 20:45:07 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C1A518439A; Mon, 6 Jun 2022 12:42:50 +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="gap3YCiJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BAE7284347; Mon, 6 Jun 2022 12: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,FORGED_SPF_HELO,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=unavailable autolearn_force=no version=3.4.2 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0614.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe08::614]) (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 563DC84392 for ; Mon, 6 Jun 2022 12:42:21 +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=gKBdKuOB58Zljaa7I5S68LtaGgM2g3/p9OZxImK7ZChdrRCwLaAxxbuvm2fb99DZpCIq8MPfl5QFheQs+6lLLDviKjTdZ1vNk9QgJ+vMJojBcK+vaQpnDESW/5Qg5q9+9GTnE+oBNmdRJfZ41EecDk6ntJEWojHWugW3FGni9i6YHn3yWl/keIxNTcW0yMlRA6AxHtX866CyKv9QZwD8XUqZNyTijY0tmzCdvVMnk4LB/hkMEMKWa9bARvSMLaZHkKJG4nXYeAhBCZkdIdALN1X24VrNOsqPyxgyO9etsRSatwv4vGKmeO31i4LX1z9CTdY1U6pztMiRiEDDk0Z5QQ== 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=dkOwJBzfslfLhiwCOQ50dkFlZOOxtn5JrvhHG9muXUf+1z+jmPYHkSp1gAIxxhtanAeMhpyepxp9B5MKBSrJiCbLoDIwx4xoBg3gQKFONNkgGP/kCF8QeqzKB+s52/KzOacZIdh6XnoV5gBSx4D5e2pMFVNtLPtgwZyLdl0HeASWnM9mE8wwCbdmS3cvZWbLGusAz5a3W5n09OH2Yrul9Od20m5aTStZr1VoGU30VoAngRi6fywB8LWZhZHTb5/Qn2pMP1cX8FRnLA2OGdv9g6NHyK2k+YkdT/vd8wXl1OUrAHPO1Zl16NOtOS4971QqgwA5UllNj6BAQSRPmEraVw== 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=gap3YCiJY0xcZ6URGiINXGBGQ7C2ttUC3pYZr5xNXTNKmdGFzEK3QRyNl1zfnMG+qdkR8scOLy9jptJlvnIgyAOivyl3/jsm19M/k5IiSAW+hgYH8NLUKVHPv0Y8yFJqytWjH21PZi8RwHnuWRp9lmZ5CL5LvT3ApURE/mkyFjk= 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 AS8PR04MB8312.eurprd04.prod.outlook.com (2603:10a6:20b:3f1::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 10:42:19 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%9]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 10:42:19 +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 , Peng Fan Subject: [PATCH 16/49] imx: imx9: disable watchdog Date: Mon, 6 Jun 2022 19:23:48 +0800 Message-Id: <20220606112421.31711-17-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220606112421.31711-1-peng.fan@oss.nxp.com> References: <20220606112421.31711-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0025.apcprd01.prod.exchangelabs.com (2603:1096:4:192::10) 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: 87c6ba4c-8c9c-4fe2-25ad-08da47a93b37 X-MS-TrafficTypeDiagnostic: AS8PR04MB8312:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GaEjEto49LxttMhpZ7mZF8U7CL/2pg2jqv/jnXJUV3GRQzPNAkRIiU7L3dqz88z2Q4DxHhQXUrwmx5fbCAVdEsUv5n1fksLimJERCtE9sCiBZXsYEP7xksp27qowY5PI9krNxc+UdvhcUbi50wK6piTmX1LjRMfUcYagoRAC/aIhlfsHp6aQyHjdARZW9381fY8PdSERTSVtKagSgMw5YneDPgjSQxQdlrZ9CQSjZv+Wh9AhTNLu8cdEg3wuMB8/R62CaLnlLYCSUgFSJNeMEEJJlAFE0apSWFthsYqrXOy7IDyD0eYT5yKT6zoq4BNIf077UftlqkKePZ+5bGO0N4xKBEup6tOIgIbKJkn5Ebkx3yang/0M5JBPOnzV64LAxPDE14EEWvhlWJ7zMQOWocMXVGPEHtARXe7AbTibV2bwufRojlQGVNF7qLwRTF78WPh7/ykGt37a5WYlXT7CcuLCDw6Y7uB0q0Dfz4fdosIekhppBK60urjAE/fgmAOgPEL9FU86gzIDPrqbsnbM2HClw6d2AtR66r9TsLQ6cN7MkWla51pVwY6j2/yZH2D3BskeW0NoouSoDP+cQU0X1PNmvUguwpWK3NgSfFCzyj4+p60U81cIPpZRlh0eQpXTOjQz0XCwhr/4oxx2dbXeDS0IFR5VUU1o0TkK/D1cS3QTeBOUbp3zNPA/D5pFQ/GVo4Qn4nCciiclWPOXMD8ejA== 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:(13230001)(4636009)(366004)(6862004)(8936002)(8676002)(38350700002)(66476007)(38100700002)(5660300002)(508600001)(6486002)(66946007)(4326008)(86362001)(2616005)(6666004)(83380400001)(2906002)(66556008)(52116002)(6506007)(186003)(6512007)(26005)(54906003)(316002)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ARPgfqGTSm+y3WL/+dM+t4P6ucevNP+hcIf1WI9O/LKjny/CIpCDDgYDvHI1lWqkUqxf75mrOjBaN/JRBCBlT/NVcK3SNUvgFqMy2g4A+l1oAtUkstCPXQTsRWT6vlshxzKg1Lb2yjohpiP2lSThtrQY9gSWZ0PbRvhFFkOfIB9QxgGDHJ7nlSJxW7xuFfHBzqwgTIyTB2UmIu87vL8l3IZ3dWqGvTCUg8lO409TullkyT0BP90b4RfM3W/l76Rd4AaotmRawWQiIBpnyicP5C5DZx8oyCy7zNOF3ppbNgA6tzPiDQI6ryjGLd8qMcNxyD7sEU4M55+YGCgarMChamV6ZrAGdD1tV+PAFt8GpPDJ5RPSk+WB09RUy4IA9zy5oDV8/DmNCp+Ze0j6dDmM4nTMPS+g8Hy3MhQaYQdJBv4sxgw1/S5dUNmGdAxXfJgMAJQ16UQvYs/kC5vRqov0TwLg3qGytfSNz+JXDeFWQe9HyzeRIW1dUvuErv0lgVkhPj/AbdI+161Q8U9rzYyyCAAQtKwLiFQ8n9IRTxkjaVZaVfPwNx6SSuZISA1bg+MoOrrytqbpxqT5CjnmCthCMlJvBNNAa+IKDlqgyiEMwtg82frqGzRgCBBlGpNTVHKu9xmtjKzzlt2dDZzz6LnujTEzjGSALR6uvK7qSCIyVQdnd97DNl6Tj+zyPOaGDiNskSMML0N0aTGfBuRkyaxSkUM8FJ8W0haE99fvzkgX4NgxiRDgVujSAYrfr1+LHoE6bo5lxvg9+oVE+P7/bUy7EIHKxCe3q5ZWlzOYgH3okUoN/j9PT4PtD6KzoR3kfqNebpHwCtzhore+L6rcyjdqqX1nmunojDP6AHukpURn1hugZaZ9rLrsM4P/fiUn0CuOefSklqXQB1Wx6Jj/xz0Kg+oqYpavkrM4z7KXHusC59DPb2pQWJhIxJK4OguDHqSbRv/Cb2xQnCKX8azD1LEHOT7UvR2mG9iNGz5WPi1bU9Vhx/Y3ix22f4lrQC/KlP4eZv+qAFUmsnodhn+fcNyaSclcMxtsBYHcktaQh5SQgM+z80yO+2K45309C+viP4ZcwzT73pFsBZWBiEpEDzyvKPYfd5YhC1F9JULr82nBLkMcym+XUOIkI6kbLglG183E2XaYnLdB8VA+llR2Flr1OoovmPaYl6fN/jHqhiHtVi8zXyNeEWkhXeA5LArfH/UcePILKIbQtM33pmmEJj2wFzP609Vv3tg8lC400g669OVtx2P1e/rZ7llgKa3JCmVwp6JLZdIkYR8+AZ6j0h4GzgpEN/ukFvP8dlvb+fgNRqYZ2oR4l/mZnXVQB5rSMjITt0RYcHw6/TnS4ufFS3i4S9N8ncUniWMvldBR3Rnrc08jkATjBZ+boGeKvwyBzgr7iEK99kAD8y9b0e4MXhqO7PeeQV+FNhiQ/xMjbTauYa2OE8934qbK98loNt48y9+Y+vZnQBTVW28b2X6m1XsXeVWo+Ydln2fvwzO5Tu2t3F7lkRKaodo+zB0pLAe7xbCbY0yZ9CT8rrcp9wuQxoUkFqeX2wapHR0x/eKJIS7JC0HYU3HCCANsyUzuAFExsP6FYOHvkFhohE6+4l0uxod6NHHY/XgEAUSMZ1+/MxH5jOgQrV1e7BUVf+Rt9ElhenayAdkCqIM7D22b67N0JBN62l8vmMwYCp04+Na45tyPo7DhEi80qUhnMpt1Trbtp12YYqsMC3d882NR9hll4SxgoQ== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 87c6ba4c-8c9c-4fe2-25ad-08da47a93b37 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2022 10:42:19.6579 (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: HzDMNPRUJbfoGhIsOItWs7bw6deb5cWQTHAy7Ejokbnba1/I6X5S9iTzqPe2F5O2UVuwOLbjYXot9/0+TyhUAg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8312 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.5 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; }