[src/netbsd-6]: src/sys/arch sys/arch/arm/include/arm32/pte.h 1.11

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

details:   https://anonhg.NetBSD.org/src/rev/f46f01c60e12
branches:  netbsd-6
changeset: 775636:f46f01c60e12
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Feb 08 19:43:01 2013 +0000

description:
sys/arch/arm/include/arm32/pte.h                1.11
sys/arch/evbarm/marvell/marvell_machdep.c       1.19 via patch

        Switch to ARM_VECTORS_HIGH for Sheeva CPU.
        [msaitoh, ticket #785]

diffstat:

 sys/arch/arm/include/arm32/pte.h          |   3 ++-
 sys/arch/evbarm/marvell/marvell_machdep.c |  12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diffs (71 lines):

diff -r e9e11073698a -r f46f01c60e12 sys/arch/arm/include/arm32/pte.h
--- a/sys/arch/arm/include/arm32/pte.h  Fri Feb 08 19:37:37 2013 +0000
+++ b/sys/arch/arm/include/arm32/pte.h  Fri Feb 08 19:43:01 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pte.h,v 1.10 2011/03/10 07:47:15 bsh Exp $     */
+/*     $NetBSD: pte.h,v 1.10.10.1 2013/02/08 19:43:01 riz Exp $        */
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -107,6 +107,7 @@
 #define        L2_L_FRAME      (~L2_L_OFFSET)
 #define        L2_L_SHIFT      16
 
+#define        L2_S_SEGSIZE    (PAGE_SIZE * L2_S_SIZE / 4)
 #define        L2_S_SIZE       0x00001000      /* 4K */
 #define        L2_S_OFFSET     (L2_S_SIZE - 1)
 #define        L2_S_FRAME      (~L2_S_OFFSET)
diff -r e9e11073698a -r f46f01c60e12 sys/arch/evbarm/marvell/marvell_machdep.c
--- a/sys/arch/evbarm/marvell/marvell_machdep.c Fri Feb 08 19:37:37 2013 +0000
+++ b/sys/arch/evbarm/marvell/marvell_machdep.c Fri Feb 08 19:43:01 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: marvell_machdep.c,v 1.6.2.1 2012/06/28 04:50:38 riz Exp $ */
+/*     $NetBSD: marvell_machdep.c,v 1.6.2.2 2013/02/08 19:43:01 riz Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.6.2.1 2012/06/28 04:50:38 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: marvell_machdep.c,v 1.6.2.2 2013/02/08 19:43:01 riz Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_ddb.h"
@@ -552,7 +552,7 @@
         * shared by all processes.
         */
        valloc_pages(systempage, 1);
-       systempage.pv_va = 0x00000000;
+       systempage.pv_va = ARM_VECTORS_HIGH;
 
        /* Allocate stacks for all modes */
        valloc_pages(irqstack, IRQ_STACK_SIZE);
@@ -596,7 +596,7 @@
        l1pagetable = kernel_l1pt.pv_va;
 
        /* Map the L2 pages tables in the L1 page table */
-       pmap_link_l2pt(l1pagetable, 0x00000000,
+       pmap_link_l2pt(l1pagetable, ARM_VECTORS_HIGH & -L2_S_SEGSIZE,
            &kernel_pt_table[KERNEL_PT_SYS]);
        for (loop = 0; loop < KERNEL_PT_KERNEL_NUM; loop++)
                pmap_link_l2pt(l1pagetable, KERNEL_BASE + loop * 0x00400000,
@@ -656,7 +656,7 @@
                    VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE);
 
        /* Map the vector page. */
-       pmap_map_entry(l1pagetable, ARM_VECTORS_LOW, systempage.pv_pa,
+       pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa,
            VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE);
 
        /*
@@ -690,7 +690,7 @@
        printf("bootstrap done.\n");
 #endif
 
-       arm32_vector_init(ARM_VECTORS_LOW, ARM_VEC_ALL);
+       arm32_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL);
 
        /*
         * Pages were allocated during the secondary bootstrap for the