Skip to content

Commit ed888cb

Browse files
Marc Zyngierctmarinas
authored andcommitted
arm64: Allow CPUs unffected by ARM erratum 1418040 to come in late
Now that we allow CPUs affected by erratum 1418040 to come in late, this prevents their unaffected sibblings from coming in late (or coming back after a suspend or hotplug-off, which amounts to the same thing). To allow this, we need to add ARM64_CPUCAP_OPTIONAL_FOR_LATE_CPU, which amounts to set .type to ARM64_CPUCAP_WEAK_LOCAL_CPU_FEATURE. Fixes: bf87bb0 ("arm64: Allow booting of late CPUs affected by erratum 1418040") Reported-by: Matthias Kaehlcke <[email protected]> Signed-off-by: Marc Zyngier <[email protected]> Tested-by: Sai Prakash Ranjan <[email protected]> Tested-by: Matthias Kaehlcke <[email protected]> Acked-by: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent e0328fe commit ed888cb

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

arch/arm64/kernel/cpu_errata.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -910,8 +910,12 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
910910
.desc = "ARM erratum 1418040",
911911
.capability = ARM64_WORKAROUND_1418040,
912912
ERRATA_MIDR_RANGE_LIST(erratum_1418040_list),
913-
.type = (ARM64_CPUCAP_SCOPE_LOCAL_CPU |
914-
ARM64_CPUCAP_PERMITTED_FOR_LATE_CPU),
913+
/*
914+
* We need to allow affected CPUs to come in late, but
915+
* also need the non-affected CPUs to be able to come
916+
* in at any point in time. Wonderful.
917+
*/
918+
.type = ARM64_CPUCAP_WEAK_LOCAL_CPU_FEATURE,
915919
},
916920
#endif
917921
#ifdef CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT

0 commit comments

Comments
 (0)