arm64: cpufeature: fold cpus_set_cap() into update_cpu_capabilities()

We only use cpus_set_cap() in update_cpu_capabilities(), where we
open-code an analgous update to boot_cpucaps.

Due to the way the cpucap_ptrs[] array is initialized, we know that the
capability number cannot be greater than or equal to ARM64_NCAPS, so the
warning is superfluous.

Fold cpus_set_cap() into update_cpu_capabilities(), matching what we do
for the boot_cpucaps, and making the relationship between the two a bit
clearer.

There should be no functional change as a result of this patch.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Cc: Marc Zyngier <maz@kernel.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20230607164846.3967305-5-mark.rutland@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h
index 6de2a5b..7a95c32 100644 (file)
--- a/arch/arm64/include/asm/cpufeature.h
+++ b/arch/arm64/include/asm/cpufeature.h
@@ -504,16 +504,6 @@ static __always_inline bool cpus_have_const_cap(int num)
                return cpus_have_cap(num);
 }
 
-static inline void cpus_set_cap(unsigned int num)
-{
-       if (num >= ARM64_NCAPS) {
-               pr_warn("Attempt to set an illegal CPU capability (%d >= %d)\n",
-                       num, ARM64_NCAPS);
-       } else {
-               __set_bit(num, system_cpucaps);
-       }
-}
-
 static inline int __attribute_const__
 cpuid_feature_extract_signed_field_width(u64 features, int field, int width)
 {

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 82e6819..bfadac3 100644 (file)
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -2903,7 +2903,8 @@ static void update_cpu_capabilities(u16 scope_mask)
 
                if (caps->desc)
                        pr_info("detected: %s\n", caps->desc);
-               cpus_set_cap(caps->capability);
+
+               __set_bit(caps->capability, system_cpucaps);
 
                if ((scope_mask & SCOPE_BOOT_CPU) && (caps->type & SCOPE_BOOT_CPU))
                        set_bit(caps->capability, boot_cpucaps);