Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/arm32 Further cpu_info inits in cpu_hatch



details:   https://anonhg.NetBSD.org/src/rev/1c71d6f2abf0
branches:  trunk
changeset: 327260:1c71d6f2abf0
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Mar 03 08:52:30 2014 +0000

description:
Further cpu_info inits in cpu_hatch

diffstat:

 sys/arch/arm/arm32/arm32_boot.c |  18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diffs (42 lines):

diff -r 8a707e32a0f7 -r 1c71d6f2abf0 sys/arch/arm/arm32/arm32_boot.c
--- a/sys/arch/arm/arm32/arm32_boot.c   Mon Mar 03 08:51:39 2014 +0000
+++ b/sys/arch/arm/arm32/arm32_boot.c   Mon Mar 03 08:52:30 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: arm32_boot.c,v 1.5 2013/08/18 06:28:18 matt Exp $      */
+/*     $NetBSD: arm32_boot.c,v 1.6 2014/03/03 08:52:30 matt Exp $      */
 
 /*
  * Copyright (c) 2002, 2003, 2005  Genetec Corporation.  All rights reserved.
@@ -123,7 +123,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.5 2013/08/18 06:28:18 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: arm32_boot.c,v 1.6 2014/03/03 08:52:30 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -342,14 +342,18 @@
        set_stackptr(PSR_UND32_MODE,
            undstack.pv_va + cpu_index(ci) * UND_STACK_SIZE * PAGE_SIZE);
 
-#if 0
+       ci->ci_lastlwp = NULL;
+       ci->ci_pmap_lastuser = NULL;
+#ifdef ARM_MMU_EXTENDED
+       printf(" tlb");
        /*
-        * Now that we are going to apart of the kernel,
-        * take out the kernel lock.
+        * Attach to the tlb.
         */
-       printf(" kernel_lock");
-       KERNEL_LOCK(1, NULL);
+       ci->ci_pmap_cur = pmap_kernel();
+       ci->ci_pmap_asid_cur = KERNEL_PID;
+       pmap_tlb_info_attach(&pmap_tlb0_info, ci);
 #endif
+
 #ifdef CPU_CORTEX
        if (CPU_ID_CORTEX_P(ci->ci_arm_cpuid)) {
                /*



Home | Main Index | Thread Index | Old Index