Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

[platform/kernel/linux-starfive.git] / arch / arm64 / kernel / topology.c

diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c
index aebeb6f..f6faa69 100644 (file)
--- a/arch/arm64/kernel/topology.c
+++ b/arch/arm64/kernel/topology.c
@@ -223,6 +223,7 @@ static DEFINE_STATIC_KEY_FALSE(amu_fie_key);
 
 static int __init init_amu_fie(void)
 {
+       bool invariance_status = topology_scale_freq_invariant();
        cpumask_var_t valid_cpus;
        bool have_policy = false;
        int ret = 0;
@@ -269,6 +270,15 @@ static int __init init_amu_fie(void)
        if (!topology_scale_freq_invariant())
                static_branch_disable(&amu_fie_key);
 
+       /*
+        * Task scheduler behavior depends on frequency invariance support,
+        * either cpufreq or counter driven. If the support status changes as
+        * a result of counter initialisation and use, retrigger the build of
+        * scheduling domains to ensure the information is propagated properly.
+        */
+       if (invariance_status != topology_scale_freq_invariant())
+               rebuild_sched_domains_energy();
+
 free_valid_mask:
        free_cpumask_var(valid_cpus);