[PATCH 2/4] arm64: capabilities: Split the processing of errata work arounds

[Suzuki K Poulose]

Right now we run through the errata workarounds check on all boot
active CPUs, with SCOPE_ALL. This doesn't help with detecting the
errata's with a SYSTEM_SCOPE. While nobody uses it, let us clean
this up in preparation for merging capability handling.

So, we run the checks with SCOPE_LOCAL_CPU on all CPUs and SCOPE_SYSTEM
checks are run only once after all the boot time CPUs are active.

Cc: Dave Martin 
Signed-off-by: Suzuki K Poulose 
---
 arch/arm64/kernel/cpufeature.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 9f52678a4df1..a6e124063e21 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -554,7 +554,7 @@ 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_capabilities(arm64_errata, SCOPE_ALL,
+   update_cpu_capabilities(arm64_errata, SCOPE_LOCAL_CPU,
"enabling workaround for");
 }
 
@@ -1416,7 +1416,7 @@ void check_local_cpu_capabilities(void)
 * advertised capabilities.
 */
if (!sys_caps_initialised)
-   update_cpu_capabilities(arm64_errata, SCOPE_ALL,
+   update_cpu_capabilities(arm64_errata, SCOPE_LOCAL_CPU,
"enabling workaround for");
else
verify_local_cpu_capabilities();
@@ -1446,6 +1446,8 @@ void __init setup_cpu_features(void)
/* Set the CPU feature capabilies */
update_cpu_capabilities(arm64_features, SCOPE_ALL,
"detected feature:");
+   update_cpu_capabilities(arm64_errata, SCOPE_SYSTEM,
+   "enabling workaround for");
enable_cpu_capabilities(arm64_features, SCOPE_ALL);
enable_cpu_capabilities(arm64_errata, SCOPE_ALL);
mark_const_caps_ready();
-- 
2.14.3

[PATCH 2/4] arm64: capabilities: Split the processing of errata work arounds

[Suzuki K Poulose]

Right now we run through the errata workarounds check on all boot
active CPUs, with SCOPE_ALL. This doesn't help with detecting the
errata's with a SYSTEM_SCOPE. While nobody uses it, let us clean
this up in preparation for merging capability handling.

So, we run the checks with SCOPE_LOCAL_CPU on all CPUs and SCOPE_SYSTEM
checks are run only once after all the boot time CPUs are active.

Cc: Dave Martin 
Signed-off-by: Suzuki K Poulose 
---
 arch/arm64/kernel/cpufeature.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 9f52678a4df1..a6e124063e21 100644
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -554,7 +554,7 @@ 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_capabilities(arm64_errata, SCOPE_ALL,
+   update_cpu_capabilities(arm64_errata, SCOPE_LOCAL_CPU,
"enabling workaround for");
 }
 
@@ -1416,7 +1416,7 @@ void check_local_cpu_capabilities(void)
 * advertised capabilities.
 */
if (!sys_caps_initialised)
-   update_cpu_capabilities(arm64_errata, SCOPE_ALL,
+   update_cpu_capabilities(arm64_errata, SCOPE_LOCAL_CPU,
"enabling workaround for");
else
verify_local_cpu_capabilities();
@@ -1446,6 +1446,8 @@ void __init setup_cpu_features(void)
/* Set the CPU feature capabilies */
update_cpu_capabilities(arm64_features, SCOPE_ALL,
"detected feature:");
+   update_cpu_capabilities(arm64_errata, SCOPE_SYSTEM,
+   "enabling workaround for");
enable_cpu_capabilities(arm64_features, SCOPE_ALL);
enable_cpu_capabilities(arm64_errata, SCOPE_ALL);
mark_const_caps_ready();
-- 
2.14.3