aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel
diff options
context:
space:
mode:
authorMarc Zyngier <marc.zyngier@arm.com>2019-04-15 08:03:54 -0400
committerWill Deacon <will.deacon@arm.com>2019-04-30 09:50:59 -0400
commit6989303a3b2d864fd8e17d3fa3365d3e9649a598 (patch)
tree23d32a1d8acb694f877b9fc6ccfa7b15ecca80da /arch/arm64/kernel
parent0cf57b86859c49381addb3ce47be70aadf5fd2c0 (diff)
arm64: Apply ARM64_ERRATUM_1188873 to Neoverse-N1
Neoverse-N1 is also affected by ARM64_ERRATUM_1188873, so let's add it to the list of affected CPUs. Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> [will: Update silicon-errata.txt] Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel')
-rw-r--r--arch/arm64/kernel/cpu_errata.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c
index 9950bb0cbd52..06f1c8aae1dc 100644
--- a/arch/arm64/kernel/cpu_errata.c
+++ b/arch/arm64/kernel/cpu_errata.c
@@ -603,6 +603,16 @@ static const struct midr_range workaround_clean_cache[] = {
603}; 603};
604#endif 604#endif
605 605
606#ifdef CONFIG_ARM64_ERRATUM_1188873
607static const struct midr_range erratum_1188873_list[] = {
608 /* Cortex-A76 r0p0 to r2p0 */
609 MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 2, 0),
610 /* Neoverse-N1 r0p0 to r2p0 */
611 MIDR_RANGE(MIDR_NEOVERSE_N1, 0, 0, 2, 0),
612 {},
613};
614#endif
615
606const struct arm64_cpu_capabilities arm64_errata[] = { 616const struct arm64_cpu_capabilities arm64_errata[] = {
607#ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE 617#ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE
608 { 618 {
@@ -725,10 +735,9 @@ const struct arm64_cpu_capabilities arm64_errata[] = {
725#endif 735#endif
726#ifdef CONFIG_ARM64_ERRATUM_1188873 736#ifdef CONFIG_ARM64_ERRATUM_1188873
727 { 737 {
728 /* Cortex-A76 r0p0 to r2p0 */
729 .desc = "ARM erratum 1188873", 738 .desc = "ARM erratum 1188873",
730 .capability = ARM64_WORKAROUND_1188873, 739 .capability = ARM64_WORKAROUND_1188873,
731 ERRATA_MIDR_RANGE(MIDR_CORTEX_A76, 0, 0, 2, 0), 740 ERRATA_MIDR_RANGE_LIST(erratum_1188873_list),
732 }, 741 },
733#endif 742#endif
734#ifdef CONFIG_ARM64_ERRATUM_1165522 743#ifdef CONFIG_ARM64_ERRATUM_1165522