From mboxrd@z Thu Jan 1 00:00:00 1970 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 7EE4BC00A8F for ; Tue, 24 Oct 2023 18:04:39 +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:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=ZakwsHychhQXHhKK3r5Jcpom3awcaOPJRl2Sa8hmUto=; b=jweczQksBWLPE7 keRnCrfIMsixm3bogMhKTYhBWWVqppA2HDjCfgoVv3XoRuy43oWapEbPuNIRRGklVZ0aMGvngPsyI /DBGX7Qcx0vSXjhpQWZP4CUsY+75LuNxhA6X6J0HN69uEi3wZSjFZbFuiLaEbOkS3Ntlo7oCCow1i R044cFowPvZg9iDSnA4751S7DKRSo8papUY/2u+5uK9yDxiey3qnh0Om2g1LOeO8U3l8zJn08cdK2 QZTYXyRWpU4LAZ1mqvFipe5oBgmtHlVk9eLLC8mSihQm1UUgxblxMqIb5Qpy1k0z0lFigTQhDZM3a WX0r1+Jg/xqlZQg35+Vg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qvLlG-00AdIZ-1y; Tue, 24 Oct 2023 18:04:14 +0000 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qvLlD-00AdHs-23 for linux-arm-kernel@lists.infradead.org; Tue, 24 Oct 2023 18:04:13 +0000 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-6bd73395bceso32745b3a.0 for ; Tue, 24 Oct 2023 11:04:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698170648; x=1698775448; darn=lists.infradead.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=XiNf7bxs7WQlL1p7N8zEaMblQKww7yLL72WVvv0ROXY=; b=fe1/AoNwUIDqbxDyZXaIwefj+TfA+FWwWuR50LwltBLBrTckgwXtNnzjgwaJC4Bm16 LAXXREUjrYmXSo61U0PxqleV+nDhUbjxZ0h1EbfRk/OQWKjTVt+KGyXVOrUq/d73/RND ZGwo4GDFDQ4419VpNgyAzD02nrdTHJcIzrGJkbrT90iiL/QE8YYHP6ofJVzMrvPDYuZ7 TiyHjJczlo59QeYW8AJyvQ4STZ4GTp8jeFzuDIns8KlnhJtjlxYYsGMobg1pMhAK0izB 0Gm+U+avLVpAoho5IHg++HIp1+i26+tilBBER4pd5QZYGZJBtFLxhKmXqqMJ4YZFsVcM OiFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698170648; x=1698775448; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=XiNf7bxs7WQlL1p7N8zEaMblQKww7yLL72WVvv0ROXY=; b=uHy/cD/TQdejtE/UbrxsJZ2fZDFbd7TwW+ZPztEWguJq1CZy83T5zkwpfXxgwQBYij NNedGLwAMcYimqFkH2oEwXNfRLGQrLb+t2VQx4/G/nUKk6T/On0oFjPLiHDNtxB/fbQZ 1jJXW2/VllDENpzr3qY4plcW+F31eOa6PBVkO+dCQD2dRy7wb4hqIDgaaxG+5cEp3nOn UOdk8yetEx9igM8Dr9lHmD/9XJvWEbmXFQMsPajH/KelHP+x8NAzEiQr8wQWQS5Y8pfZ Qkj8mi9N5OJ3P3Rr+kVETeE1fLHLLCxOtWr5dABXxUU7h0l+rScNFS0RHTj2tcARlbmE i8iQ== X-Gm-Message-State: AOJu0YwrRrMIakrtUUNawvPQf9K2pQ9/afi07yiP+97me78zZrL9NJCM z0WBLI7S/O0dLOSHPzuqeb2gE1l3xaY= X-Google-Smtp-Source: AGHT+IGGmy0G/+afdYUJkH5aUTsk4FzE1PuM+hOPncww8+bWosXhuzeZyzk6ESrdepCC8vjB/+o4NA== X-Received: by 2002:a05:6a20:7348:b0:17b:2c56:70bc with SMTP id v8-20020a056a20734800b0017b2c5670bcmr4227853pzc.10.1698170648145; Tue, 24 Oct 2023 11:04:08 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id e14-20020aa798ce000000b0069023d80e63sm7872398pfm.25.2023.10.24.11.04.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Oct 2023 11:04:07 -0700 (PDT) Date: Tue, 24 Oct 2023 11:04:05 -0700 From: Guenter Roeck To: j@jannau.net Cc: Hector Martin , Sven Peter , Alyssa Rosenzweig , Wim Van Sebroeck , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] watchdog: apple: Deactivate on suspend Message-ID: <5e975f5d-c60b-43fb-ab15-f657cb8419a3@roeck-us.net> References: <20231016-apple-watchdog-suspend-v2-1-7ffff8042dbc@jannau.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20231016-apple-watchdog-suspend-v2-1-7ffff8042dbc@jannau.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231024_110411_675094_7A3573FB X-CRM114-Status: GOOD ( 26.65 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Oct 16, 2023 at 08:58:01AM +0200, Janne Grunau via B4 Relay wrote: > From: Janne Grunau > > The watchdog remains active after putting the system into suspend. Add > PM callbacks to deactivate the watchdog on suspend an re-activate it on > resume. > > Signed-off-by: Janne Grunau Reviewed-by: Guenter Roeck > --- > Changes in v2: > - use DEFINE_SIMPLE_DEV_PM_OPS > - Link to v1: https://lore.kernel.org/r/20230930-apple-watchdog-suspend-v1-1-1998c0be9fd7@jannau.net > --- > drivers/watchdog/apple_wdt.c | 25 +++++++++++++++++++++++++ > 1 file changed, 25 insertions(+) > > diff --git a/drivers/watchdog/apple_wdt.c b/drivers/watchdog/apple_wdt.c > index eddeb0fede89..d4f739932f0b 100644 > --- a/drivers/watchdog/apple_wdt.c > +++ b/drivers/watchdog/apple_wdt.c > @@ -173,6 +173,8 @@ static int apple_wdt_probe(struct platform_device *pdev) > if (!wdt->clk_rate) > return -EINVAL; > > + platform_set_drvdata(pdev, wdt); > + > wdt->wdd.ops = &apple_wdt_ops; > wdt->wdd.info = &apple_wdt_info; > wdt->wdd.max_timeout = U32_MAX / wdt->clk_rate; > @@ -190,6 +192,28 @@ static int apple_wdt_probe(struct platform_device *pdev) > return devm_watchdog_register_device(dev, &wdt->wdd); > } > > +static int apple_wdt_resume(struct device *dev) > +{ > + struct apple_wdt *wdt = dev_get_drvdata(dev); > + > + if (watchdog_active(&wdt->wdd) || watchdog_hw_running(&wdt->wdd)) > + apple_wdt_start(&wdt->wdd); > + > + return 0; > +} > + > +static int apple_wdt_suspend(struct device *dev) > +{ > + struct apple_wdt *wdt = dev_get_drvdata(dev); > + > + if (watchdog_active(&wdt->wdd) || watchdog_hw_running(&wdt->wdd)) > + apple_wdt_stop(&wdt->wdd); > + > + return 0; > +} > + > +static DEFINE_SIMPLE_DEV_PM_OPS(apple_wdt_pm_ops, apple_wdt_suspend, apple_wdt_resume); > + > static const struct of_device_id apple_wdt_of_match[] = { > { .compatible = "apple,wdt" }, > {}, > @@ -200,6 +224,7 @@ static struct platform_driver apple_wdt_driver = { > .driver = { > .name = "apple-watchdog", > .of_match_table = apple_wdt_of_match, > + .pm = pm_sleep_ptr(&apple_wdt_pm_ops), > }, > .probe = apple_wdt_probe, > }; > > --- > base-commit: 0bb80ecc33a8fb5a682236443c1e740d5c917d1d > change-id: 20230930-apple-watchdog-suspend-7f73831130fb > > Best regards, > -- > Janne Grunau > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel