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

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (30 commits)
  cpufreq: stats: Fix string format specifier mismatch
  arm: disable frequency invariance for CONFIG_BL_SWITCHER
  cpufreq,arm,arm64: restructure definitions of arch_set_freq_scale()
  cpufreq: stats: Add memory barrier to store_reset()
  cpufreq: schedutil: Simplify sugov_fast_switch()
  cpufreq: Move traces and update to policy->cur to cpufreq core
  cpufreq: stats: Enable stats for fast-switch as well
  cpufreq: stats: Mark few conditionals with unlikely()
  cpufreq: stats: Remove locking
  cpufreq: stats: Defer stats update to cpufreq_stats_record_transition()
  arch_topology, arm, arm64: define arch_scale_freq_invariant()
  arch_topology, cpufreq: constify arch_* cpumasks
  cpufreq: report whether cpufreq supports Frequency Invariance (FI)
  cpufreq: move invariance setter calls in cpufreq core
  arch_topology: validate input frequencies to arch_set_freq_scale()
  cpufreq: qcom: Don't add frequencies without an OPP
  cpufreq: qcom-hw: Add cpufreq support for SM8250 SoC
  cpufreq: qcom-hw: Use of_device_get_match_data for offsets and row size
  cpufreq: qcom-hw: Use devm_platform_ioremap_resource() to simplify code
  dt-bindings: cpufreq: cpufreq-qcom-hw: Document Qcom EPSS compatible
  ...
parents 757e2821 b7af6080

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

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ Properties: 
- compatible

	Usage:		required

	Value type:	<string>

	Definition:	must be "qcom,cpufreq-hw".

	Definition:	must be "qcom,cpufreq-hw" or "qcom,cpufreq-epss".



- clocks

	Usage:		required

arch/arm/include/asm/topology.h

+5 −0
Original line number Diff line number Diff line
@@ -7,8 +7,13 @@ 
#include <linux/cpumask.h>

#include <linux/arch_topology.h>



/* big.LITTLE switcher is incompatible with frequency invariance */

#ifndef CONFIG_BL_SWITCHER

/* Replace task scheduler's default frequency-invariant accounting */

#define arch_set_freq_scale topology_set_freq_scale

#define arch_scale_freq_capacity topology_get_freq_scale

#define arch_scale_freq_invariant topology_scale_freq_invariant

#endif



/* Replace task scheduler's default cpu-invariant accounting */

#define arch_scale_cpu_capacity topology_get_cpu_scale

arch/arm64/include/asm/topology.h

+2 −0
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ void topology_scale_freq_tick(void); 
#endif /* CONFIG_ARM64_AMU_EXTN */



/* Replace task scheduler's default frequency-invariant accounting */

#define arch_set_freq_scale topology_set_freq_scale

#define arch_scale_freq_capacity topology_get_freq_scale

#define arch_scale_freq_invariant topology_scale_freq_invariant



/* Replace task scheduler's default cpu-invariant accounting */

#define arch_scale_cpu_capacity topology_get_cpu_scale

arch/arm64/kernel/topology.c

+8 −1
Original line number Diff line number Diff line
@@ -246,6 +246,13 @@ static int __init init_amu_fie(void) 
		static_branch_enable(&amu_fie_key);

	}



	/*

	 * If the system is not fully invariant after AMU init, disable

	 * partial use of counters for frequency invariance.

	 */

	if (!topology_scale_freq_invariant())

		static_branch_disable(&amu_fie_key);



free_valid_mask:

	free_cpumask_var(valid_cpus);
@@ -253,7 +260,7 @@ free_valid_mask: 
}

late_initcall_sync(init_amu_fie);



bool arch_freq_counters_available(struct cpumask *cpus)

bool arch_freq_counters_available(const struct cpumask *cpus)

{

	return amu_freq_invariant() &&

	       cpumask_subset(cpus, amu_fie_cpus);

drivers/base/arch_topology.c

+12 −3
Original line number Diff line number Diff line
@@ -21,18 +21,27 @@ 
#include <linux/sched.h>

#include <linux/smp.h>



__weak bool arch_freq_counters_available(struct cpumask *cpus)

bool topology_scale_freq_invariant(void)

{

	return cpufreq_supports_freq_invariance() ||

	       arch_freq_counters_available(cpu_online_mask);

}



__weak bool arch_freq_counters_available(const struct cpumask *cpus)

{

	return false;

}

DEFINE_PER_CPU(unsigned long, freq_scale) = SCHED_CAPACITY_SCALE;



void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,

void topology_set_freq_scale(const struct cpumask *cpus, unsigned long cur_freq,

			     unsigned long max_freq)

{

	unsigned long scale;

	int i;



	if (WARN_ON_ONCE(!cur_freq || !max_freq))

		return;



	/*

	 * If the use of counters for FIE is enabled, just return as we don't

	 * want to update the scale factor with information from CPUFREQ.

CRA Git | Maintained and supported by SUSTech CRA and CCSE