We are about to group the handling of all capabilities (features
and errata workarounds). This patch open codes the wrapper routines
to make it easier to merge the handling.

Reviewed-by: Dave Martin <dave.mar...@arm.com>
Signed-off-by: Suzuki K Poulose <suzuki.poul...@arm.com>
---
 arch/arm64/kernel/cpufeature.c | 58 +++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 40 deletions(-)

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index e5229ad553e9..4386675af189 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -507,7 +507,8 @@ static void __init init_cpu_ftr_reg(u32 sys_reg, u64 new)
 }
 
 extern const struct arm64_cpu_capabilities arm64_errata[];
-static void update_cpu_errata_workarounds(void);
+static void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,
+                                   u16 scope_mask, const char *info);
 
 void __init init_cpu_features(struct cpuinfo_arm64 *info)
 {
@@ -556,7 +557,8 @@ void __init init_cpu_features(struct cpuinfo_arm64 *info)
         * Run the errata work around checks on the boot CPU, once we have
         * initialised the cpu feature infrastructure.
         */
-       update_cpu_errata_workarounds();
+       update_cpu_capabilities(arm64_errata, SCOPE_ALL,
+                               "enabling workaround for");
 }
 
 static void update_cpu_ftr_reg(struct arm64_ftr_reg *reg, u64 new)
@@ -1382,12 +1384,6 @@ verify_local_elf_hwcaps(const struct 
arm64_cpu_capabilities *caps)
                }
 }
 
-static void verify_local_cpu_features(void)
-{
-       if (!__verify_local_cpu_caps(arm64_features, SCOPE_ALL))
-               cpu_die_early();
-}
-
 static void verify_sve_features(void)
 {
        u64 safe_zcr = read_sanitised_ftr_reg(SYS_ZCR_EL1);
@@ -1405,27 +1401,6 @@ static void verify_sve_features(void)
        /* Add checks on other ZCR bits here if necessary */
 }
 
-/*
- * The CPU Errata work arounds are detected and applied at boot time
- * and the related information is freed soon after. If the new CPU requires
- * an errata not detected at boot, fail this CPU.
- */
-static void verify_local_cpu_errata_workarounds(void)
-{
-       if (!__verify_local_cpu_caps(arm64_errata, SCOPE_ALL))
-               cpu_die_early();
-}
-
-static void update_cpu_errata_workarounds(void)
-{
-       update_cpu_capabilities(arm64_errata, SCOPE_ALL,
-                               "enabling workaround for");
-}
-
-static void __init enable_errata_workarounds(void)
-{
-       enable_cpu_capabilities(arm64_errata, SCOPE_ALL);
-}
 
 /*
  * Run through the enabled system capabilities and enable() it on this CPU.
@@ -1437,8 +1412,15 @@ static void __init enable_errata_workarounds(void)
  */
 static void verify_local_cpu_capabilities(void)
 {
-       verify_local_cpu_errata_workarounds();
-       verify_local_cpu_features();
+       /*
+        * The CPU Errata work arounds are detected and applied at boot time
+        * and the related information is freed soon after. If the new CPU
+        * requires an errata not detected at boot, fail this CPU.
+        */
+       if (!__verify_local_cpu_caps(arm64_errata, SCOPE_ALL))
+               cpu_die_early();
+       if (!__verify_local_cpu_caps(arm64_features, SCOPE_ALL))
+               cpu_die_early();
        verify_local_elf_hwcaps(arm64_elf_hwcaps);
 
        if (system_supports_32bit_el0())
@@ -1463,17 +1445,12 @@ void check_local_cpu_capabilities(void)
         * advertised capabilities.
         */
        if (!sys_caps_initialised)
-               update_cpu_errata_workarounds();
+               update_cpu_capabilities(arm64_errata, SCOPE_ALL,
+                                       "enabling workaround for");
        else
                verify_local_cpu_capabilities();
 }
 
-static void __init setup_feature_capabilities(void)
-{
-       update_cpu_capabilities(arm64_features, SCOPE_ALL, "detected:");
-       enable_cpu_capabilities(arm64_features, SCOPE_ALL);
-}
-
 DEFINE_STATIC_KEY_FALSE(arm64_const_caps_ready);
 EXPORT_SYMBOL(arm64_const_caps_ready);
 
@@ -1495,8 +1472,9 @@ void __init setup_cpu_features(void)
        u32 cwg;
 
        /* Set the CPU feature capabilies */
-       setup_feature_capabilities();
-       enable_errata_workarounds();
+       update_cpu_capabilities(arm64_features, SCOPE_ALL, "detected:");
+       enable_cpu_capabilities(arm64_features, SCOPE_ALL);
+       enable_cpu_capabilities(arm64_errata, SCOPE_ALL);
        mark_const_caps_ready();
        setup_elf_hwcaps(arm64_elf_hwcaps);
 
-- 
2.14.3

Reply via email to