Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/aarch64/aarch64 set correctly TCR_EL1 for inner sha...



details:   https://anonhg.NetBSD.org/src/rev/47a969b68d53
branches:  trunk
changeset: 992322:47a969b68d53
user:      ryo <ryo%NetBSD.org@localhost>
date:      Fri Aug 24 19:06:30 2018 +0000

description:
set correctly TCR_EL1 for inner shareable when MULTIPROCESSOR

diffstat:

 sys/arch/aarch64/aarch64/locore.S |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (40 lines):

diff -r a721fe2ceec2 -r 47a969b68d53 sys/arch/aarch64/aarch64/locore.S
--- a/sys/arch/aarch64/aarch64/locore.S Fri Aug 24 17:09:30 2018 +0000
+++ b/sys/arch/aarch64/aarch64/locore.S Fri Aug 24 19:06:30 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.S,v 1.18 2018/08/10 21:06:42 ryo Exp $  */
+/*     $NetBSD: locore.S,v 1.19 2018/08/24 19:06:30 ryo Exp $  */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo%nerv.org@localhost>
@@ -35,7 +35,7 @@
 #include <aarch64/hypervisor.h>
 #include "assym.h"
 
-RCSID("$NetBSD: locore.S,v 1.18 2018/08/10 21:06:42 ryo Exp $")
+RCSID("$NetBSD: locore.S,v 1.19 2018/08/24 19:06:30 ryo Exp $")
 
 /* #define DEBUG_LOCORE */
 /* #define DEBUG_MMU */
@@ -917,6 +917,10 @@
        ldr     x0, tcr_setting
        mrs     x1, id_aa64mmfr0_el1
        bfi     x0, x1, #32, #3
+#ifdef MULTIPROCESSOR
+       ldr     x1, tcr_setting_inner_shareable
+       orr     x0, x0, x1
+#endif
        msr     tcr_el1, x0
 
        /*
@@ -934,10 +938,6 @@
 #else
        bic     x0, x0, x1      /* clear: LittleEndian */
 #endif
-#ifdef MULTIPROCESSOR
-       ldr     x1, tcr_setting_inner_shareable
-       orr     x0, x0, x1
-#endif
        msr     sctlr_el1, x0   /* enabling MMU! */
        isb
 



Home | Main Index | Thread Index | Old Index