Commit dfaa0f7d authored by Marc Zyngier's avatar Marc Zyngier Committed by Greg Kroah-Hartman
Browse files

arm64: Run ARCH_WORKAROUND_2 enabling code on all CPUs

commit 39533e12063be7f55e3d6ae21ffe067799d542a4 upstream.

Commit 606f8e7b ("arm64: capabilities: Use linear array for
detection and verification") changed the way we deal with per-CPU errata
by only calling the .matches() callback until one CPU is found to be
affected. At this point, .matches() stop being called, and .cpu_enable()
will be called on all CPUs.

This breaks the ARCH_WORKAROUND_2 handling, as only a single CPU will be

In order to address this, forcefully call the .matches() callback from a
.cpu_enable() callback, which brings us back to the original behaviour.

Fixes: 606f8e7b

 ("arm64: capabilities: Use linear array for detection and verification")
Cc: <>
Reviewed-by: default avatarSuzuki K Poulose <>
Signed-off-by: default avatarMarc Zyngier <>
Signed-off-by: default avatarWill Deacon <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 0ccd5c2c
......@@ -457,6 +457,12 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry,
return required;
static void cpu_enable_ssbd_mitigation(const struct arm64_cpu_capabilities *cap)
if (ssbd_state != ARM64_SSBD_FORCE_DISABLE)
cap->matches(cap, SCOPE_LOCAL_CPU);
/* known invulnerable cores */
static const struct midr_range arm64_ssb_cpus[] = {
......@@ -914,6 +920,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
.capability = ARM64_SSBD,
.matches = has_ssbd_mitigation,
.cpu_enable = cpu_enable_ssbd_mitigation,
.midr_range_list = arm64_ssb_cpus,
#ifdef CONFIG_ARM64_ERRATUM_1418040
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment