arm64: errata: Mitigate TLBI errata on NVIDIA Olympus CPU

commit ec7216f92e4ebd485b1c6dc6aa3f6064b71a5768 upstream.

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>
[Mark: backport to v6.12.y]
Signed-off-by: Shanker Donthineni <sdonthineni@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/Documentation/arch/arm64/silicon-errata.rst b/Documentation/arch/arm64/silicon-errata.rst
index 5f417fe7f04accbe725edae153ab44d20b246482..81e4ea2d4917bb9d1d83afc2206c00cfc62f9847 100644 (file)
--- a/Documentation/arch/arm64/silicon-errata.rst
+++ b/Documentation/arch/arm64/silicon-errata.rst
@@ -285,6 +285,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                         |
 +----------------+-----------------+-----------------+-----------------------------+
 +----------------+-----------------+-----------------+-----------------------------+

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index bb0f8b6a100cc48eeb4fd54eb5d4327d3206948b..297e2e391104d3286be3b42d446d93a509f8459f 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1139,7 +1139,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
@@ -1166,6 +1166,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 fba5c4e7c8ca774a157dfc3b8e31e9dbc742c0fc..42699eb454df8d25c2f9065287f4ef4211aa23bd 100644 (file)
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -249,6 +249,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),
                        {}
                })),
        },