Pull up following revision(s) (requested by skrll in ticket #48):

	sys/arch/riscv/riscv/trap.c: revision 1.31
	sys/arch/riscv/riscv/cpu.c: revision 1.8
	sys/arch/riscv/riscv/cpu.c: revision 1.9

whitespace

Attach the fpu {loads,save,reenable} event counters.

Author: MartinHusemann

sys/arch/riscv/riscv/cpu.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu.c,v 1.7 2024/08/10 07:27:04 skrll Exp $	*/
+/*	$NetBSD: cpu.c,v 1.7.2.1 2025/10/09 09:25:52 martin Exp $	*/
 
 /*-
  * Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
 #include "opt_multiprocessor.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.7 2024/08/10 07:27:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.7.2.1 2025/10/09 09:25:52 martin Exp $");
 
 #include <sys/param.h>
 
@@ -183,7 +183,7 @@ cpu_identify(device_t self, struct cpu_info *ci)
 
 	aprint_naive("\n");
 	aprint_normal(": %s %s imp. %" PRIx32 "\n", cv_name, ca_name, mimpid);
-        aprint_verbose_dev(ci->ci_dev,
+	aprint_verbose_dev(ci->ci_dev,
 	    "vendor 0x%" PRIxREGISTER " arch. %" PRIxREGISTER " imp. %" PRIx32 "\n",
 	    mvendorid, marchid, mimpid);
 }
@@ -235,6 +235,15 @@ cpu_attach(device_t dv, cpuid_t hartid)
 	ci->ci_dev = dv;
 	device_set_private(dv, ci);
 
+	const char * const xname = device_xname(dv);
+
+	evcnt_attach_dynamic(&ci->ci_ev_fpu_loads, EVCNT_TYPE_MISC, NULL,
+	    xname, "fpu loads");
+	evcnt_attach_dynamic(&ci->ci_ev_fpu_saves, EVCNT_TYPE_MISC, NULL,
+	    xname, "fpu saves");
+	evcnt_attach_dynamic(&ci->ci_ev_fpu_reenables, EVCNT_TYPE_MISC, NULL,
+	    xname, "fpu reenables");
+
 	cpu_identify(dv, ci);
 
 #ifdef MULTIPROCESSOR

sys/arch/riscv/riscv/trap.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.30 2024/11/25 22:04:14 skrll Exp $	*/
+/*	$NetBSD: trap.c,v 1.30.2.1 2025/10/09 09:25:52 martin Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #define	__PMAP_PRIVATE
 #define	__UFETCHSTORE_PRIVATE
 
-__RCSID("$NetBSD: trap.c,v 1.30 2024/11/25 22:04:14 skrll Exp $");
+__RCSID("$NetBSD: trap.c,v 1.30.2.1 2025/10/09 09:25:52 martin Exp $");
 
 #include <sys/param.h>
 
@@ -301,7 +301,7 @@ dump_trapframe(const struct trapframe *tf, void (*pr)(const char *, ...))
 
 static inline void
 trap_ksi_init(ksiginfo_t *ksi, int signo, int code, vaddr_t addr,
-     register_t cause)
+    register_t cause)
 {
 	KSI_INIT_TRAP(ksi);
 	ksi->ksi_signo = signo;