evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Linux Build Service Account 2018-02-08 19:03:34 -08:00 • committed by Gerrit - the friendly Code Review server
commit 8543ad0652
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm64/include/asm/cpufeature.h
View file

@ -170,7 +170,9 @@ void __init setup_cpu_features(void);
void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps, void update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,
const char *info); const char *info);
void enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps);
void check_local_cpu_errata(void); void check_local_cpu_errata(void);
void __init enable_errata_workarounds(void);
#ifdef CONFIG_HOTPLUG_CPU #ifdef CONFIG_HOTPLUG_CPU
void verify_local_cpu_capabilities(void); void verify_local_cpu_capabilities(void);

5
arch/arm64/kernel/cpu_errata.c
View file

@ -111,3 +111,8 @@ void check_local_cpu_errata(void)
{ {
update_cpu_capabilities(arm64_errata, "enabling workaround for"); update_cpu_capabilities(arm64_errata, "enabling workaround for");
} }
void __init enable_errata_workarounds(void)
{
enable_cpu_capabilities(arm64_errata);
}

4
arch/arm64/kernel/cpufeature.c
View file

@ -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 * Run through the enabled capabilities and enable() it on all active
* CPUs * CPUs
*/ */
static void __init void __init enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps)
enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps)
{ {
int i; int i;
@ -1019,6 +1018,7 @@ void __init setup_cpu_features(void)
/* Set the CPU feature capabilies */ /* Set the CPU feature capabilies */
setup_feature_capabilities(); setup_feature_capabilities();
enable_errata_workarounds();
setup_cpu_hwcaps(); setup_cpu_hwcaps();
/* Advertise that we have computed the system capabilities */ /* Advertise that we have computed the system capabilities */