Skip to content

Commit d9fecca

Browse files
rafaeljwrafaeljw
committed
Merge branch 'pm-opp'
* pm-opp: (24 commits) PM / Domains: Drop unused parameter in genpd_allocate_dev_data() PM / Domains: Drop genpd as in-param for pm_genpd_remove_device() PM / Domains: Drop __pm_genpd_add_device() PM / Domains: Drop extern declarations of functions in pm_domain.h PM / domains: Add perf_state attribute to genpd debugfs OPP: Allow same OPP table to be used for multiple genpd PM / Domain: Return 0 on error from of_genpd_opp_to_performance_state() PM / OPP: Fix shared OPP table support in dev_pm_opp_register_set_opp_helper() PM / OPP: Fix shared OPP table support in dev_pm_opp_set_regulators() PM / OPP: Fix shared OPP table support in dev_pm_opp_set_prop_name() PM / OPP: Fix shared OPP table support in dev_pm_opp_set_supported_hw() PM / OPP: silence an uninitialized variable warning PM / OPP: Remove dev_pm_opp_{un}register_get_pstate_helper() PM / OPP: Get performance state using genpd helper PM / Domain: Implement of_genpd_opp_to_performance_state() PM / Domain: Add support to parse domain's OPP table PM / Domain: Add struct device to genpd PM / OPP: Implement dev_pm_opp_get_of_node() PM / OPP: Implement of_dev_pm_opp_find_required_opp() PM / OPP: Implement dev_pm_opp_of_add_table_indexed() ...
2 parents 5b550c9 + 96c1bf6 commit d9fecca

File tree

11 files changed

+476
-300
lines changed

11 files changed

+476
-300
lines changed

‎Documentation/devicetree/bindings/opp/opp.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,10 @@ This defines voltage-current-frequency combinations along with other related
8282
properties.
8383

8484
Required properties:
85-
- opp-hz: Frequency in Hz, expressed as a 64-bit big-endian integer.
85+
- opp-hz: Frequency in Hz, expressed as a 64-bit big-endian integer. This is a
86+
required property for all device nodes but devices like power domains. The
87+
power domain nodes must have another (implementation dependent) property which
88+
uniquely identifies the OPP nodes.
8689

8790
Optional properties:
8891
- opp-microvolt: voltage in micro Volts.
@@ -159,7 +162,7 @@ Optional properties:
159162

160163
- status: Marks the node enabled/disabled.
161164

162-
- required-opp: This contains phandle to an OPP node in another device's OPP
165+
- required-opps: This contains phandle to an OPP node in another device's OPP
163166
table. It may contain an array of phandles, where each phandle points to an
164167
OPP of a different device. It should not contain multiple phandles to the OPP
165168
nodes in the same OPP table. This specifies the minimum required OPP of the

‎Documentation/devicetree/bindings/power/power_domain.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ inside a PM domain with index 0 of a power controller represented by a node
127127
with the label "power".
128128

129129
Optional properties:
130-
- required-opp: This contains phandle to an OPP node in another device's OPP
130+
- required-opps: This contains phandle to an OPP node in another device's OPP
131131
table. It may contain an array of phandles, where each phandle points to an
132132
OPP of a different device. It should not contain multiple phandles to the OPP
133133
nodes in the same OPP table. This specifies the minimum required OPP of the
@@ -175,14 +175,14 @@ Example:
175175
compatible = "foo,i-leak-current";
176176
reg = <0x12350000 0x1000>;
177177
power-domains = <&power 0>;
178-
required-opp = <&domain0_opp_0>;
178+
required-opps = <&domain0_opp_0>;
179179
};
180180

181181
leaky-device1@12350000 {
182182
compatible = "foo,i-leak-current";
183183
reg = <0x12350000 0x1000>;
184184
power-domains = <&power 1>;
185-
required-opp = <&domain1_opp_1>;
185+
required-opps = <&domain1_opp_1>;
186186
};
187187

188188
[1]. Documentation/devicetree/bindings/power/domain-idle-state.txt

‎drivers/base/power/domain.c

Lines changed: 141 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include <linux/kernel.h>
1111
#include <linux/io.h>
1212
#include <linux/platform_device.h>
13+
#include <linux/pm_opp.h>
1314
#include <linux/pm_runtime.h>
1415
#include <linux/pm_domain.h>
1516
#include <linux/pm_qos.h>
@@ -1315,7 +1316,6 @@ EXPORT_SYMBOL_GPL(pm_genpd_syscore_poweron);
13151316
#endif /* CONFIG_PM_SLEEP */
13161317

13171318
static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,
1318-
struct generic_pm_domain *genpd,
13191319
struct gpd_timing_data *td)
13201320
{
13211321
struct generic_pm_domain_data *gpd_data;
@@ -1384,7 +1384,7 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
13841384
if (IS_ERR_OR_NULL(genpd) || IS_ERR_OR_NULL(dev))
13851385
return -EINVAL;
13861386

1387-
gpd_data = genpd_alloc_dev_data(dev, genpd, td);
1387+
gpd_data = genpd_alloc_dev_data(dev, td);
13881388
if (IS_ERR(gpd_data))
13891389
return PTR_ERR(gpd_data);
13901390

@@ -1413,23 +1413,21 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
14131413
}
14141414

14151415
/**
1416-
* __pm_genpd_add_device - Add a device to an I/O PM domain.
1416+
* pm_genpd_add_device - Add a device to an I/O PM domain.
14171417
* @genpd: PM domain to add the device to.
14181418
* @dev: Device to be added.
1419-
* @td: Set of PM QoS timing parameters to attach to the device.
14201419
*/
1421-
int __pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
1422-
struct gpd_timing_data *td)
1420+
int pm_genpd_add_device(struct generic_pm_domain *genpd, struct device *dev)
14231421
{
14241422
int ret;
14251423

14261424
mutex_lock(&gpd_list_lock);
1427-
ret = genpd_add_device(genpd, dev, td);
1425+
ret = genpd_add_device(genpd, dev, NULL);
14281426
mutex_unlock(&gpd_list_lock);
14291427

14301428
return ret;
14311429
}
1432-
EXPORT_SYMBOL_GPL(__pm_genpd_add_device);
1430+
EXPORT_SYMBOL_GPL(pm_genpd_add_device);
14331431

14341432
static int genpd_remove_device(struct generic_pm_domain *genpd,
14351433
struct device *dev)
@@ -1476,13 +1474,13 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,
14761474

14771475
/**
14781476
* pm_genpd_remove_device - Remove a device from an I/O PM domain.
1479-
* @genpd: PM domain to remove the device from.
14801477
* @dev: Device to be removed.
14811478
*/
1482-
int pm_genpd_remove_device(struct generic_pm_domain *genpd,
1483-
struct device *dev)
1479+
int pm_genpd_remove_device(struct device *dev)
14841480
{
1485-
if (!genpd || genpd != genpd_lookup_dev(dev))
1481+
struct generic_pm_domain *genpd = genpd_lookup_dev(dev);
1482+
1483+
if (!genpd)
14861484
return -EINVAL;
14871485

14881486
return genpd_remove_device(genpd, dev);
@@ -1691,6 +1689,9 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
16911689
return ret;
16921690
}
16931691

1692+
device_initialize(&genpd->dev);
1693+
dev_set_name(&genpd->dev, "%s", genpd->name);
1694+
16941695
mutex_lock(&gpd_list_lock);
16951696
list_add(&genpd->gpd_list_node, &gpd_list);
16961697
mutex_unlock(&gpd_list_lock);
@@ -1887,14 +1888,33 @@ int of_genpd_add_provider_simple(struct device_node *np,
18871888

18881889
mutex_lock(&gpd_list_lock);
18891890

1890-
if (genpd_present(genpd)) {
1891-
ret = genpd_add_provider(np, genpd_xlate_simple, genpd);
1892-
if (!ret) {
1893-
genpd->provider = &np->fwnode;
1894-
genpd->has_provider = true;
1891+
if (!genpd_present(genpd))
1892+
goto unlock;
1893+
1894+
genpd->dev.of_node = np;
1895+
1896+
/* Parse genpd OPP table */
1897+
if (genpd->set_performance_state) {
1898+
ret = dev_pm_opp_of_add_table(&genpd->dev);
1899+
if (ret) {
1900+
dev_err(&genpd->dev, "Failed to add OPP table: %d\n",
1901+
ret);
1902+
goto unlock;
18951903
}
18961904
}
18971905

1906+
ret = genpd_add_provider(np, genpd_xlate_simple, genpd);
1907+
if (ret) {
1908+
if (genpd->set_performance_state)
1909+
dev_pm_opp_of_remove_table(&genpd->dev);
1910+
1911+
goto unlock;
1912+
}
1913+
1914+
genpd->provider = &np->fwnode;
1915+
genpd->has_provider = true;
1916+
1917+
unlock:
18981918
mutex_unlock(&gpd_list_lock);
18991919

19001920
return ret;
@@ -1909,6 +1929,7 @@ EXPORT_SYMBOL_GPL(of_genpd_add_provider_simple);
19091929
int of_genpd_add_provider_onecell(struct device_node *np,
19101930
struct genpd_onecell_data *data)
19111931
{
1932+
struct generic_pm_domain *genpd;
19121933
unsigned int i;
19131934
int ret = -EINVAL;
19141935

@@ -1921,13 +1942,27 @@ int of_genpd_add_provider_onecell(struct device_node *np,
19211942
data->xlate = genpd_xlate_onecell;
19221943

19231944
for (i = 0; i < data->num_domains; i++) {
1924-
if (!data->domains[i])
1945+
genpd = data->domains[i];
1946+
1947+
if (!genpd)
19251948
continue;
1926-
if (!genpd_present(data->domains[i]))
1949+
if (!genpd_present(genpd))
19271950
goto error;
19281951

1929-
data->domains[i]->provider = &np->fwnode;
1930-
data->domains[i]->has_provider = true;
1952+
genpd->dev.of_node = np;
1953+
1954+
/* Parse genpd OPP table */
1955+
if (genpd->set_performance_state) {
1956+
ret = dev_pm_opp_of_add_table_indexed(&genpd->dev, i);
1957+
if (ret) {
1958+
dev_err(&genpd->dev, "Failed to add OPP table for index %d: %d\n",
1959+
i, ret);
1960+
goto error;
1961+
}
1962+
}
1963+
1964+
genpd->provider = &np->fwnode;
1965+
genpd->has_provider = true;
19311966
}
19321967

19331968
ret = genpd_add_provider(np, data->xlate, data);
@@ -1940,10 +1975,16 @@ int of_genpd_add_provider_onecell(struct device_node *np,
19401975

19411976
error:
19421977
while (i--) {
1943-
if (!data->domains[i])
1978+
genpd = data->domains[i];
1979+
1980+
if (!genpd)
19441981
continue;
1945-
data->domains[i]->provider = NULL;
1946-
data->domains[i]->has_provider = false;
1982+
1983+
genpd->provider = NULL;
1984+
genpd->has_provider = false;
1985+
1986+
if (genpd->set_performance_state)
1987+
dev_pm_opp_of_remove_table(&genpd->dev);
19471988
}
19481989

19491990
mutex_unlock(&gpd_list_lock);
@@ -1970,10 +2011,17 @@ void of_genpd_del_provider(struct device_node *np)
19702011
* provider, set the 'has_provider' to false
19712012
* so that the PM domain can be safely removed.
19722013
*/
1973-
list_for_each_entry(gpd, &gpd_list, gpd_list_node)
1974-
if (gpd->provider == &np->fwnode)
2014+
list_for_each_entry(gpd, &gpd_list, gpd_list_node) {
2015+
if (gpd->provider == &np->fwnode) {
19752016
gpd->has_provider = false;
19762017

2018+
if (!gpd->set_performance_state)
2019+
continue;
2020+
2021+
dev_pm_opp_of_remove_table(&gpd->dev);
2022+
}
2023+
}
2024+
19772025
list_del(&cp->link);
19782026
of_node_put(cp->node);
19792027
kfree(cp);
@@ -2346,6 +2394,55 @@ int of_genpd_parse_idle_states(struct device_node *dn,
23462394
}
23472395
EXPORT_SYMBOL_GPL(of_genpd_parse_idle_states);
23482396

2397+
/**
2398+
* of_genpd_opp_to_performance_state- Gets performance state of device's
2399+
* power domain corresponding to a DT node's "required-opps" property.
2400+
*
2401+
* @dev: Device for which the performance-state needs to be found.
2402+
* @opp_node: DT node where the "required-opps" property is present. This can be
2403+
* the device node itself (if it doesn't have an OPP table) or a node
2404+
* within the OPP table of a device (if device has an OPP table).
2405+
* @state: Pointer to return performance state.
2406+
*
2407+
* Returns performance state corresponding to the "required-opps" property of
2408+
* a DT node. This calls platform specific genpd->opp_to_performance_state()
2409+
* callback to translate power domain OPP to performance state.
2410+
*
2411+
* Returns performance state on success and 0 on failure.
2412+
*/
2413+
unsigned int of_genpd_opp_to_performance_state(struct device *dev,
2414+
struct device_node *opp_node)
2415+
{
2416+
struct generic_pm_domain *genpd;
2417+
struct dev_pm_opp *opp;
2418+
int state = 0;
2419+
2420+
genpd = dev_to_genpd(dev);
2421+
if (IS_ERR(genpd))
2422+
return 0;
2423+
2424+
if (unlikely(!genpd->set_performance_state))
2425+
return 0;
2426+
2427+
genpd_lock(genpd);
2428+
2429+
opp = of_dev_pm_opp_find_required_opp(&genpd->dev, opp_node);
2430+
if (IS_ERR(opp)) {
2431+
dev_err(dev, "Failed to find required OPP: %ld\n",
2432+
PTR_ERR(opp));
2433+
goto unlock;
2434+
}
2435+
2436+
state = genpd->opp_to_performance_state(genpd, opp);
2437+
dev_pm_opp_put(opp);
2438+
2439+
unlock:
2440+
genpd_unlock(genpd);
2441+
2442+
return state;
2443+
}
2444+
EXPORT_SYMBOL_GPL(of_genpd_opp_to_performance_state);
2445+
23492446
#endif /* CONFIG_PM_GENERIC_DOMAINS_OF */
23502447

23512448

@@ -2613,6 +2710,19 @@ static int genpd_devices_show(struct seq_file *s, void *data)
26132710
return ret;
26142711
}
26152712

2713+
static int genpd_perf_state_show(struct seq_file *s, void *data)
2714+
{
2715+
struct generic_pm_domain *genpd = s->private;
2716+
2717+
if (genpd_lock_interruptible(genpd))
2718+
return -ERESTARTSYS;
2719+
2720+
seq_printf(s, "%u\n", genpd->performance_state);
2721+
2722+
genpd_unlock(genpd);
2723+
return 0;
2724+
}
2725+
26162726
#define define_genpd_open_function(name) \
26172727
static int genpd_##name##_open(struct inode *inode, struct file *file) \
26182728
{ \
@@ -2626,6 +2736,7 @@ define_genpd_open_function(idle_states);
26262736
define_genpd_open_function(active_time);
26272737
define_genpd_open_function(total_idle_time);
26282738
define_genpd_open_function(devices);
2739+
define_genpd_open_function(perf_state);
26292740

26302741
#define define_genpd_debugfs_fops(name) \
26312742
static const struct file_operations genpd_##name##_fops = { \
@@ -2642,6 +2753,7 @@ define_genpd_debugfs_fops(idle_states);
26422753
define_genpd_debugfs_fops(active_time);
26432754
define_genpd_debugfs_fops(total_idle_time);
26442755
define_genpd_debugfs_fops(devices);
2756+
define_genpd_debugfs_fops(perf_state);
26452757

26462758
static int __init genpd_debug_init(void)
26472759
{
@@ -2675,6 +2787,9 @@ static int __init genpd_debug_init(void)
26752787
d, genpd, &genpd_total_idle_time_fops);
26762788
debugfs_create_file("devices", 0444,
26772789
d, genpd, &genpd_devices_fops);
2790+
if (genpd->set_performance_state)
2791+
debugfs_create_file("perf_state", 0444,
2792+
d, genpd, &genpd_perf_state_fops);
26782793
}
26792794

26802795
return 0;

‎drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ static int acp_hw_fini(void *handle)
513513
if (adev->acp.acp_genpd) {
514514
for (i = 0; i < ACP_DEVS ; i++) {
515515
dev = get_mfd_cell_dev(adev->acp.acp_cell[i].name, i);
516-
ret = pm_genpd_remove_device(&adev->acp.acp_genpd->gpd, dev);
516+
ret = pm_genpd_remove_device(dev);
517517
/* If removal fails, dont giveup and try rest */
518518
if (ret)
519519
dev_err(dev, "remove dev from genpd failed\n");

0 commit comments

Comments
 (0)