Commit 638757c9 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-em' and 'pm-opp' 

Merge energy model management updates and operating performance points
(OPP) library changes for 6.19-rc1:

 - Add support for sending netlink notifications to user space on energy
   model updates (Changwoo Mini, Peng Fan)

 - Minor improvements to the Rust OPP interface (Tamir Duberstein)

 - Fixes to scope-based pointers in the OPP library (Viresh Kumar)

* pm-em:
  PM: EM: Add to em_pd_list only when no failure
  PM: EM: Notify an event when the performance domain changes
  PM: EM: Implement em_notify_pd_created/updated()
  PM: EM: Implement em_notify_pd_deleted()
  PM: EM: Implement em_nl_get_pd_table_doit()
  PM: EM: Implement em_nl_get_pds_doit()
  PM: EM: Add an iterator and accessor for the performance domain
  PM: EM: Add a skeleton code for netlink notification
  PM: EM: Add em.yaml and autogen files
  PM: EM: Expose the ID of a performance domain via debugfs
  PM: EM: Assign a unique ID when creating a performance domain

* pm-opp:
  rust: opp: simplify callers of `to_c_str_array`
  OPP: Initialize scope-based pointers inline
  rust: opp: fix broken rustdoc link
parents bf7ae177 65df3a96 8dfa8bb6

Documentation/netlink/specs/em.yaml

0 → 100644
+113 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)



name: em



doc: |

  Energy model netlink interface to notify its changes.



protocol: genetlink



uapi-header: linux/energy_model.h



attribute-sets:

  -

    name: pds

    attributes:

      -

        name: pd

        type: nest

        nested-attributes: pd

        multi-attr: true

  -

    name: pd

    attributes:

      -

        name: pad

        type: pad

      -

        name: pd-id

        type: u32

      -

        name: flags

        type: u64

      -

        name: cpus

        type: string

  -

    name: pd-table

    attributes:

      -

        name: pd-id

        type: u32

      -

        name: ps

        type: nest

        nested-attributes: ps

        multi-attr: true

  -

    name: ps

    attributes:

      -

        name: pad

        type: pad

      -

        name: performance

        type: u64

      -

        name: frequency

        type: u64

      -

        name: power

        type: u64

      -

        name: cost

        type: u64

      -

        name: flags

        type: u64



operations:

  list:

    -

      name: get-pds

      attribute-set: pds

      doc: Get the list of information for all performance domains.

      do:

        reply:

          attributes:

            - pd

    -

      name: get-pd-table

      attribute-set: pd-table

      doc: Get the energy model table of a performance domain.

      do:

        request:

          attributes:

            - pd-id

        reply:

          attributes:

            - pd-id

            - ps

    -

      name: pd-created

      doc: A performance domain is created.

      notify: get-pd-table

      mcgrp: event

    -

      name: pd-updated

      doc: A performance domain is updated.

      notify: get-pd-table

      mcgrp: event

    -

      name: pd-deleted

      doc: A performance domain is deleted.

      attribute-set: pd-table

      event:

        attributes:

            - pd-id

      mcgrp: event



mcast-groups:

  list:

    -

      name: event

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -9188,6 +9188,9 @@ S: Maintained 
F:	kernel/power/energy_model.c

F:	include/linux/energy_model.h

F:	Documentation/power/energy-model.rst

F:	Documentation/netlink/specs/em.yaml

F:	include/uapi/linux/energy_model.h

F:	kernel/power/em_netlink*.*









EPAPR HYPERVISOR BYTE CHANNEL DEVICE DRIVER









M:	Laurentiu Tudor <laurentiu.tudor@nxp.com>
































drivers/opp/core.c



+38
−31






























Original line number
Diff line number
Diff line







@@ -309,9 +309,9 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_is_turbo);







 */









unsigned long dev_pm_opp_get_max_clock_latency(struct device *dev)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	opp_table = _find_opp_table(dev);









	if (IS_ERR(opp_table))









		return 0;


















@@ -327,7 +327,6 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_clock_latency);







 */









unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct dev_pm_opp *opp;









	struct regulator *reg;









	unsigned long latency_ns = 0;








@@ -337,7 +336,9 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)







		unsigned long max;









	} *uV;



















	opp_table = _find_opp_table(dev);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	if (IS_ERR(opp_table))









		return 0;


















@@ -409,10 +410,11 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_max_transition_latency);







 */









unsigned long dev_pm_opp_get_suspend_opp_freq(struct device *dev)









{









	struct opp_table *opp_table __free(put_opp_table);









	unsigned long freq = 0;



















	opp_table = _find_opp_table(dev);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	if (IS_ERR(opp_table))









		return 0;


















@@ -447,9 +449,9 @@ int _get_opp_count(struct opp_table *opp_table)







 */









int dev_pm_opp_get_opp_count(struct device *dev)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	opp_table = _find_opp_table(dev);









	if (IS_ERR(opp_table)) {









		dev_dbg(dev, "%s: OPP table not found (%ld)\n",









			__func__, PTR_ERR(opp_table));








@@ -605,9 +607,9 @@ _find_key(struct device *dev, unsigned long *key, int index, bool available,







			  unsigned long opp_key, unsigned long key),









	  bool (*assert)(struct opp_table *opp_table, unsigned int index))









{









	struct opp_table *opp_table __free(put_opp_table);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	opp_table = _find_opp_table(dev);









	if (IS_ERR(opp_table)) {









		dev_err(dev, "%s: OPP table not found (%ld)\n", __func__,









			PTR_ERR(opp_table));








@@ -1410,12 +1412,13 @@ static int _set_opp(struct device *dev, struct opp_table *opp_table,







 */









int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct dev_pm_opp *opp __free(put_opp) = NULL;









	unsigned long freq = 0, temp_freq;









	bool forced = false;



















	opp_table = _find_opp_table(dev);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	if (IS_ERR(opp_table)) {









		dev_err(dev, "%s: device's opp table doesn't exist\n", __func__);









		return PTR_ERR(opp_table);








@@ -1477,9 +1480,9 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_set_rate);







 */









int dev_pm_opp_set_opp(struct device *dev, struct dev_pm_opp *opp)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	opp_table = _find_opp_table(dev);









	if (IS_ERR(opp_table)) {









		dev_err(dev, "%s: device opp doesn't exist\n", __func__);









		return PTR_ERR(opp_table);








@@ -1794,10 +1797,11 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_put);







 */









void dev_pm_opp_remove(struct device *dev, unsigned long freq)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct dev_pm_opp *opp = NULL, *iter;



















	opp_table = _find_opp_table(dev);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	if (IS_ERR(opp_table))









		return;


















@@ -1885,9 +1889,9 @@ bool _opp_remove_all_static(struct opp_table *opp_table)







 */









void dev_pm_opp_remove_all_dynamic(struct device *dev)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	opp_table = _find_opp_table(dev);









	if (IS_ERR(opp_table))









		return;


















@@ -2871,10 +2875,11 @@ static int _opp_set_availability(struct device *dev, unsigned long freq,







				 bool availability_req)









{









	struct dev_pm_opp *opp __free(put_opp) = ERR_PTR(-ENODEV), *tmp_opp;









	struct opp_table *opp_table __free(put_opp_table);



















	/* Find the opp_table */









	opp_table = _find_opp_table(dev);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	if (IS_ERR(opp_table)) {









		dev_warn(dev, "%s: Device OPP not found (%ld)\n", __func__,









			 PTR_ERR(opp_table));








@@ -2932,11 +2937,12 @@ int dev_pm_opp_adjust_voltage(struct device *dev, unsigned long freq,

















{









	struct dev_pm_opp *opp __free(put_opp) = ERR_PTR(-ENODEV), *tmp_opp;









	struct opp_table *opp_table __free(put_opp_table);









	int r;



















	/* Find the opp_table */









	opp_table = _find_opp_table(dev);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	if (IS_ERR(opp_table)) {









		r = PTR_ERR(opp_table);









		dev_warn(dev, "%s: Device OPP not found (%d)\n", __func__, r);








@@ -2986,12 +2992,13 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_adjust_voltage);







 */









int dev_pm_opp_sync_regulators(struct device *dev)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct regulator *reg;









	int ret, i;



















	/* Device may not have OPP table */









	opp_table = _find_opp_table(dev);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	if (IS_ERR(opp_table))









		return 0;


















@@ -3062,9 +3069,9 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_disable);







 */









int dev_pm_opp_register_notifier(struct device *dev, struct notifier_block *nb)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	opp_table = _find_opp_table(dev);









	if (IS_ERR(opp_table))









		return PTR_ERR(opp_table);


















@@ -3082,9 +3089,9 @@ EXPORT_SYMBOL(dev_pm_opp_register_notifier);







int dev_pm_opp_unregister_notifier(struct device *dev,









				   struct notifier_block *nb)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	opp_table = _find_opp_table(dev);









	if (IS_ERR(opp_table))









		return PTR_ERR(opp_table);


















@@ -3101,10 +3108,10 @@ EXPORT_SYMBOL(dev_pm_opp_unregister_notifier);







 */









void dev_pm_opp_remove_table(struct device *dev)









{









	struct opp_table *opp_table __free(put_opp_table);



















	/* Check for existing table for 'dev' */









	opp_table = _find_opp_table(dev);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(dev);



















	if (IS_ERR(opp_table)) {









		int error = PTR_ERR(opp_table);










































drivers/opp/cpu.c



+9
−7






























Original line number
Diff line number
Diff line







@@ -56,10 +56,10 @@ int dev_pm_opp_init_cpufreq_table(struct device *dev,







		return -ENOMEM;



















	for (i = 0, rate = 0; i < max_opps; i++, rate++) {









		struct dev_pm_opp *opp __free(put_opp);



















		/* find next rate */









		opp = dev_pm_opp_find_freq_ceil(dev, &rate);









		struct dev_pm_opp *opp __free(put_opp) =









			dev_pm_opp_find_freq_ceil(dev, &rate);



















		if (IS_ERR(opp)) {









			ret = PTR_ERR(opp);









			goto out;








@@ -154,12 +154,13 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_cpumask_remove_table);







int dev_pm_opp_set_sharing_cpus(struct device *cpu_dev,









				const struct cpumask *cpumask)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct opp_device *opp_dev;









	struct device *dev;









	int cpu;



















	opp_table = _find_opp_table(cpu_dev);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(cpu_dev);



















	if (IS_ERR(opp_table))









		return PTR_ERR(opp_table);


















@@ -201,10 +202,11 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_set_sharing_cpus);







 */









int dev_pm_opp_get_sharing_cpus(struct device *cpu_dev, struct cpumask *cpumask)









{









	struct opp_table *opp_table __free(put_opp_table);









	struct opp_device *opp_dev;



















	opp_table = _find_opp_table(cpu_dev);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_opp_table(cpu_dev);



















	if (IS_ERR(opp_table))









		return PTR_ERR(opp_table);










































drivers/opp/of.c



+70
−55






























Original line number
Diff line number
Diff line







@@ -45,9 +45,10 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_get_opp_desc_node);







struct opp_table *_managed_opp(struct device *dev, int index)









{









	struct opp_table *opp_table, *managed_table = NULL;









	struct device_node *np __free(device_node);



















	np = _opp_of_get_opp_desc_node(dev->of_node, index);









	struct device_node *np __free(device_node) =









		_opp_of_get_opp_desc_node(dev->of_node, index);



















	if (!np)









		return NULL;


















@@ -95,10 +96,11 @@ static struct device_node *of_parse_required_opp(struct device_node *np,







/* The caller must call dev_pm_opp_put_opp_table() after the table is used */









static struct opp_table *_find_table_of_opp_np(struct device_node *opp_np)









{









	struct device_node *opp_table_np __free(device_node);









	struct opp_table *opp_table;



















	opp_table_np = of_get_parent(opp_np);









	struct device_node *opp_table_np __free(device_node) =









		of_get_parent(opp_np);



















	if (!opp_table_np)









		return ERR_PTR(-ENODEV);


















@@ -146,12 +148,13 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table,







					     struct device_node *opp_np)









{









	struct opp_table **required_opp_tables;









	struct device_node *np __free(device_node);









	bool lazy = false;









	int count, i, size;



















	/* Traversing the first OPP node is all we need */









	np = of_get_next_available_child(opp_np, NULL);









	struct device_node *np __free(device_node) =









		of_get_next_available_child(opp_np, NULL);



















	if (!np) {









		dev_warn(dev, "Empty OPP table\n");









		return;








@@ -171,9 +174,9 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table,







	opp_table->required_opp_count = count;



















	for (i = 0; i < count; i++) {









		struct device_node *required_np __free(device_node);









		struct device_node *required_np __free(device_node) =









			of_parse_required_opp(np, i);



















		required_np = of_parse_required_opp(np, i);









		if (!required_np) {









			_opp_table_free_required_tables(opp_table);









			return;








@@ -199,14 +202,15 @@ static void _opp_table_alloc_required_tables(struct opp_table *opp_table,







void _of_init_opp_table(struct opp_table *opp_table, struct device *dev,









			int index)









{









	struct device_node *np __free(device_node), *opp_np;









	struct device_node *opp_np;









	u32 val;



















	/*









	 * Only required for backward compatibility with v1 bindings, but isn't









	 * harmful for other cases. And so we do it unconditionally.









	 */









	np = of_node_get(dev->of_node);









	struct device_node *np __free(device_node) = of_node_get(dev->of_node);



















	if (!np)









		return;


















@@ -273,9 +277,9 @@ void _of_clear_opp(struct opp_table *opp_table, struct dev_pm_opp *opp)







static int _link_required_opps(struct dev_pm_opp *opp,









			       struct opp_table *required_table, int index)









{









	struct device_node *np __free(device_node);









	struct device_node *np __free(device_node) =









		of_parse_required_opp(opp->np, index);



















	np = of_parse_required_opp(opp->np, index);









	if (unlikely(!np))









		return -ENODEV;


















@@ -349,16 +353,13 @@ static void lazy_link_required_opp_table(struct opp_table *new_table)







	guard(mutex)(&opp_table_lock);



















	list_for_each_entry_safe(opp_table, temp, &lazy_opp_tables, lazy) {









		struct device_node *opp_np __free(device_node);









		bool lazy = false;



















		/* opp_np can't be invalid here */









		opp_np = of_get_next_available_child(opp_table->np, NULL);









		struct device_node *opp_np __free(device_node) =









			of_get_next_available_child(opp_table->np, NULL);



















		for (i = 0; i < opp_table->required_opp_count; i++) {









			struct device_node *required_np __free(device_node) = NULL;









			struct device_node *required_table_np __free(device_node) = NULL;



















			required_opp_tables = opp_table->required_opp_tables;



















			/* Required opp-table is already parsed */








@@ -366,8 +367,10 @@ static void lazy_link_required_opp_table(struct opp_table *new_table)







				continue;



















			/* required_np can't be invalid here */









			required_np = of_parse_required_opp(opp_np, i);









			required_table_np = of_get_parent(required_np);









			struct device_node *required_np __free(device_node) =









				of_parse_required_opp(opp_np, i);









			struct device_node *required_table_np __free(device_node) =









				of_get_parent(required_np);



















			/*









			 * Newly added table isn't the required opp-table for








@@ -402,13 +405,12 @@ static void lazy_link_required_opp_table(struct opp_table *new_table)







static int _bandwidth_supported(struct device *dev, struct opp_table *opp_table)









{









	struct device_node *opp_np __free(device_node) = NULL;









	struct device_node *np __free(device_node) = NULL;









	struct property *prop;



















	if (!opp_table) {









		struct device_node *np __free(device_node);









		struct device_node *np __free(device_node) =









			of_node_get(dev->of_node);



















		np = of_node_get(dev->of_node);









		if (!np)









			return -ENODEV;


















@@ -422,7 +424,9 @@ static int _bandwidth_supported(struct device *dev, struct opp_table *opp_table)







		return 0;



















	/* Checking only first OPP is sufficient */









	np = of_get_next_available_child(opp_np, NULL);









	struct device_node *np __free(device_node) =









		of_get_next_available_child(opp_np, NULL);



















	if (!np) {









		dev_err(dev, "OPP table empty\n");









		return -EINVAL;








@@ -1269,11 +1273,12 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_cpumask_add_table);







int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev,









				   struct cpumask *cpumask)









{









	struct device_node *np __free(device_node);









	int cpu;



















	/* Get OPP descriptor node */









	np = dev_pm_opp_of_get_opp_desc_node(cpu_dev);









	struct device_node *np __free(device_node) =









		dev_pm_opp_of_get_opp_desc_node(cpu_dev);



















	if (!np) {









		dev_dbg(cpu_dev, "%s: Couldn't find opp node.\n", __func__);









		return -ENOENT;








@@ -1286,13 +1291,12 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev,







		return 0;



















	for_each_possible_cpu(cpu) {









		struct device_node *cpu_np __free(device_node) = NULL;









		struct device_node *tmp_np __free(device_node) = NULL;



















		if (cpu == cpu_dev->id)









			continue;



















		cpu_np = of_cpu_device_node_get(cpu);









		struct device_node *cpu_np __free(device_node) =









			of_cpu_device_node_get(cpu);



















		if (!cpu_np) {









			dev_err(cpu_dev, "%s: failed to get cpu%d node\n",









				__func__, cpu);








@@ -1300,7 +1304,9 @@ int dev_pm_opp_of_get_sharing_cpus(struct device *cpu_dev,







		}



















		/* Get OPP descriptor node */









		tmp_np = _opp_of_get_opp_desc_node(cpu_np, 0);









		struct device_node *tmp_np __free(device_node) =









			_opp_of_get_opp_desc_node(cpu_np, 0);



















		if (!tmp_np) {









			pr_err("%pOF: Couldn't find opp node\n", cpu_np);









			return -ENOENT;








@@ -1328,16 +1334,17 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_of_get_sharing_cpus);







 */









int of_get_required_opp_performance_state(struct device_node *np, int index)









{









	struct device_node *required_np __free(device_node);









	struct opp_table *opp_table __free(put_opp_table) = NULL;









	struct dev_pm_opp *opp __free(put_opp) = NULL;









	int pstate = -EINVAL;



















	required_np = of_parse_required_opp(np, index);









	struct device_node *required_np __free(device_node) =









		of_parse_required_opp(np, index);



















	if (!required_np)









		return -ENODEV;



















	opp_table = _find_table_of_opp_np(required_np);









	struct opp_table *opp_table __free(put_opp_table) =









		_find_table_of_opp_np(required_np);



















	if (IS_ERR(opp_table)) {









		pr_err("%s: Failed to find required OPP table %pOF: %ld\n",









		       __func__, np, PTR_ERR(opp_table));








@@ -1350,7 +1357,9 @@ int of_get_required_opp_performance_state(struct device_node *np, int index)







		return -EINVAL;









	}



















	opp = _find_opp_of_np(opp_table, required_np);









	struct dev_pm_opp *opp __free(put_opp) =









		_find_opp_of_np(opp_table, required_np);



















	if (opp) {









		if (opp->level == OPP_LEVEL_UNSET) {









			pr_err("%s: OPP levels aren't available for %pOF\n",








@@ -1376,14 +1385,17 @@ EXPORT_SYMBOL_GPL(of_get_required_opp_performance_state);







 */









bool dev_pm_opp_of_has_required_opp(struct device *dev)









{









	struct device_node *np __free(device_node) = NULL, *opp_np __free(device_node);









	int count;



















	opp_np = _opp_of_get_opp_desc_node(dev->of_node, 0);









	struct device_node *opp_np __free(device_node) =









		_opp_of_get_opp_desc_node(dev->of_node, 0);



















	if (!opp_np)









		return false;



















	np = of_get_next_available_child(opp_np, NULL);









	struct device_node *np __free(device_node) =









		of_get_next_available_child(opp_np, NULL);



















	if (!np) {









		dev_warn(dev, "Empty OPP table\n");









		return false;








@@ -1425,12 +1437,14 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_of_node);







static int __maybe_unused









_get_dt_power(struct device *dev, unsigned long *uW, unsigned long *kHz)









{









	struct dev_pm_opp *opp __free(put_opp);









	unsigned long opp_freq, opp_power;



















	/* Find the right frequency and related OPP */









	opp_freq = *kHz * 1000;









	opp = dev_pm_opp_find_freq_ceil(dev, &opp_freq);



















	struct dev_pm_opp *opp __free(put_opp) =









		dev_pm_opp_find_freq_ceil(dev, &opp_freq);



















	if (IS_ERR(opp))









		return -EINVAL;


















@@ -1465,14 +1479,13 @@ _get_dt_power(struct device *dev, unsigned long *uW, unsigned long *kHz)







int dev_pm_opp_calc_power(struct device *dev, unsigned long *uW,









			  unsigned long *kHz)









{









	struct dev_pm_opp *opp __free(put_opp) = NULL;









	struct device_node *np __free(device_node);









	unsigned long mV, Hz;









	u32 cap;









	u64 tmp;









	int ret;



















	np = of_node_get(dev->of_node);









	struct device_node *np __free(device_node) = of_node_get(dev->of_node);



















	if (!np)









		return -EINVAL;


















@@ -1481,7 +1494,10 @@ int dev_pm_opp_calc_power(struct device *dev, unsigned long *uW,







		return -EINVAL;



















	Hz = *kHz * 1000;









	opp = dev_pm_opp_find_freq_ceil(dev, &Hz);



















	struct dev_pm_opp *opp __free(put_opp) =









		dev_pm_opp_find_freq_ceil(dev, &Hz);



















	if (IS_ERR(opp))









		return -EINVAL;


















@@ -1502,11 +1518,12 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_calc_power);

















static bool _of_has_opp_microwatt_property(struct device *dev)









{









	struct dev_pm_opp *opp __free(put_opp);









	unsigned long freq = 0;



















	/* Check if at least one OPP has needed property */









	opp = dev_pm_opp_find_freq_ceil(dev, &freq);









	struct dev_pm_opp *opp __free(put_opp) =









		dev_pm_opp_find_freq_ceil(dev, &freq);



















	if (IS_ERR(opp))









		return false;


















@@ -1526,12 +1543,16 @@ static bool _of_has_opp_microwatt_property(struct device *dev)







 */









int dev_pm_opp_of_register_em(struct device *dev, struct cpumask *cpus)









{









	struct device_node *np __free(device_node) = NULL;









	struct em_data_callback em_cb;









	int ret, nr_opp;









	u32 cap;



















	if (IS_ERR_OR_NULL(dev)) {









	if (IS_ERR_OR_NULL(dev))









		return -EINVAL;



















	struct device_node *np __free(device_node) = of_node_get(dev->of_node);



















	if (!np) {









		ret = -EINVAL;









		goto failed;









	}








@@ -1548,12 +1569,6 @@ int dev_pm_opp_of_register_em(struct device *dev, struct cpumask *cpus)







		goto register_em;









	}



















	np = of_node_get(dev->of_node);









	if (!np) {









		ret = -EINVAL;









		goto failed;









	}



















	/*









	 * Register an EM only if the 'dynamic-power-coefficient' property is









	 * set in devicetree. It is assumed the voltage values are known if that