Skip to content

Commit 68c3f5d

Browse files
bmastbergenroxanan1996
authored andcommitted
arm64: errata: Mitigate TLBI errata on NVIDIA Olympus CPU
jira VULN-187522 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 9eac15c commit 68c3f5d

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
@@ -226,6 +226,8 @@ stable kernels.
226226
+----------------+-----------------+-----------------+-----------------------------+
227227
| NVIDIA | Carmel Core | N/A | NVIDIA_CARMEL_CNP_ERRATUM |
228228
+----------------+-----------------+-----------------+-----------------------------+
229+
| NVIDIA | Olympus core | T410-OLY-1029 | ARM64_ERRATUM_4118414 |
230+
+----------------+-----------------+-----------------+-----------------------------+
229231
| NVIDIA | T241 GICv3/4.x | T241-FABRIC-4 | N/A |
230232
+----------------+-----------------+-----------------+-----------------------------+
231233
+----------------+-----------------+-----------------+-----------------------------+

arch/arm64/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1022,7 +1022,7 @@ config ARM64_ERRATUM_2966298
10221022
If unsure, say Y.
10231023

10241024
config ARM64_ERRATUM_4118414
1025-
bool "Cortex-*/Neoverse-*/C1-*: Completion of affected memory accesses might not be guaranteed by completion of a TLBI"
1025+
bool "Various: Completion of affected memory accesses might not be guaranteed by completion of a TLBI"
10261026
default y
10271027
select ARM64_WORKAROUND_REPEAT_TLBI
10281028
help
@@ -1049,6 +1049,7 @@ config ARM64_ERRATUM_4118414
10491049
* ARM Neoverse-V2 erratum 4193787
10501050
* ARM Neoverse-V3 erratum 4193784
10511051
* ARM Neoverse-V3AE erratum 4193784
1052+
* NVIDIA Olympus erratum T410-OLY-1029
10521053

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

arch/arm64/kernel/cpu_errata.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = {
265265
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),
266266
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),
267267
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3AE),
268+
MIDR_ALL_VERSIONS(MIDR_NVIDIA_OLYMPUS),
268269
{}
269270
})),
270271
},

0 commit comments

Comments
 (0)