Skip to content

cpuidle/pmdomain: Correctly track state of excluded CPU clusters #1671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
maulik-k-shah wants to merge 2 commits into
base: tech/pm/power
Choose a base branch
from
+15 −1
Open

cpuidle/pmdomain: Correctly track state of excluded CPU clusters #1671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e15c496
FROMLIST: cpuidle: psci: Start CPU-cluster pmdomain OFF when OSI is used
maulik-k-shah Aug 11, 2026
9641a46
FROMLIST: pmdomain: core: Initialize state_idx to deepest state for O…
maulik-k-shah Aug 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion drivers/cpuidle/cpuidle-psci-domain.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,19 @@ static int psci_pd_init(struct device_node *np, bool use_osi)
/* Use governor for CPU PM domains if it has some states to manage. */
pd_gov = pd->states ? &pm_domain_cpu_gov : NULL;

ret = pm_genpd_init(pd, pd_gov, false);
/*
* Start the domain in the OFF state when OSI is in use, so that
* genpd's own status tracking (and its power-on notifier chain)
* reflects reality from the outset instead of reporting ON before
* any CPU in the domain has actually requested it. This is safe:
* dt_idle_attach_cpu() runtime-resumes the domain for every CPU
* that is already online by the time this driver probes, and the
* PSCI cpuidle cpuhp callbacks power it on/off for CPUs that come
* online/offline afterwards. When OSI isn't in use, GENPD_FLAG_ALWAYS_ON
* above keeps the domain powered regardless of is_off, so this has
* no effect there.
*/
ret = pm_genpd_init(pd, pd_gov, use_osi);
if (ret)
goto free_pd_prov;

Expand Down
2 changes: 2 additions & 0 deletions drivers/pmdomain/core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2409,6 +2409,8 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
INIT_WORK(&genpd->power_off_work, genpd_power_off_work_fn);
atomic_set(&genpd->sd_count, 0);
genpd->status = is_off ? GENPD_STATE_OFF : GENPD_STATE_ON;
if (is_off && genpd->state_count)
genpd->state_idx = genpd->state_count - 1;
genpd_set_stay_on(genpd, is_off);
genpd->sync_state = GENPD_SYNC_STATE_OFF;
genpd->device_count = 0;
Expand Down
Loading