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

Halt any other CPUs in cpu_reboot().

This commit is contained in:
pk 2003-01-13 01:35:45 +00:00
parent 4726f033ed
commit 4641d55697
1 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sys/arch/sparc/sparc/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.216 2003/01/12 16:29:01 pk Exp $ */ /* $NetBSD: machdep.c,v 1.217 2003/01/13 01:35:45 pk Exp $ */
/*- /*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@ -709,6 +709,24 @@ sys___sigreturn14(p, v, retval)
return (EJUSTRETURN); return (EJUSTRETURN);
} }
#if defined(MULTIPROCESSOR)
/*
* stop routine for CPUs not running cpu_reboot.
*/
static void cpu_halt(void)
{
/* XXX - Acknowledge receipt */
cpuinfo.flags |= CPUFLG_GOTMSG;
printf("cpu%d halted\n", cpu_number());
/* This CPU is no longer available */
cpuinfo.flags &= ~CPUFLG_READY;
spl0();
prom_cpustop(0);
}
#endif /* MULTIPROCESSOR */
int waittime = -1; int waittime = -1;
@ -751,8 +769,17 @@ cpu_reboot(howto, user_boot_string)
resettodr(); resettodr();
} }
/* Disable interrupts. */ /* Disable interrupts. But still allow IPI on MP systems */
(void) splhigh(); if (ncpu > 1)
(void)splsched();
else
(void)splhigh();
#if defined(MULTIPROCESSOR)
/* Direct system interrupts to this CPU, since dump uses polled I/O */
if (CPU_ISSUN4M)
*((u_int *)ICR_ITR) = cpuinfo.mid - 8;
#endif
/* If rebooting and a dump is requested, do it. */ /* If rebooting and a dump is requested, do it. */
#if 0 #if 0
@ -767,6 +794,12 @@ cpu_reboot(howto, user_boot_string)
/* Run any shutdown hooks. */ /* Run any shutdown hooks. */
doshutdownhooks(); doshutdownhooks();
#if defined(MULTIPROCESSOR)
UNLOCK_XPMSG(); /* XXX - in case we paniced in xcall() */
XCALL0(cpu_halt, CPUSET_ALL & ~(1 << cpu_number()));
delay(100);
#endif /* MULTIPROCESSOR */
/* If powerdown was requested, do it. */ /* If powerdown was requested, do it. */
if ((howto & RB_POWERDOWN) == RB_POWERDOWN) { if ((howto & RB_POWERDOWN) == RB_POWERDOWN) {
#if NPOWER > 0 #if NPOWER > 0
@ -784,7 +817,11 @@ cpu_reboot(howto, user_boot_string)
} }
if (howto & RB_HALT) { if (howto & RB_HALT) {
#if defined(MULTIPROCESSOR)
printf("cpu%d halted\n\n", cpu_number());
#else
printf("halted\n\n"); printf("halted\n\n");
#endif
prom_halt(); prom_halt();
} }