 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.230 2011/02/15 09:05:14 mrg Exp $ */
+/*	$NetBSD: cpu.c,v 1.231 2011/02/20 10:02:01 mrg Exp $ */
 /*
  * Copyright (c) 1996
  *	The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -42,27 +42,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)cpu.c	8.5 (Berkeley) 11/23/93
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.230 2011/02/15 09:05:14 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.231 2011/02/20 10:02:01 mrg Exp $");
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #include "opt_ddb.h"
 #include "opt_sparc_arch.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/evcnt.h>
 #include <sys/xcall.h>
 @@ -332,34 +332,29 @@ static const char * const soft_intr_name
 	"lev12 soft",
 	"xcall std",
 	"xcall fast",
 	"nmi soft",
 };
 static void
 cpu_init_evcnt(struct cpu_info *cpi)
+{
 	int i;
 	/*
 	 * Setup the per-cpu counters.
 	 * The "savefp null" counter should go away when the NULL
 	 * struct fpstate * bug is fixed.
 	 */
 	evcnt_attach_dynamic(&cpi->ci_savefpstate, EVCNT_TYPE_MISC,
 			     NULL, cpu_name(cpi), "savefp ipi");
 	evcnt_attach_dynamic(&cpi->ci_savefpstate_null, EVCNT_TYPE_MISC,
 			     NULL, cpu_name(cpi), "savefp null ipi");
 	evcnt_attach_dynamic(&cpi->ci_xpmsg_mutex_fail, EVCNT_TYPE_MISC,
 			     NULL, cpu_name(cpi), "IPI mutex_trylock fail");
 	evcnt_attach_dynamic(&cpi->ci_xpmsg_mutex_fail_call, EVCNT_TYPE_MISC,
 			     NULL, cpu_name(cpi), "IPI mutex_trylock fail/call");
 	/*
 	 * These are the per-cpu per-IPL hard & soft interrupt counters.
 	 */
 	for (i = 0; i < 16; i++) {
 		evcnt_attach_dynamic(&cpi->ci_intrcnt[i], EVCNT_TYPE_INTR,
 				     NULL, cpu_name(cpi), hard_intr_names[i]);
 		evcnt_attach_dynamic(&cpi->ci_sintrcnt[i], EVCNT_TYPE_INTR,
 				     NULL, cpu_name(cpi), soft_intr_names[i]);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpuvar.h,v 1.88 2011/02/15 09:05:14 mrg Exp $ */
+/*	$NetBSD: cpuvar.h,v 1.89 2011/02/20 10:02:01 mrg Exp $ */
 /*
  *  Copyright (c) 1996 The NetBSD Foundation, Inc.
  *  All rights reserved.
+ *
  *  This code is derived from software contributed to The NetBSD Foundation
  *  by Paul Kranenburg.
+ *
  *  Redistribution and use in source and binary forms, with or without
  *  modification, are permitted provided that the following conditions
  *  are met:
  *  1. Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
 @@ -327,27 +327,26 @@ struct cpu_info {
 	/* Module Control Registers */
 	/*bus_space_handle_t*/ long ci_mbusport;
 	/*bus_space_handle_t*/ long ci_mxccregs;
 	u_int	ci_tt;			/* Last trap (if tracing) */
 	/*
 	 * Start/End VA's of this cpu_info region; we upload the other pages
 	 * in this region that aren't part of the cpu_info to uvm.
 	 */
 	vaddr_t	ci_free_sva1, ci_free_eva1, ci_free_sva2, ci_free_eva2;
 	struct evcnt ci_savefpstate;
 	struct evcnt ci_savefpstate_null;
 	struct evcnt ci_xpmsg_mutex_fail;
 	struct evcnt ci_xpmsg_mutex_fail_call;
 	struct evcnt ci_intrcnt[16];
 	struct evcnt ci_sintrcnt[16];
 };
 /*
  * CPU architectures
  */
 #define CPUARCH_UNKNOWN		0
 #define CPUARCH_SUN4		1
 #define CPUARCH_SUN4C		2
 #define CPUARCH_SUN4M		3

 @@ -1,14 +1,14 @@
-#	$NetBSD: genassym.cf,v 1.64 2011/01/27 06:24:59 mrg Exp $
+#	$NetBSD: genassym.cf,v 1.65 2011/02/20 10:02:01 mrg Exp $
+#
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Christos Zoulas.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 @@ -161,27 +161,26 @@ define	CPUINFO_TT		offsetof(struct cpu_i
 define	CPUINFO_CACHE_LINESZ	offsetof(struct cpu_info, cacheinfo.c_linesize)
 define	CPUINFO_CACHE_NLINES	offsetof(struct cpu_info, cacheinfo.c_nlines)
 define	CPUINFO_XMSG_FUNC	offsetof(struct cpu_info, msg.u.xpmsg_func.func)
 define	CPUINFO_XMSG_TRAP	offsetof(struct cpu_info, msg.u.xpmsg_func.trap)
 define	CPUINFO_XMSG_ARG0	offsetof(struct cpu_info, msg.u.xpmsg_func.arg0)
 define	CPUINFO_XMSG_ARG1	offsetof(struct cpu_info, msg.u.xpmsg_func.arg1)
 define	CPUINFO_XMSG_ARG2	offsetof(struct cpu_info, msg.u.xpmsg_func.arg2)
 define	CPUINFO_XMSG_CMPLT	offsetof(struct cpu_info, msg.complete)
 define	CPUINFO_IDLESPIN	offsetof(struct cpu_info, idlespin)
 define	CPUINFO_MTX_COUNT	offsetof(struct cpu_info, ci_mtx_count)
 define	CPUINFO_MTX_OLDSPL	offsetof(struct cpu_info, ci_mtx_oldspl)
 define	CPUINFO_IDEPTH		offsetof(struct cpu_info, ci_idepth)
 define	CPUINFO_SAVEFPSTATE	offsetof(struct cpu_info, ci_savefpstate)
 define	CPUINFO_SAVEFPSTATE_NULL offsetof(struct cpu_info, ci_savefpstate_null)
 # PTE bits and related information
 define	PG_W		PG_W
 define	PG_VSHIFT	PG_VSHIFT
 define	PG_PROTSHIFT	PG_PROTSHIFT
 define	PG_PROTUREAD	PG_PROTUREAD
 define	PG_PROTUWRITE	PG_PROTUWRITE
 define	SRMMU_TETYPE	SRMMU_TETYPE
 define	SRMMU_TEPTE	SRMMU_TEPTE
 define	SRMMU_PROT_MASK	SRMMU_PROT_MASK
 define	PPROT_R_RW	PPROT_R_RW
 define	PPROT_RX_RX	PPROT_RX_RX

 @@ -1,14 +1,14 @@
-/*	$NetBSD: locore.s,v 1.262 2011/02/15 11:30:21 mrg Exp $	*/
+/*	$NetBSD: locore.s,v 1.263 2011/02/20 10:02:01 mrg Exp $	*/
 /*
  * Copyright (c) 1996 Paul Kranenburg
  * Copyright (c) 1996
  * 	The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
 @@ -5902,44 +5902,33 @@ Lfp_finish:
 	std	%f12, [%o0 + FS_REGS + (4*12)]
 	std	%f14, [%o0 + FS_REGS + (4*14)]
 	std	%f16, [%o0 + FS_REGS + (4*16)]
 	std	%f18, [%o0 + FS_REGS + (4*18)]
 	std	%f20, [%o0 + FS_REGS + (4*20)]
 	std	%f22, [%o0 + FS_REGS + (4*22)]
 	std	%f24, [%o0 + FS_REGS + (4*24)]
 	std	%f26, [%o0 + FS_REGS + (4*26)]
 	std	%f28, [%o0 + FS_REGS + (4*28)]
 	retl
 	 std	%f30, [%o0 + FS_REGS + (4*30)]
 /*
- * We really should panic here but while we figure out what the bug is
+ * We got a NULL struct fpstate * on the IPI.  We panic.
  * that a remote CPU gets a NULL struct fpstate *, this lets the system
  * work at least seemingly stably.
  */
 Lfp_null_fpstate:
 #if 1
 	sethi	%hi(CPUINFO_VA), %o5
 	ldd	[%o5 + CPUINFO_SAVEFPSTATE_NULL], %o2
 	inccc   %o3
 	addx    %o2, 0, %o2
 	retl
 	 std	%o2, [%o5 + CPUINFO_SAVEFPSTATE_NULL]
 #else
 	ld	[%o5 + CPUINFO_CPUNO], %o1
 	sethi	%hi(Lpanic_savefpstate), %o0
 	call	_C_LABEL(panic)
 	 or	%o0, %lo(Lpanic_savefpstate), %o0
 #endif
 :
 /*
  * Store the (now known nonempty) FP queue.
  * We have to reread the fsr each time in order to get the new QNE bit.
  */
 Lfp_storeq:
 	add	%o0, FS_QUEUE, %o1	! q = &f->fs_queue[0];
 :
 	std	%fq, [%o1 + %o3]	! q[qsize++] = fsr_qfront();
 	st	%fsr, [%o0 + FS_FSR]	! reread fsr
 	ld	[%o0 + FS_FSR], %o4	! if fsr & QNE, loop
 	btst	%o5, %o4