Skip to content

Commit 11586bd

Browse files
bmastbergenPlaidCat
authored andcommitted
arm64: errata: Mitigate TLBI errata on NVIDIA Olympus CPU
cve CVE-2025-10263 commit-author Shanker Donthineni <sdonthineni@nvidia.com> commit - commit-source-sha ec7216f commit-source arm64 NVIDIA Olympus cores are affected by the TLBI completion issue tracked as CVE-2025-10263. The existing ARM64_ERRATUM_4118414 handling already uses ARM64_WORKAROUND_REPEAT_TLBI to issue an additional broadcast TLBI;DSB sequence and ensure affected memory write effects are globally observed. Add MIDR_NVIDIA_OLYMPUS to the repeat-TLBI match list so the same mitigation is enabled on affected Olympus systems. Also document the NVIDIA Olympus erratum in the arm64 silicon errata table and list it in the Kconfig help text. Signed-off-by: Shanker Donthineni <sdonthineni@nvidia.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Acked-by: Mark Rutland <mark.rutland@arm.com> Signed-off-by: Will Deacon <will@kernel.org> (cherry picked from commit ec7216f) Signed-off-by: Brett Mastbergen <bmastbergen@ciq.com>
1 parent 9196d9b commit 11586bd

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

Documentation/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,8 @@ stable kernels.
296296
+----------------+-----------------+-----------------+-----------------------------+
297297
| NVIDIA | Carmel Core | N/A | NVIDIA_CARMEL_CNP_ERRATUM |
298298
+----------------+-----------------+-----------------+-----------------------------+
299+
| NVIDIA | Olympus core | T410-OLY-1029 | ARM64_ERRATUM_4118414 |
300+
+----------------+-----------------+-----------------+-----------------------------+
299301
| NVIDIA | T241 GICv3/4.x | T241-FABRIC-4 | N/A |
300302
+----------------+-----------------+-----------------+-----------------------------+
301303
+----------------+-----------------+-----------------+-----------------------------+

arch/arm64/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,7 @@ config ARM64_ERRATUM_3194386
11201120
If unsure, say Y.
11211121

11221122
config ARM64_ERRATUM_4118414
1123-
bool "Cortex-*/Neoverse-*/C1-*: Completion of affected memory accesses might not be guaranteed by completion of a TLBI"
1123+
bool "Various: Completion of affected memory accesses might not be guaranteed by completion of a TLBI"
11241124
default y
11251125
select ARM64_WORKAROUND_REPEAT_TLBI
11261126
help
@@ -1147,6 +1147,7 @@ config ARM64_ERRATUM_4118414
11471147
* ARM Neoverse-V2 erratum 4193787
11481148
* ARM Neoverse-V3 erratum 4193784
11491149
* ARM Neoverse-V3AE erratum 4193784
1150+
* NVIDIA Olympus erratum T410-OLY-1029
11501151

11511152
On affected cores, some memory accesses might not be completed by
11521153
broadcast TLB invalidation.

arch/arm64/kernel/cpu_errata.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = {
249249
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),
250250
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),
251251
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3AE),
252+
MIDR_ALL_VERSIONS(MIDR_NVIDIA_OLYMPUS),
252253
{}
253254
})),
254255
},

0 commit comments

Comments
 (0)