]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
arm64: topology: Do not warn on missing AMU in cpuhp_topology_online()
authorGeert Uytterhoeven <geert+renesas@glider.be>
Thu, 15 Jan 2026 08:51:45 +0000 (09:51 +0100)
committerWill Deacon <will@kernel.org>
Thu, 22 Jan 2026 11:18:41 +0000 (11:18 +0000)
When CONFIG_CPUMASK_OFFSTACK is not enabled, and resuming from s2ram on
Renesas R-Car H3 (big.LITTLE 4x Cortex-A57 + 4x Cortex-A53), during
enabling of the first little core, a warning message is printed:

    AMU: CPU[4] doesn't support AMU counters

This confuses users, as during boot amu_fie_setup() does not print such
a message, unless debugging is enabled (freq_counters_valid() prints
"CPU%d: counters are not supported.\n" at debug level in that case).

Hence drop the warning, freq_counters_valid() has already printed a
debug message anyway.

Fixes: 6fd9be0b7b2e ("arm64: topology: Handle AMU FIE setup on CPU hotplug")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Lifeng Zheng <zhenglifeng1@huawei.com>
Signed-off-by: Will Deacon <will@kernel.org>
arch/arm64/kernel/topology.c

index 539b3893518281ece20dca1a0f89d77603d83123..3fe1faab03620e783e405b7959dc81338085df1a 100644 (file)
@@ -332,7 +332,6 @@ static int cpuhp_topology_online(unsigned int cpu)
         * may use different source of the freq scale.
         */
        if (!freq_counters_valid(cpu)) {
-               pr_warn("CPU[%u] doesn't support AMU counters\n", cpu);
                topology_clear_scale_freq_source(SCALE_FREQ_SOURCE_ARCH,
                                                 policy->related_cpus);
                cpumask_andnot(amu_fie_cpus, amu_fie_cpus, policy->related_cpus);