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

Merge branches 'powercap', 'pm-domains', 'pm-em' and 'pm-opp' 

Merge updates of the powercap framework, generic PM domains, Energy
Model and operating performance points for 6.3-rc1:

 - Fix possible name leak in powercap_register_zone() (Yang Yingliang).

 - Add Meteor Lake and Emerald Rapids support to the intel_rapl power
   capping driver (Zhang Rui).

 - Modify the idle_inject power capping facility to support 100% idle
   injection (Srinivas Pandruvada).

 - Fix large time windows handling in the intel_rapl power capping
   driver (Zhang Rui).

 - Fix memory leaks with using debugfs_lookup() in the generic PM
   domains and Energy Model code (Greg Kroah-Hartman).

 - Add missing 'cache-unified' property in example for kryo OPP bindings
   (Rob Herring).

 - Fix error checking in opp_migrate_dentry() (Qi Zheng).

 - Remove "select SRCU" (Paul E. McKenney).

 - Let qcom,opp-fuse-level be a 2-long array for qcom SoCs (Konrad
   Dybcio).

* powercap:
  powercap: intel_rapl: Fix handling for large time window
  powercap: idle_inject: Support 100% idle injection
  powercap: intel_rapl: add support for Emerald Rapids
  powercap: intel_rapl: add support for Meteor Lake
  powercap: fix possible name leak in powercap_register_zone()

* pm-domains:
  PM: domains: fix memory leak with using debugfs_lookup()

* pm-em:
  PM: EM: fix memory leak with using debugfs_lookup()

* pm-opp:
  OPP: fix error checking in opp_migrate_dentry()
  dt-bindings: opp: v2-qcom-level: Let qcom,opp-fuse-level be a 2-long array
  drivers/opp: Remove "select SRCU"
  dt-bindings: opp: opp-v2-kryo-cpu: Add missing 'cache-unified' property in example
parents 7e71a133 cf835b00 0b6200e1 a0e8c13c 99537067

Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ examples: 
                L2_0: l2-cache {

                    compatible = "cache";

                    cache-level = <2>;

                    cache-unified;

                };

            };
@@ -150,6 +151,7 @@ examples: 
                L2_1: l2-cache {

                    compatible = "cache";

                    cache-level = <2>;

                    cache-unified;

                };

            };

Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ patternProperties: 
          this OPP node. Sometimes several corners/levels shares a certain fuse

          corner/level. A fuse corner/level contains e.g. ref uV, min uV,

          and max uV.

        $ref: /schemas/types.yaml#/definitions/uint32

        $ref: /schemas/types.yaml#/definitions/uint32-array

        minItems: 1

        maxItems: 2



    required:

      - opp-level

drivers/base/power/domain.c

+1 −4
Original line number Diff line number Diff line
@@ -220,13 +220,10 @@ static void genpd_debug_add(struct generic_pm_domain *genpd); 


static void genpd_debug_remove(struct generic_pm_domain *genpd)

{

	struct dentry *d;



	if (!genpd_debugfs_dir)

		return;



	d = debugfs_lookup(genpd->name, genpd_debugfs_dir);

	debugfs_remove(d);

	debugfs_lookup_and_remove(genpd->name, genpd_debugfs_dir);

}



static void genpd_update_accounting(struct generic_pm_domain *genpd)

drivers/opp/Kconfig

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config PM_OPP

	bool

	select SRCU

	help

	  SOCs have a standard set of tuples consisting of frequency and

	  voltage pairs that the device will support per voltage domain. This

drivers/opp/debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ static void opp_migrate_dentry(struct opp_device *opp_dev, 


	dentry = debugfs_rename(rootdir, opp_dev->dentry, rootdir,

				opp_table->dentry_name);

	if (!dentry) {

	if (IS_ERR(dentry)) {

		dev_err(dev, "%s: Failed to rename link from: %s to %s\n",

			__func__, dev_name(opp_dev->dev), dev_name(dev));

		return;