 @@ -1,14 +1,14 @@
-/* $NetBSD: aarch64_machdep.c,v 1.66 2022/08/19 08:17:32 ryo Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.67 2023/04/07 08:55:29 skrll 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.
 @@ -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(1, "$NetBSD: aarch64_machdep.c,v 1.66 2022/08/19 08:17:32 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.67 2023/04/07 08:55:29 skrll Exp $");
 #include "opt_arm_debug.h"
 #include "opt_cpuoptions.h"
 #include "opt_ddb.h"
 #include "opt_fdt.h"
 #include "opt_kernhist.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/types.h>
 #include <sys/asan.h>
 #include <sys/boot_flag.h>
 #include <sys/bus.h>
 @@ -64,26 +64,27 @@ __KERNEL_RCSID(1, "$NetBSD: aarch64_mach
 #include <aarch64/armreg.h>
 #ifdef DDB
 #include <aarch64/db_machdep.h>
 #endif
 #include <aarch64/frame.h>
 #include <aarch64/machdep.h>
 #include <aarch64/pmap.h>
 #include <aarch64/pte.h>
 #include <aarch64/vmparam.h>
 #include <aarch64/kcore.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_memory.h>
 #ifdef VERBOSE_INIT_ARM
 #define VPRINTF(...)	printf(__VA_ARGS__)
 #else
 #define VPRINTF(...)	__nothing
 #endif
 char cpu_model[32];
 char machine[] = MACHINE;
 char machine_arch[] = MACHINE_ARCH;
 const pcu_ops_t * const pcu_ops_md_defs[PCU_UNIT_COUNT] = {
 @@ -667,29 +668,29 @@ mm_md_kernacc(void *ptr, vm_prot_t prot,
+	}
 	return 0;
+}
 #endif
 void
 cpu_startup(void)
+{
 	vaddr_t maxaddr, minaddr;
 	consinit();
 #ifdef FDT
-	const struct arm_platform * const plat = arm_fdt_platform();
+	const struct fdt_platform * const plat = fdt_platform_find();
-	if (plat->ap_startup != NULL)
+	if (plat->fp_startup != NULL)
-		plat->ap_startup();
+		plat->fp_startup();
 #endif
 	/*
 	 * Allocate a submap for physio.
 	 */
 	minaddr = 0;
 	phys_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr,
 	   VM_PHYS_SIZE, 0, FALSE, NULL);
 #ifdef MODULAR
 	uvm_map_setup(&module_map_store, module_start, module_end, 0);
 	module_map_store.pmap = pmap_kernel();
 	module_map = &module_map_store;

 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_platform.c,v 1.35 2023/01/24 06:56:40 mlelstv Exp $ */
+/* $NetBSD: acpi_platform.c,v 1.36 2023/04/07 08:55:29 skrll Exp $ */
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jared McNeill <jmcneill@invisible.ca>.
+ *
  * 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.
 @@ -25,37 +25,36 @@
  * 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 "com.h"
 #include "plcom.h"
 #include "opt_efi.h"
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.35 2023/01/24 06:56:40 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.36 2023/04/07 08:55:29 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <sys/kprintf.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootconfig.h>
 #include <arm/cpufunc.h>
 #include <arm/locore.h>
 #include <arm/cortex/gtmr_var.h>
 #include <arm/arm/smccc.h>
 #include <arm/arm/psci.h>
 #include <arm/fdt/psci_fdtvar.h>
 @@ -398,25 +397,25 @@ acpi_platform_reset(void)
 	if (arm_efirt_reset(EFI_RESET_COLD) == 0)
 		return;
 #endif
 	if (psci_available())
 		psci_system_reset();
+}
 static u_int
 acpi_platform_uart_freq(void)
+{
 	return 0;
+}
-static const struct arm_platform acpi_platform = {
+static const struct fdt_platform acpi_platform = {
-	.ap_devmap = acpi_platform_devmap,
+	.fp_devmap = acpi_platform_devmap,
-	.ap_bootstrap = acpi_platform_bootstrap,
+	.fp_bootstrap = acpi_platform_bootstrap,
-	.ap_startup = acpi_platform_startup,
+	.fp_startup = acpi_platform_startup,
-	.ap_init_attach_args = acpi_platform_init_attach_args,
+	.fp_init_attach_args = acpi_platform_init_attach_args,
-	.ap_device_register = acpi_platform_device_register,
+	.fp_device_register = acpi_platform_device_register,
-	.ap_reset = acpi_platform_reset,
+	.fp_reset = acpi_platform_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = acpi_platform_uart_freq,
+	.fp_uart_freq = acpi_platform_uart_freq,
 };
-ARM_PLATFORM(acpi, "netbsd,generic-acpi", &acpi_platform);
+FDT_PLATFORM(acpi, "netbsd,generic-acpi", &acpi_platform);

 @@ -1,45 +1,46 @@
-/* $NetBSD: cycv_platform.c,v 1.18 2021/04/24 23:36:25 thorpej Exp $ */
+/* $NetBSD: cycv_platform.c,v 1.19 2023/04/07 08:55:29 skrll Exp $ */
 /* This file is in the public domain. */
 #include "arml2cc.h"
 #include "opt_console.h"
 #include "opt_multiprocessor.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.18 2021/04/24 23:36:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cycv_platform.c,v 1.19 2023/04/07 08:55:29 skrll Exp $");
 #define	_ARM32_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <arm/arm32/machdep.h>
 #include <arm/altera/cycv_reg.h>
 #include <arm/altera/cycv_var.h>
 #include <arm/cortex/a9tmr_var.h>
 #include <arm/cortex/pl310_var.h>
 #include <arm/cortex/scu_reg.h>
 #include <arm/bootconfig.h>
 #include <arm/cpufunc.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <dev/ic/comreg.h>
 void cycv_platform_early_putchar(char);
 void __noasan
 cycv_platform_early_putchar(char c) {
 #ifdef CONSADDR
 #define CONSADDR_VA (CONSADDR - CYCV_PERIPHERAL_BASE + CYCV_PERIPHERAL_VBASE)
 	volatile uint32_t *uartaddr = cpu_earlydevice_va_p() ?
 	    (volatile uint32_t *) CONSADDR_VA :
 	    (volatile uint32_t *) CONSADDR;
 	while ((le32toh(uartaddr[com_lsr]) & LSR_TXRDY) == 0)
 @@ -154,25 +155,25 @@ cycv_platform_reset(void) {
 	uint32_t val;
 	bus_space_map(bst, CYCV_RSTMGR_BASE, CYCV_RSTMGR_SIZE, 0, &bsh);
 	val = bus_space_read_4(bst, bsh, CYCV_RSTMGR_CTRL);
 	bus_space_write_4(bst, bsh, CYCV_RSTMGR_CTRL,
 		val | CYCV_RSTMGR_CTRL_SWCOLDRSTREQ);
+}
 static u_int
 cycv_platform_uart_freq(void) {
 	return cycv_clkmgr_early_get_l4_sp_clk();
+}
-static const struct arm_platform cycv_platform = {
+static const struct fdt_platform cycv_platform = {
-	.ap_devmap = cycv_platform_devmap,
+	.fp_devmap = cycv_platform_devmap,
-	.ap_bootstrap = cycv_platform_bootstrap,
+	.fp_bootstrap = cycv_platform_bootstrap,
-	.ap_init_attach_args = cycv_platform_init_attach_args,
+	.fp_init_attach_args = cycv_platform_init_attach_args,
-	.ap_device_register = cycv_platform_device_register,
+	.fp_device_register = cycv_platform_device_register,
-	.ap_reset = cycv_platform_reset,
+	.fp_reset = cycv_platform_reset,
-	.ap_delay = a9tmr_delay,
+	.fp_delay = a9tmr_delay,
-	.ap_uart_freq = cycv_platform_uart_freq,
+	.fp_uart_freq = cycv_platform_uart_freq,
-	.ap_mpstart = cycv_mpstart,
+	.fp_mpstart = cycv_mpstart,
 };
-ARM_PLATFORM(cycv, "altr,socfpga-cyclone5", &cycv_platform);
+FDT_PLATFORM(cycv, "altr,socfpga-cyclone5", &cycv_platform);

 @@ -1,14 +1,14 @@
-/* $NetBSD: meson_platform.c,v 1.20 2021/04/24 23:36:26 thorpej Exp $ */
+/* $NetBSD: meson_platform.c,v 1.21 2023/04/07 08:55:29 skrll Exp $ */
 /*-
  * Copyright (c) 2019 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.
 @@ -23,35 +23,36 @@
  * 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_soc.h"
 #include "opt_multiprocessor.h"
 #include "opt_console.h"
 #include "arml2cc.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.20 2021/04/24 23:36:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.21 2023/04/07 08:55:29 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootconfig.h>
 #include <arm/cpufunc.h>
 #include <arm/cortex/a9tmr_var.h>
 #include <arm/cortex/gtmr_var.h>
 #include <arm/cortex/pl310_var.h>
 #include <arm/cortex/scu_reg.h>
 #include <arm/amlogic/meson_uart.h>
 @@ -430,69 +431,69 @@ meson8b_mpstart(void)
 	 */
 	bus_space_write_4(bst, scu_bsh, SCU_INV_ALL_REG, 0xffff);
 	uint32_t scu_ctl = bus_space_read_4(bst, scu_bsh, SCU_CTL);
 	scu_ctl |= SCU_CTL_SCU_ENA;
 	bus_space_write_4(bst, scu_bsh, SCU_CTL, scu_ctl);
 	armv7_dcache_wbinv_all();
 	ret = arm_fdt_cpu_mpstart();
 	return ret;
+}
-static const struct arm_platform meson8b_platform = {
+static const struct fdt_platform meson8b_platform = {
-	.ap_devmap = meson_platform_devmap,
+	.fp_devmap = meson_platform_devmap,
-	.ap_bootstrap = meson8b_platform_bootstrap,
+	.fp_bootstrap = meson8b_platform_bootstrap,
-	.ap_init_attach_args = meson_platform_init_attach_args,
+	.fp_init_attach_args = meson_platform_init_attach_args,
-	.ap_device_register = meson8b_platform_device_register,
+	.fp_device_register = meson8b_platform_device_register,
-	.ap_reset = meson8b_platform_reset,
+	.fp_reset = meson8b_platform_reset,
-	.ap_delay = a9ptmr_delay,
+	.fp_delay = a9ptmr_delay,
-	.ap_uart_freq = meson_platform_uart_freq,
+	.fp_uart_freq = meson_platform_uart_freq,
-	.ap_mpstart = meson8b_mpstart,
+	.fp_mpstart = meson8b_mpstart,
 };
-ARM_PLATFORM(meson8b, "amlogic,meson8b", &meson8b_platform);
+FDT_PLATFORM(meson8b, "amlogic,meson8b", &meson8b_platform);
 #endif	/* SOC_MESON8B */
 #if defined(SOC_MESONGX)
 static void
 mesongx_platform_reset(void)
+{
 	bus_space_tag_t bst = &meson_bs_tag;
 	bus_space_handle_t bsh;
 	uint32_t val;
 	bus_space_map(bst, MESONGX_WATCHDOG_BASE, MESONGX_WATCHDOG_SIZE, 0, &bsh);
 	val = MESONGX_WATCHDOG_CNTL_SYS_RESET_N_EN |
 	      MESONGX_WATCHDOG_CNTL_WDOG_EN |
 	      MESONGX_WATCHDOG_CNTL_CLK_EN;
 	bus_space_write_4(bst, bsh, MESONGX_WATCHDOG_CNTL, val);
 	bus_space_write_4(bst, bsh, MESONGX_WATCHDOG_TCNT, 1);
 	bus_space_write_4(bst, bsh, MESONGX_WATCHDOG_RESET, 0);
 	for (;;) {
 		__asm("wfi");
+	}
+}
-static const struct arm_platform mesongx_platform = {
+static const struct fdt_platform mesongx_platform = {
-	.ap_devmap = meson_platform_devmap,
+	.fp_devmap = meson_platform_devmap,
-	.ap_bootstrap = meson_platform_bootstrap,
+	.fp_bootstrap = meson_platform_bootstrap,
-	.ap_init_attach_args = meson_platform_init_attach_args,
+	.fp_init_attach_args = meson_platform_init_attach_args,
-	.ap_device_register = meson_platform_device_register,
+	.fp_device_register = meson_platform_device_register,
-	.ap_reset = mesongx_platform_reset,
+	.fp_reset = mesongx_platform_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = meson_platform_uart_freq,
+	.fp_uart_freq = meson_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
 #if defined(SOC_MESONGXBB)
-ARM_PLATFORM(mesongxbb, "amlogic,meson-gxbb", &mesongx_platform);
+FDT_PLATFORM(mesongxbb, "amlogic,meson-gxbb", &mesongx_platform);
 #endif	/* SOC_MESONGXBB */
 #if defined(SOC_MESONGXL)
-ARM_PLATFORM(mesongxl, "amlogic,meson-gxl", &mesongx_platform);
+FDT_PLATFORM(mesongxl, "amlogic,meson-gxl", &mesongx_platform);
 #endif	/* SOC_MESONGXL */
 #endif	/* SOC_MESONGX */

 @@ -1,14 +1,14 @@
-/* $NetBSD: apple_platform.c,v 1.5 2022/10/15 11:07:38 jmcneill Exp $ */
+/* $NetBSD: apple_platform.c,v 1.6 2023/04/07 08:55:29 skrll Exp $ */
 /*-
  * Copyright (c) 2021 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.
 @@ -17,35 +17,36 @@
  * 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(0, "$NetBSD: apple_platform.c,v 1.5 2022/10/15 11:07:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apple_platform.c,v 1.6 2023/04/07 08:55:29 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootconfig.h>
 #include <net/if_ether.h>
 #include <dev/pci/pcivar.h>
 #include <machine/pci_machdep.h>
 #include <arm/cpufunc.h>
 @@ -140,27 +141,27 @@ apple_platform_devmap(void)
 		devmap[devmap_index].pd_va = DEVMAP_ALIGN(devmap_va);
 		devmap[devmap_index].pd_size = DEVMAP_SIZE(L2_SIZE);
 		devmap[devmap_index].pd_prot = VM_PROT_READ | VM_PROT_WRITE;
 		devmap[devmap_index].pd_flags = PMAP_WRITE_BACK;
 		devmap_va = DEVMAP_SIZE(devmap[devmap_index].pd_va +
 		    devmap[devmap_index].pd_size);
 		devmap_index++;
+	}
 	return devmap;
+}
 static u_int
-arm_platform_uart_freq(void)
+apple_platform_uart_freq(void)
+{
 	return 0;
+}
 static int
 apple_platform_get_mac_address(pci_chipset_tag_t pc, pcitag_t tag,
     uint8_t *eaddr)
+{
 	int b, d, f;
 	int bridge, len;
 	u_int bdf;
 	const int pcie = of_find_bycompat(OF_finddevice("/"), "apple,pcie");
 @@ -225,25 +226,25 @@ apple_platform_device_register(device_t
 		struct pci_attach_args * const pa = aux;
 		len = apple_platform_get_mac_address(pa->pa_pc, pa->pa_tag,
 		    eaddr);
 		if (len == ETHER_ADDR_LEN) {
 			prop_dictionary_set_bool(prop, "without-seeprom", true);
 			prop_dictionary_set_data(prop, "mac-address", eaddr,
 			    sizeof(eaddr));
+		}
 		return;
+	}
+}
-static const struct arm_platform apple_arm_platform = {
+static const struct fdt_platform apple_fdt_platform = {
-	.ap_devmap = apple_platform_devmap,
+	.fp_devmap = apple_platform_devmap,
-	.ap_bootstrap = apple_platform_bootstrap,
+	.fp_bootstrap = apple_platform_bootstrap,
-	.ap_init_attach_args = apple_platform_init_attach_args,
+	.fp_init_attach_args = apple_platform_init_attach_args,
-	.ap_reset = psci_fdt_reset,
+	.fp_reset = psci_fdt_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = arm_platform_uart_freq,
+	.fp_uart_freq = apple_platform_uart_freq,
-	.ap_device_register = apple_platform_device_register,
+	.fp_device_register = apple_platform_device_register,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(apple_arm, "apple,arm-platform", &apple_arm_platform);
+FDT_PLATFORM(apple_arm, "apple,arm-platform", &apple_fdt_platform);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: arm32_machdep.c,v 1.145 2023/01/19 08:03:51 mlelstv Exp $	*/
+/*	$NetBSD: arm32_machdep.c,v 1.146 2023/04/07 08:55:30 skrll Exp $	*/
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
+ *
  * 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.
 @@ -32,27 +32,27 @@
  * 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.
+ *
  * Machine dependent functions for kernel setup
+ *
  * Created      : 17/09/94
  * Updated	: 18/04/01 updated for new wscons
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.145 2023/01/19 08:03:51 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm32_machdep.c,v 1.146 2023/04/07 08:55:30 skrll Exp $");
 #include "opt_arm_debug.h"
 #include "opt_arm_start.h"
 #include "opt_fdt.h"
 #include "opt_modular.h"
 #include "opt_md.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/cpu.h>
 @@ -75,26 +75,28 @@ __KERNEL_RCSID(0, "$NetBSD: arm32_machde
 #include <dev/cons.h>
 #include <dev/mm.h>
 #include <arm/locore.h>
 #include <arm/cpu_topology.h>
 #include <arm/arm32/machdep.h>
 #include <machine/bootconfig.h>
 #include <machine/pcb.h>
 #if defined(FDT)
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <arch/evbarm/fdt/platform.h>
 #endif
 #ifdef VERBOSE_INIT_ARM
 #define VPRINTF(...)	printf(__VA_ARGS__)
 #ifdef __HAVE_GENERIC_START
 void generic_prints(const char *);
 void generic_printx(int);
 #define VPRINTS(s)	generic_prints(s)
 #define VPRINTX(x)	generic_printx(x)
 #else
 #define VPRINTS(s)	__nothing
 @@ -291,29 +293,29 @@ cpu_startup(void)
 #ifndef ARM_HAS_VBAR
 	/* Lock down zero page */
 	vector_page_setprot(VM_PROT_READ);
 #endif
 	/*
 	 * Give pmap a chance to set up a few more things now the vm
 	 * is initialised
 	 */
 	pmap_postinit();
 #ifdef FDT
-	const struct arm_platform * const plat = arm_fdt_platform();
+	const struct fdt_platform * const plat = fdt_platform_find();
-	if (plat->ap_startup != NULL)
+	if (plat->fp_startup != NULL)
-		plat->ap_startup();
+		plat->fp_startup();
 #endif
 	/*
 	 * Initialize error message buffer (at end of core).
 	 */
 	/* msgbufphys was setup during the secondary boot strap */
 	if (!pmap_extract(pmap_kernel(), (vaddr_t)msgbufaddr, NULL)) {
 		for (u_int loop = 0; loop < btoc(MSGBUFSIZE); ++loop) {
 			pmap_kenter_pa((vaddr_t)msgbufaddr + loop * PAGE_SIZE,
 			    msgbufphys + loop * PAGE_SIZE,
 			    VM_PROT_READ|VM_PROT_WRITE, 0);
+		}
 @@ -883,38 +885,38 @@ mm_md_page_color(paddr_t pa, int *colorp
 	*colorp = 0;
 	return true;
 #endif
+}
 #if defined(FDT)
 extern char KERNEL_BASE_phys[];
 #define KERNEL_BASE_PHYS ((paddr_t)KERNEL_BASE_phys)
 void
 cpu_kernel_vm_init(paddr_t memory_start, psize_t memory_size)
+{
-	const struct arm_platform *plat = arm_fdt_platform();
+	const struct fdt_platform *plat = fdt_platform_find();
 #ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS
 	const bool mapallmem_p = true;
 #ifndef PMAP_NEED_ALLOC_POOLPAGE
 	if (memory_size > KERNEL_VM_BASE - KERNEL_BASE) {
 		VPRINTF("%s: dropping RAM size from %luMB to %uMB\n",
 		    __func__, (unsigned long) (memory_size >> 20),
 		    (KERNEL_VM_BASE - KERNEL_BASE) >> 20);
 		memory_size = KERNEL_VM_BASE - KERNEL_BASE;
+	}
 #endif
 #else
 	const bool mapallmem_p = false;
 #endif
 	VPRINTF("%s: kernel phys start %" PRIxPADDR " end %" PRIxPADDR "\n",
 	    __func__, memory_start, memory_start + memory_size);
 	arm32_bootmem_init(memory_start, memory_size, KERNEL_BASE_PHYS);
 	arm32_kernel_vm_init(KERNEL_VM_BASE, ARM_VECTORS_HIGH, 0,
-	    plat->ap_devmap(), mapallmem_p);
+	    plat->fp_devmap(), mapallmem_p);
+}
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcm283x_platform.c,v 1.48 2021/04/24 23:36:26 thorpej Exp $	*/
+/*	$NetBSD: bcm283x_platform.c,v 1.49 2023/04/07 08:55:30 skrll Exp $	*/
 /*-
  * Copyright (c) 2017 Jared D. 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.
 @@ -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(0, "$NetBSD: bcm283x_platform.c,v 1.48 2021/04/24 23:36:26 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.49 2023/04/07 08:55:30 skrll Exp $");
 #include "opt_arm_debug.h"
 #include "opt_bcm283x.h"
 #include "opt_cpuoptions.h"
 #include "opt_ddb.h"
 #include "opt_evbarm_boardtype.h"
 #include "opt_kgdb.h"
 #include "opt_fdt.h"
 #include "opt_rpi.h"
 #include "opt_vcprop.h"
 #include "sdhc.h"
 #include "bcmsdhost.h"
 @@ -1471,81 +1471,81 @@ bcm283x_platform_device_register(device_
 		} else {
 			prop_dictionary_set_bool(dict, "is_console", false);
+		}
+	}
 #endif
+}
 static u_int
 bcm283x_platform_uart_freq(void)
+{
 	/*
 	 * We are safe to access stdout phandle - consinit did before
-	 * calling ap_uart_freq
+	 * calling fp_uart_freq
 	 */
 	const int phandle = fdtbus_get_stdout_phandle();
 	static const struct device_compatible_entry aux_compat_data[] = {
 		{ .compat = "brcm,bcm2835-aux-uart" },
 		DEVICE_COMPAT_EOL
 	};
 	if (of_compatible_match(phandle, aux_compat_data))
 		return core_clk * 2;
 	return uart_clk;
+}
 #if defined(SOC_BCM2835)
-static const struct arm_platform bcm2835_platform = {
+static const struct fdt_platform bcm2835_platform = {
-	.ap_devmap = bcm2835_platform_devmap,
+	.fp_devmap = bcm2835_platform_devmap,
-	.ap_bootstrap = bcm2835_platform_bootstrap,
+	.fp_bootstrap = bcm2835_platform_bootstrap,
-	.ap_init_attach_args = bcm2835_platform_init_attach_args,
+	.fp_init_attach_args = bcm2835_platform_init_attach_args,
-	.ap_device_register = bcm283x_platform_device_register,
+	.fp_device_register = bcm283x_platform_device_register,
-	.ap_reset = bcm2835_system_reset,
+	.fp_reset = bcm2835_system_reset,
-	.ap_delay = bcm2835_tmr_delay,
+	.fp_delay = bcm2835_tmr_delay,
-	.ap_uart_freq = bcm283x_platform_uart_freq,
+	.fp_uart_freq = bcm283x_platform_uart_freq,
 };
-ARM_PLATFORM(bcm2835, "brcm,bcm2835", &bcm2835_platform);
+FDT_PLATFORM(bcm2835, "brcm,bcm2835", &bcm2835_platform);
 #endif
 #if defined(SOC_BCM2836)
-static const struct arm_platform bcm2836_platform = {
+static const struct fdt_platform bcm2836_platform = {
-	.ap_devmap = bcm2836_platform_devmap,
+	.fp_devmap = bcm2836_platform_devmap,
-	.ap_bootstrap = bcm2836_platform_bootstrap,
+	.fp_bootstrap = bcm2836_platform_bootstrap,
-	.ap_init_attach_args = bcm2836_platform_init_attach_args,
+	.fp_init_attach_args = bcm2836_platform_init_attach_args,
-	.ap_device_register = bcm283x_platform_device_register,
+	.fp_device_register = bcm283x_platform_device_register,
-	.ap_reset = bcm2835_system_reset,
+	.fp_reset = bcm2835_system_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = bcm283x_platform_uart_freq,
+	.fp_uart_freq = bcm283x_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-static const struct arm_platform bcm2837_platform = {
+static const struct fdt_platform bcm2837_platform = {
-	.ap_devmap = bcm2836_platform_devmap,
+	.fp_devmap = bcm2836_platform_devmap,
-	.ap_bootstrap = bcm2836_platform_bootstrap,
+	.fp_bootstrap = bcm2836_platform_bootstrap,
-	.ap_init_attach_args = bcm2836_platform_init_attach_args,
+	.fp_init_attach_args = bcm2836_platform_init_attach_args,
-	.ap_device_register = bcm283x_platform_device_register,
+	.fp_device_register = bcm283x_platform_device_register,
-	.ap_reset = bcm2835_system_reset,
+	.fp_reset = bcm2835_system_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = bcm283x_platform_uart_freq,
+	.fp_uart_freq = bcm283x_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-static const struct arm_platform bcm2711_platform = {
+static const struct fdt_platform bcm2711_platform = {
-	.ap_devmap = bcm2711_platform_devmap,
+	.fp_devmap = bcm2711_platform_devmap,
-	.ap_bootstrap = bcm2711_platform_bootstrap,
+	.fp_bootstrap = bcm2711_platform_bootstrap,
-	.ap_init_attach_args = bcm2711_platform_init_attach_args,
+	.fp_init_attach_args = bcm2711_platform_init_attach_args,
-	.ap_device_register = bcm283x_platform_device_register,
+	.fp_device_register = bcm283x_platform_device_register,
-	.ap_reset = bcm2835_system_reset,
+	.fp_reset = bcm2835_system_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = bcm283x_platform_uart_freq,
+	.fp_uart_freq = bcm283x_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(bcm2836, "brcm,bcm2836", &bcm2836_platform);
+FDT_PLATFORM(bcm2836, "brcm,bcm2836", &bcm2836_platform);
-ARM_PLATFORM(bcm2837, "brcm,bcm2837", &bcm2837_platform);
+FDT_PLATFORM(bcm2837, "brcm,bcm2837", &bcm2837_platform);
-ARM_PLATFORM(bcm2711, "brcm,bcm2711", &bcm2711_platform);
+FDT_PLATFORM(bcm2711, "brcm,bcm2711", &bcm2711_platform);
 #endif

 @@ -1,14 +1,14 @@
-/* $NetBSD: arm_fdt.c,v 1.20 2021/10/10 13:03:09 jmcneill Exp $ */
+/* $NetBSD: arm_fdt.c,v 1.21 2023/04/07 08:55:30 skrll Exp $ */
 /*-
  * Copyright (c) 2017 Jared D. 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.
 @@ -21,39 +21,40 @@
  * 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_arm_timer.h"
 #include "opt_efi.h"
 #include "opt_modular.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_fdt.c,v 1.20 2021/10/10 13:03:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_fdt.c,v 1.21 2023/04/07 08:55:30 skrll Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 #include <sys/module.h>
 #include <uvm/uvm_extern.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/ofw/openfirm.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <arm/locore.h>
 #ifdef EFI_RUNTIME
 #include <arm/arm/efi_runtime.h>
 #include <dev/clock_subr.h>
 #endif
 static int	arm_fdt_match(device_t, cfdata_t, void *);
 static void	arm_fdt_attach(device_t, device_t, void *);
 @@ -84,89 +85,44 @@ static TAILQ_HEAD(, arm_fdt_cpu_hatch_cb
 static void (*_arm_fdt_irq_handler)(void *) = arm_fdt_irq_default_handler;
 static void (*_arm_fdt_fiq_handler)(void *) = arm_fdt_fiq_default_handler;
 static void (*_arm_fdt_timer_init)(void) = NULL;
 int
 arm_fdt_match(device_t parent, cfdata_t cf, void *aux)
+{
 	return 1;
+}
 void
 arm_fdt_attach(device_t parent, device_t self, void *aux)
+{
-	const struct arm_platform *plat = arm_fdt_platform();
+	const struct fdt_platform *plat = fdt_platform_find();
 	struct fdt_attach_args faa;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	DISABLE_INTERRUPT();
 #ifdef EFI_RUNTIME
 	arm_fdt_efi_init(self);
 #endif
-	plat->ap_init_attach_args(&faa);
+	plat->fp_init_attach_args(&faa);
 	faa.faa_name = "";
 	faa.faa_phandle = OF_peer(0);
 	config_found(self, &faa, NULL, CFARGS_NONE);
+}
 const struct arm_platform *
 arm_fdt_platform(void)
 	static const struct arm_platform_info *booted_platform = NULL;
 	__link_set_decl(arm_platforms, struct arm_platform_info);
 	struct arm_platform_info * const *info;
 	if (booted_platform == NULL) {
 		const struct arm_platform_info *best_info = NULL;
 		const int phandle = OF_peer(0);
 		int match, best_match = 0;
 		__link_set_foreach(info, arm_platforms) {
 			const struct device_compatible_entry compat_data[] = {
 				{ .compat = (*info)->api_compat },
 				DEVICE_COMPAT_EOL
 			};
 			match = of_compatible_match(phandle, compat_data);
 			if (match > best_match) {
 				best_match = match;
 				best_info = *info;
 		booted_platform = best_info;
 	/*
 	 * No SoC specific platform was found. Try to find a generic
 	 * platform definition and use that if available.
 	 */
 	if (booted_platform == NULL) {
 		__link_set_foreach(info, arm_platforms) {
 			if (strcmp((*info)->api_compat, ARM_PLATFORM_DEFAULT) == 0) {
 				booted_platform = *info;
 				break;
 	return booted_platform == NULL ? NULL : booted_platform->api_ops;
 void
 arm_fdt_cpu_hatch_register(void *priv, void (*cb)(void *, struct cpu_info *))
+{
 	struct arm_fdt_cpu_hatch_cb *c;
 	c = kmem_alloc(sizeof(*c), KM_SLEEP);
 	c->priv = priv;
 	c->cb = cb;
 	TAILQ_INSERT_TAIL(&arm_fdt_cpu_hatch_cbs, c, next);
+}
 void
 arm_fdt_cpu_hatch(struct cpu_info *ci)

 @@ -1,14 +1,14 @@
-/* $NetBSD: arm_fdtvar.h,v 1.19 2021/09/05 13:20:34 jmcneill Exp $ */
+/* $NetBSD: arm_fdtvar.h,v 1.20 2023/04/07 08:55:30 skrll Exp $ */
 /*-
  * Copyright (c) 2017 Jared D. 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.
 @@ -19,70 +19,33 @@
  * 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.
  */
 #ifndef _ARM_ARM_FDTVAR_H
 #define _ARM_ARM_FDTVAR_H
 struct fdt_attach_args;
 /*
  * Platform-specific data
  */
 struct arm_platform {
 	const struct pmap_devmap * (*ap_devmap)(void);
 	void			(*ap_bootstrap)(void);
 	int			(*ap_mpstart)(void);
 	void			(*ap_startup)(void);
 	void			(*ap_init_attach_args)(struct fdt_attach_args *);
 	void			(*ap_device_register)(device_t, void *);
 	void			(*ap_reset)(void);
 	void			(*ap_delay)(u_int);
 	u_int			(*ap_uart_freq)(void);
 };
 struct arm_platform_info {
 	const char *			api_compat;
 	const struct arm_platform *	api_ops;
 };
 #define ARM_PLATFORM_DEFAULT		""
 #define _ARM_PLATFORM_REGISTER(name)	\
 	__link_set_add_rodata(arm_platforms, __CONCAT(name,_platinfo));
 #define ARM_PLATFORM(_name, _compat, _ops)				\
 static const struct arm_platform_info __CONCAT(_name,_platinfo) = {	\
 	.api_compat = (_compat),					\
 	.api_ops = (_ops)						\
 };									\
 _ARM_PLATFORM_REGISTER(_name)
 const struct arm_platform *	arm_fdt_platform(void);
 /*
  * CPU enable methods
  */
 struct arm_cpu_method {
-	const char *		acm_compat;
+	const char *	acm_compat;
-	int			(*acm_enable)(int);
+	int		(*acm_enable)(int);
 };
 #define	_ARM_CPU_METHOD_REGISTER(_name)	\
 	__link_set_add_rodata(arm_cpu_methods, __CONCAT(_name,_cpu_method));
 #define	ARM_CPU_METHOD(_name, _compat, _enable)				\
 static const struct arm_cpu_method __CONCAT(_name,_cpu_method) = {	\
 	.acm_compat = (_compat),					\
 	.acm_enable = (_enable)						\
 };									\
 _ARM_CPU_METHOD_REGISTER(_name)
 void	arm_fdt_cpu_bootstrap(void);

 @@ -1,14 +1,14 @@
-/* $NetBSD: arm_platform.c,v 1.6 2023/02/25 08:19:35 skrll Exp $ */
+/* $NetBSD: arm_platform.c,v 1.7 2023/04/07 08:55:30 skrll Exp $ */
 /*-
  * Copyright (c) 2020 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.
 @@ -28,46 +28,47 @@
 /*
  * This is the default Arm FDT platform implementation. It assumes the
  * following:
+ *
  *  - Generic timer
  *  - PSCI support
  *  - Console UART is pre-configured by firmware
  */
 #include "opt_console.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_platform.c,v 1.6 2023/02/25 08:19:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_platform.c,v 1.7 2023/04/07 08:55:30 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootconfig.h>
 #include <arm/cpufunc.h>
 #include <arm/cortex/gtmr_var.h>
 #include <arm/arm/psci.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <arm/fdt/psci_fdtvar.h>
 #include <evbarm/dev/plcomreg.h>
 #include <evbarm/dev/plcomvar.h>
 #include <libfdt.h>
 #include <arch/evbarm/fdt/platform.h>
 extern struct arm32_bus_dma_tag arm_generic_dma_tag;
 extern struct bus_space arm_generic_bs_tag;
 void plcom_platform_early_putchar(char);
 @@ -127,25 +128,25 @@ arm_platform_devmap(void)
 		return devmap_empty;
 	devmap_uart[0].pd_pa = DEVMAP_ALIGN(uart_base);
 	return devmap_uart;
+}
 static u_int
 arm_platform_uart_freq(void)
+{
 	return 0;
+}
-static const struct arm_platform arm_platform = {
+static const struct fdt_platform arm_platform = {
-	.ap_devmap = arm_platform_devmap,
+	.fp_devmap = arm_platform_devmap,
-	.ap_bootstrap = arm_fdt_cpu_bootstrap,
+	.fp_bootstrap = arm_fdt_cpu_bootstrap,
-	.ap_init_attach_args = arm_platform_init_attach_args,
+	.fp_init_attach_args = arm_platform_init_attach_args,
-	.ap_device_register = arm_platform_device_register,
+	.fp_device_register = arm_platform_device_register,
-	.ap_reset = psci_fdt_reset,
+	.fp_reset = psci_fdt_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = arm_platform_uart_freq,
+	.fp_uart_freq = arm_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(arm, ARM_PLATFORM_DEFAULT, &arm_platform);
+FDT_PLATFORM(arm, FDT_PLATFORM_DEFAULT, &arm_platform);

 @@ -1,14 +1,14 @@
-/* $NetBSD: tegra_platform.c,v 1.27 2021/04/24 23:36:27 thorpej Exp $ */
+/* $NetBSD: tegra_platform.c,v 1.28 2023/04/07 08:55:30 skrll Exp $ */
 /*-
  * Copyright (c) 2017 Jared D. 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.
 @@ -24,27 +24,27 @@
  * 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_arm_debug.h"
 #include "opt_console.h"
 #include "opt_multiprocessor.h"
 #include "opt_tegra.h"
 #include "ukbd.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.27 2021/04/24 23:36:27 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_platform.c,v 1.28 2023/04/07 08:55:30 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <dev/fdt/fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootconfig.h>
 #include <arm/cpufunc.h>
 @@ -207,41 +207,41 @@ static void
 tegra_platform_delay(u_int us)
+{
 	tegra_timer_delay(us);
+}
 static u_int
 tegra_platform_uart_freq(void)
+{
 	return PLLP_OUT0_FREQ;
+}
 #endif	/* SOC_TEGRA124 || SOC_TEGRA210 */
 #if defined(SOC_TEGRA124)
-static const struct arm_platform tegra124_platform = {
+static const struct fdt_platform tegra124_platform = {
-	.ap_devmap = tegra_platform_devmap,
+	.fp_devmap = tegra_platform_devmap,
-	.ap_bootstrap = tegra124_platform_bootstrap,
+	.fp_bootstrap = tegra124_platform_bootstrap,
-	.ap_init_attach_args = tegra_platform_init_attach_args,
+	.fp_init_attach_args = tegra_platform_init_attach_args,
-	.ap_device_register = tegra_platform_device_register,
+	.fp_device_register = tegra_platform_device_register,
-	.ap_reset = tegra_platform_reset,
+	.fp_reset = tegra_platform_reset,
-	.ap_delay = tegra_platform_delay,
+	.fp_delay = tegra_platform_delay,
-	.ap_uart_freq = tegra_platform_uart_freq,
+	.fp_uart_freq = tegra_platform_uart_freq,
-	.ap_mpstart = tegra124_mpstart,
+	.fp_mpstart = tegra124_mpstart,
 };
-ARM_PLATFORM(tegra124, "nvidia,tegra124", &tegra124_platform);
+FDT_PLATFORM(tegra124, "nvidia,tegra124", &tegra124_platform);
 #endif
 #if defined(SOC_TEGRA210)
-static const struct arm_platform tegra210_platform = {
+static const struct fdt_platform tegra210_platform = {
-	.ap_devmap = tegra_platform_devmap,
+	.fp_devmap = tegra_platform_devmap,
-	.ap_bootstrap = tegra210_platform_bootstrap,
+	.fp_bootstrap = tegra210_platform_bootstrap,
-	.ap_init_attach_args = tegra_platform_init_attach_args,
+	.fp_init_attach_args = tegra_platform_init_attach_args,
-	.ap_device_register = tegra_platform_device_register,
+	.fp_device_register = tegra_platform_device_register,
-	.ap_reset = tegra_platform_reset,
+	.fp_reset = tegra_platform_reset,
-	.ap_delay = tegra_platform_delay,
+	.fp_delay = tegra_platform_delay,
-	.ap_uart_freq = tegra_platform_uart_freq,
+	.fp_uart_freq = tegra_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(tegra210, "nvidia,tegra210", &tegra210_platform);
+FDT_PLATFORM(tegra210, "nvidia,tegra210", &tegra210_platform);
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: imx6_platform.c,v 1.6 2021/04/24 23:36:28 thorpej Exp $	*/
+/*	$NetBSD: imx6_platform.c,v 1.7 2023/04/07 08:55:30 skrll Exp $	*/
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
+ *
  * 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,41 +17,42 @@
  * 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(0, "$NetBSD: imx6_platform.c,v 1.6 2021/04/24 23:36:28 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.7 2023/04/07 08:55:30 skrll Exp $");
 #include "arml2cc.h"
 #include "opt_console.h"
 #include "opt_fdt.h"
 #include "opt_multiprocessor.h"
 #include "opt_soc.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <arm/arm32/machdep.h>
 #include <machine/bootconfig.h>
 #include <arm/cpufunc.h>
 #include <arm/cortex/a9tmr_var.h>
 #include <arm/cortex/scu_reg.h>
 #include <arm/cortex/gic_reg.h>
 #include <arm/cortex/pl310_var.h>
 @@ -212,27 +213,27 @@ imx6_platform_reset(void)
 	/* software reset signal on wdog */
 	bus_space_write_2(bst, bsh, IMX_WDOG_WCR, WCR_WDE);
 	/*
 	 * write twice due to errata.
 	 * Reference: ERR004346: IMX6DQCE Chip Errata for the i.MX 6Dual/6Quad
 	 */
 	bus_space_write_2(bst, bsh, IMX_WDOG_WCR, WCR_WDE);
 	for (;;)
 		__asm("wfi");
+}
-const struct arm_platform imx6_platform = {
+static const struct fdt_platform imx6_platform = {
-	.ap_devmap = imx_platform_devmap,
+	.fp_devmap = imx_platform_devmap,
-	.ap_bootstrap = imx_platform_bootstrap,
+	.fp_bootstrap = imx_platform_bootstrap,
-	.ap_init_attach_args = imx_platform_init_attach_args,
+	.fp_init_attach_args = imx_platform_init_attach_args,
-	.ap_device_register = imx_platform_device_register,
+	.fp_device_register = imx_platform_device_register,
-	.ap_reset = imx6_platform_reset,
+	.fp_reset = imx6_platform_reset,
-	.ap_delay = a9ptmr_delay,
+	.fp_delay = a9ptmr_delay,
-	.ap_uart_freq = imx_platform_uart_freq,
+	.fp_uart_freq = imx_platform_uart_freq,
-	.ap_mpstart = imx_platform_mpstart,
+	.fp_mpstart = imx_platform_mpstart,
 };
-ARM_PLATFORM(imx6dl, "fsl,imx6dl", &imx6_platform);
+FDT_PLATFORM(imx6dl, "fsl,imx6dl", &imx6_platform);
-ARM_PLATFORM(imx6q, "fsl,imx6q", &imx6_platform);
+FDT_PLATFORM(imx6q, "fsl,imx6q", &imx6_platform);
-ARM_PLATFORM(imx6qp, "fsl,imx6qp", &imx6_platform);
+FDT_PLATFORM(imx6qp, "fsl,imx6qp", &imx6_platform);

 @@ -1,14 +1,14 @@
-/* $NetBSD: rk_platform.c,v 1.16 2022/08/23 05:39:06 ryo Exp $ */
+/* $NetBSD: rk_platform.c,v 1.17 2023/04/07 08:55:30 skrll Exp $ */
 /*-
  * Copyright (c) 2018,2021 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.
 @@ -21,36 +21,36 @@
  * 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_soc.h"
 #include "opt_multiprocessor.h"
 #include "opt_console.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.16 2022/08/23 05:39:06 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_platform.c,v 1.17 2023/04/07 08:55:30 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootconfig.h>
 #include <arm/cpufunc.h>
 #include <arm/cortex/gtmr_var.h>
 #include <dev/ic/ns16550reg.h>
 #include <dev/ic/comreg.h>
 #include <arm/arm/psci.h>
 @@ -165,38 +165,38 @@ rk3288_platform_reset(void)
 	bus_space_write_4(bst, rk3288_wdt_bsh, RK3288_WDT_TORR, 0);
 	bus_space_write_4(bst, rk3288_wdt_bsh, RK3288_WDT_CRR, RK3288_WDT_MAGIC);
 	for (;;) {
 		bus_space_write_4(bst, rk3288_wdt_bsh, RK3288_WDT_CR, RK3288_WDT_CR_WDT_EN);
+	}
+}
 static u_int
 rk3288_platform_uart_freq(void)
+{
 	return RK3288_UART_FREQ;
+}
-static const struct arm_platform rk3288_platform = {
+static const struct fdt_platform rk3288_platform = {
-	.ap_devmap = rk3288_platform_devmap,
+	.fp_devmap = rk3288_platform_devmap,
-	.ap_bootstrap = rk3288_platform_bootstrap,
+	.fp_bootstrap = rk3288_platform_bootstrap,
-	.ap_init_attach_args = rk_platform_init_attach_args,
+	.fp_init_attach_args = rk_platform_init_attach_args,
-	.ap_device_register = rk_platform_device_register,
+	.fp_device_register = rk_platform_device_register,
-	.ap_reset = rk3288_platform_reset,
+	.fp_reset = rk3288_platform_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = rk3288_platform_uart_freq,
+	.fp_uart_freq = rk3288_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(rk3288, "rockchip,rk3288", &rk3288_platform);
+FDT_PLATFORM(rk3288, "rockchip,rk3288", &rk3288_platform);
 #endif /* SOC_RK3288 */
 #ifdef SOC_RK3328
 #include <arm/rockchip/rk3328_platform.h>
 static const struct pmap_devmap *
 rk3328_platform_devmap(void)
+{
 	static const struct pmap_devmap devmap[] = {
 		DEVMAP_ENTRY(RK3328_CORE_VBASE,
 			     RK3328_CORE_PBASE,
 @@ -222,38 +222,38 @@ rk3328_platform_early_putchar(char c)
+		;
 	uartaddr[com_data] = htole32(c);
 #undef CONSADDR_VA
 #endif
+}
 static u_int
 rk3328_platform_uart_freq(void)
+{
 	return RK3328_UART_FREQ;
+}
-static const struct arm_platform rk3328_platform = {
+static const struct fdt_platform rk3328_platform = {
-	.ap_devmap = rk3328_platform_devmap,
+	.fp_devmap = rk3328_platform_devmap,
-	.ap_bootstrap = rk_platform_bootstrap,
+	.fp_bootstrap = rk_platform_bootstrap,
-	.ap_init_attach_args = rk_platform_init_attach_args,
+	.fp_init_attach_args = rk_platform_init_attach_args,
-	.ap_device_register = rk_platform_device_register,
+	.fp_device_register = rk_platform_device_register,
-	.ap_reset = psci_fdt_reset,
+	.fp_reset = psci_fdt_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = rk3328_platform_uart_freq,
+	.fp_uart_freq = rk3328_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(rk3328, "rockchip,rk3328", &rk3328_platform);
+FDT_PLATFORM(rk3328, "rockchip,rk3328", &rk3328_platform);
 #endif /* SOC_RK3328 */
 #ifdef SOC_RK3399
 #include <arm/rockchip/rk3399_platform.h>
 static const struct pmap_devmap *
 rk3399_platform_devmap(void)
+{
 	static const struct pmap_devmap devmap[] = {
 		DEVMAP_ENTRY(RK3399_CORE_VBASE,
 @@ -280,38 +280,38 @@ rk3399_platform_early_putchar(char c)
+		;
 	uartaddr[com_data] = htole32(c);
 #undef CONSADDR_VA
 #endif
+}
 static u_int
 rk3399_platform_uart_freq(void)
+{
 	return RK3399_UART_FREQ;
+}
-static const struct arm_platform rk3399_platform = {
+static const struct fdt_platform rk3399_platform = {
-	.ap_devmap = rk3399_platform_devmap,
+	.fp_devmap = rk3399_platform_devmap,
-	.ap_bootstrap = rk_platform_bootstrap,
+	.fp_bootstrap = rk_platform_bootstrap,
-	.ap_init_attach_args = rk_platform_init_attach_args,
+	.fp_init_attach_args = rk_platform_init_attach_args,
-	.ap_device_register = rk_platform_device_register,
+	.fp_device_register = rk_platform_device_register,
-	.ap_reset = psci_fdt_reset,
+	.fp_reset = psci_fdt_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = rk3399_platform_uart_freq,
+	.fp_uart_freq = rk3399_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(rk3399, "rockchip,rk3399", &rk3399_platform);
+FDT_PLATFORM(rk3399, "rockchip,rk3399", &rk3399_platform);
 #endif /* SOC_RK3399 */
 #ifdef SOC_RK3588
 #include <arm/rockchip/rk3588_platform.h>
 static const struct pmap_devmap *
 rk3588_platform_devmap(void)
+{
 	static const struct pmap_devmap devmap[] = {
 		DEVMAP_ENTRY(
 @@ -339,28 +339,28 @@ rk3588_platform_early_putchar(char c)
+		;
 	uartaddr[com_data] = htole32(c);
 #undef CONSADDR_VA
 #endif
+}
 static u_int
 rk3588_platform_uart_freq(void)
+{
 	return RK3588_UART_FREQ;
+}
-static const struct arm_platform rk3588_platform = {
+static const struct fdt_platform rk3588_platform = {
-	.ap_devmap = rk3588_platform_devmap,
+	.fp_devmap = rk3588_platform_devmap,
-	.ap_bootstrap = rk_platform_bootstrap,
+	.fp_bootstrap = rk_platform_bootstrap,
-	.ap_init_attach_args = rk_platform_init_attach_args,
+	.fp_init_attach_args = rk_platform_init_attach_args,
-	.ap_device_register = rk_platform_device_register,
+	.fp_device_register = rk_platform_device_register,
-	.ap_reset = psci_fdt_reset,
+	.fp_reset = psci_fdt_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = rk3588_platform_uart_freq,
+	.fp_uart_freq = rk3588_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(rk3588, "rockchip,rk3588", &rk3588_platform);
+FDT_PLATFORM(rk3588, "rockchip,rk3588", &rk3588_platform);
 #endif /* SOC_RK3588 */

 @@ -1,14 +1,14 @@
-/* $NetBSD: exynos_platform.c,v 1.39 2022/10/29 13:29:46 jmcneill Exp $ */
+/* $NetBSD: exynos_platform.c,v 1.40 2023/04/07 08:55:30 skrll Exp $ */
 /*-
  * Copyright (c) 2017 Jared D. 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.
 @@ -25,27 +25,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include "opt_arm_debug.h"
 #include "opt_console.h"
 #include "opt_exynos.h"
 #include "opt_multiprocessor.h"
 #include "opt_console.h"
 #include "ukbd.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.39 2022/10/29 13:29:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos_platform.c,v 1.40 2023/04/07 08:55:30 skrll Exp $");
 #define	EXYNOS_CORE_VBASE	KERNEL_IO_VBASE
 /*
  * Booting a CA7 core on Exynos5422 is currently broken, disable starting CA7 secondaries.
  */
 #define        EXYNOS5422_DISABLE_CA7_CLUSTER
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 @@ -286,38 +286,38 @@ exynos4_platform_devmap(void)
+}
 static void
 exynos4_platform_bootstrap(void)
+{
 	exynos_bootstrap(4);
 #if defined(MULTIPROCESSOR)
 	arm_cpu_max = 1 + __SHIFTOUT(armreg_l2ctrl_read(), L2CTRL_NUMCPU);
 #endif
+}
-static const struct arm_platform exynos4_platform = {
+static const struct fdt_platform exynos4_platform = {
-	.ap_devmap = exynos4_platform_devmap,
+	.fp_devmap = exynos4_platform_devmap,
-//	.ap_mpstart = exynos4_mpstart,
+//	.fp_mpstart = exynos4_mpstart,
-	.ap_bootstrap = exynos4_platform_bootstrap,
+	.fp_bootstrap = exynos4_platform_bootstrap,
-	.ap_init_attach_args = exynos_platform_init_attach_args,
+	.fp_init_attach_args = exynos_platform_init_attach_args,
-	.ap_device_register = exynos_platform_device_register,
+	.fp_device_register = exynos_platform_device_register,
-	.ap_reset = exynos5_platform_reset,
+	.fp_reset = exynos5_platform_reset,
-	.ap_delay = mct_delay,
+	.fp_delay = mct_delay,
-	.ap_uart_freq = exynos_platform_uart_freq,
+	.fp_uart_freq = exynos_platform_uart_freq,
 };
-ARM_PLATFORM(exynos4, "samsung,exynos4", &exynos4_platform);
+FDT_PLATFORM(exynos4, "samsung,exynos4", &exynos4_platform);
 #endif
 #if defined(SOC_EXYNOS5)
 static const struct pmap_devmap *
 exynos5_platform_devmap(void)
+{
 	static const struct pmap_devmap devmap[] = {
 		DEVMAP_ENTRY(EXYNOS_CORE_VBASE,
 			     EXYNOS_CORE_PBASE,
 			     EXYNOS5_CORE_SIZE),
 		DEVMAP_ENTRY(EXYNOS5_AUDIOCORE_VBASE,
 			     EXYNOS5_AUDIOCORE_PBASE,
 @@ -352,26 +352,26 @@ exynos5_platform_bootstrap(void)
 			const void *prop = fdt_getprop(fdt_data, cpu_off, "reg", &len);
 			if (len != 4)
 				continue;
 			const uint32_t mpidr = be32dec(prop);
 			if (mpidr != cpu_mpidr_aff_read() && __SHIFTOUT(mpidr, MPIDR_AFF1) == 1)
 				fdt_setprop_string(fdt_data, cpu_off, "status", "fail");
+		}
+	}
 #endif
 	arm_fdt_cpu_bootstrap();
+}
-static const struct arm_platform exynos5_platform = {
+static const struct fdt_platform exynos5_platform = {
-	.ap_devmap = exynos5_platform_devmap,
+	.fp_devmap = exynos5_platform_devmap,
-	.ap_bootstrap = exynos5_platform_bootstrap,
+	.fp_bootstrap = exynos5_platform_bootstrap,
-	.ap_mpstart = exynos_platform_mpstart,
+	.fp_mpstart = exynos_platform_mpstart,
-	.ap_init_attach_args = exynos_platform_init_attach_args,
+	.fp_init_attach_args = exynos_platform_init_attach_args,
-	.ap_device_register = exynos_platform_device_register,
+	.fp_device_register = exynos_platform_device_register,
-	.ap_reset = exynos5_platform_reset,
+	.fp_reset = exynos5_platform_reset,
-	.ap_delay = mct_delay,
+	.fp_delay = mct_delay,
-	.ap_uart_freq = exynos_platform_uart_freq,
+	.fp_uart_freq = exynos_platform_uart_freq,
 };
-ARM_PLATFORM(exynos5, "samsung,exynos5", &exynos5_platform);
+FDT_PLATFORM(exynos5, "samsung,exynos5", &exynos5_platform);
 #endif

 @@ -1,14 +1,14 @@
-/* $NetBSD: sunxi_platform.c,v 1.46 2022/06/28 05:19:03 skrll Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.47 2023/04/07 08:55:30 skrll 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.
 @@ -21,35 +21,36 @@
  * 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_soc.h"
 #include "opt_multiprocessor.h"
 #include "opt_console.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.46 2022/06/28 05:19:03 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.47 2023/04/07 08:55:30 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootconfig.h>
 #include <arm/cpufunc.h>
 #include <arm/cortex/gtmr_var.h>
 #include <arm/cortex/gic_reg.h>
 #include <dev/ic/ns16550reg.h>
 #include <dev/ic/comreg.h>
 @@ -416,131 +417,131 @@ sun9i_platform_reset(void)
 	bus_space_write_4(bst, reset_bsh, SUN9I_WDT_CFG, SUN9I_WDT_CFG_SYS);
 	bus_space_write_4(bst, reset_bsh, SUN9I_WDT_MODE, SUN9I_WDT_MODE_EN);
+}
 static void
 sun50i_h6_platform_reset(void)
+{
 	bus_space_tag_t bst = &sunxi_bs_tag;
 	bus_space_write_4(bst, reset_bsh, SUN50I_H6_WDT_CFG, SUN50I_H6_WDT_CFG_SYS);
 	bus_space_write_4(bst, reset_bsh, SUN50I_H6_WDT_MODE, SUN50I_H6_WDT_MODE_EN);
+}
-static const struct arm_platform sun4i_platform = {
+static const struct fdt_platform sun4i_platform = {
-	.ap_devmap = sunxi_platform_devmap,
+	.fp_devmap = sunxi_platform_devmap,
-	.ap_bootstrap = sun4i_platform_bootstrap,
+	.fp_bootstrap = sun4i_platform_bootstrap,
-	.ap_init_attach_args = sunxi_platform_init_attach_args,
+	.fp_init_attach_args = sunxi_platform_init_attach_args,
-	.ap_device_register = sunxi_platform_device_register,
+	.fp_device_register = sunxi_platform_device_register,
-	.ap_reset = sun4i_platform_reset,
+	.fp_reset = sun4i_platform_reset,
-	.ap_delay = sun4i_platform_delay,
+	.fp_delay = sun4i_platform_delay,
-	.ap_uart_freq = sunxi_platform_uart_freq,
+	.fp_uart_freq = sunxi_platform_uart_freq,
 };
-ARM_PLATFORM(sun4i_a10, "allwinner,sun4i-a10", &sun4i_platform);
+FDT_PLATFORM(sun4i_a10, "allwinner,sun4i-a10", &sun4i_platform);
-static const struct arm_platform sun5i_platform = {
+static const struct fdt_platform sun5i_platform = {
-	.ap_devmap = sunxi_platform_devmap,
+	.fp_devmap = sunxi_platform_devmap,
-	.ap_bootstrap = sun4i_platform_bootstrap,
+	.fp_bootstrap = sun4i_platform_bootstrap,
-	.ap_init_attach_args = sunxi_platform_init_attach_args,
+	.fp_init_attach_args = sunxi_platform_init_attach_args,
-	.ap_device_register = sunxi_platform_device_register,
+	.fp_device_register = sunxi_platform_device_register,
-	.ap_reset = sun4i_platform_reset,
+	.fp_reset = sun4i_platform_reset,
-	.ap_delay = sun4i_platform_delay,
+	.fp_delay = sun4i_platform_delay,
-	.ap_uart_freq = sunxi_platform_uart_freq,
+	.fp_uart_freq = sunxi_platform_uart_freq,
 };
-ARM_PLATFORM(sun5i_a13, "allwinner,sun5i-a13", &sun5i_platform);
+FDT_PLATFORM(sun5i_a13, "allwinner,sun5i-a13", &sun5i_platform);
-ARM_PLATFORM(sun5i_gr8, "nextthing,gr8", &sun5i_platform);
+FDT_PLATFORM(sun5i_gr8, "nextthing,gr8", &sun5i_platform);
-static const struct arm_platform sun6i_platform = {
+static const struct fdt_platform sun6i_platform = {
-	.ap_devmap = sunxi_platform_devmap,
+	.fp_devmap = sunxi_platform_devmap,
-	.ap_bootstrap = sun6i_platform_bootstrap,
+	.fp_bootstrap = sun6i_platform_bootstrap,
-	.ap_init_attach_args = sunxi_platform_init_attach_args,
+	.fp_init_attach_args = sunxi_platform_init_attach_args,
-	.ap_device_register = sunxi_platform_device_register,
+	.fp_device_register = sunxi_platform_device_register,
-	.ap_reset = sun6i_platform_reset,
+	.fp_reset = sun6i_platform_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = sunxi_platform_uart_freq,
+	.fp_uart_freq = sunxi_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(sun6i_a31, "allwinner,sun6i-a31", &sun6i_platform);
+FDT_PLATFORM(sun6i_a31, "allwinner,sun6i-a31", &sun6i_platform);
-static const struct arm_platform sun7i_platform = {
+static const struct fdt_platform sun7i_platform = {
-	.ap_devmap = sunxi_platform_devmap,
+	.fp_devmap = sunxi_platform_devmap,
-	.ap_bootstrap = sun4i_platform_bootstrap,
+	.fp_bootstrap = sun4i_platform_bootstrap,
-	.ap_init_attach_args = sunxi_platform_init_attach_args,
+	.fp_init_attach_args = sunxi_platform_init_attach_args,
-	.ap_device_register = sunxi_platform_device_register,
+	.fp_device_register = sunxi_platform_device_register,
-	.ap_reset = sun4i_platform_reset,
+	.fp_reset = sun4i_platform_reset,
-	.ap_delay = sun4i_platform_delay,
+	.fp_delay = sun4i_platform_delay,
-	.ap_uart_freq = sunxi_platform_uart_freq,
+	.fp_uart_freq = sunxi_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(sun7i_a20, "allwinner,sun7i-a20", &sun7i_platform);
+FDT_PLATFORM(sun7i_a20, "allwinner,sun7i-a20", &sun7i_platform);
-static const struct arm_platform sun8i_platform = {
+static const struct fdt_platform sun8i_platform = {
-	.ap_devmap = sunxi_platform_devmap,
+	.fp_devmap = sunxi_platform_devmap,
-	.ap_bootstrap = sun6i_platform_bootstrap,
+	.fp_bootstrap = sun6i_platform_bootstrap,
-	.ap_init_attach_args = sunxi_platform_init_attach_args,
+	.fp_init_attach_args = sunxi_platform_init_attach_args,
-	.ap_device_register = sunxi_platform_device_register,
+	.fp_device_register = sunxi_platform_device_register,
-	.ap_reset = sun6i_platform_reset,
+	.fp_reset = sun6i_platform_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = sunxi_platform_uart_freq,
+	.fp_uart_freq = sunxi_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(sun8i_h2plus, "allwinner,sun8i-h2-plus", &sun8i_platform);
+FDT_PLATFORM(sun8i_h2plus, "allwinner,sun8i-h2-plus", &sun8i_platform);
-ARM_PLATFORM(sun8i_h3, "allwinner,sun8i-h3", &sun8i_platform);
+FDT_PLATFORM(sun8i_h3, "allwinner,sun8i-h3", &sun8i_platform);
-ARM_PLATFORM(sun8i_v3s, "allwinner,sun8i-v3s", &sun8i_platform);
+FDT_PLATFORM(sun8i_v3s, "allwinner,sun8i-v3s", &sun8i_platform);
-static const struct arm_platform sun8i_a83t_platform = {
+static const struct fdt_platform sun8i_a83t_platform = {
-	.ap_devmap = sun8i_a83t_platform_devmap,
+	.fp_devmap = sun8i_a83t_platform_devmap,
-	.ap_bootstrap = sun6i_platform_bootstrap,
+	.fp_bootstrap = sun6i_platform_bootstrap,
-	.ap_init_attach_args = sunxi_platform_init_attach_args,
+	.fp_init_attach_args = sunxi_platform_init_attach_args,
-	.ap_device_register = sunxi_platform_device_register,
+	.fp_device_register = sunxi_platform_device_register,
-	.ap_reset = sun6i_platform_reset,
+	.fp_reset = sun6i_platform_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = sunxi_platform_uart_freq,
+	.fp_uart_freq = sunxi_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(sun8i_a83t, "allwinner,sun8i-a83t", &sun8i_a83t_platform);
+FDT_PLATFORM(sun8i_a83t, "allwinner,sun8i-a83t", &sun8i_a83t_platform);
-static const struct arm_platform sun9i_platform = {
+static const struct fdt_platform sun9i_platform = {
-	.ap_devmap = sun9i_a80_platform_devmap,
+	.fp_devmap = sun9i_a80_platform_devmap,
-	.ap_bootstrap = sun9i_platform_bootstrap,
+	.fp_bootstrap = sun9i_platform_bootstrap,
-	.ap_init_attach_args = sunxi_platform_init_attach_args,
+	.fp_init_attach_args = sunxi_platform_init_attach_args,
-	.ap_device_register = sunxi_platform_device_register,
+	.fp_device_register = sunxi_platform_device_register,
-	.ap_reset = sun9i_platform_reset,
+	.fp_reset = sun9i_platform_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = sunxi_platform_uart_freq,
+	.fp_uart_freq = sunxi_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(sun9i_a80, "allwinner,sun9i-a80", &sun9i_platform);
+FDT_PLATFORM(sun9i_a80, "allwinner,sun9i-a80", &sun9i_platform);
-static const struct arm_platform sun50i_platform = {
+static const struct fdt_platform sun50i_platform = {
-	.ap_devmap = sunxi_platform_devmap,
+	.fp_devmap = sunxi_platform_devmap,
-	.ap_bootstrap = sun6i_platform_bootstrap,
+	.fp_bootstrap = sun6i_platform_bootstrap,
-	.ap_init_attach_args = sunxi_platform_init_attach_args,
+	.fp_init_attach_args = sunxi_platform_init_attach_args,
-	.ap_device_register = sunxi_platform_device_register,
+	.fp_device_register = sunxi_platform_device_register,
-	.ap_reset = sun6i_platform_reset,
+	.fp_reset = sun6i_platform_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = sunxi_platform_uart_freq,
+	.fp_uart_freq = sunxi_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(sun50i_a64, "allwinner,sun50i-a64", &sun50i_platform);
+FDT_PLATFORM(sun50i_a64, "allwinner,sun50i-a64", &sun50i_platform);
-ARM_PLATFORM(sun50i_h5, "allwinner,sun50i-h5", &sun50i_platform);
+FDT_PLATFORM(sun50i_h5, "allwinner,sun50i-h5", &sun50i_platform);
-static const struct arm_platform sun50i_h6_platform = {
+static const struct fdt_platform sun50i_h6_platform = {
-	.ap_devmap = sunxi_platform_devmap,
+	.fp_devmap = sunxi_platform_devmap,
-	.ap_bootstrap = sun50i_h6_platform_bootstrap,
+	.fp_bootstrap = sun50i_h6_platform_bootstrap,
-	.ap_init_attach_args = sunxi_platform_init_attach_args,
+	.fp_init_attach_args = sunxi_platform_init_attach_args,
-	.ap_device_register = sunxi_platform_device_register,
+	.fp_device_register = sunxi_platform_device_register,
-	.ap_reset = sun50i_h6_platform_reset,
+	.fp_reset = sun50i_h6_platform_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = sunxi_platform_uart_freq,
+	.fp_uart_freq = sunxi_platform_uart_freq,
-	.ap_mpstart = arm_fdt_cpu_mpstart,
+	.fp_mpstart = arm_fdt_cpu_mpstart,
 };
-ARM_PLATFORM(sun50i_h6, "allwinner,sun50i-h6", &sun50i_h6_platform);
+FDT_PLATFORM(sun50i_h6, "allwinner,sun50i-h6", &sun50i_h6_platform);

 @@ -1,14 +1,14 @@
-/* $NetBSD: omap3_platform.c,v 1.7 2021/04/24 23:36:29 thorpej Exp $ */
+/* $NetBSD: omap3_platform.c,v 1.8 2023/04/07 08:55:30 skrll Exp $ */
 /*-
  * Copyright (c) 2019 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,35 +20,36 @@
  * 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_soc.h"
 #include "opt_console.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.7 2021/04/24 23:36:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap3_platform.c,v 1.8 2023/04/07 08:55:30 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootconfig.h>
 #include <arm/cpufunc.h>
 #include <dev/ic/ns16550reg.h>
 #include <dev/ic/comreg.h>
 #include <evbarm/fdt/platform.h>
 #include <evbarm/fdt/machdep.h>
 @@ -175,24 +176,24 @@ omap3_platform_delay(u_int n)
 	long ticks = howmany(n * 32768, 1000000);
 	prev = *cr;
 	while (ticks > 0) {
 		cur = *cr;
 		if (cur >= prev)
 			ticks -= (cur - prev);
 		else
 			ticks -= (UINT32_MAX - cur + prev);
 		prev = cur;
+	}
+}
-static const struct arm_platform omap3_platform = {
+static const struct fdt_platform omap3_platform = {
-	.ap_devmap = omap3_platform_devmap,
+	.fp_devmap = omap3_platform_devmap,
-	.ap_bootstrap = arm_fdt_cpu_bootstrap,
+	.fp_bootstrap = arm_fdt_cpu_bootstrap,
-	.ap_init_attach_args = omap3_platform_init_attach_args,
+	.fp_init_attach_args = omap3_platform_init_attach_args,
-	.ap_device_register = omap3_platform_device_register,
+	.fp_device_register = omap3_platform_device_register,
-	.ap_reset = omap3_platform_reset,
+	.fp_reset = omap3_platform_reset,
-	.ap_delay = omap3_platform_delay,
+	.fp_delay = omap3_platform_delay,
-	.ap_uart_freq = omap3_platform_uart_freq,
+	.fp_uart_freq = omap3_platform_uart_freq,
 };
-ARM_PLATFORM(omap3, "ti,omap3", &omap3_platform);
+FDT_PLATFORM(omap3, "ti,omap3", &omap3_platform);

 @@ -1,14 +1,14 @@
-/* $NetBSD: vexpress_platform.c,v 1.22 2021/04/24 23:36:29 thorpej Exp $ */
+/* $NetBSD: vexpress_platform.c,v 1.23 2023/04/07 08:55:31 skrll 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,27 +20,27 @@
  * 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 "opt_console.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.22 2021/04/24 23:36:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vexpress_platform.c,v 1.23 2023/04/07 08:55:31 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <sys/termios.h>
 #include <dev/fdt/fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootconfig.h>
 #include <arm/cpufunc.h>
 @@ -205,25 +205,25 @@ vexpress_platform_reset(void)
 	SYSREG_WRITE(SYS_CFGCTRL,
 	    SYS_CFGCTRL_START |
 	    SYS_CFGCTRL_WRITE |
 	    __SHIFTIN(SYS_CFGCTRL_FUNCTION_REBOOT,
 		      SYS_CFGCTRL_FUNCTION));
+}
 static u_int
 vexpress_platform_uart_freq(void)
+{
 	return VEXPRESS_REF_FREQ;
+}
-static const struct arm_platform vexpress_platform = {
+static const struct fdt_platform vexpress_platform = {
-	.ap_devmap = vexpress_platform_devmap,
+	.fp_devmap = vexpress_platform_devmap,
-	.ap_bootstrap = vexpress_platform_bootstrap,
+	.fp_bootstrap = vexpress_platform_bootstrap,
-	.ap_mpstart = vexpress_a15_smp_init,
+	.fp_mpstart = vexpress_a15_smp_init,
-	.ap_init_attach_args = vexpress_platform_init_attach_args,
+	.fp_init_attach_args = vexpress_platform_init_attach_args,
-	.ap_device_register = vexpress_platform_device_register,
+	.fp_device_register = vexpress_platform_device_register,
-	.ap_reset = vexpress_platform_reset,
+	.fp_reset = vexpress_platform_reset,
-	.ap_delay = gtmr_delay,
+	.fp_delay = gtmr_delay,
-	.ap_uart_freq = vexpress_platform_uart_freq,
+	.fp_uart_freq = vexpress_platform_uart_freq,
 };
-ARM_PLATFORM(vexpress, "arm,vexpress", &vexpress_platform);
+FDT_PLATFORM(vexpress, "arm,vexpress", &vexpress_platform);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: zynq_platform.c,v 1.10 2022/10/31 22:23:38 jmcneill Exp $	*/
+/*	$NetBSD: zynq_platform.c,v 1.11 2023/04/07 08:55:31 skrll Exp $	*/
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * 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.
 @@ -25,27 +25,27 @@
  * 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_console.h"
 #include "opt_soc.h"
 #include "arml2cc.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.10 2022/10/31 22:23:38 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.11 2023/04/07 08:55:31 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/device.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bootconfig.h>
 @@ -242,28 +242,28 @@ zynq_platform_bootstrap(void)
+	}
+}
 static void
 zynq_platform_reset(void)
+{
 	bus_space_tag_t bst = &arm_generic_bs_tag;
 	bus_space_handle_t bsh = ZYNQ_SLCR_VBASE;
 	bus_space_write_4(bst, bsh, SLCR_UNLOCK, UNLOCK_KEY);
 	bus_space_write_4(bst, bsh, PSS_RST_CTRL, SOFT_RST);
+}
-static const struct arm_platform zynq_platform = {
+static const struct fdt_platform zynq_platform = {
-	.ap_devmap = zynq_platform_devmap,
+	.fp_devmap = zynq_platform_devmap,
-	.ap_bootstrap = zynq_platform_bootstrap,
+	.fp_bootstrap = zynq_platform_bootstrap,
-	.ap_init_attach_args = zynq_platform_init_attach_args,
+	.fp_init_attach_args = zynq_platform_init_attach_args,
-	.ap_device_register = zynq_platform_device_register,
+	.fp_device_register = zynq_platform_device_register,
-	.ap_reset = zynq_platform_reset,
+	.fp_reset = zynq_platform_reset,
-	.ap_delay = a9tmr_delay,
+	.fp_delay = a9tmr_delay,
-	.ap_uart_freq = zynq_platform_uart_freq,
+	.fp_uart_freq = zynq_platform_uart_freq,
 #ifdef MULTIPROCESSOR
-	.ap_mpstart = zynq_platform_mpstart,
+	.fp_mpstart = zynq_platform_mpstart,
 #endif
 };
-ARM_PLATFORM(zynq, "xlnx,zynq-7000", &zynq_platform);
+FDT_PLATFORM(zynq, "xlnx,zynq-7000", &zynq_platform);

 @@ -1,14 +1,14 @@
-/* $NetBSD: fdt_bus_machdep.c,v 1.2 2022/10/15 11:07:39 jmcneill Exp $ */
+/* $NetBSD: fdt_bus_machdep.c,v 1.3 2023/04/07 08:55:31 skrll Exp $ */
 /*-
  * Copyright (c) 2021 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.
 @@ -17,52 +17,53 @@
  * 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(0, "$NetBSD: fdt_bus_machdep.c,v 1.2 2022/10/15 11:07:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_bus_machdep.c,v 1.3 2023/04/07 08:55:31 skrll Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kmem.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 extern struct bus_space arm_generic_bs_tag;
 static int
 nonposted_mmio_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flag,
     bus_space_handle_t *bshp)
+{
 	if (flag == 0) {
 		flag |= BUS_SPACE_MAP_NONPOSTED;
+	}
 	return bus_space_map(&arm_generic_bs_tag, bpa, size, flag, bshp);
+}
 bus_space_tag_t
 fdtbus_bus_tag_create(int phandle, uint32_t flags)
+{
-	const struct arm_platform *plat = arm_fdt_platform();
+	const struct fdt_platform *plat = fdt_platform_find();
 	struct bus_space *tagp;
 	struct fdt_attach_args faa;
-	plat->ap_init_attach_args(&faa);
+	plat->fp_init_attach_args(&faa);
 	tagp = kmem_alloc(sizeof(*tagp), KM_SLEEP);
 	*tagp = *faa.faa_bst;
 	if ((flags & FDT_BUS_SPACE_FLAG_NONPOSTED_MMIO) != 0) {
 		tagp->bs_map = nonposted_mmio_bs_map;
+	}
 	return tagp;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: fdt_machdep.c,v 1.101 2023/03/05 22:04:54 mlelstv Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.102 2023/04/07 08:55:31 skrll Exp $ */
 /*-
  * Copyright (c) 2015-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.
 @@ -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(0, "$NetBSD: fdt_machdep.c,v 1.101 2023/03/05 22:04:54 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.102 2023/04/07 08:55:31 skrll Exp $");
 #include "opt_arm_debug.h"
 #include "opt_bootconfig.h"
 #include "opt_cpuoptions.h"
 #include "opt_ddb.h"
 #include "opt_efi.h"
 #include "opt_machdep.h"
 #include "opt_md.h"
 #include "opt_multiprocessor.h"
 #include "genfb.h"
 #include "ukbd.h"
 #include "wsdisplay.h"
 @@ -82,26 +82,28 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep.
 #include <ddb/db_sym.h>
 #include <ddb/db_extern.h>
 #include <machine/bootconfig.h>
 #include <arm/armreg.h>
 #include <arm/cpufunc.h>
 #include <evbarm/include/autoconf.h>
 #include <evbarm/fdt/machdep.h>
 #include <evbarm/fdt/platform.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <dev/fdt/fdtvar.h>
 #include <dev/fdt/fdt_private.h>
 #include <dev/fdt/fdt_memory.h>
 #ifdef EFI_RUNTIME
 #include <arm/arm/efi_runtime.h>
 #endif
 #if NWSDISPLAY > 0 && NGENFB > 0
 #include <arm/fdt/arm_simplefb.h>
 #endif
 #if NUKBD > 0
 #include <dev/usb/ukbdvar.h>
 @@ -479,76 +481,76 @@ fdt_map_efi_runtime(const char *prop, en
 		VPRINTF("%s: %s %#" PRIxPADDR "-%#" PRIxVADDR " (%#" PRIxVADDR
 		    "-%#" PRIxVSIZE ")\n", __func__, prop, pa, pa + sz - 1,
 		    va, va + sz - 1);
 		arm_efirt_md_map_range(va, pa, sz, type);
 		map += 3;
 		len -= 24;
+	}
+}
 #endif
 vaddr_t
 initarm(void *arg)
+{
-	const struct arm_platform *plat;
+	const struct fdt_platform *plat;
 	uint64_t memory_start, memory_end;
 	/* set temporally to work printf()/panic() even before consinit() */
 	cn_tab = &earlycons;
 	/* Load FDT */
 	int error = fdt_check_header(fdt_addr_r);
 	if (error != 0)
 		panic("fdt_check_header failed: %s", fdt_strerror(error));
 	/* If the DTB is too big, try to pack it in place first. */
 	if (fdt_totalsize(fdt_addr_r) > sizeof(fdt_data))
 		(void)fdt_pack(__UNCONST(fdt_addr_r));
 	error = fdt_open_into(fdt_addr_r, fdt_data, sizeof(fdt_data));
 	if (error != 0)
 		panic("fdt_move failed: %s", fdt_strerror(error));
 	fdtbus_init(fdt_data);
 	/* Lookup platform specific backend */
-	plat = arm_fdt_platform();
+	plat = fdt_platform_find();
 	if (plat == NULL)
 		panic("Kernel does not support this device");
 	/* Early console may be available, announce ourselves. */
 	VPRINTF("FDT<%p>\n", fdt_addr_r);
 	const int chosen = OF_finddevice("/chosen");
 	if (chosen >= 0)
 		OF_getprop(chosen, "bootargs", bootargs, sizeof(bootargs));
 	boot_args = bootargs;
 	/* Heads up ... Setup the CPU / MMU / TLB functions. */
 	VPRINTF("cpufunc\n");
 	if (set_cpufuncs())
 		panic("cpu not recognized!");
 	/*
 	 * Memory is still identity/flat mapped this point so using ttbr for
 	 * l1pt VA is fine
 	 */
-	VPRINTF("devmap %p\n", plat->ap_devmap());
+	VPRINTF("devmap %p\n", plat->fp_devmap());
 	extern char ARM_BOOTSTRAP_LxPT[];
-	pmap_devmap_bootstrap((vaddr_t)ARM_BOOTSTRAP_LxPT, plat->ap_devmap());
+	pmap_devmap_bootstrap((vaddr_t)ARM_BOOTSTRAP_LxPT, plat->fp_devmap());
 	VPRINTF("bootstrap\n");
-	plat->ap_bootstrap();
+	plat->fp_bootstrap();
 	/*
 	 * If stdout-path is specified on the command line, override the
 	 * value in /chosen/stdout-path before initializing console.
 	 */
 	VPRINTF("stdout\n");
 	fdt_update_stdout_path();
 #if BYTE_ORDER == BIG_ENDIAN
 	/*
 	 * Most boards are configured to little-endian mode initially, and
 	 * switched to big-endian mode after kernel is loaded. In this case,
 	 * framebuffer seems byte-swapped to CPU. Override FDT to let
 @@ -627,28 +629,28 @@ initarm(void *arg)
 	/* Populate fdt_physmem / nfdt_physmem for initarm_common */
 	fdt_memory_foreach(fdt_add_boot_physmem, &memory_size);
 	vaddr_t sp = initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, fdt_physmem,
 	     nfdt_physmem);
 	/*
 	 * initarm_common flushes cache if required before AP start
 	 */
 	error = 0;
 	if ((boothowto & RB_MD1) == 0) {
 		VPRINTF("mpstart\n");
-		if (plat->ap_mpstart)
+		if (plat->fp_mpstart)
-			error = plat->ap_mpstart();
+			error = plat->fp_mpstart();
+	}
 	if (error)
 		return sp;
 	/*
 	 * Now we have APs started the pages used for stacks and L1PT can
 	 * be given to uvm
 	 */
 	extern char const __start__init_memory[];
 	extern char const __stop__init_memory[] __weak;
 	if (__start__init_memory != __stop__init_memory) {
 @@ -686,66 +688,66 @@ fdt_update_stdout_path(void)
 	if (stdout_path_len >= sizeof(buf))
 		return;
 	strncpy(buf, stdout_path, stdout_path_len);
 	buf[stdout_path_len] = '\0';
 	fdt_setprop(fdt_data, chosen_off, "stdout-path",
 	    buf, stdout_path_len + 1);
+}
 void
 consinit(void)
+{
 	static bool initialized = false;
-	const struct arm_platform *plat = arm_fdt_platform();
+	const struct fdt_platform *plat = fdt_platform_find();
 	const struct fdt_console *cons = fdtbus_get_console();
 	struct fdt_attach_args faa;
 	u_int uart_freq = 0;
 	if (initialized || cons == NULL)
 		return;
-	plat->ap_init_attach_args(&faa);
+	plat->fp_init_attach_args(&faa);
 	faa.faa_phandle = fdtbus_get_stdout_phandle();
-	if (plat->ap_uart_freq != NULL)
+	if (plat->fp_uart_freq != NULL)
-		uart_freq = plat->ap_uart_freq();
+		uart_freq = plat->fp_uart_freq();
 	cons->consinit(&faa, uart_freq);
 	initialized = true;
+}
 void
 cpu_startup_hook(void)
+{
 #ifdef EFI_RUNTIME
 	fdt_map_efi_runtime("netbsd,uefi-runtime-code", ARM_EFIRT_MEM_CODE);
 	fdt_map_efi_runtime("netbsd,uefi-runtime-data", ARM_EFIRT_MEM_DATA);
 	fdt_map_efi_runtime("netbsd,uefi-runtime-mmio", ARM_EFIRT_MEM_MMIO);
 #endif
 	fdtbus_intr_init();
 	fdt_setup_rndseed();
 	fdt_setup_efirng();
+}
 void
 delay(u_int us)
+{
-	const struct arm_platform *plat = arm_fdt_platform();
+	const struct fdt_platform *plat = fdt_platform_find();
-	plat->ap_delay(us);
+	plat->fp_delay(us);
+}
 static void
 fdt_detect_root_device(device_t dev)
+{
 	int error, len;
 	const int chosen = OF_finddevice("/chosen");
 	if (chosen < 0)
 		return;
 	if (of_hasprop(chosen, "netbsd,mbr") &&
 	    of_hasprop(chosen, "netbsd,partition")) {
 @@ -839,49 +841,49 @@ fdt_detect_root_device(device_t dev)
 					booted_device = dv;
 				break;
+			}
+		}
 		pserialize_read_exit(s);
 		return;
+	}
+}
 static void
 fdt_device_register(device_t self, void *aux)
+{
-	const struct arm_platform *plat = arm_fdt_platform();
+	const struct fdt_platform *plat = fdt_platform_find();
 	if (device_is_a(self, "armfdt")) {
 		fdt_setup_initrd();
 #if NWSDISPLAY > 0 && NGENFB > 0
 		/*
 		 * Setup framebuffer console, if present.
 		 */
 		arm_simplefb_preattach();
 #endif
+	}
 #if NWSDISPLAY > 0 && NGENFB > 0
 	if (device_is_a(self, "genfb")) {
 		prop_dictionary_t dict = device_properties(self);
 		prop_dictionary_set_uint64(dict,
 		    "simplefb-physaddr", arm_simplefb_physaddr());
+	}
 #endif
-	if (plat && plat->ap_device_register)
+	if (plat && plat->fp_device_register)
-		plat->ap_device_register(self, aux);
+		plat->fp_device_register(self, aux);
+}
 static void
 fdt_device_register_post_config(device_t self, void *aux)
+{
 #if NUKBD > 0 && NWSDISPLAY > 0
 	if (device_is_a(self, "wsdisplay")) {
 		struct wsdisplay_softc *sc = device_private(self);
 		if (wsdisplay_isconsole(sc))
 			ukbd_cnattach();
+	}
 #endif
+}
 @@ -900,32 +902,32 @@ fdt_cpu_rootconf(void)
 			continue;
 		fdt_detect_root_device(dev);
 		if (booted_device != NULL)
 			break;
+	}
 	deviter_release(&di);
+}
 static void
 fdt_reset(void)
+{
-	const struct arm_platform *plat = arm_fdt_platform();
+	const struct fdt_platform *plat = fdt_platform_find();
 	fdtbus_power_reset();
-	if (plat && plat->ap_reset)
+	if (plat && plat->fp_reset)
-		plat->ap_reset();
+		plat->fp_reset();
+}
 static void
 fdt_powerdown(void)
+{
 	fdtbus_power_poweroff();
+}
 #if BYTE_ORDER == BIG_ENDIAN
 static void
 fdt_update_fb_format(void)
+{
 	int off, len;

 @@ -1,14 +1,14 @@
-/* $NetBSD: fdtvar.h,v 1.77 2022/03/04 08:19:06 skrll Exp $ */
+/* $NetBSD: fdtvar.h,v 1.78 2023/04/07 08:55:31 skrll Exp $ */
 /*-
  * Copyright (c) 2015 Jared D. 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.
 @@ -296,26 +296,64 @@ struct fdt_opp_info {
 #define	_FDT_OPP_REGISTER(name)		\
 	__link_set_add_rodata(fdt_opps, __CONCAT(name,_oppinfo));
 #define	FDT_OPP(_name, _compat, _suppfn)				\
 static const struct fdt_opp_info __CONCAT(_name,_oppinfo) = {		\
 	.opp_compat = (_compat),					\
 	.opp_supported = (_suppfn)					\
 };									\
 _FDT_OPP_REGISTER(_name)
 TAILQ_HEAD(fdt_conslist, fdt_console_info);
 /*
  * Platform-specific data
  */
 struct fdt_platform {
 	const struct pmap_devmap *
 				(*fp_devmap)(void);
 	void			(*fp_bootstrap)(void);
 	int			(*fp_mpstart)(void);
 	void			(*fp_startup)(void);
 	void			(*fp_init_attach_args)(struct fdt_attach_args *);
 	void			(*fp_device_register)(device_t, void *);
 	void			(*fp_reset)(void);
 	void			(*fp_delay)(u_int);
 	u_int			(*fp_uart_freq)(void);
 };
 struct fdt_platform_info {
 	const char *			fpi_compat;
 	const struct fdt_platform *	fpi_ops;
 };
 #define FDT_PLATFORM_DEFAULT		""
 #define _FDT_PLATFORM_REGISTER(name)	\
 	__link_set_add_rodata(fdt_platforms, __CONCAT(name,_platinfo));
 #define FDT_PLATFORM(_name, _compat, _ops)				\
 static const struct fdt_platform_info __CONCAT(_name,_platinfo) = {	\
 	.fpi_compat = (_compat),					\
 	.fpi_ops = (_ops)						\
 };									\
 _FDT_PLATFORM_REGISTER(_name)
 const struct fdt_platform *
 		fdt_platform_find(void);
 struct fdt_dma_range {
 	paddr_t		dr_sysbase;
 	bus_addr_t	dr_busbase;
 	bus_size_t	dr_len;
 };
 #define	FDT_BUS_SPACE_FLAG_NONPOSTED_MMIO	__BIT(0)
 int		fdtbus_register_clock_controller(device_t, int,
 		    const struct fdtbus_clock_controller_func *);
 int		fdtbus_register_dai_controller(device_t, int,
 		    const struct fdtbus_dai_controller_func *);
 int		fdtbus_register_dma_controller(device_t, int,

 @@ -1,14 +1,14 @@
-# $NetBSD: files.fdt,v 1.66 2022/11/05 17:31:37 jmcneill Exp $
+# $NetBSD: files.fdt,v 1.67 2023/04/07 08:55:31 skrll Exp $
 include	"external/bsd/libfdt/conf/files.libfdt"
 defflag	opt_fdt.h				FDTBASE : libfdt, ofw_subr
 defflag	opt_fdt.h				FDT: FDTBASE
 defparam opt_fdt.h				FDT_MEMORY_RANGES
 defparam opt_fdt.h				FDT_DEFAULT_STDOUT_PATH
 define	fdt { [pass = 10] } : clk, pwm
 device	simplebus: fdt
 attach	simplebus at fdt
 file	dev/fdt/fdtbus.c			fdt
 @@ -58,26 +58,27 @@ file	dev/fdt/fdt_panel.c			panel_fdt
 makeoptions	panel_fdt	"CPPFLAGS.panel_fdt"+="${CPPFLAGS.drmkms}"
 device	dispcon: fdt_port, drmkms, ddc_read_edid
 attach	dispcon at fdt with dispcon_hdmi
 file	dev/fdt/hdmi_connector.c		dispcon_hdmi
 makeoptions	dispcon_hdmi	"CPPFLAGS.dispcon_hdmi"+="${CPPFLAGS.drmkms}"
 device	iicmux: i2cbus, i2cmux
 attach	iicmux at fdt with iicmux_fdt
 file	dev/fdt/i2cmux_fdt.c			iicmux_fdt
 file	dev/fdt/fdt_memory.c			fdtbase
 file	dev/fdt/fdt_openfirm.c			fdtbase
 file	dev/fdt/fdt_platform.c			fdtbase
 file	dev/fdt/fdt_subr.c			fdtbase
 file	dev/fdt/fdt_clock.c			fdt
 file	dev/fdt/fdt_dai.c			fdt
 file	dev/fdt/fdt_dma.c			fdt
 file	dev/fdt/fdt_ddb.c			fdt & ddb
 file	dev/fdt/fdt_gpio.c			fdt
 file	dev/fdt/fdt_i2c.c			fdt
 file	dev/fdt/fdt_iommu.c			fdt
 file	dev/fdt/fdt_intr.c			fdt
 file	dev/fdt/fdt_mbox.c			fdt
 file	dev/fdt/fdt_mmc_pwrseq.c		fdt
 file	dev/fdt/fdt_phy.c			fdt

 @@ -1,23 +1,24 @@
-/* $NetBSD: am3_platform.c,v 1.3 2020/09/28 11:54:23 jmcneill Exp $ */
+/* $NetBSD: am3_platform.c,v 1.4 2023/04/07 08:55:30 skrll Exp $ */
 #include "opt_console.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: am3_platform.c,v 1.3 2020/09/28 11:54:23 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: am3_platform.c,v 1.4 2023/04/07 08:55:30 skrll Exp $");
 #include <sys/param.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/fdt/arm_fdtvar.h>
 #include <uvm/uvm_extern.h>
 #include <dev/ic/comreg.h>
 #include <machine/vmparam.h>
 #include <arch/evbarm/fdt/platform.h>
 extern struct bus_space armv7_generic_bs_tag;
 extern struct arm32_bus_dma_tag arm_generic_dma_tag;
 void am33xx_platform_early_putchar(char);
 @@ -127,23 +128,23 @@ am33xx_platform_delay(u_int n)
 			ticks -= (UINT32_MAX - cur + prev);
 		prev = cur;
+	}
+}
 static void
 am33xx_platform_reset(void)
+{
 	volatile uint32_t *resetaddr = (volatile uint32_t *)(KERNEL_IO_VBASE | 0x04e00f00);
 	*resetaddr = 1;
+}
-static const struct arm_platform am33xx_platform = {
+static const struct fdt_platform am33xx_platform = {
-	.ap_devmap = am33xx_platform_devmap,
+	.fp_devmap = am33xx_platform_devmap,
-	.ap_init_attach_args = am33xx_platform_init_attach_args,
+	.fp_init_attach_args = am33xx_platform_init_attach_args,
-	.ap_bootstrap = am33xx_platform_bootstrap,
+	.fp_bootstrap = am33xx_platform_bootstrap,
-	.ap_uart_freq = am33xx_platform_uart_freq,
+	.fp_uart_freq = am33xx_platform_uart_freq,
-	.ap_delay = am33xx_platform_delay,
+	.fp_delay = am33xx_platform_delay,
-	.ap_reset = am33xx_platform_reset,
+	.fp_reset = am33xx_platform_reset,
 };
-ARM_PLATFORM(am33xx, "ti,am33xx", &am33xx_platform);
+FDT_PLATFORM(am33xx, "ti,am33xx", &am33xx_platform);