This pressure is not always related to thermal mitigation but can also be
generated by max current limitation as an example.

Signed-off-by: Vincent Guittot <vincent.guittot@linaro.org>
---
  arch/arm/include/asm/topology.h               |  6 ++---
  arch/arm64/include/asm/topology.h             |  6 ++---
  drivers/base/arch_topology.c                  | 26 +++++++++----------
  drivers/cpufreq/qcom-cpufreq-hw.c             |  4 +--
  include/linux/arch_topology.h                 |  8 +++---
  include/linux/sched/topology.h                |  8 +++---
  .../{thermal_pressure.h => hw_pressure.h}     | 14 +++++-----
  include/trace/events/sched.h                  |  2 +-
  init/Kconfig                                  | 12 ++++-----
  kernel/sched/core.c                           |  8 +++---
  kernel/sched/fair.c                           | 12 ++++-----
  kernel/sched/pelt.c                           | 18 ++++++-------
  kernel/sched/pelt.h                           | 16 ++++++------
  kernel/sched/sched.h                          |  4 +--
  14 files changed, 72 insertions(+), 72 deletions(-)
  rename include/trace/events/{thermal_pressure.h => hw_pressure.h} (55%)

diff --git a/arch/arm/include/asm/topology.h b/arch/arm/include/asm/topology.h
index 853c4f81ba4a..e175e8596b5d 100644
--- a/arch/arm/include/asm/topology.h
+++ b/arch/arm/include/asm/topology.h

@@ -22,9 +22,9 @@
  /* Enable topology flag updates */
  #define arch_update_cpu_topology topology_update_cpu_topology
  
-/* Replace task scheduler's default thermal pressure API */
-#define arch_scale_thermal_pressure topology_get_thermal_pressure
-#define arch_update_thermal_pressure	topology_update_thermal_pressure
+/* Replace task scheduler's default hw pressure API */
+#define arch_scale_hw_pressure topology_get_hw_pressure
+#define arch_update_hw_pressure	topology_update_hw_pressure
  
  #else
  

diff --git a/arch/arm64/include/asm/topology.h b/arch/arm64/include/asm/topology.h
index a323b109b9c4..a427650bdfba 100644
--- a/arch/arm64/include/asm/topology.h
+++ b/arch/arm64/include/asm/topology.h

@@ -35,9 +35,9 @@ void update_freq_counters_refs(void);
  /* Enable topology flag updates */
  #define arch_update_cpu_topology topology_update_cpu_topology
  
-/* Replace task scheduler's default thermal pressure API */
-#define arch_scale_thermal_pressure topology_get_thermal_pressure
-#define arch_update_thermal_pressure	topology_update_thermal_pressure
+/* Replace task scheduler's default hw pressure API */

+#define arch_scale_hw_pressure topology_get_hw_pressure
+#define arch_update_hw_pressure	topology_update_hw_pressure
  
  #include <asm-generic/topology.h>
  

diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 0906114963ff..3d8dc9d5c3ad 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c

@@ -22,7 +22,7 @@
  #include <linux/units.h>
  
  #define CREATE_TRACE_POINTS
-#include <trace/events/thermal_pressure.h>
+#include <trace/events/hw_pressure.h>
  
  static DEFINE_PER_CPU(struct scale_freq_data __rcu *, sft_data);
  static struct cpumask scale_freq_counters_mask;

@@ -160,26 +160,26 @@ void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity)
  	per_cpu(cpu_scale, cpu) = capacity;
  }
  
-DEFINE_PER_CPU(unsigned long, thermal_pressure);
+DEFINE_PER_CPU(unsigned long, hw_pressure);
  
  /**
- * topology_update_thermal_pressure() - Update thermal pressure for CPUs
+ * topology_update_hw_pressure() - Update hw pressure for CPUs

   */
-void topology_update_thermal_pressure(const struct cpumask *cpus,
+void topology_update_hw_pressure(const struct cpumask *cpus,
  				      unsigned long capped_freq)
  {
-	unsigned long max_capacity, capacity, th_pressure;
+	unsigned long max_capacity, capacity, hw_pressure;
  	u32 max_freq;
  	int cpu;
  

@@ -189,21 +189,21 @@ void topology_update_thermal_pressure(const struct cpumask *cpus,
  
  	/*
  	 * Handle properly the boost frequencies, which should simply clean
-	 * the thermal pressure value.
+	 * the hw pressure value.

  	 */
  	if (max_freq <= capped_freq)
  		capacity = max_capacity;
  	else
  		capacity = mult_frac(max_capacity, capped_freq, max_freq);
  
-	th_pressure = max_capacity - capacity;
+	hw_pressure = max_capacity - capacity;
  
-	trace_thermal_pressure_update(cpu, th_pressure);
+	trace_hw_pressure_update(cpu, hw_pressure);
  
  	for_each_cpu(cpu, cpus)
-		WRITE_ONCE(per_cpu(thermal_pressure, cpu), th_pressure);
+		WRITE_ONCE(per_cpu(hw_pressure, cpu), hw_pressure);
  }
-EXPORT_SYMBOL_GPL(topology_update_thermal_pressure);
+EXPORT_SYMBOL_GPL(topology_update_hw_pressure);
  
  static ssize_t cpu_capacity_show(struct device *dev,
  				 struct device_attribute *attr,

diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c
index 70b0f21968a0..a619202ba81d 100644
--- a/drivers/cpufreq/qcom-cpufreq-hw.c
+++ b/drivers/cpufreq/qcom-cpufreq-hw.c

@@ -347,8 +347,8 @@ static void qcom_lmh_dcvs_notify(struct qcom_cpufreq_data *data)
  
  	throttled_freq = freq_hz / HZ_PER_KHZ;
  
-	/* Update thermal pressure (the boost frequencies are accepted) */
-	arch_update_thermal_pressure(policy->related_cpus, throttled_freq);
+	/* Update hw pressure (the boost frequencies are accepted) */

  
  	if (housekeeping_cpu(cpu, HK_TYPE_TICK))

@@ -5669,8 +5669,8 @@ void scheduler_tick(void)
  	rq_lock(rq, &rf);
  
  	update_rq_clock(rq);
-	thermal_pressure = arch_scale_thermal_pressure(cpu_of(rq));
-	update_thermal_load_avg(rq_clock_thermal(rq), rq, thermal_pressure);
+	hw_pressure = arch_scale_hw_pressure(cpu_of(rq));
+	update_hw_load_avg(rq_clock_task(rq), rq, hw_pressure);

  	curr->sched_class->task_tick(rq, curr, 0);
  	if (sched_feat(LATENCY_WARN))
  		resched_latency = cpu_resched_latency(rq);

diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
index 11d3be829302..07050955d6e0 100644
--- a/kernel/sched/fair.c
+++ b/kernel/sched/fair.c

@@ -4936,7 +4936,7 @@ static inline unsigned long get_actual_cpu_capacity(int cpu)
  {
  	unsigned long capacity = arch_scale_cpu_capacity(cpu);
  
-	capacity -= max(thermal_load_avg(cpu_rq(cpu)), cpufreq_get_pressure(cpu));
+	capacity -= max(hw_load_avg(cpu_rq(cpu)), cpufreq_get_pressure(cpu));
  
  	return capacity;
  }

@@ -4968,7 +4968,7 @@ static inline int util_fits_cpu(unsigned long util,
  	 * Similarly if a task is capped to arch_scale_cpu_capacity(little_cpu), it
  	 * should fit a little cpu even if there's some pressure.
  	 *
-	 * Only exception is for thermal pressure since it has a direct impact
+	 * Only exception is for hw or cpufreq pressure since it has a direct impact

  	 * on available OPP of the system.
  	 *
  	 * We honour it for uclamp_min only as a drop in performance level

@@ -9224,7 +9224,7 @@ static inline bool others_have_blocked(struct rq *rq)
  	if (READ_ONCE(rq->avg_dl.util_avg))
  		return true;
  
-	if (thermal_load_avg(rq))
+	if (hw_load_avg(rq))
  		return true;
  
  #ifdef CONFIG_HAVE_SCHED_AVG_IRQ

@@ -9256,7 +9256,7 @@ static bool __update_blocked_others(struct rq *rq, bool *done)
  {
  	const struct sched_class *curr_class;
  	u64 now = rq_clock_pelt(rq);
-	unsigned long thermal_pressure;
+	unsigned long hw_pressure;
  	bool decayed;
  
  	/*

@@ -9265,11 +9265,11 @@ static bool __update_blocked_others(struct rq *rq, bool *done)
  	 */
  	curr_class = rq->curr->sched_class;
  
-	thermal_pressure = arch_scale_thermal_pressure(cpu_of(rq));
+	hw_pressure = arch_scale_hw_pressure(cpu_of(rq));
  
  	decayed = update_rt_rq_load_avg(now, rq, curr_class == &rt_sched_class) |
  		  update_dl_rq_load_avg(now, rq, curr_class == &dl_sched_class) |
-		  update_thermal_load_avg(rq_clock_thermal(rq), rq, thermal_pressure) |
+		  update_hw_load_avg(now, rq, hw_pressure) |

diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
index e58a54bda77d..7eaf186d071e 100644
--- a/kernel/sched/sched.h
+++ b/kernel/sched/sched.h

@@ -1078,8 +1078,8 @@ struct rq {
  #ifdef CONFIG_HAVE_SCHED_AVG_IRQ
  	struct sched_avg	avg_irq;
  #endif
-#ifdef CONFIG_SCHED_THERMAL_PRESSURE
-	struct sched_avg	avg_thermal;
+#ifdef CONFIG_SCHED_HW_PRESSURE
+	struct sched_avg	avg_hw;
  #endif
  	u64			idle_stamp;
  	u64			avg_idle;