arm64: errata: Mitigate TLBI errata on NVIDIA Olympus CPU

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>

diff --git a/Documentation/arch/arm64/silicon-errata.rst b/Documentation/arch/arm64/silicon-errata.rst
index 6f4a93602abcaf6fad4656e842c5ddac0df193a0..dc4de8f2dce3dcd8f40e3fa85ceae34a4ae65828 100644 (file)
--- a/Documentation/arch/arm64/silicon-errata.rst
+++ b/Documentation/arch/arm64/silicon-errata.rst
@@ -304,6 +304,8 @@ stable kernels.
 +----------------+-----------------+-----------------+-----------------------------+
 | NVIDIA         | Carmel Core     | N/A             | NVIDIA_CARMEL_CNP_ERRATUM   |
 +----------------+-----------------+-----------------+-----------------------------+
+| NVIDIA         | Olympus core    | T410-OLY-1029   | ARM64_ERRATUM_4118414       |
++----------------+-----------------+-----------------+-----------------------------+
 | NVIDIA         | T241 GICv3/4.x  | T241-FABRIC-4   | N/A                         |
 +----------------+-----------------+-----------------+-----------------------------+
 | NVIDIA         | T241 MPAM       | T241-MPAM-1,    | N/A                         |

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 2b17033d96629ad4f9d1897323a63ffc543b797f..eac9a02b5f624840ade4277e4453274589d54d77 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1155,7 +1155,7 @@ config ARM64_ERRATUM_4193714
          If unsure, say Y.
 
 config ARM64_ERRATUM_4118414
-       bool "Cortex-*/Neoverse-*/C1-*: Completion of affected memory accesses might not be guaranteed by completion of a TLBI"
+       bool "Various: Completion of affected memory accesses might not be guaranteed by completion of a TLBI"
        default y
        select ARM64_WORKAROUND_REPEAT_TLBI
        help
@@ -1182,6 +1182,7 @@ config ARM64_ERRATUM_4118414
          * ARM Neoverse-V2 erratum 4193787
          * ARM Neoverse-V3 erratum 4193784
          * ARM Neoverse-V3AE erratum 4193784
+         * NVIDIA Olympus erratum T410-OLY-1029
 
          On affected cores, some memory accesses might not be completed by
          broadcast TLB invalidation.

diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 95e3be145fb1e6e51f42d596c2ae7884f0eca0c6..476b0108057fff722b4e71c83c6a298bda5e7c37 100644 (file)
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -364,6 +364,7 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = {
                        MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2),
                        MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),
                        MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3AE),
+                       MIDR_ALL_VERSIONS(MIDR_NVIDIA_OLYMPUS),
                        {}
                })),
        },