2023-10-16 06:58:31

by Janne Grunau via B4 Relay

Subject: [PATCH v2] watchdog: apple: Deactivate on suspend

From: Janne Grunau <[email protected]>

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 <[email protected]>
---
Changes in v2:
- use DEFINE_SIMPLE_DEV_PM_OPS
- Link to v1: https://lore.kernel.org/r/[email protected]
---
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 <[email protected]>

2023-10-16 10:23:03

by Eric Curtin

Subject: Re: [PATCH v2] watchdog: apple: Deactivate on suspend

On Mon, 16 Oct 2023 at 08:05, Janne Grunau via B4 Relay
<[email protected]> wrote:
>
> From: Janne Grunau <[email protected]>
>
> 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 <[email protected]>

Reviewed-by: Eric Curtin <[email protected]>

Is mise le meas/Regards,

Eric Curtin

> ---
> Changes in v2:
> - use DEFINE_SIMPLE_DEV_PM_OPS
> - Link to v1: https://lore.kernel.org/r/[email protected]
> ---
> 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 <[email protected]>
>
>

2023-10-17 14:39:44

by Neal Gompa

Subject: Re: [PATCH v2] watchdog: apple: Deactivate on suspend

On Mon, Oct 16, 2023 at 2:58 AM Janne Grunau via B4 Relay
<[email protected]> wrote:
>
> From: Janne Grunau <[email protected]>
>
> 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 <[email protected]>
> ---
> Changes in v2:
> - use DEFINE_SIMPLE_DEV_PM_OPS
> - Link to v1: https://lore.kernel.org/r/[email protected]
> ---
> 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
>

Reviewed-by: Neal Gompa <[email protected]>


--
真実はいつも一つ！/ Always, there's only one truth!

2023-10-22 16:48:29

by Guenter Roeck

Subject: Re: [PATCH v2] watchdog: apple: Deactivate on suspend

On 10/15/23 23:58, Janne Grunau via B4 Relay wrote:
> From: Janne Grunau <[email protected]>
>
> 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 <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> Changes in v2:
> - use DEFINE_SIMPLE_DEV_PM_OPS
> - Link to v1: https://lore.kernel.org/r/[email protected]
> ---
> 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,

2023-10-24 18:04:43

by Guenter Roeck

Subject: Re: [PATCH v2] watchdog: apple: Deactivate on suspend

On Mon, Oct 16, 2023 at 08:58:01AM +0200, Janne Grunau via B4 Relay wrote:
> From: Janne Grunau <[email protected]>
>
> 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 <[email protected]>

Reviewed-by: Guenter Roeck <[email protected]>

> ---
> Changes in v2:
> - use DEFINE_SIMPLE_DEV_PM_OPS
> - Link to v1: https://lore.kernel.org/r/[email protected]
> ---
> 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 <[email protected]>
>