Thu Oct 4 08:58:13 2018 UTC ()

fix to boot APs of RPI3 with GENERIC64.
if no psci, try other methods.


(ryo)

diff -r1.14 -r1.15 src/sys/arch/arm/fdt/cpu_fdt.c

--- src/sys/arch/arm/fdt/cpu_fdt.c 2018/09/13 12:53:00	1.14
+++ src/sys/arch/arm/fdt/cpu_fdt.c 2018/10/04 08:58:13	1.15

 @@ -1,14 +1,14 @@
-/* $NetBSD: cpu_fdt.c,v 1.14 2018/09/13 12:53:00 jmcneill Exp $ */
+/* $NetBSD: cpu_fdt.c,v 1.15 2018/10/04 08:58:13 ryo 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 "psci_fdt.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.14 2018/09/13 12:53:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_fdt.c,v 1.15 2018/10/04 08:58:13 ryo Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/lwp.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <dev/fdt/fdtvar.h>
 #include <arm/armreg.h>
 #include <arm/cpu.h>
 @@ -226,43 +226,46 @@ arm_fdt_cpu_okay(const int child)
 		return true;
+	}
+}
 #endif /* MULTIPROCESSOR */
 void
 arm_fdt_cpu_bootstrap(void)
+{
 #ifdef MULTIPROCESSOR
 	uint64_t mpidr, bp_mpidr;
 	u_int cpuindex;
 	int child, ret;
 	const char *method;
 #if NPSCI_FDT > 0
 	bool nopsci = false;
 #endif
 	const int cpus = OF_finddevice("/cpus");
 	if (cpus == -1) {
 		aprint_error("%s: no /cpus node found\n", __func__);
 		arm_cpu_max = 1;
 		return;
+	}
 	/* Count CPUs */
 	arm_cpu_max = 0;
 	for (child = OF_child(cpus); child; child = OF_peer(child))
 		if (arm_fdt_cpu_okay(child))
 			arm_cpu_max++;
 #if NPSCI_FDT > 0
 	if (psci_fdt_preinit() != 0)
-		return;
+		nopsci = true;
 #endif
 	/* MPIDR affinity levels of boot processor. */
 	bp_mpidr = cpu_mpidr_aff_read();
 	/* Boot APs */
 	uint32_t started = 0;
 	cpuindex = 1;
 	for (child = OF_child(cpus); child; child = OF_peer(child)) {
 		if (!arm_fdt_cpu_okay(child))
 			continue;
 		if (fdtbus_get_reg64(child, 0, &mpidr, NULL) != 0)
 			continue;
 @@ -289,27 +292,27 @@ arm_fdt_cpu_bootstrap(void)
 			uint64_t data;
 			paddr_t cpu_release_addr;
 			if (OF_getprop(child, "cpu-release-addr", &data,
 			    sizeof(data)) != sizeof(data))
 				continue;
 			cpu_release_addr = (paddr_t)be64toh(data);
 			ret = spintable_cpu_on(mpidr, cpu_fdt_mpstart_pa(), cpu_release_addr);
 			if (ret != 0)
 				continue;
 #if NPSCI_FDT > 0
-		} else if (strcmp(method, "psci") == 0) {
+		} else if (!nopsci && (strcmp(method, "psci") == 0)) {
 			ret = psci_cpu_on(mpidr, cpu_fdt_mpstart_pa(), 0);
 			if (ret != PSCI_SUCCESS)
 				continue;
 #endif
 		} else {
 			aprint_error("%s: %s: unsupported method\n", __func__, method);
 			continue;
+		}
 		started |= __BIT(cpuindex);
 		cpuindex++;
+	}