Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use crimereg.h definitions for the crime dog. Also, move watchdog 

disable down the very last possible place in cpu_reboot.

from Chris Sekiya
This commit is contained in:
pooka 2002-12-23 21:04:23 +00:00
parent 8ecf5692ac
commit 87a74ecee8
1 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
sys/arch/sgimips/sgimips/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.42 2002/11/09 19:20:18 thorpej Exp $ */
/* $NetBSD: machdep.c,v 1.43 2002/12/23 21:04:23 pooka Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@ -73,6 +73,8 @@
#include <dev/arcbios/arcbios.h>
#include <dev/arcbios/arcbiosvar.h>
#include <sgimips/dev/crimereg.h>
#if defined(DDB) || defined(KGDB)
#include <machine/db_machdep.h>
#include <ddb/db_access.h>
@ -635,21 +637,6 @@ cpu_reboot(howto, bootstr)
if (curproc)
savectx((struct user *)curpcb);
#if 1
/* Clear and disable watchdog timer. */
switch (mach_type) {
case MACH_SGI_IP22:
*(volatile u_int32_t *)0xbfa00014 = 0;
*(volatile u_int32_t *)0xbfa00004 &= ~0x100;
break;
case MACH_SGI_IP32:
*(volatile u_int32_t *)0xb4000034 = 0;
*(volatile u_int32_t *)0xb400000c &= ~0x200;
break;
}
#endif
if (cold) {
howto |= RB_HALT;
goto haltsys;
@ -671,6 +658,22 @@ cpu_reboot(howto, bootstr)
resettodr();
}
#if 1
/* Clear and disable watchdog timer. */
switch (mach_type) {
case MACH_SGI_IP22:
*(volatile u_int32_t *)0xbfa00014 = 0;
*(volatile u_int32_t *)0xbfa00004 &= ~0x100;
break;
case MACH_SGI_IP32:
*(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(CRIME_WATCHDOG) = 0;
*(volatile u_int32_t *)MIPS_PHYS_TO_KSEG1(CRIME_CONTROL)
&= ~CRIME_CONTROL_DOG_ENABLE;
break;
}
#endif
splhigh();
if (howto & RB_DUMP)
@ -864,29 +867,33 @@ void ddb_trap_hook(int where)
switch (where) {
case 1: /* Entry to DDB, turn watchdog off */
switch (mach_type) {
case MACH_SGI_IP32:
*(volatile u_int32_t *)0xb4000034 = 0;
*(volatile u_int32_t *)0xb400000c &= ~0x200;
break;
case MACH_SGI_IP22:
*(volatile u_int32_t *)0xbfa00014 = 0;
*(volatile u_int32_t *)0xbfa00004 &= ~0x100;
break;
case MACH_SGI_IP32:
*(volatile u_int32_t *)
MIPS_PHYS_TO_KSEG1(CRIME_WATCHDOG)= 0;
*(volatile u_int32_t *)
MIPS_PHYS_TO_KSEG1(CRIME_CONTROL) \
&= ~CRIME_CONTROL_DOG_ENABLE;
break;
}
break;
case 0: /* Exit from DDB, turn watchdog back on */
switch (mach_type) {
case MACH_SGI_IP32:
*(volatile u_int32_t *)0xb400000c |= 0x200;
*(volatile u_int32_t *)0xb4000034 = 0;
break;
case MACH_SGI_IP22:
*(volatile u_int32_t *)0xbfa00004 |= 0x100;
*(volatile u_int32_t *)0xbfa00014 = 0;
break;
case MACH_SGI_IP32:
*(volatile u_int32_t *)
MIPS_PHYS_TO_KSEG1(CRIME_CONTROL) \
|= CRIME_CONTROL_DOG_ENABLE;
*(volatile u_int32_t *)0xb4000034 = 0;
break;
}
break;