[src/trunk]: src/sys/arch add workaround for Neoverse N1 erratum 1542419

[ryo <ryo%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/23e5a2e7ddfa
branches:  trunk
changeset: 973450:23e5a2e7ddfa
user:      ryo <ryo%NetBSD.org@localhost>
date:      Wed Jul 01 08:02:13 2020 +0000

description:
add workaround for Neoverse N1 erratum 1542419

diffstat:

 sys/arch/aarch64/aarch64/trap.c |  9 +++++++--
 sys/arch/arm/include/cputypes.h |  4 +++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r 7594528f0e28 -r 23e5a2e7ddfa sys/arch/aarch64/aarch64/trap.c
--- a/sys/arch/aarch64/aarch64/trap.c   Wed Jul 01 08:01:07 2020 +0000
+++ b/sys/arch/aarch64/aarch64/trap.c   Wed Jul 01 08:02:13 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.28 2020/07/01 08:01:07 ryo Exp $ */
+/* $NetBSD: trap.c,v 1.29 2020/07/01 08:02:13 ryo Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.28 2020/07/01 08:01:07 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.29 2020/07/01 08:02:13 ryo Exp $");
 
 #include "opt_arm_intr_impl.h"
 #include "opt_compat_netbsd32.h"
@@ -338,6 +338,11 @@
                if (__SHIFTOUT(ctr_el0_cpu, CTR_EL0_DIC) == 1)
                        ctr_el0_cpu |= CTR_EL0_IMIN_LINE;
 
+               /* Neoverse N1 erratum 1542419 */
+               if (CPU_ID_NEOVERSEN1_P(ci->ci_id.ac_midr) &&
+                   __SHIFTOUT(ctr_el0_cpu, CTR_EL0_DIC) == 1)
+                       ctr_el0_cpu &= ~CTR_EL0_DIC;
+
                if (cii == 0) {
                        ctr_el0_usr = ctr_el0_cpu;
                        continue;
diff -r 7594528f0e28 -r 23e5a2e7ddfa sys/arch/arm/include/cputypes.h
--- a/sys/arch/arm/include/cputypes.h   Wed Jul 01 08:01:07 2020 +0000
+++ b/sys/arch/arm/include/cputypes.h   Wed Jul 01 08:02:13 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cputypes.h,v 1.12 2020/01/27 12:56:44 skrll Exp $      */
+/*     $NetBSD: cputypes.h,v 1.13 2020/07/01 08:02:13 ryo Exp $        */
 
 /*
  * Copyright (c) 1998, 2001 Ben Harris
@@ -198,6 +198,8 @@
 #define CPU_ID_CORTEX_A76AE_P(n) ((n & 0xff0ff0f0) == 0x410fd0e0)
 #define CPU_ID_CORTEX_A77_P(n) ((n & 0xff0ff0f0) == 0x410fd0f0)
 
+#define CPU_ID_NEOVERSEN1_P(n) ((n & 0xff0ffff0) == 0x410fd0c0)
+
 #define CPU_ID_THUNDERXRX      0x43000a10
 #define CPU_ID_THUNDERXP1d0    0x43000a10
 #define CPU_ID_THUNDERXP1d1    0x43000a11