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

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

Pull power management updates from Rafael Wysocki:
 "The majority of changes here are cpufreq updates which are dominated
  by amd-pstate driver changes, like in the previous cycle. Moreover,
  changes related to amd-pstate are also the majority of cpupower
  utility updates.

  Included are some pieces of new hardware support, like the addition of
  Clearwater Forest processors support to intel_idle, new cpufreq driver
  for Airoha SoCs, and Apple cpufreq driver extensions to support more
  SoCs. The intel_pstate driver is also extended to be able to support
  new platforms by using ACPI CPPC to compute scaling factors between
  HWP performance states and frequency.

  The rest is mostly fixes and cleanups in assorted pieces of power
  management code.

  Specifics:

   - Use str_enable_disable()-like helpers in cpufreq (Krzysztof
     Kozlowski)

   - Extend the Apple cpufreq driver to support more SoCs (Hector
     Martin, Nick Chan)

   - Add new cpufreq driver for Airoha SoCs (Christian Marangi)

   - Fix using cpufreq-dt as module (Andreas Kemnade)

   - Minor fixes for Sparc, SCMI, and Qcom cpufreq drivers (Ethan Carter
     Edwards, Sibi Sankar, Manivannan Sadhasivam)

   - Fix the maximum supported frequency computation in the ACPI cpufreq
     driver to avoid relying on unfounded assumptions (Gautham Shenoy)

   - Fix an amd-pstate driver regression with preferred core rankings
     not being used (Mario Limonciello)

   - Fix a precision issue with frequency calculation in the amd-pstate
     driver (Naresh Solanki)

   - Add ftrace event to the amd-pstate driver for active mode (Mario
     Limonciello)

   - Set default EPP policy on Ryzen processors in amd-pstate (Mario
     Limonciello)

   - Clean up the amd-pstate cpufreq driver and optimize it to increase
     code reuse (Mario Limonciello, Dhananjay Ugwekar)

   - Use CPPC to get scaling factors between HWP performance levels and
     frequency in the intel_pstate driver and make it stop using a
     built-in scaling factor for Arrow Lake processors (Rafael Wysocki)

   - Make intel_pstate initialize epp_policy to CPUFREQ_POLICY_UNKNOWN
     for consistency with CPU offline (Christian Loehle)

   - Fix superfluous updates caused by need_freq_update in the schedutil
     cpufreq governor (Sultan Alsawaf)

   - Allow configuring the system suspend-resume (DPM) watchdog to warn
     earlier than panic (Douglas Anderson)

   - Implement devm_device_init_wakeup() helper and introduce a device-
     managed variant of dev_pm_set_wake_irq() (Joe Hattori, Peng Fan)

   - Remove direct inclusions of 'pm_wakeup.h' which should be only
     included via 'device.h' (Wolfram Sang)

   - Clean up two comments in the core system-wide PM code (Rafael
     Wysocki, Randy Dunlap)

   - Add Clearwater Forest processor support to the intel_idle cpuidle
     driver (Artem Bityutskiy)

   - Clean up the Exynos devfreq driver and devfreq core (Markus
     Elfring, Jeongjun Park)

   - Minor cleanups and fixes for OPP (Dan Carpenter, Neil Armstrong,
     Joe Hattori)

   - Implement dev_pm_opp_get_bw() (Neil Armstrong)

   - Expose OPP reference counting helpers for Rust (Viresh Kumar)

   - Fix TSC MHz calculation in cpupower (He Rongguang)

   - Add install and uninstall options to bindings Makefile and add
     header changes for cpufreq.h to SWIG bindings in cpupower (John B.
     Wyatt IV)

   - Add missing residency header changes in cpuidle.h to SWIG bindings
     in cpupower (John B. Wyatt IV)

   - Add output files to .gitignore and clean them up in "make clean" in
     selftests/cpufreq (Li Zhijian)

   - Fix cross-compilation in cpupower Makefile (Peng Fan)

   - Revise the is_valid flag handling for idle_monitor in the cpupower
     utility (wangfushuai)

   - Extend and clean up AMD processors support in cpupower (Mario
     Limonciello)"

* tag 'pm-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (67 commits)
  PM / OPP: Add reference counting helpers for Rust implementation
  PM: sleep: wakeirq: Introduce device-managed variant of dev_pm_set_wake_irq()
  cpufreq: Use str_enable_disable()-like helpers
  cpufreq: airoha: Add EN7581 CPUFreq SMCCC driver
  PM: sleep: Allow configuring the DPM watchdog to warn earlier than panic
  PM: sleep: convert comment from kernel-doc to plain comment
  cpufreq: ACPI: Fix max-frequency computation
  pm: cpupower: Add missing residency header changes in cpuidle.h to SWIG
  PM / devfreq: exynos: remove unused function parameter
  OPP: OF: Fix an OF node leak in _opp_add_static_v2()
  cpufreq/amd-pstate: Refactor max frequency calculation
  cpufreq/amd-pstate: Fix prefcore rankings
  pm: cpupower: Add header changes for cpufreq.h to SWIG bindings
  cpufreq: sparc: change kzalloc to kcalloc
  cpufreq: qcom: Implement clk_ops::determine_rate() for qcom_cpufreq* clocks
  cpufreq: qcom: Fix qcom_cpufreq_hw_recalc_rate() to query LUT if LMh IRQ is not available
  cpufreq: apple-soc: Add Apple A7-A8X SoC cpufreq support
  cpufreq: apple-soc: Set fallback transition latency to APPLE_DVFS_TRANSITION_TIMEOUT
  cpufreq: apple-soc: Increase cluster switch timeout to 400us
  cpufreq: apple-soc: Use 32-bit read for status register
  ...
parents df60eac9 1c91c990

Documentation/devicetree/bindings/cpufreq/airoha,en7581-cpufreq.yaml

0 → 100644
+55 −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/cpufreq/airoha,en7581-cpufreq.yaml#

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



title: Airoha EN7581 CPUFreq



maintainers:

  - Christian Marangi <ansuelsmth@gmail.com>



description: |

  On newer Airoha SoC, CPU Frequency is scaled indirectly with SMC commands

  to ATF.



  A virtual clock is exposed. This virtual clock is a get-only clock and

  is used to expose the current global CPU clock. The frequency info comes

  by the output of the SMC command that reports the clock in MHz.



  The SMC sets the CPU clock by providing an index, this is modelled as

  performance states in a power domain.



  CPUs can't be individually scaled as the CPU frequency is shared across

  all CPUs and is global.



properties:

  compatible:

    const: airoha,en7581-cpufreq



  '#clock-cells':

    const: 0



  '#power-domain-cells':

    const: 0



  operating-points-v2: true



required:

  - compatible

  - '#clock-cells'

  - '#power-domain-cells'

  - operating-points-v2



additionalProperties: false



examples:

  - |

    performance-domain {

        compatible = "airoha,en7581-cpufreq";



        operating-points-v2 = <&cpu_smcc_opp_table>;



        #power-domain-cells = <0>;

        #clock-cells = <0>;

    };

Documentation/devicetree/bindings/cpufreq/apple,cluster-cpufreq.yaml

+9 −1
Original line number Diff line number Diff line
@@ -24,9 +24,17 @@ properties: 
              - apple,t8112-cluster-cpufreq

          - const: apple,cluster-cpufreq

      - items:

          - const: apple,t6000-cluster-cpufreq

          - enum:

              - apple,s8000-cluster-cpufreq

              - apple,t8010-cluster-cpufreq

              - apple,t8015-cluster-cpufreq

              - apple,t6000-cluster-cpufreq

          - const: apple,t8103-cluster-cpufreq

          - const: apple,cluster-cpufreq

      - items:

          - const: apple,t7000-cluster-cpufreq

          - const: apple,s5l8960x-cluster-cpufreq

      - const: apple,s5l8960x-cluster-cpufreq



  reg:

    maxItems: 1

drivers/base/power/main.c

+20 −6
Original line number Diff line number Diff line
@@ -496,6 +496,7 @@ struct dpm_watchdog { 
	struct device		*dev;

	struct task_struct	*tsk;

	struct timer_list	timer;

	bool			fatal;

};



#define DECLARE_DPM_WATCHDOG_ON_STACK(wd) \
@@ -512,13 +513,25 @@ struct dpm_watchdog { 
static void dpm_watchdog_handler(struct timer_list *t)

{

	struct dpm_watchdog *wd = from_timer(wd, t, timer);

	struct timer_list *timer = &wd->timer;

	unsigned int time_left;



	if (wd->fatal) {

		dev_emerg(wd->dev, "**** DPM device timeout ****\n");

		show_stack(wd->tsk, NULL, KERN_EMERG);

		panic("%s %s: unrecoverable failure\n",

			dev_driver_string(wd->dev), dev_name(wd->dev));

	}



	time_left = CONFIG_DPM_WATCHDOG_TIMEOUT - CONFIG_DPM_WATCHDOG_WARNING_TIMEOUT;

	dev_warn(wd->dev, "**** DPM device timeout after %u seconds; %u seconds until panic ****\n",

		 CONFIG_DPM_WATCHDOG_WARNING_TIMEOUT, time_left);

	show_stack(wd->tsk, NULL, KERN_WARNING);



	wd->fatal = true;

	mod_timer(timer, jiffies + HZ * time_left);

}



/**

 * dpm_watchdog_set - Enable pm watchdog for given device.

 * @wd: Watchdog. Must be allocated on the stack.
@@ -530,10 +543,11 @@ static void dpm_watchdog_set(struct dpm_watchdog *wd, struct device *dev) 


	wd->dev = dev;

	wd->tsk = current;

	wd->fatal = CONFIG_DPM_WATCHDOG_TIMEOUT == CONFIG_DPM_WATCHDOG_WARNING_TIMEOUT;



	timer_setup_on_stack(timer, dpm_watchdog_handler, 0);

	/* use same timeout value for both suspend and resume */

	timer->expires = jiffies + HZ * CONFIG_DPM_WATCHDOG_TIMEOUT;

	timer->expires = jiffies + HZ * CONFIG_DPM_WATCHDOG_WARNING_TIMEOUT;

	add_timer(timer);

}
@@ -914,7 +928,7 @@ static void device_resume(struct device *dev, pm_message_t state, bool async) 
		goto Complete;



	if (dev->power.direct_complete) {

		/* Match the pm_runtime_disable() in __device_suspend(). */

		/* Match the pm_runtime_disable() in device_suspend(). */

		pm_runtime_enable(dev);

		goto Complete;

	}

drivers/base/power/sysfs.c

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#include <linux/export.h>

#include <linux/pm_qos.h>

#include <linux/pm_runtime.h>

#include <linux/pm_wakeup.h>

#include <linux/atomic.h>

#include <linux/jiffies.h>

#include "power.h"

drivers/base/power/wakeirq.c

+26 −0
Original line number Diff line number Diff line
@@ -103,6 +103,32 @@ void dev_pm_clear_wake_irq(struct device *dev) 
}

EXPORT_SYMBOL_GPL(dev_pm_clear_wake_irq);



static void devm_pm_clear_wake_irq(void *dev)

{

	dev_pm_clear_wake_irq(dev);

}



/**

 * devm_pm_set_wake_irq - device-managed variant of dev_pm_set_wake_irq

 * @dev: Device entry

 * @irq: Device IO interrupt

 *

 *

 * Attach a device IO interrupt as a wake IRQ, same with dev_pm_set_wake_irq,

 * but the device will be auto clear wake capability on driver detach.

 */

int devm_pm_set_wake_irq(struct device *dev, int irq)

{

	int ret;



	ret = dev_pm_set_wake_irq(dev, irq);

	if (ret)

		return ret;



	return devm_add_action_or_reset(dev, devm_pm_clear_wake_irq, dev);

}

EXPORT_SYMBOL_GPL(devm_pm_set_wake_irq);



/**

 * handle_threaded_wake_irq - Handler for dedicated wake-up interrupts

 * @irq: Device specific dedicated wake-up interrupt