Commit dc0e3658 authored Jul 25, 2018 by Dirk Mueller Committed by Will Deacon Jul 25, 2018

arm64: Check for errata before evaluating cpu features



Since commit d3aec8a2 ("arm64: capabilities: Restrict KPTI
detection to boot-time CPUs") we rely on errata flags being already
populated during feature enumeration. The order of errata and
features was flipped as part of commit ed478b3f ("arm64:
capabilities: Group handling of features and errata workarounds").

Return to the orginal order of errata and feature evaluation to
ensure errata flags are present during feature evaluation.

Fixes: ed478b3f ("arm64: capabilities: Group handling of
    features and errata workarounds")
CC: Suzuki K Poulose <suzuki.poulose@arm.com>
CC: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Dirk Mueller <dmueller@suse.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>

parent d72e90f3

arch/arm64/kernel/cpufeature.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1351,9 +1351,9 @@ static void __update_cpu_capabilities(const struct arm64_cpu_capabilities *caps,

		static void update_cpu_capabilities(u16 scope_mask)
		{
		__update_cpu_capabilities(arm64_features, scope_mask, "detected:");
		__update_cpu_capabilities(arm64_errata, scope_mask,
		"enabling workaround for");
		__update_cpu_capabilities(arm64_features, scope_mask, "detected:");
		}

		static int __enable_cpu_capability(void *arg)
		@@ -1408,8 +1408,8 @@ __enable_cpu_capabilities(const struct arm64_cpu_capabilities *caps,

		static void __init enable_cpu_capabilities(u16 scope_mask)
		{
		__enable_cpu_capabilities(arm64_features, scope_mask);
		__enable_cpu_capabilities(arm64_errata, scope_mask);
		__enable_cpu_capabilities(arm64_features, scope_mask);
		}

		/*