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

Commit 8543ad06 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: errata: Calling enable functions for CPU errata too"

parents cf1de4e0 ce870f33

arch/arm64/include/asm/cpufeature.h

+2 −0
Original line number Diff line number Diff line
@@ -170,7 +170,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
@@ -111,3 +111,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
@@ -859,8 +859,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;
@@ -1019,6 +1018,7 @@ void __init setup_cpu_features(void) 


	/* Set the CPU feature capabilies */

	setup_feature_capabilities();

	enable_errata_workarounds();

	setup_cpu_hwcaps();



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