hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arm64: Allow checking of a CPU-local erratum 

this_cpu_has_cap() only checks the feature array, and not the errata
one. In order to be able to check for a CPU-local erratum, allow it
to inspect the latter as well.

This is consistent with cpus_have_cap()'s behaviour, which includes
errata already.

Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Marc Zyngier 2017-01-30 15:39:52 +00:00
parent 97da3854c5
commit 8f41375882
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm64/kernel/cpufeature.c
View File

@ -1090,20 +1090,29 @@ static void __init setup_feature_capabilities(void)
* Check if the current CPU has a given feature capability. * Check if the current CPU has a given feature capability.
* Should be called from non-preemptible context. * Should be called from non-preemptible context.
*/ */
bool this_cpu_has_cap(unsigned int cap) static bool __this_cpu_has_cap(const struct arm64_cpu_capabilities *cap_array,
unsigned int cap)
{ {
const struct arm64_cpu_capabilities *caps; const struct arm64_cpu_capabilities *caps;
if (WARN_ON(preemptible())) if (WARN_ON(preemptible()))
return false; return false;
for (caps = arm64_features; caps->desc; caps++) for (caps = cap_array; caps->desc; caps++)
if (caps->capability == cap && caps->matches) if (caps->capability == cap && caps->matches)
return caps->matches(caps, SCOPE_LOCAL_CPU); return caps->matches(caps, SCOPE_LOCAL_CPU);
return false; return false;
} }
extern const struct arm64_cpu_capabilities arm64_errata[];
bool this_cpu_has_cap(unsigned int cap)
{
return (__this_cpu_has_cap(arm64_features, cap) ||
__this_cpu_has_cap(arm64_errata, cap));
}
void __init setup_cpu_features(void) void __init setup_cpu_features(void)
{ {
u32 cwg; u32 cwg;