Skip to content

Commit c6b523f

Browse files
committed
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 upstream-diff silicon-errata.rst at different path and required manual conflict resolution due to missing entries in our branch. 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> (cherry picked from commit 573f6f2) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 29cfe99 commit c6b523f

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
@@ -174,6 +174,8 @@ stable kernels.
174174
+----------------+-----------------+-----------------+-----------------------------+
175175
| NVIDIA | Carmel Core | N/A | NVIDIA_CARMEL_CNP_ERRATUM |
176176
+----------------+-----------------+-----------------+-----------------------------+
177+
| NVIDIA | Olympus core | T410-OLY-1029 | ARM64_ERRATUM_4118414 |
178+
+----------------+-----------------+-----------------+-----------------------------+
177179
+----------------+-----------------+-----------------+-----------------------------+
178180
| Freescale/NXP | LS2080A/LS1043A | A-008585 | FSL_ERRATUM_A008585 |
179181
+----------------+-----------------+-----------------+-----------------------------+

arch/arm64/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,7 @@ config ARM64_ERRATUM_1508412
670670
register reads and warning KVM users. The DMB barrier is sufficient
671671
to prevent a speculative PAR_EL1 read.
672672
config ARM64_ERRATUM_4118414
673-
bool "Cortex-*/Neoverse-*/C1-*: Completion of affected memory accesses might not be guaranteed by completion of a TLBI"
673+
bool "Various: Completion of affected memory accesses might not be guaranteed by completion of a TLBI"
674674
default y
675675
select ARM64_WORKAROUND_REPEAT_TLBI
676676
help
@@ -697,6 +697,7 @@ config ARM64_ERRATUM_4118414
697697
* ARM Neoverse-V2 erratum 4193787
698698
* ARM Neoverse-V3 erratum 4193784
699699
* ARM Neoverse-V3AE erratum 4193784
700+
* NVIDIA Olympus erratum T410-OLY-1029
700701

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

arch/arm64/kernel/cpu_errata.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -709,6 +709,7 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = {
709709
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),
710710
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),
711711
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3AE),
712+
MIDR_ALL_VERSIONS(MIDR_NVIDIA_OLYMPUS),
712713
{}
713714
})),
714715
},

0 commit comments

Comments
 (0)