cpufreq: intel_pstate: hybrid: Adjust energy model rules

Instead of using HWP-to-frequency scaling factors for computing cost
coefficients in the energy model used on hybrid systems, which is
fragile, rely on CPU type information that is easily accessible now and
the information on whether or not L3 cache is present for this purpose.

This also allows the cost coefficients for P-cores to be adjusted so
that they start to be populated somewhat earlier (that is, before
E-cores are loaded up to their full capacity).

In addition to the above, replace an inaccurate comment regarding the
reason why the freq value is added to the cost in hybrid_get_cost().

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Reviewed-by: Yaxiong Tian <tianyaxiong@kylinos.cn>
Link: https://patch.msgid.link/5932894.DvuYhMxLoT@rafael.j.wysocki

diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index f85056ee6e619b2d4a7aa385be892e0b42dd5a63..3ed8a0001b2f8995e12956298a81694a8a88fadb 100644 (file)
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -933,11 +933,8 @@ static int hybrid_active_power(struct device *dev, unsigned long *power,
                               unsigned long *freq)
 {
        /*
-        * Create "utilization bins" of 0-40%, 40%-60%, 60%-80%, and 80%-100%
-        * of the maximum capacity such that two CPUs of the same type will be
-        * regarded as equally attractive if the utilization of each of them
-        * falls into the same bin, which should prevent tasks from being
-        * migrated between them too often.
+        * Create four "states" corresponding to 40%, 60%, 80%, and 100% of the
+        * full capacity.
         *
         * For this purpose, return the "frequency" of 2 for the first
         * performance level and otherwise leave the value set by the caller.
@@ -970,26 +967,22 @@ static bool hybrid_has_l3(unsigned int cpu)
 static int hybrid_get_cost(struct device *dev, unsigned long freq,
                           unsigned long *cost)
 {
-       struct pstate_data *pstate = &all_cpu_data[dev->id]->pstate;
-
+       /* Facilitate load balancing between CPUs of the same type. */
+       *cost = freq;
        /*
-        * The smaller the perf-to-frequency scaling factor, the larger the IPC
-        * ratio between the given CPU and the least capable CPU in the system.
-        * Regard that IPC ratio as the primary cost component and assume that
-        * the scaling factors for different CPU types will differ by at least
-        * 5% and they will not be above INTEL_PSTATE_CORE_SCALING.
+        * Adjust the cost depending on CPU type.
         *
-        * Add the freq value to the cost, so that the cost of running on CPUs
-        * of the same type in different "utilization bins" is different.
-        */
-       *cost = div_u64(100ULL * INTEL_PSTATE_CORE_SCALING, pstate->scaling) + freq;
-       /*
-        * Increase the cost slightly for CPUs able to access L3 to avoid
-        * touching it in case some other CPUs of the same type can do the work
-        * without it.
+        * The idea is to start loading up LPE-cores before E-cores and start
+        * to populate E-cores when LPE-cores are utilized above 60% of the
+        * capacity.  Similarly, P-cores start to be populated when E-cores are
+        * utilized above 60% of the capacity.
         */
-       if (hybrid_has_l3(dev->id))
+       if (hybrid_get_cpu_type(dev->id) == INTEL_CPU_TYPE_ATOM) {
+               if (hybrid_has_l3(dev->id)) /* E-core */
+                       *cost += 1;
+       } else { /* P-core */
                *cost += 2;
+       }
 
        return 0;
 }