 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.5 2015/06/26 21:57:25 matt Exp $	*/
+/*	$NetBSD: cpu.c,v 1.6 2022/03/03 06:27:40 riastradh Exp $	*/
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.5 2015/06/26 21:57:25 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.6 2022/03/03 06:27:40 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <mips/locore.h>
 static int	cpu_match(device_t, cfdata_t, void *);
 static void	cpu_attach(device_t, device_t, void *);
 CFATTACH_DECL_NEW(cpu, 0,
     cpu_match, cpu_attach, NULL, NULL);
 @@ -54,24 +54,24 @@ CFATTACH_DECL_NEW(cpu, 0,
 static int
 cpu_match(device_t parent, cfdata_t match, void *aux)
+{
 	return 1;
+}
 static void
 cpu_attach(device_t parent, device_t self, void *aux)
+{
 	struct cpu_info * const ci = curcpu();
 	ci->ci_dev = self;
-	self->dv_private = ci;
+	device_set_private(self, ci);
 	aprint_normal(": %lu.%02luMHz (hz cycles = %lu, delay divisor = %lu)\n",
 	    ci->ci_cpu_freq / 1000000,
 	    (ci->ci_cpu_freq % 1000000) / 10000,
 	    ci->ci_cycles_per_hz, ci->ci_divisor_delay);
 	aprint_normal("%s: ", device_xname(self));
 	cpu_identify(self);
 	cpu_attach_common(self, ci);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.4 2017/05/21 06:49:12 skrll Exp $	*/
+/*	$NetBSD: cpu.c,v 1.5 2022/03/03 06:27:40 riastradh Exp $	*/
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -26,27 +26,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL WASABI SYSTEMS, INC
  * BE LIABLE 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.4 2017/05/21 06:49:12 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.5 2022/03/03 06:27:40 riastradh Exp $");
 #include "opt_ingenic.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <mips/locore.h>
 #include <mips/ingenic/ingenic_coreregs.h>
 #include <mips/ingenic/ingenic_regs.h>
 #include <mips/ingenic/ingenic_var.h>
 @@ -103,24 +103,24 @@ cpu_attach(device_t parent, device_t sel
 		if (!kcpuset_isset(cpus_hatched, cpu_index(startup_cpu_info))) {
 			aprint_error_dev(self, "did not hatch\n");
 			return;
+		}
 #else
 		aprint_normal_dev(self,
 		    "processor off-line; "
 		    "multiprocessor support not present in kernel\n");
 		return;
 #endif
+	}
 	ci->ci_dev = self;
-	self->dv_private = ci;
+	device_set_private(self, ci);
 	aprint_normal(": %lu.%02luMHz (hz cycles = %lu, delay divisor = %lu)\n",
 	    ci->ci_cpu_freq / 1000000,
 	    (ci->ci_cpu_freq % 1000000) / 10000,
 	    ci->ci_cycles_per_hz, ci->ci_divisor_delay);
 	aprint_normal_dev(self, "");
 	cpu_identify(self);
 	cpu_attach_common(self, ci);
+}

 @@ -1,14 +1,14 @@
-/*      $NetBSD: octeon_cpunode.c,v 1.21 2021/08/07 16:18:59 thorpej Exp $   */
+/*      $NetBSD: octeon_cpunode.c,v 1.22 2022/03/03 06:27:41 riastradh Exp $   */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE 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.
  */
 #define __INTR_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_cpunode.c,v 1.21 2021/08/07 16:18:59 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_cpunode.c,v 1.22 2022/03/03 06:27:41 riastradh Exp $");
 #include "locators.h"
 #include "cpunode.h"
 #include "opt_multiprocessor.h"
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/lwp.h>
 #include <sys/reboot.h>
 #include <sys/wdog.h>
 @@ -242,27 +242,27 @@ octeon_cpu_run(struct cpu_info *ci)
 	KASSERT(mips_cp0_status_read() & MIPS_SR_INT_IE);
 	aprint_normal("%s: ", device_xname(ci->ci_dev));
 	cpu_identify(ci->ci_dev);
+}
 #endif /* MULTIPROCESSOR */
 static void
 cpu_cpunode_attach_common(device_t self, struct cpu_info *ci)
+{
 	struct cpu_softc * const cpu __diagused = ci->ci_softc;
 	ci->ci_dev = self;
-	self->dv_private = ci;
+	device_set_private(self, ci);
 	KASSERTMSG(cpu != NULL, "ci %p index %d", ci, cpu_index(ci));
 #if NWDOG > 0 || defined(DDB)
 	/* XXXXXX __mips_n32 and MIPS_PHYS_TO_XKPHYS_CACHED needed here?????? */
 	void **nmi_vector = (void *)MIPS_PHYS_TO_KSEG0(0x800 + 32*ci->ci_cpuid);
 	*nmi_vector = octeon_reset_vector;
 	struct vm_page * const pg = PMAP_ALLOC_POOLPAGE(UVM_PGA_ZERO);
 	KASSERT(pg != NULL);
 	const vaddr_t kva = PMAP_MAP_POOLPAGE(VM_PAGE_TO_PHYS(pg));
 	KASSERT(kva != 0);
 	ci->ci_nmi_stack = (void *)(kva + PAGE_SIZE - sizeof(struct kernframe));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu_subr.c,v 1.59 2021/11/16 06:11:52 simonb Exp $	*/
+/*	$NetBSD: cpu_subr.c,v 1.60 2022/03/03 06:27:41 riastradh Exp $	*/
 /*-
  * Copyright (c) 2010, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * 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.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.59 2021/11/16 06:11:52 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.60 2022/03/03 06:27:41 riastradh Exp $");
 #include "opt_cputype.h"
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/bitops.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/idle.h>
 #include <sys/intr.h>
 @@ -226,26 +226,31 @@ cpu_hwrena_setup(void)
 			mipsNN_cp0_userlocal_write(curlwp->l_private);
+		}
+	}
 #endif
+}
 void
 cpu_attach_common(device_t self, struct cpu_info *ci)
+{
 	const char * const xname = device_xname(self);
 	/*
 	 * Cross link cpu_info and its device together
+	 *
 	 * XXX autoconf abuse: Can't use device_set_private here
 	 * because some callers already do so -- and some callers
 	 * (sbmips cpu_attach) already have a softc allocated by
 	 * autoconf.
 	 */
 	ci->ci_dev = self;
 	self->dv_private = ci;
 	KASSERT(ci->ci_idepth == 0);
 	evcnt_attach_dynamic(&ci->ci_ev_count_compare,
 		EVCNT_TYPE_INTR, NULL, xname,
 		"int 5 (clock)");
 	evcnt_attach_dynamic(&ci->ci_ev_count_compare_missed,
 		EVCNT_TYPE_INTR, NULL, xname,
 		"int 5 (clock) missed");
 	evcnt_attach_dynamic(&ci->ci_ev_fpu_loads,
 		EVCNT_TYPE_MISC, NULL, xname,