Skip to content

Commit 039d2b0

Browse files
author
Ulf Hansson
committed
cpuidle: psci: Drop redundant sync_state support
The recent updates to the genpd core, can entirely manage the sync_state support for the cpuidle-psci-domain. More precisely, genpd prevents our ->power_off() callback from being invoked, until all of our consumers are ready for it. Let's therefore drop the sync_state support for the cpuidle-psci-domain as it has become redundant. Tested-by: Hiago De Franco <hiago.franco@toradex.com> # Colibri iMX8X Tested-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com> # TI AM62A,Xilinx ZynqMP ZCU106 Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Link: https://lore.kernel.org/r/20250701114733.636510-24-ulf.hansson@linaro.org
1 parent 0e789b4 commit 039d2b0

1 file changed

Lines changed: 1 addition & 21 deletions

File tree

drivers/cpuidle/cpuidle-psci-domain.c

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ struct psci_pd_provider {
2828
};
2929

3030
static LIST_HEAD(psci_pd_providers);
31-
static bool psci_pd_allow_domain_state;
3231

3332
static int psci_pd_power_off(struct generic_pm_domain *pd)
3433
{
@@ -38,9 +37,6 @@ static int psci_pd_power_off(struct generic_pm_domain *pd)
3837
if (!state->data)
3938
return 0;
4039

41-
if (!psci_pd_allow_domain_state)
42-
return -EBUSY;
43-
4440
/* OSI mode is enabled, set the corresponding domain state. */
4541
pd_state = state->data;
4642
psci_set_domain_state(pd, pd->state_idx, *pd_state);
@@ -63,8 +59,7 @@ static int psci_pd_init(struct device_node *np, bool use_osi)
6359
if (!pd_provider)
6460
goto free_pd;
6561

66-
pd->flags |= GENPD_FLAG_IRQ_SAFE | GENPD_FLAG_CPU_DOMAIN |
67-
GENPD_FLAG_NO_SYNC_STATE;
62+
pd->flags |= GENPD_FLAG_IRQ_SAFE | GENPD_FLAG_CPU_DOMAIN;
6863

6964
/*
7065
* Allow power off when OSI has been successfully enabled.
@@ -127,20 +122,6 @@ static void psci_pd_remove(void)
127122
}
128123
}
129124

130-
static void psci_cpuidle_domain_sync_state(struct device *dev)
131-
{
132-
struct psci_pd_provider *pd_provider;
133-
134-
/*
135-
* All devices have now been attached/probed to the PM domain topology,
136-
* hence it's fine to allow domain states to be picked.
137-
*/
138-
psci_pd_allow_domain_state = true;
139-
140-
list_for_each_entry(pd_provider, &psci_pd_providers, link)
141-
of_genpd_sync_state(pd_provider->node);
142-
}
143-
144125
static const struct of_device_id psci_of_match[] = {
145126
{ .compatible = "arm,psci-1.0" },
146127
{}
@@ -201,7 +182,6 @@ static struct platform_driver psci_cpuidle_domain_driver = {
201182
.driver = {
202183
.name = "psci-cpuidle-domain",
203184
.of_match_table = psci_of_match,
204-
.sync_state = psci_cpuidle_domain_sync_state,
205185
},
206186
};
207187

0 commit comments

Comments
 (0)