[src/trunk]: src/sys/arch/sgimips/sgimips Fix initial interrupt mask settings...

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

details:   https://anonhg.NetBSD.org/src/rev/660c2eace26e
branches:  trunk
changeset: 510873:660c2eace26e
user:      rafal <rafal%NetBSD.org@localhost>
date:      Fri Jun 08 00:02:41 2001 +0000

description:
Fix initial interrupt mask settings for `hard' interupts to mask out soft
interrupts as well.  The system is quite stable now that soft interrupts
don't pop up at random places where they're unexpected 8-)

Also, while here, fix CPU clock speed calculation for the Indy.

diffstat:

 sys/arch/sgimips/sgimips/ip22.c |  26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diffs (61 lines):

diff -r 4fb32ac76e73 -r 660c2eace26e sys/arch/sgimips/sgimips/ip22.c
--- a/sys/arch/sgimips/sgimips/ip22.c   Thu Jun 07 23:05:51 2001 +0000
+++ b/sys/arch/sgimips/sgimips/ip22.c   Fri Jun 08 00:02:41 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ip22.c,v 1.3 2001/05/11 04:56:09 thorpej Exp $ */
+/*     $NetBSD: ip22.c,v 1.4 2001/06/08 00:02:41 rafal Exp $   */
 
 /*
  * Copyright (c) 2001 Rafal K. Boni
@@ -63,6 +63,7 @@
 void 
 ip22_init(void)
 {
+       int i;
        u_int32_t sysid;
        u_int32_t int23addr;
        unsigned long cps;
@@ -135,10 +136,10 @@
        platform.bus_reset = ip22_bus_reset;
        platform.intr_establish = ip22_intr_establish;
 
-       biomask = 0x0400;
-       netmask = 0x0400;
-       ttymask = 0x0c00;
-       clockmask = 0xbc00;
+       biomask = 0x0700;
+       netmask = 0x0700;
+       ttymask = 0x0f00;
+       clockmask = 0xbf00;
 
        /* Hardcode interrupts 7, 11 to mappable interrupt 0,1 handlers */
        intrtab[7].ih_fun = ip22_mappable_intr;
@@ -150,10 +151,16 @@
        /* Prime cache */
        ip22_cal_timer(int23addr + 0x3c, int23addr + 0x38);
 
-       ctrdiff[0] = ip22_cal_timer(int23addr + 0x3c, int23addr + 0x38);
-       ctrdiff[1] = ip22_cal_timer(int23addr + 0x3c, int23addr + 0x38);
-       ctrdiff[2] = ip22_cal_timer(int23addr + 0x3c, int23addr + 0x38);
-       cps = (ctrdiff[0] + ctrdiff[1] + ctrdiff[2]) / 3;
+       cps = 0;
+       for(i = 0; i < sizeof(ctrdiff) / sizeof(ctrdiff[0]); i++) {
+           do {
+               ctrdiff[i] = ip22_cal_timer(int23addr + 0x3c, int23addr + 0x38);
+           } while (ctrdiff[i] == 0);
+
+           cps += ctrdiff[i];
+       }
+
+       cps = cps / (sizeof(ctrdiff) / sizeof(ctrdiff[0]));
 
        printf("Timer calibration, got %lu cycles (%lu, %lu, %lu)\n", cps, 
                                ctrdiff[0], ctrdiff[1], ctrdiff[2]);
@@ -182,6 +189,7 @@
        struct clockframe cf;
 
        /* XXXrkb Tickle Indy/I2 MC watchdog timer */ 
+       *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa00004) |= 0x100;
        *(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(0x1fa00014) = 0;
 
        nested++;