This series improves the configurability of the DPM watchdog.

Currently, the DPM watchdog is always enabled if compiled in.  Also, the
module parameters defined in drivers/base/power/main.c use the generic
and non-descriptive "main" prefix.

This series addresses these limitations.

Patch 1 renames the module parameter prefix for
drivers/base/power/main.c from "main" to "pm".

Patch 2 introduces the "dpm_watchdog_enabled" module parameter to allow
enabling/disabling the watchdog at boot time and runtime.  It also adds
CONFIG_DPM_WATCHDOG_ENABLED to set the default value of the module
parameter at compile time.

The primary motivation for this configurability revolves around Android
GKI (Generic Kernel Image).  We want to enable CONFIG_DPM_WATCHDOG in
the GKI so the feature is available.  However, because the GKI is shared
across many different devices, we don't want to inadvertently affect
devices that are unaware of this feature.  This provides a way to
compile it in, but keep it disabled by default for those devices via the
kernel command line or module parameters.

To maintain backward compatibility, CONFIG_DPM_WATCHDOG_ENABLED relies
on `default y`.  Previously, the DPM watchdog was always active if
CONFIG_DPM_WATCHDOG was set.  Defaulting this new option to 'y' ensures
that the behavior remains unchanged for existing users and defconfigs
when they upgrade.
---
Since there was no further feedback on v5, I'm sending out v6.
Any feedback would be appreciated.
---
v6:
- Change the prefix "pm_sleep" -> "pm".

v5: https://lore.kernel.org/all/20260701045640.3130090-1-tzungbi@kernel.org
- Rebase to v7.2-rc1.
- Fix Signed-off-by lines.

v4: https://lore.kernel.org/all/20260611021219.2093476-1-tzungbi@kernel.org
- Address review comments.
- Patch 3 in v3 has applied separately.

v3: https://lore.kernel.org/all/20260608021526.1023248-1-tzungbi@kernel.org
- Address review comments on patch 2.

v2: https://lore.kernel.org/all/20260604090756.2884671-1-tzungbi@kernel.org
- Form a new series.

v1: Doesn't exist.

Tzung-Bi Shih (2):
  PM: sleep: Rename module parameters prefix to "pm"
  PM: dpm_watchdog: Allow disabling DPM watchdog by default

 Documentation/admin-guide/kernel-parameters.txt |  7 +++++++
 drivers/base/power/main.c                       | 14 ++++++++++++++
 kernel/power/Kconfig                            | 10 ++++++++++
 3 files changed, 31 insertions(+)

-- 
2.55.0.795.g602f6c329a-goog

On Mon, Jul 20, 2026 at 5:08 AM Tzung-Bi Shih <tzungbi@kernel.org> wrote:
>
> This series improves the configurability of the DPM watchdog.
>
> Currently, the DPM watchdog is always enabled if compiled in.  Also, the
> module parameters defined in drivers/base/power/main.c use the generic
> and non-descriptive "main" prefix.
>
> This series addresses these limitations.
>
> Patch 1 renames the module parameter prefix for
> drivers/base/power/main.c from "main" to "pm".
>
> Patch 2 introduces the "dpm_watchdog_enabled" module parameter to allow
> enabling/disabling the watchdog at boot time and runtime.  It also adds
> CONFIG_DPM_WATCHDOG_ENABLED to set the default value of the module
> parameter at compile time.
>
> The primary motivation for this configurability revolves around Android
> GKI (Generic Kernel Image).  We want to enable CONFIG_DPM_WATCHDOG in
> the GKI so the feature is available.  However, because the GKI is shared
> across many different devices, we don't want to inadvertently affect
> devices that are unaware of this feature.  This provides a way to
> compile it in, but keep it disabled by default for those devices via the
> kernel command line or module parameters.
>
> To maintain backward compatibility, CONFIG_DPM_WATCHDOG_ENABLED relies
> on `default y`.  Previously, the DPM watchdog was always active if
> CONFIG_DPM_WATCHDOG was set.  Defaulting this new option to 'y' ensures
> that the behavior remains unchanged for existing users and defconfigs
> when they upgrade.
> ---
> Since there was no further feedback on v5, I'm sending out v6.
> Any feedback would be appreciated.
> ---
> v6:
> - Change the prefix "pm_sleep" -> "pm".
>
> v5: https://lore.kernel.org/all/20260701045640.3130090-1-tzungbi@kernel.org
> - Rebase to v7.2-rc1.
> - Fix Signed-off-by lines.
>
> v4: https://lore.kernel.org/all/20260611021219.2093476-1-tzungbi@kernel.org
> - Address review comments.
> - Patch 3 in v3 has applied separately.
>
> v3: https://lore.kernel.org/all/20260608021526.1023248-1-tzungbi@kernel.org
> - Address review comments on patch 2.
>
> v2: https://lore.kernel.org/all/20260604090756.2884671-1-tzungbi@kernel.org
> - Form a new series.
>
> v1: Doesn't exist.
>
> Tzung-Bi Shih (2):
>   PM: sleep: Rename module parameters prefix to "pm"
>   PM: dpm_watchdog: Allow disabling DPM watchdog by default
>
>  Documentation/admin-guide/kernel-parameters.txt |  7 +++++++
>  drivers/base/power/main.c                       | 14 ++++++++++++++
>  kernel/power/Kconfig                            | 10 ++++++++++
>  3 files changed, 31 insertions(+)
>
> --

Applied as 7.3 material, thanks!