diff --git a/sys/arm/qemu/virt_machdep.c b/sys/arm/qemu/virt_machdep.c index 72ed0fae0e4..dc8e4fcba86 100644 --- a/sys/arm/qemu/virt_machdep.c +++ b/sys/arm/qemu/virt_machdep.c @@ -60,7 +60,6 @@ static platform_method_t virt_methods[] = { #ifdef SMP PLATFORMMETHOD(platform_mp_start_ap, virt_mp_start_ap), - PLATFORMMETHOD(platform_mp_setmaxid, virt_mp_setmaxid), #endif PLATFORMMETHOD_END, diff --git a/sys/arm/qemu/virt_mp.c b/sys/arm/qemu/virt_mp.c index 855ec129477..12a957caa89 100644 --- a/sys/arm/qemu/virt_mp.c +++ b/sys/arm/qemu/virt_mp.c @@ -49,27 +49,6 @@ __FBSDID("$FreeBSD$"); static int running_cpus; -static boolean_t -virt_maxid(u_int id, phandle_t node, u_int addr_cells, pcell_t *reg) -{ - - if (mp_maxid < id) - mp_maxid = id; - - return (true); -} - -void -virt_mp_setmaxid(platform_t plat) -{ - - mp_maxid = PCPU_GET(cpuid); - mp_ncpus = ofw_cpu_early_foreach(virt_maxid, true); - if (mp_ncpus < 1) - mp_ncpus = 1; - mp_ncpus = MIN(mp_ncpus, MAXCPU); -} - static boolean_t virt_start_ap(u_int id, phandle_t node, u_int addr_cells, pcell_t *reg) { diff --git a/sys/dev/fdt/fdt_arm_platform.c b/sys/dev/fdt/fdt_arm_platform.c index fe1f4046168..bc761f6c231 100644 --- a/sys/dev/fdt/fdt_arm_platform.c +++ b/sys/dev/fdt/fdt_arm_platform.c @@ -30,12 +30,14 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include #include +#include #include #include "platform_if.h" @@ -43,6 +45,10 @@ __FBSDID("$FreeBSD$"); #define FDT_PLATFORM(plat) \ ((fdt_platform_def_t *)(plat)->cls->baseclasses[0]) +#if defined(SMP) +static platform_mp_setmaxid_t fdt_platform_mp_setmaxid; +#endif + static int fdt_platform_probe(platform_t plat) { @@ -66,8 +72,36 @@ fdt_platform_probe(platform_t plat) return 1; } +#if defined(SMP) +static boolean_t +fdt_platform_maxid(u_int id, phandle_t node, u_int addr_cells, pcell_t *reg) +{ + + if (mp_maxid < id) + mp_maxid = id; + + return (true); +} + +static void +fdt_platform_mp_setmaxid(platform_t plat) +{ + + mp_maxid = PCPU_GET(cpuid); + mp_ncpus = ofw_cpu_early_foreach(fdt_platform_maxid, true); + if (mp_ncpus < 1) + mp_ncpus = 1; + mp_ncpus = MIN(mp_ncpus, MAXCPU); +} +#endif + platform_method_t fdt_platform_methods[] = { PLATFORMMETHOD(platform_probe, fdt_platform_probe), + +#if defined(SMP) + PLATFORMMETHOD(platform_mp_setmaxid, fdt_platform_mp_setmaxid), +#endif + PLATFORMMETHOD_END };