From patchwork Wed Mar 23 11:57:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 12789727 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 318EBC433F5 for ; Wed, 23 Mar 2022 11:59:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=/IwKQLCMMmxEyITH+9ExP9qF3nLiTuniCmGZOXOcFy0=; b=THnSbTArp9JtNW 5XmW6msM0QBBvr1XZReXhFAn62y2/vVfIItvZgO2uIP/phErbmW6pyYjc+7fd1+/kBbB4JmAgWBY/ ZkTurbmmYx0ZoInp1ZG3LDZzn5T6ZqrQ02Wnehe8FrzyXEIwaFshITmgxcbbUV74iUEKQUE3EtUAo TobocobWFcvT8xayWKmpHRZfN5f7AeTQ4MMcafghncULFpu3XxqrZk5KBHDa/ZjAuJok0Gd2c8yds bXnBHuSr7Eb3pWLEjeOCwMXGFg6aMF9UlsJajdbOLWT3OqlDp0X7oCoGUsecmjOPsUKOfh/uQpE1l 9duMI6+pUv8+dst0leSQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nWzcv-00DWzs-E1; Wed, 23 Mar 2022 11:58:09 +0000 Received: from out4-smtp.messagingengine.com ([66.111.4.28]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nWzcs-00DWz0-Bj for linux-arm-kernel@lists.infradead.org; Wed, 23 Mar 2022 11:58:08 +0000 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 0CB875C017F; Wed, 23 Mar 2022 07:58:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 23 Mar 2022 07:58:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alistair23.me; h=cc:cc:content-transfer-encoding:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm1; bh=njhFasRxl7Ia1rqX1GO6RIfc0g8n5/4PEtJNvN BVDok=; b=Y5thfAR321DMYFnFm7bhCzkSBUoOnnavryCjsHPUXb+M/fK1gc86hX 1mZB/Yrsa4ov6SpS1GYP8O4mNJPmMEfBsbgFBfd+7SyRWvm0RaVAgn3q5KvJnIMv F8s9dDqFT3+qNmWgp8DUtdGcoe8oZIDtedMig8UOYxqOZm94ip6QjBHUwcec44cL ar/zdmmvpRGpZ8vBgU+TR6CrFHrzHyE0kvvFyJfqHn6mkWVKdSqyuWBZJCtVAE89 hopavM3je5MY87re4Tfuu5mbNgih9u9M5VYcBmS8MwXQ5EPBNySrb1fX5hptYELM zYol+N/fD3T30z+S1thQ9piHi+JcQrKw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding:date:date :from:from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; bh=njhFasRxl7Ia1rqX1GO6RIfc0g8n5 /4PEtJNvNBVDok=; b=mdnYcUdhuEX6a0ttheB9gooKSO65Xb2r33bLAJvwQdVqO NDL29/OuMpscze0GVQEZE+kyWpxc2aH2Hc1gDZFc7F5QUtyj3G6CiRdqskW4kgrz YCXEBufpyleb5mAugj3Mo2ZLX36RPfg8vwZJJP2PWzyswclL+3gn/Bx0qKDwZvHq zfqCv8/qx1XsOAJO6lNxAtOAQyDoTq4ojcLZIJNrAxALaewQBU36QSJ3Gm6PBOp4 2puydx4N/G8WUWeG76hDfe37UwBRIS1xeDMse/Qq6FSolJGQDSg5OX6Ladawlz4I Za3AEd+AKdTdx7x3E8AMFDqZQCcjQS5FQNd+qXKRg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvvddrudegjedgfedvucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheptehlihhsthgrihhrucfhrhgrnhgtihhsuceorghlihhsthgrihhr segrlhhishhtrghirhdvfedrmhgvqeenucggtffrrghtthgvrhhnpeejleeihfdvtefgtd ethfdtgefftdeiffefjeeiffefveeuleejheejvefhffeukeenucevlhhushhtvghrufhi iigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpegrlhhishhtrghirhesrghlihhsth grihhrvdefrdhmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 23 Mar 2022 07:57:55 -0400 (EDT) From: Alistair Francis To: shawnguo@kernel.org, linux@roeck-us.net, linux-watchdog@vger.kernel.org, s.hauer@pengutronix.de, wim@linux-watchdog.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com, festevam@gmail.com, robh+dt@kernel.org, Alistair Francis Subject: [PATCH v4] watchdog: imx2_wdg: Allow ping on suspend Date: Wed, 23 Mar 2022 21:57:52 +1000 Message-Id: <20220323115752.360409-1-alistair@alistair23.me> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220323_045806_565161_38B647FB X-CRM114-Status: GOOD ( 17.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The i.MX watchdog cannot be disabled by software once it has been enabled. This means that it can't be stopped before suspend. For systems that enter low power mode this is fine, as the watchdog will be automatically stopped by hardware in low power mode. Not all i.MX platforms support low power mode in the mainline kernel. For example the i.MX7D does not enter low power mode and so will be rebooted 2 minutes after entering sleep states. This patch introduces a device tree property "fsl,ping-during-suspend" that can be used to enable ping on suspend support for these systems. Signed-off-by: Alistair Francis Reviewed-by: Guenter Roeck --- drivers/watchdog/imx2_wdt.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c index 51bfb796898b..d0c5d47ddede 100644 --- a/drivers/watchdog/imx2_wdt.c +++ b/drivers/watchdog/imx2_wdt.c @@ -66,6 +66,7 @@ struct imx2_wdt_device { struct watchdog_device wdog; bool ext_reset; bool clk_is_on; + bool no_ping; }; static bool nowayout = WATCHDOG_NOWAYOUT; @@ -312,12 +313,18 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) wdev->ext_reset = of_property_read_bool(dev->of_node, "fsl,ext-reset-output"); + /* + * The i.MX7D doesn't support low power mode, so we need to ping the watchdog + * during suspend. + */ + wdev->no_ping = !of_device_is_compatible(dev->of_node, "fsl,imx7d-wdt"); platform_set_drvdata(pdev, wdog); watchdog_set_drvdata(wdog, wdev); watchdog_set_nowayout(wdog, nowayout); watchdog_set_restart_priority(wdog, 128); watchdog_init_timeout(wdog, timeout, dev); - watchdog_stop_ping_on_suspend(wdog); + if (wdev->no_ping) + watchdog_stop_ping_on_suspend(wdog); if (imx2_wdt_is_running(wdev)) { imx2_wdt_set_timeout(wdog, wdog->timeout); @@ -366,9 +373,11 @@ static int __maybe_unused imx2_wdt_suspend(struct device *dev) imx2_wdt_ping(wdog); } - clk_disable_unprepare(wdev->clk); + if (wdev->no_ping) { + clk_disable_unprepare(wdev->clk); - wdev->clk_is_on = false; + wdev->clk_is_on = false; + } return 0; } @@ -380,11 +389,14 @@ static int __maybe_unused imx2_wdt_resume(struct device *dev) struct imx2_wdt_device *wdev = watchdog_get_drvdata(wdog); int ret; - ret = clk_prepare_enable(wdev->clk); - if (ret) - return ret; + if (wdev->no_ping) { + ret = clk_prepare_enable(wdev->clk); - wdev->clk_is_on = true; + if (ret) + return ret; + + wdev->clk_is_on = true; + } if (watchdog_active(wdog) && !imx2_wdt_is_running(wdev)) { /* @@ -407,6 +419,7 @@ static SIMPLE_DEV_PM_OPS(imx2_wdt_pm_ops, imx2_wdt_suspend, static const struct of_device_id imx2_wdt_dt_ids[] = { { .compatible = "fsl,imx21-wdt", }, + { .compatible = "fsl,imx7d-wdt", }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, imx2_wdt_dt_ids);