watchdog: apple: Deactivate on suspend
authorJanne Grunau <j@jannau.net>
Mon, 16 Oct 2023 06:58:01 +0000 (08:58 +0200)
committerWim Van Sebroeck <wim@linux-watchdog.org>
Sun, 29 Oct 2023 18:45:10 +0000 (19:45 +0100)
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 <j@jannau.net>
Reviewed-by: Eric Curtin <ecurtin@redhat.com>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20231016-apple-watchdog-suspend-v2-1-7ffff8042dbc@jannau.net
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
drivers/watchdog/apple_wdt.c

index eddeb0fede896d88e8c1ea2283cd305f076d5df8..d4f739932f0be8394c827e9beed3c1bbc4aace0d 100644 (file)
@@ -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,
 };