Commit ad1871ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management updates from Rafael Wysocki:
 "These add new hardware support (new Qualcomm SoC versions in cpufreq,
  RK3568/RK3588 in devfreq), extend the OPP (operating performance
  points) framework, improve cpufreq governors, fix issues and clean up
  code (most of the changes are in cpufreq and devfreq).

  Specifics:

   - Add support for several Qualcomm SoC versions and other similar
     changes (Christian Marangi, Dmitry Baryshkov, Luca Weiss, Neil
     Armstrong, Richard Acayan, Robert Marko, Rohit Agarwal, Stephan
     Gerhold and Varadarajan Narayanan)

   - Clean up the tegra cpufreq driver (Sumit Gupta)

   - Use of_property_read_reg() to parse "reg" in pmac32 driver (Rob
     Herring)

   - Add support for TI's am62p5 Soc (Bryan Brattlof)

   - Make ARM_BRCMSTB_AVS_CPUFREQ depends on !ARM_SCMI_CPUFREQ (Florian
     Fainelli)

   - Update Kconfig to mention i.MX7 as well (Alexander Stein)

   - Revise global turbo disable check in intel_pstate (Srinivas
     Pandruvada)

   - Carry out initialization of sg_cpu in the schedutil cpufreq
     governor in one loop (Liao Chang)

   - Simplify the condition for storing 'down_threshold' in the
     conservative cpufreq governor (Liao Chang)

   - Use fine-grained mutex in the userspace cpufreq governor (Liao
     Chang)

   - Move is_managed indicator in the userspace cpufreq governor into a
     per-policy structure (Liao Chang)

   - Rebuild sched-domains when removing cpufreq driver (Pierre Gondois)

   - Fix buffer overflow detection in trans_stats() (Christian Marangi)

   - Switch to dev_pm_opp_find_freq_(ceil/floor)_indexed() APIs to
     support specific devices like UFS which handle multiple clocks
     through OPP (Operating Performance Point) framework (Manivannan
     Sadhasivam)

   - Add perf support to the Rockchip DFI (DDR Monitor Module) devfreq-
     event driver:
      * Generalize rockchip-dfi.c to support new RK3568/RK3588 using
        different DDR type (Sascha Hauer).
      * Convert DT binding document format to yaml (Sascha Hauer).
      * Add perf support for DFI (a unit suitable for measuring DDR
        utilization) to rockchip-dfi.c to extend DFI usage (Sascha
        Hauer)

   - Add locking to the OPP handling code in the Mediatek CCI devfreq
     driver, because the voltage of shared OPP might be changed by
     multiple drivers (Mark Tseng, Dan Carpenter)

   - Use device_get_match_data() in the Samsung Exynos PPMU
     devfreq-event driver (Rob Herring)

   - Extend support for the opp-level beyond required-opps (Ulf Hansson)

   - Add dev_pm_opp_find_level_floor() (Krishna chaitanya chundru)

   - dt-bindings: Allow opp-peak-kBpsfor kryo CPUs, support Qualcomm
     Krait SoCs and document named opp-microvolt property (Bjorn
     Andersson, Dmitry Baryshkov and Christian Marangi)

   - Fix -Wunsequenced warning _of_add_opp_table_v1() (Nathan
     Chancellor)

   - General cleanup of OPP code (Viresh Kumar)

   - Use __get_safe_page() rather than touching the list in hibernation
     snapshot code (Brian Geffon)

   - Fix symbol export for _SIMPLE_ variants of _PM_OPS() (Raag Jadav)

   - Clean up sync_read handling in snapshot_write_next() (Brian Geffon)

   - Fix kerneldoc comments for swsusp_check() and swsusp_close() to
     better match code (Christoph Hellwig)

   - Downgrade BIOS locked limits pr_warn() in the Intel RAPL power
     capping driver to pr_debug() (Ville Syrjälä)

   - Change the minimum python version for the intel_pstate_tracer
     utility from 2.7 to 3.6 (Doug Smythies)"

* tag 'pm-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (82 commits)
  dt-bindings: cpufreq: qcom-hw: document SM8650 CPUFREQ Hardware
  cpufreq: arm: Kconfig: Add i.MX7 to supported SoC for ARM_IMX_CPUFREQ_DT
  cpufreq: qcom-nvmem: add support for IPQ8064
  cpufreq: qcom-nvmem: also accept operating-points-v2-krait-cpu
  cpufreq: qcom-nvmem: drop pvs_ver for format a fuses
  dt-bindings: cpufreq: qcom-cpufreq-nvmem: Document krait-cpu
  cpufreq: qcom-nvmem: add support for IPQ6018
  dt-bindings: cpufreq: qcom-cpufreq-nvmem: document IPQ6018
  cpufreq: qcom-nvmem: Add MSM8909
  cpufreq: qcom-nvmem: Simplify driver data allocation
  powercap: intel_rapl: Downgrade BIOS locked limits pr_warn() to pr_debug()
  cpufreq: stats: Fix buffer overflow detection in trans_stats()
  dt-bindings: devfreq: event: rockchip,dfi: Add rk3588 support
  dt-bindings: devfreq: event: rockchip,dfi: Add rk3568 support
  dt-bindings: devfreq: event: convert Rockchip DFI binding to yaml
  PM / devfreq: rockchip-dfi: add support for RK3588
  PM / devfreq: rockchip-dfi: account for multiple DDRMON_CTRL registers
  PM / devfreq: rockchip-dfi: make register stride SoC specific
  PM / devfreq: rockchip-dfi: Add perf support
  PM / devfreq: rockchip-dfi: give variable a better name
  ...
parents d4b671d4 bf224871

Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
          - enum:

              - qcom,qcm2290-cpufreq-hw

              - qcom,sc7180-cpufreq-hw

              - qcom,sdm670-cpufreq-hw

              - qcom,sdm845-cpufreq-hw

              - qcom,sm6115-cpufreq-hw

              - qcom,sm6350-cpufreq-hw
@@ -36,11 +37,13 @@ properties: 
              - qcom,sa8775p-cpufreq-epss

              - qcom,sc7280-cpufreq-epss

              - qcom,sc8280xp-cpufreq-epss

              - qcom,sdx75-cpufreq-epss

              - qcom,sm6375-cpufreq-epss

              - qcom,sm8250-cpufreq-epss

              - qcom,sm8350-cpufreq-epss

              - qcom,sm8450-cpufreq-epss

              - qcom,sm8550-cpufreq-epss

              - qcom,sm8650-cpufreq-epss

          - const: qcom,cpufreq-epss



  reg:
@@ -128,6 +131,7 @@ allOf: 
              - qcom,qdu1000-cpufreq-epss

              - qcom,sc7180-cpufreq-hw

              - qcom,sc8280xp-cpufreq-epss

              - qcom,sdm670-cpufreq-hw

              - qcom,sdm845-cpufreq-hw

              - qcom,sm6115-cpufreq-hw

              - qcom,sm6350-cpufreq-hw

Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-nvmem.yaml

+7 −1
Original line number Diff line number Diff line
@@ -27,8 +27,12 @@ select: 
        enum:

          - qcom,apq8064

          - qcom,apq8096

          - qcom,ipq5332

          - qcom,ipq6018

          - qcom,ipq8064

          - qcom,ipq8074

          - qcom,ipq9574

          - qcom,msm8909

          - qcom,msm8939

          - qcom,msm8960

          - qcom,msm8974
@@ -43,7 +47,9 @@ patternProperties: 
      - if:

          properties:

            compatible:

              const: operating-points-v2-kryo-cpu

              enum:

                - operating-points-v2-krait-cpu

                - operating-points-v2-kryo-cpu

        then:

          $ref: /schemas/opp/opp-v2-kryo-cpu.yaml#

Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml

0 → 100644
+74 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/devfreq/event/rockchip,dfi.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Rockchip DFI



maintainers:

  - Sascha Hauer <s.hauer@pengutronix.de>



properties:

  compatible:

    enum:

      - rockchip,rk3399-dfi

      - rockchip,rk3568-dfi

      - rockchip,rk3588-dfi



  clocks:

    maxItems: 1



  clock-names:

    items:

      - const: pclk_ddr_mon



  interrupts:

    minItems: 1

    maxItems: 4



  reg:

    maxItems: 1



  rockchip,pmu:

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

    description:

      Phandle to the syscon managing the "PMU general register files".



required:

  - compatible

  - interrupts

  - reg



if:

  properties:

    compatible:

      contains:

        enum:

          - rockchip,rk3399-dfi



then:

  required:

    - clocks

    - clock-names



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/rk3308-cru.h>



    bus {

      #address-cells = <2>;

      #size-cells = <2>;



      dfi: dfi@ff630000 {

        compatible = "rockchip,rk3399-dfi";

        reg = <0x00 0xff630000 0x00 0x4000>;

        interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH 0>;

        rockchip,pmu = <&pmugrf>;

        clocks = <&cru PCLK_DDR_MON>;

        clock-names = "pclk_ddr_mon";

      };

    };

Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 


* Rockchip rk3399 DFI device



Required properties:

- compatible: Must be "rockchip,rk3399-dfi".

- reg: physical base address of each DFI and length of memory mapped region

- rockchip,pmu: phandle to the syscon managing the "pmu general register files"

- clocks: phandles for clock specified in "clock-names" property

- clock-names : the name of clock used by the DFI, must be "pclk_ddr_mon";



Example:

	dfi: dfi@ff630000 {

		compatible = "rockchip,rk3399-dfi";

		reg = <0x00 0xff630000 0x00 0x4000>;

		rockchip,pmu = <&pmugrf>;

		clocks = <&cru PCLK_DDR_MON>;

		clock-names = "pclk_ddr_mon";

	};

Documentation/devicetree/bindings/memory-controllers/rockchip,rk3399-dmc.yaml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ properties: 
    $ref: /schemas/types.yaml#/definitions/phandle

    description:

      Node to get DDR loading. Refer to

      Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt.

      Documentation/devicetree/bindings/devfreq/event/rockchip,dfi.yaml.



  clocks:

    maxItems: 1