Skip to content

Commit 081eb79

Browse files
mrutland-armctmarinas
authored andcommitted
arm64: errata: Expand speculative SSBS workaround once more
A number of Arm Ltd CPUs suffer from errata whereby an MSR to the SSBS special-purpose register does not affect subsequent speculative instructions, permitting speculative store bypassing for a window of time. We worked around this for a number of CPUs in commits: * 7187bb7 ("arm64: errata: Add workaround for Arm errata 3194386 and 3312417") * 75b3c43 ("arm64: errata: Expand speculative SSBS workaround") * 145502cac7ea70b5 ("arm64: errata: Expand speculative SSBS workaround (again)") Since then, a (hopefully final) batch of updates have been published, with two more affected CPUs. For the affected CPUs the existing mitigation is sufficient, as described in their respective Software Developer Errata Notice (SDEN) documents: * Cortex-A715 (MP148) SDEN v15.0, erratum 3456084 https://developer.arm.com/documentation/SDEN-2148827/1500/ * Neoverse-N3 (MP195) SDEN v5.0, erratum 3456111 https://developer.arm.com/documentation/SDEN-3050973/0500/ Enable the existing mitigation by adding the relevant MIDRs to erratum_spec_ssbs_list, and update silicon-errata.rst and the Kconfig text accordingly. Signed-off-by: Mark Rutland <[email protected]> Cc: James Morse <[email protected]> Cc: Will Deacon <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 9247257 commit 081eb79

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

Documentation/arch/arm64/silicon-errata.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ stable kernels.
146146
+----------------+-----------------+-----------------+-----------------------------+
147147
| ARM | Cortex-A715 | #2645198 | ARM64_ERRATUM_2645198 |
148148
+----------------+-----------------+-----------------+-----------------------------+
149+
| ARM | Cortex-A715 | #3456084 | ARM64_ERRATUM_3194386 |
150+
+----------------+-----------------+-----------------+-----------------------------+
149151
| ARM | Cortex-A720 | #3456091 | ARM64_ERRATUM_3194386 |
150152
+----------------+-----------------+-----------------+-----------------------------+
151153
| ARM | Cortex-A725 | #3456106 | ARM64_ERRATUM_3194386 |
@@ -186,6 +188,8 @@ stable kernels.
186188
+----------------+-----------------+-----------------+-----------------------------+
187189
| ARM | Neoverse-N2 | #3324339 | ARM64_ERRATUM_3194386 |
188190
+----------------+-----------------+-----------------+-----------------------------+
191+
| ARM | Neoverse-N3 | #3456111 | ARM64_ERRATUM_3194386 |
192+
+----------------+-----------------+-----------------+-----------------------------+
189193
| ARM | Neoverse-V1 | #1619801 | N/A |
190194
+----------------+-----------------+-----------------+-----------------------------+
191195
| ARM | Neoverse-V1 | #3324341 | ARM64_ERRATUM_3194386 |

arch/arm64/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1097,6 +1097,7 @@ config ARM64_ERRATUM_3194386
10971097
* ARM Cortex-A78C erratum 3324346
10981098
* ARM Cortex-A78C erratum 3324347
10991099
* ARM Cortex-A710 erratam 3324338
1100+
* ARM Cortex-A715 errartum 3456084
11001101
* ARM Cortex-A720 erratum 3456091
11011102
* ARM Cortex-A725 erratum 3456106
11021103
* ARM Cortex-X1 erratum 3324344
@@ -1107,6 +1108,7 @@ config ARM64_ERRATUM_3194386
11071108
* ARM Cortex-X925 erratum 3324334
11081109
* ARM Neoverse-N1 erratum 3324349
11091110
* ARM Neoverse N2 erratum 3324339
1111+
* ARM Neoverse-N3 erratum 3456111
11101112
* ARM Neoverse-V1 erratum 3324341
11111113
* ARM Neoverse V2 erratum 3324336
11121114
* ARM Neoverse-V3 erratum 3312417

arch/arm64/kernel/cpu_errata.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ static const struct midr_range erratum_spec_ssbs_list[] = {
439439
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78),
440440
MIDR_ALL_VERSIONS(MIDR_CORTEX_A78C),
441441
MIDR_ALL_VERSIONS(MIDR_CORTEX_A710),
442+
MIDR_ALL_VERSIONS(MIDR_CORTEX_A715),
442443
MIDR_ALL_VERSIONS(MIDR_CORTEX_A720),
443444
MIDR_ALL_VERSIONS(MIDR_CORTEX_A725),
444445
MIDR_ALL_VERSIONS(MIDR_CORTEX_X1),
@@ -449,6 +450,7 @@ static const struct midr_range erratum_spec_ssbs_list[] = {
449450
MIDR_ALL_VERSIONS(MIDR_CORTEX_X925),
450451
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N1),
451452
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2),
453+
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N3),
452454
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V1),
453455
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),
454456
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),

0 commit comments

Comments
 (0)