iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cpuidle: psci: Convert PM domain to platform driver

Browse Source 
To enable support for deferred probing and to allow implementation of the
->sync_state() callback from subsequent changes, let's convert into a
platform driver.

Reviewed-by: Lina Iyer <ilina@codeaurora.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Ulf Hansson
2020-07-07 14:58:03 +02:00
committed by Rafael J. Wysocki
parent 166bf83529
commit ee7c34caac
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/cpuidle/cpuidle-psci-domain.c
View File

@@ -12,6 +12,7 @@
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/pm_domain.h> #include <linux/pm_domain.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/psci.h> #include <linux/psci.h>
@@ -42,8 +43,8 @@ static int psci_pd_power_off(struct generic_pm_domain *pd)
return 0; return 0;
} }
static int __init psci_pd_parse_state_nodes(struct genpd_power_state *states, static int psci_pd_parse_state_nodes(struct genpd_power_state *states,
int state_count) int state_count)
{ {
int i, ret; int i, ret;
u32 psci_state, *psci_state_buf; u32 psci_state, *psci_state_buf;
@@ -72,7 +73,7 @@ free_state:
return ret; return ret;
} }
static int __init psci_pd_parse_states(struct device_node *np, static int psci_pd_parse_states(struct device_node *np,
struct genpd_power_state **states, int *state_count) struct genpd_power_state **states, int *state_count)
{ {
int ret; int ret;
@@ -100,7 +101,7 @@ static void psci_pd_free_states(struct genpd_power_state *states,
kfree(states); kfree(states);
} }
static int __init psci_pd_init(struct device_node *np) static int psci_pd_init(struct device_node *np)
{ {
struct generic_pm_domain *pd; struct generic_pm_domain *pd;
struct psci_pd_provider *pd_provider; struct psci_pd_provider *pd_provider;
@@ -167,7 +168,7 @@ out:
return ret; return ret;
} }
static void __init psci_pd_remove(void) static void psci_pd_remove(void)
{ {
struct psci_pd_provider *pd_provider, *it; struct psci_pd_provider *pd_provider, *it;
struct generic_pm_domain *genpd; struct generic_pm_domain *genpd;
@@ -185,7 +186,7 @@ static void __init psci_pd_remove(void)
} }
} }
static int __init psci_pd_init_topology(struct device_node *np, bool add) static int psci_pd_init_topology(struct device_node *np, bool add)
{ {
struct device_node *node; struct device_node *node;
struct of_phandle_args child, parent; struct of_phandle_args child, parent;
@@ -211,24 +212,24 @@ static int __init psci_pd_init_topology(struct device_node *np, bool add)
return 0; return 0;
} }
static int __init psci_pd_add_topology(struct device_node *np) static int psci_pd_add_topology(struct device_node *np)
{ {
return psci_pd_init_topology(np, true); return psci_pd_init_topology(np, true);
} }
static void __init psci_pd_remove_topology(struct device_node *np) static void psci_pd_remove_topology(struct device_node *np)
{ {
psci_pd_init_topology(np, false); psci_pd_init_topology(np, false);
} }
static const struct of_device_id psci_of_match[] __initconst = { static const struct of_device_id psci_of_match[] = {
{ .compatible = "arm,psci-1.0" }, { .compatible = "arm,psci-1.0" },
{} {}
}; };
static int __init psci_idle_init_domains(void) static int psci_cpuidle_domain_probe(struct platform_device *pdev)
{ {
struct device_node *np = of_find_matching_node(NULL, psci_of_match); struct device_node *np = pdev->dev.of_node;
struct device_node *node; struct device_node *node;
int ret = 0, pd_count = 0; int ret = 0, pd_count = 0;
@@ -237,7 +238,7 @@ static int __init psci_idle_init_domains(void)
/* Currently limit the hierarchical topology to be used in OSI mode. */ /* Currently limit the hierarchical topology to be used in OSI mode. */
if (!psci_has_osi_support()) if (!psci_has_osi_support())
goto out; return 0;
/* /*
* Parse child nodes for the "#power-domain-cells" property and * Parse child nodes for the "#power-domain-cells" property and
@@ -256,7 +257,7 @@ static int __init psci_idle_init_domains(void)
/* Bail out if not using the hierarchical CPU topology. */ /* Bail out if not using the hierarchical CPU topology. */
if (!pd_count) if (!pd_count)
goto out; return 0;
/* Link genpd masters/subdomains to model the CPU topology. */ /* Link genpd masters/subdomains to model the CPU topology. */
ret = psci_pd_add_topology(np); ret = psci_pd_add_topology(np);
@@ -271,9 +272,8 @@ static int __init psci_idle_init_domains(void)
goto remove_pd; goto remove_pd;
} }
of_node_put(np);
pr_info("Initialized CPU PM domain topology\n"); pr_info("Initialized CPU PM domain topology\n");
return pd_count; return 0;
put_node: put_node:
of_node_put(node); of_node_put(node);
@@ -281,10 +281,21 @@ remove_pd:
if (pd_count) if (pd_count)
psci_pd_remove(); psci_pd_remove();
pr_err("failed to create CPU PM domains ret=%d\n", ret); pr_err("failed to create CPU PM domains ret=%d\n", ret);
out:
of_node_put(np);
return ret; return ret;
} }
static struct platform_driver psci_cpuidle_domain_driver = {
.probe = psci_cpuidle_domain_probe,
.driver = {
.name = "psci-cpuidle-domain",
.of_match_table = psci_of_match,
},
};
static int __init psci_idle_init_domains(void)
{
return platform_driver_register(&psci_cpuidle_domain_driver);
}
subsys_initcall(psci_idle_init_domains); subsys_initcall(psci_idle_init_domains);
struct device *psci_dt_attach_cpu(int cpu) struct device *psci_dt_attach_cpu(int cpu)