[src/netbsd-2]: src/sys/arch/mips/mips Pull up following revision(s) (request...

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

details:   https://anonhg.NetBSD.org/src/rev/a518ccadec2e
branches:  netbsd-2
changeset: 564051:a518ccadec2e
user:      riz <riz%NetBSD.org@localhost>
date:      Tue Sep 13 21:28:44 2005 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #5829):
        sys/arch/mips/mips/mips_machdep.c: revision 1.179
Initilize CP0 pagemask register properly.
Fixes PR 30590 and some other mips port.

diffstat:

 sys/arch/mips/mips/mips_machdep.c |  16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diffs (64 lines):

diff -r 126d3827a5f0 -r a518ccadec2e sys/arch/mips/mips/mips_machdep.c
--- a/sys/arch/mips/mips/mips_machdep.c Tue Sep 13 21:26:33 2005 +0000
+++ b/sys/arch/mips/mips/mips_machdep.c Tue Sep 13 21:28:44 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_machdep.c,v 1.175.2.1 2004/07/04 12:53:59 he Exp $        */
+/*     $NetBSD: mips_machdep.c,v 1.175.2.1.2.1 2005/09/13 21:28:44 riz Exp $   */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -119,7 +119,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.175.2.1 2004/07/04 12:53:59 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.175.2.1.2.1 2005/09/13 21:28:44 riz Exp $");
 
 #include "opt_cputype.h"
 
@@ -216,10 +216,6 @@
 
 caddr_t        msgbufaddr;
 
-#if defined(MIPS3_4100)                        /* VR4100 core */
-int    default_pg_mask = 0x00001800;
-#endif
-
 /* the following is used externally (sysctl_hw) */
 char   machine[] = MACHINE;            /* from <machine/param.h> */
 char   machine_arch[] = MACHINE_ARCH;  /* from <machine/param.h> */
@@ -886,12 +882,18 @@
        case CPU_ARCH_MIPS3:
        case CPU_ARCH_MIPS4:
 #if defined(MIPS3_5900)        /* XXX */
+               mips3_cp0_pg_mask_write(MIPS3_PG_SIZE_4K);
                mips3_cp0_wired_write(0);
                mips5900_TBIA(mips_num_tlb_entries);
                mips3_cp0_wired_write(MIPS3_TLB_WIRED_UPAGES);
                r5900_vector_init();
                memcpy(mips_locoresw, mips5900_locoresw, sizeof(mips_locoresw));
 #else /* MIPS3_5900 */
+#if defined(MIPS3_4100)
+               mips3_cp0_pg_mask_write(MIPS4100_PG_SIZE_4K);
+#else
+               mips3_cp0_pg_mask_write(MIPS3_PG_SIZE_4K);
+#endif
                mips3_cp0_wired_write(0);
                mips3_TBIA(mips_num_tlb_entries);
                mips3_cp0_wired_write(MIPS3_TLB_WIRED_UPAGES);
@@ -902,6 +904,7 @@
 #endif
 #if defined(MIPS32)
        case CPU_ARCH_MIPS32:
+               mips3_cp0_pg_mask_write(MIPS3_PG_SIZE_4K);
                mips3_cp0_wired_write(0);
                mips32_TBIA(mips_num_tlb_entries);
                mips3_cp0_wired_write(MIPS3_TLB_WIRED_UPAGES);
@@ -911,6 +914,7 @@
 #endif
 #if defined(MIPS64)
        case CPU_ARCH_MIPS64:
+               mips3_cp0_pg_mask_write(MIPS3_PG_SIZE_4K);
                mips3_cp0_wired_write(0);
                mips64_TBIA(mips_num_tlb_entries);
                mips3_cp0_wired_write(MIPS3_TLB_WIRED_UPAGES);