 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu.c,v 1.68 2021/11/12 06:44:46 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.69 2022/03/03 06:26:05 riastradh Exp $ */
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo@nerv.org>
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * 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 AUTHOR 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(1, "$NetBSD: cpu.c,v 1.68 2021/11/12 06:44:46 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.69 2022/03/03 06:26:05 riastradh Exp $");
 #include "locators.h"
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
 #include "opt_fdt.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/reboot.h>
 @@ -118,42 +118,42 @@ cpu_attach(device_t dv, cpuid_t id)
 			return;
+		}
 		KASSERT(unit < MAXCPUS);
 		ci = &cpu_info_store[unit];
 		ci->ci_cpl = IPL_HIGH;
 		ci->ci_cpuid = id;
 		/* ci_id is stored by own cpus when hatching */
 		cpu_info[ncpu] = ci;
 		if (cpu_hatched_p(unit) == 0) {
 			ci->ci_dev = dv;
-			dv->dv_private = ci;
+			device_set_private(dv, ci);
 			ci->ci_index = -1;
 			aprint_naive(": disabled\n");
 			aprint_normal(": disabled (unresponsive)\n");
 			return;
+		}
 #else /* MULTIPROCESSOR */
 		aprint_naive(": disabled\n");
 		aprint_normal(": disabled (uniprocessor kernel)\n");
 		return;
 #endif /* MULTIPROCESSOR */
+	}
 	ci->ci_dev = dv;
-	dv->dv_private = ci;
+	device_set_private(dv, ci);
 	ci->ci_kfpu_spl = -1;
 	arm_cpu_do_topology(ci);	// XXXNH move this after mi_cpu_attach
 	cpu_identify(dv, ci);
 	cpu_setup_sysctl(dv, ci);
 #ifdef MULTIPROCESSOR
 	if (unit != 0) {
 		mi_cpu_attach(ci);
 		pmap_tlb_info_attach(&pmap_tlb0_info, ci);
 		aarch64_parsecacheinfo(ci);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.152 2021/10/31 16:23:47 skrll Exp $	*/
+/*	$NetBSD: cpu.c,v 1.153 2022/03/03 06:26:05 riastradh Exp $	*/
 /*
  * Copyright (c) 1995 Mark Brinicombe.
  * Copyright (c) 1995 Brini.
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
 @@ -36,27 +36,27 @@
+ *
  * cpu.c
+ *
  * Probing and configuration for the master CPU
+ *
  * Created      : 10/10/95
  */
 #include "opt_armfpe.h"
 #include "opt_cputypes.h"
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.152 2021/10/31 16:23:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.153 2022/03/03 06:26:05 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <uvm/uvm_extern.h>
 @@ -118,40 +118,40 @@ cpu_attach(device_t dv, cpuid_t id)
 		KASSERT(unit < MAXCPUS);
 		ci = &cpu_info_store[unit];
 		KASSERT(cpu_info[unit] == NULL);
 		ci->ci_cpl = IPL_HIGH;
 		ci->ci_cpuid = id;
 		ci->ci_data.cpu_cc_freq = cpu_info_store[0].ci_data.cpu_cc_freq;
 		ci->ci_undefsave[2] = cpu_info_store[0].ci_undefsave[2];
 		cpu_info[unit] = ci;
 		if (cpu_hatched_p(unit) == false) {
 			ci->ci_dev = dv;
-			dv->dv_private = ci;
+			device_set_private(dv, ci);
 			aprint_naive(": disabled\n");
 			aprint_normal(": disabled (unresponsive)\n");
 			return;
+		}
 #else
 		aprint_naive(": disabled\n");
 		aprint_normal(": disabled (uniprocessor kernel)\n");
 		return;
 #endif
+	}
 	ci->ci_dev = dv;
-	dv->dv_private = ci;
+	device_set_private(dv, ci);
 	arm_cpu_do_topology(ci);
 	evcnt_attach_dynamic(&ci->ci_arm700bugcount, EVCNT_TYPE_MISC,
 	    NULL, xname, "arm700swibug");
 	evcnt_attach_dynamic_nozero(&ci->ci_abt_evs[FAULT_WRTBUF_0], EVCNT_TYPE_TRAP,
 	    NULL, xname, "vector abort");
 	evcnt_attach_dynamic_nozero(&ci->ci_abt_evs[FAULT_WRTBUF_1], EVCNT_TYPE_TRAP,
 	    NULL, xname, "terminal abort");
 	evcnt_attach_dynamic_nozero(&ci->ci_abt_evs[FAULT_BUSERR_0], EVCNT_TYPE_TRAP,
 	    NULL, xname, "external linefetch abort (S)");
 	evcnt_attach_dynamic_nozero(&ci->ci_abt_evs[FAULT_BUSERR_1], EVCNT_TYPE_TRAP,

 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu_fdt.c,v 1.41 2021/08/30 23:16:17 jmcneill Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.42 2022/03/03 06:26:05 riastradh Exp $ */
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,86 +20,77 @@
  * 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 "opt_multiprocessor.h"
 #include "psci_fdt.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.41 2021/08/30 23:16:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.42 2022/03/03 06:26:05 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/lwp.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/armreg.h>
 #include <arm/cpu.h>
 #include <arm/cpufunc.h>
 #include <arm/cpuvar.h>
 #include <arm/locore.h>
 #include <arm/arm/psci.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <arm/fdt/psci_fdtvar.h>
 #include <uvm/uvm_extern.h>
 static int	cpu_fdt_match(device_t, cfdata_t, void *);
 static void	cpu_fdt_attach(device_t, device_t, void *);
-struct cpu_fdt_softc {
+CFATTACH_DECL_NEW(cpu_fdt, 0,
 	device_t		sc_dev;
 	int			sc_phandle;
 };
 CFATTACH_DECL_NEW(cpu_fdt, sizeof(struct cpu_fdt_softc),
 	cpu_fdt_match, cpu_fdt_attach, NULL, NULL);
 static int
 cpu_fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
 	struct fdt_attach_args * const faa = aux;
 	const int phandle = faa->faa_phandle;
 	const char *device_type;
 	device_type = fdtbus_get_string(phandle, "device_type");
 	return device_type != NULL && strcmp(device_type, "cpu") == 0;
+}
 static void
 cpu_fdt_attach(device_t parent, device_t self, void *aux)
+{
 	struct cpu_fdt_softc * const sc = device_private(self);
 	struct fdt_attach_args * const faa = aux;
 	const int phandle = faa->faa_phandle;
 	bus_addr_t cpuid;
 	const uint32_t *cap_ptr;
 	int len;
 	sc->sc_dev = self;
 	sc->sc_phandle = phandle;
  	cap_ptr = fdtbus_get_prop(phandle, "capacity-dmips-mhz", &len);
 	if (cap_ptr && len == 4) {
 		prop_dictionary_t dict = device_properties(self);
 		uint32_t capacity_dmips_mhz = be32toh(*cap_ptr);
 		prop_dictionary_set_uint32(dict, "capacity_dmips_mhz",
 		    capacity_dmips_mhz);
+	}
 	if (fdtbus_get_reg(phandle, 0, &cpuid, NULL) != 0)
 		cpuid = 0;
 	/* Attach the CPU */