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

Commit ff4a2773 authored by Andre Przywara's avatar Andre Przywara Committed by Gerrit - the friendly Code Review server
Browse files

arm64: errata: Calling enable functions for CPU errata too 



Currently we call the (optional) enable function for CPU _features_
only. As CPU _errata_ descriptions share the same data structure and
having an enable function is useful for errata as well (for instance
to set bits in SCTLR), lets call it when enumerating erratas too.

Change-Id: If9eff7dd87d7ebcf8ee44ae0cc326f91e2c16af8
Signed-off-by: default avatarAndre Przywara <andre.przywara@arm.com>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Git-commit: 8e2318521bf5837dae093413f81292b59d49d030
Git-repo: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux


[neeraju@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: default avatarNeeraj Upadhyay <neeraju@codeaurora.org>
parent 07b65cce

arch/arm64/include/asm/cpufeature.h

+2 −0
Original line number Diff line number Diff line
@@ -162,7 +162,9 @@ void __init setup_cpu_features(void); 


void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,

			    const char *info);

void enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps);

void check_local_cpu_errata(void);

void __init enable_errata_workarounds(void);



#ifdef CONFIG_HOTPLUG_CPU

void verify_local_cpu_capabilities(void);

arch/arm64/kernel/cpu_errata.c

+5 −0
Original line number Diff line number Diff line
@@ -97,3 +97,8 @@ void check_local_cpu_errata(void) 
{

	update_cpu_capabilities(arm64_errata, "enabling workaround for");

}



void __init enable_errata_workarounds(void)

{

	enable_cpu_capabilities(arm64_errata);

}

arch/arm64/kernel/cpufeature.c

+2 −2
Original line number Diff line number Diff line
@@ -799,8 +799,7 @@ void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps, 
 * Run through the enabled capabilities and enable() it on all active

 * CPUs

 */

static void __init

enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps)

void __init enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps)

{

	int i;
@@ -954,6 +953,7 @@ void __init setup_cpu_features(void) 
	/* Set the CPU feature capabilies */

	setup_feature_capabilities();

	setup_cpu_hwcaps();

	enable_errata_workarounds();



	/* Advertise that we have computed the system capabilities */

	set_sys_caps_initialised();