Skip to content

Commit 5257aae

Browse files
committed
arm64: errata: Mitigate TLBI errata on Microsoft Azure Cobalt 100 CPU
cve cve-2025-10263 commit-author Will Deacon <will@kernel.org> commit - commit-source-sha 1940e70 commit-source arm64 upstream-diff silicon-errata.rst at different path and required manual conflict resolution due to missing entries in our branch. arm64_repeat_tlbi_cpus[] is a flat struct midr_range array on 4.18; added MIDR_ALL_VERSIONS() entry directly instead of nested ERRATA_MIDR_RANGE_LIST(). Commit fb091ff ("arm64: Subscribe Microsoft Azure Cobalt 100 to ARM Neoverse N2 errata") states that Microsoft Azure Cobalt 100 CPU "is a Microsoft implemented CPU based on r0p0 of the ARM Neoverse N2 CPU, and therefore suffers from all the same errata.". So enable the workaround for the latest broadcast TLB invalidation bug on these parts. Signed-off-by: Will Deacon <will@kernel.org> (cherry picked from commit 1940e70) Signed-off-by: Brett Mastbergen <bmastbergen@ciq.com>
1 parent 573f6f2 commit 5257aae

3 files changed

Lines changed: 5 additions & 0 deletions

File tree

Documentation/arm64/silicon-errata.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,3 +190,6 @@ stable kernels.
190190
+----------------+-----------------+-----------------+-----------------------------+
191191
| Fujitsu | A64FX | E#010001 | FUJITSU_ERRATUM_010001 |
192192
+----------------+-----------------+-----------------+-----------------------------+
193+
+----------------+-----------------+-----------------+-----------------------------+
194+
| Microsoft | Azure Cobalt 100| #4193789 | ARM64_ERRATUM_4118414 |
195+
+----------------+-----------------+-----------------+-----------------------------+

arch/arm64/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -650,6 +650,7 @@ config ARM64_ERRATUM_4118414
650650
* ARM Neoverse-V2 erratum 4193787
651651
* ARM Neoverse-V3 erratum 4193784
652652
* ARM Neoverse-V3AE erratum 4193784
653+
* Microsoft Azure Cobalt 100 4193789
653654
* NVIDIA Olympus erratum T410-OLY-1029
654655

655656
On affected cores, some memory accesses might not be completed by

arch/arm64/kernel/cpu_errata.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,7 @@ static const struct midr_range arm64_repeat_tlbi_cpus[] = {
686686
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),
687687
MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3AE),
688688
MIDR_ALL_VERSIONS(MIDR_NVIDIA_OLYMPUS),
689+
MIDR_ALL_VERSIONS(MIDR_MICROSOFT_AZURE_COBALT_100),
689690
#endif
690691
{},
691692
};

0 commit comments

Comments
 (0)