 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu_subr.c,v 1.52 2020/07/20 10:53:47 skrll Exp $	*/
+/*	$NetBSD: cpu_subr.c,v 1.53 2020/07/20 14:19:41 jmcneill Exp $	*/
 /*-
  * Copyright (c) 2010, 2019 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matt Thomas of 3am Software Foundry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.52 2020/07/20 10:53:47 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.53 2020/07/20 14:19:41 jmcneill Exp $");
 #include "opt_cputype.h"
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/atomic.h>
 #include <sys/device.h>
 #include <sys/lwp.h>
 #include <sys/proc.h>
 @@ -65,26 +65,28 @@ __KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v
 #if defined(DDB) || defined(KGDB)
 #ifdef DDB
 #include <mips/db_machdep.h>
 #include <ddb/db_command.h>
 #include <ddb/db_output.h>
 #endif
 #endif
 #ifdef MIPS64_OCTEON
 #include <mips/cavium/octeonvar.h>
 extern struct cpu_softc octeon_cpu_softc[];
 #endif
 static kmutex_t cpu_hatch_lock;
 struct cpu_info cpu_info_store
 #if defined(MULTIPROCESSOR) && !defined(MIPS64_OCTEON)
 	__section(".data1")
 	__aligned(1LU << ilog2((2*sizeof(struct cpu_info)-1)))
 #endif
     = {
 	.ci_curlwp = &lwp0,
 	.ci_tlb_info = &pmap_tlb0_info,
 	.ci_pmap_kern_segtab = &pmap_kern_segtab,
 	.ci_pmap_user_segtab = NULL,
 #ifdef _LP64
 	.ci_pmap_user_seg0tab = NULL,
 #endif
 @@ -939,67 +941,71 @@ cpu_hatch(struct cpu_info *ci)
 	/*
 	 * initialize the MIPS count/compare clock
 	 */
 	mips3_cp0_count_write(ci->ci_data.cpu_cc_skew);
 	KASSERT(ci->ci_cycles_per_hz != 0);
 	ci->ci_next_cp0_clk_intr = ci->ci_data.cpu_cc_skew + ci->ci_cycles_per_hz;
 	mips3_cp0_compare_write(ci->ci_next_cp0_clk_intr);
 	ci->ci_data.cpu_cc_skew = 0;
 	/*
 	 * Let this CPU do its own post-running initialization
 	 * (for things that have to be done on the local CPU).
 	 */
 	mutex_enter(&cpu_hatch_lock);
 	(*mips_locoresw.lsw_cpu_run)(ci);
 	mutex_exit(&cpu_hatch_lock);
 	/*
 	 * Now turn on interrupts (and verify they are on).
 	 */
 	spl0();
 	KASSERTMSG(ci->ci_cpl == IPL_NONE, "cpl %d", ci->ci_cpl);
 	KASSERT(mips_cp0_status_read() & MIPS_SR_INT_IE);
 	kcpuset_atomic_set(pmap_kernel()->pm_onproc, cpu_index(ci));
 	kcpuset_atomic_set(pmap_kernel()->pm_active, cpu_index(ci));
 	/*
 	 * And do a tail call to idle_loop
 	 */
 	idle_loop(NULL);
+}
 void
 cpu_boot_secondary_processors(void)
+{
 	CPU_INFO_ITERATOR cii;
 	struct cpu_info *ci;
 	mutex_init(&cpu_hatch_lock, MUTEX_DEFAULT, IPL_HIGH);
 	for (CPU_INFO_FOREACH(cii, ci)) {
 		if (CPU_IS_PRIMARY(ci))
 			continue;
 		KASSERT(ci->ci_data.cpu_idlelwp);
 		/*
 		 * Skip this CPU if it didn't successfully hatch.
 		 */
 		if (!kcpuset_isset(cpus_hatched, cpu_index(ci)))
 			continue;
 		ci->ci_data.cpu_cc_skew = mips3_cp0_count_read();
 		atomic_or_ulong(&ci->ci_flags, CPUF_RUNNING);
 		kcpuset_set(cpus_running, cpu_index(ci));
 		// Spin until the cpu calls idle_loop
-		for (u_int i = 0; i < 100; i++) {
+		for (u_int i = 0; i < 10000; i++) {
-			if (kcpuset_isset(cpus_running, cpu_index(ci)))
+			if (kcpuset_isset(kcpuset_running, cpu_index(ci)))
 				break;
 			delay(1000);
+		}
+	}
+}
 void
 xc_send_ipi(struct cpu_info *ci)
+{
 	(*mips_locoresw.lsw_send_ipi)(ci, IPI_XCALL);
+}