From owner-p4-projects@FreeBSD.ORG  Tue Oct 18 18:42:13 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 85CFC16A421; Tue, 18 Oct 2005 18:42:13 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5FFF616A41F
	for <perforce@freebsd.org>; Tue, 18 Oct 2005 18:42:13 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 066FB43D53
	for <perforce@freebsd.org>; Tue, 18 Oct 2005 18:42:13 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9IIgClR098038
	for <perforce@freebsd.org>; Tue, 18 Oct 2005 18:42:12 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9IIgC80098035
	for perforce@freebsd.org; Tue, 18 Oct 2005 18:42:12 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 18 Oct 2005 18:42:12 GMT
Message-Id: <200510181842.j9IIgC80098035@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85510 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Oct 2005 18:42:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=85510

Change 85510 by jhb@jhb_slimer on 2005/10/18 18:41:27

	Some cpu reset fixes.

Affected files ...

.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#89 edit
.. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#73 edit

Differences ...

==== //depot/projects/smpng/sys/i386/i386/mp_machdep.c#89 (text+ko) ====

@@ -1285,6 +1285,7 @@
 ipi_nmi_handler()
 {
 	int cpu  = PCPU_GET(cpuid);
+	void *restartfunc(void);
 
 	if(!(atomic_load_acq_int(&ipi_nmi_pending) & (1 << cpu)))
 		return 1;
@@ -1304,8 +1305,9 @@
 	atomic_clear_int(&started_cpus,1 << cpu);
 	atomic_clear_int(&stopped_cpus,1 << cpu);
 
-	if(cpu == 0 && cpustop_restartfunc != NULL)
-		cpustop_restartfunc();
+	restartfunc = (void (*)(void)atomic_readandclear_int(&cpustop_restartfunc);
+	if (restartfunc != NULL)
+		restartfunc();
 
 	return 0;
 }

==== //depot/projects/smpng/sys/i386/i386/vm_machdep.c#73 (text+ko) ====

@@ -550,7 +550,10 @@
 			cpustop_restartfunc = cpu_reset_proxy;
 			cpu_reset_proxy_active = 0;
 			printf("cpu_reset: Restarting BSP\n");
-			started_cpus = (1<<0);		/* Restart CPU #0 */
+
+			/* Restart CPU #0. */
+			/* XXX: restart_cpus(1 << 0); */
+			atomic_store_rel_int(&started_cpus, (1 << 0));
 
 			cnt = 0;
 			while (cpu_reset_proxy_active == 0 && cnt < 10000000)