Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/aarch64 report A72 errata #859971 workaround status...



details:   https://anonhg.NetBSD.org/src/rev/a6e9e5fc04ea
branches:  trunk
changeset: 454376:a6e9e5fc04ea
user:      tnn <tnn%NetBSD.org@localhost>
date:      Sun Sep 15 15:16:30 2019 +0000

description:
report A72 errata #859971 workaround status during boot

diffstat:

 sys/arch/aarch64/aarch64/cpu.c    |  12 ++++++++++--
 sys/arch/aarch64/include/armreg.h |   3 ++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (50 lines):

diff -r b0cc2ae7591a -r a6e9e5fc04ea sys/arch/aarch64/aarch64/cpu.c
--- a/sys/arch/aarch64/aarch64/cpu.c    Sun Sep 15 15:15:02 2019 +0000
+++ b/sys/arch/aarch64/aarch64/cpu.c    Sun Sep 15 15:16:30 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.20 2019/07/16 20:29:53 jmcneill Exp $ */
+/* $NetBSD: cpu.c,v 1.21 2019/09/15 15:16:30 tnn Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.20 2019/07/16 20:29:53 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.21 2019/09/15 15:16:30 tnn Exp $");
 
 #include "locators.h"
 #include "opt_arm_debug.h"
@@ -432,6 +432,14 @@
        }
 
        aprint_normal("\n");
+
+       if ((id->ac_midr & CPU_PARTMASK) == (CPU_ID_CORTEXA72R0 & CPU_PARTMASK)
+           && __SHIFTOUT(id->ac_midr, CPU_ID_REVISION_MASK) <= 3) {
+               aprint_normal_dev(self, "A72 errata #859971 present"
+                   ", workaround %s\n",
+                   ISSET(reg_a72_cpuactlr_el1_read(), __BIT(32))
+                   ? "enabled" : "NOT enabled (U-Boot update needed)");
+       }
 }
 
 /*
diff -r b0cc2ae7591a -r a6e9e5fc04ea sys/arch/aarch64/include/armreg.h
--- a/sys/arch/aarch64/include/armreg.h Sun Sep 15 15:15:02 2019 +0000
+++ b/sys/arch/aarch64/include/armreg.h Sun Sep 15 15:16:30 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: armreg.h,v 1.27 2019/09/11 18:19:35 skrll Exp $ */
+/* $NetBSD: armreg.h,v 1.28 2019/09/15 15:16:30 tnn Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -260,6 +260,7 @@
 #define         ID_AA64MMFR0_EL1_PARANGE_16T    4
 #define         ID_AA64MMFR0_EL1_PARANGE_256T   5
 
+AARCH64REG_READ_INLINE2(a72_cpuactlr_el1, s3_1_c15_c2_0)
 AARCH64REG_READ_INLINE(id_aa64mmfr1_el1)
 AARCH64REG_READ_INLINE(id_aa64mmfr2_el1)
 AARCH64REG_READ_INLINE(id_aa64pfr0_el1)



Home | Main Index | Thread Index | Old Index