Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d69fe9a7 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Will Deacon
Browse files

arm64: capabilities: Split the processing of errata work arounds 



Right now we run through the errata workarounds check on all boot
active CPUs, with SCOPE_ALL. This wouldn't help for detecting erratum
workarounds with a SYSTEM_SCOPE. There are none yet, but we plan to
introduce some: let us clean this up so that such workarounds can be
detected and enabled correctly.

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.

Reviewed-by: default avatarDave Martin <dave.martin@arm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 600b9c91

arch/arm64/kernel/cpufeature.c

+4 −2
Original line number Diff line number Diff line
@@ -560,7 +560,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");

}
@@ -1452,7 +1452,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();
@@ -1480,6 +1480,8 @@ void __init setup_cpu_features(void) 


	/* Set the CPU feature capabilies */

	update_cpu_capabilities(arm64_features, SCOPE_ALL, "detected:");

	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();