Commit 1d648e44 authored Apr 03, 2018 by Marc Zyngier Committed by Greg Kroah-Hartman Apr 08, 2018

arm64: Allow checking of a CPU-local erratum



commit 8f4137588261d7504f4aa022dc9d1a1fd1940e8e upstream.

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>
Signed-off-by: Alex Shi <alex.shi@linaro.org> [v4.9 backport]
Signed-off-by: Mark Rutland <mark.rutland@arm.com> [v4.9 backport]
Tested-by: Will Deacon <will.deacon@arm.com>
Tested-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 7354772a

arch/arm64/kernel/cpufeature.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -1103,20 +1103,29 @@ static void __init setup_feature_capabilities(void)
		* Check if the current CPU has a given feature capability.
		* 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;

		if (WARN_ON(preemptible()))
		return false;

		for (caps = arm64_features; caps->desc; caps++)
		for (caps = cap_array; caps->desc; caps++)
		if (caps->capability == cap && caps->matches)
		return caps->matches(caps, SCOPE_LOCAL_CPU);

		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)
		{
		u32 cwg;