[src/trunk]: src/sys/arch/arm/arm port-arm/50635: arm11_setup() cpuctrlmask v...

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

details:   https://anonhg.NetBSD.org/src/rev/4555bdec800c
branches:  trunk
changeset: 366149:4555bdec800c
user:      skrll <skrll%NetBSD.org@localhost>
date:      Mon May 16 07:07:17 2022 +0000

description:
port-arm/50635: arm11_setup() cpuctrlmask value causes CPU_CONTROL_VECRELOC bit to toggle

Fix slightly differently to as suggested in the PR.  Annotate arm10_setup
while I'm here.

diffstat:

 sys/arch/arm/arm/cpufunc.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 97ebd63c8a15 -r 4555bdec800c sys/arch/arm/arm/cpufunc.c
--- a/sys/arch/arm/arm/cpufunc.c        Mon May 16 06:07:23 2022 +0000
+++ b/sys/arch/arm/arm/cpufunc.c        Mon May 16 07:07:17 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.c,v 1.183 2021/11/27 08:51:01 skrll Exp $      */
+/*     $NetBSD: cpufunc.c,v 1.184 2022/05/16 07:07:17 skrll Exp $      */
 
 /*
  * arm7tdmi support code Copyright (c) 2001 John Fremlin
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.183 2021/11/27 08:51:01 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpufunc.c,v 1.184 2022/05/16 07:07:17 skrll Exp $");
 
 #include "opt_arm_start.h"
 #include "opt_compat_netbsd.h"
@@ -2713,7 +2713,7 @@
            | CPU_CONTROL_IC_ENABLE | CPU_CONTROL_DC_ENABLE
            | CPU_CONTROL_WBUF_ENABLE | CPU_CONTROL_ROM_ENABLE
            | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
-           | CPU_CONTROL_BPRD_ENABLE
+           | CPU_CONTROL_BPRD_ENABLE | CPU_CONTROL_VECRELOC
            | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK;
 #endif
 
@@ -2776,7 +2776,8 @@
        int cpuctrlmask = cpuctrl
            | CPU_CONTROL_ROM_ENABLE | CPU_CONTROL_BPRD_ENABLE
            | CPU_CONTROL_BEND_ENABLE | CPU_CONTROL_AFLT_ENABLE
-           | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK;
+           | CPU_CONTROL_ROUNDROBIN | CPU_CONTROL_CPCLK
+           | CPU_CONTROL_VECRELOC;
 
 #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
        cpuctrl |= CPU_CONTROL_AFLT_ENABLE;