arm64: errata: Mitigate TLBI errata on Microsoft Azure Cobalt 100 CPU

commit 1940e70a8144bf75e6df26bf6f600862ea7f7ea1 upstream.

Commit fb091ff39479 ("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>
[Mark: backport to v6.12.y]
Signed-off-by: Mark Rutland <mark.rutland@arm.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 81e4ea2d4917bb9d1d83afc2206c00cfc62f9847..e2ec25d14f1c9aa5cf41f86ff762eab5a6d8bf6d 100644 (file)
--- a/Documentation/arch/arm64/silicon-errata.rst
+++ b/Documentation/arch/arm64/silicon-errata.rst
@@ -346,3 +346,5 @@ stable kernels.
 +----------------+-----------------+-----------------+-----------------------------+
 | Microsoft      | Azure Cobalt 100| #3324339        | ARM64_ERRATUM_3194386       |
 +----------------+-----------------+-----------------+-----------------------------+
+| Microsoft      | Azure Cobalt 100| #4193789        | ARM64_ERRATUM_4118414       |
++----------------+-----------------+-----------------+-----------------------------+

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 297e2e391104d3286be3b42d446d93a509f8459f..012ec170232ea0f791139ca1be703b8f2b0a7317 100644 (file)
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1166,6 +1166,7 @@ config ARM64_ERRATUM_4118414
          * ARM Neoverse-V2 erratum 4193787
          * ARM Neoverse-V3 erratum 4193784
          * ARM Neoverse-V3AE erratum 4193784
+         * Microsoft Azure Cobalt 100 4193789
          * NVIDIA Olympus erratum T410-OLY-1029
 
          On affected cores, some memory accesses might not be completed by

diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 42699eb454df8d25c2f9065287f4ef4211aa23bd..80e47d3e86af4d02abb42ddc0204f33b94ee25ec 100644 (file)
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -250,6 +250,7 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = {
                        MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3),
                        MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3AE),
                        MIDR_ALL_VERSIONS(MIDR_NVIDIA_OLYMPUS),
+                       MIDR_ALL_VERSIONS(MIDR_MICROSOFT_AZURE_COBALT_100),
                        {}
                })),
        },