 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.h,v 1.120 2016/07/16 01:59:05 macallan Exp $	*/
+/*	$NetBSD: cpu.h,v 1.121 2016/10/31 12:49:04 skrll Exp $	*/
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Ralph Campbell and Rick Macklem.
+ *
  * 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.
 @@ -140,26 +140,29 @@ struct cpu_info {
 	uint32_t ci_ksp_tlb_slot;	/* tlb entry for kernel stack */
 	struct evcnt ci_evcnt_all_ipis;	/* aggregated IPI counter */
 	struct evcnt ci_evcnt_per_ipi[NIPIS];	/* individual IPI counters*/
 	struct evcnt ci_evcnt_synci_activate_rqst;
 	struct evcnt ci_evcnt_synci_onproc_rqst;
 	struct evcnt ci_evcnt_synci_deferred_rqst;
 	struct evcnt ci_evcnt_synci_ipi_rqst;
 #define	CPUF_PRIMARY	0x01		/* CPU is primary CPU */
 #define	CPUF_PRESENT	0x02		/* CPU is present */
 #define	CPUF_RUNNING	0x04		/* CPU is running */
 #define	CPUF_PAUSED	0x08		/* CPU is paused */
 #define	CPUF_USERPMAP	0x20		/* CPU has a user pmap activated */
 	kcpuset_t *ci_multicastcpus;
 	kcpuset_t *ci_watchcpus;
 	kcpuset_t *ci_ddbcpus;
 #endif
 };
 #ifdef MULTIPROCESSOR
 #define	CPU_INFO_ITERATOR		int
 #define	CPU_INFO_FOREACH(cii, ci)	\
     cii = 0, ci = cpu_infos[0]; cii < ncpu && (ci = cpu_infos[cii]) != NULL; cii++
 #else
 #define	CPU_INFO_ITERATOR		int __unused
 #define	CPU_INFO_FOREACH(cii, ci)	\
     ci = &cpu_info_store; ci != NULL; ci = NULL
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu_subr.c,v 1.29 2016/08/23 07:29:46 skrll Exp $	*/
+/*	$NetBSD: cpu_subr.c,v 1.30 2016/10/31 12:49:04 skrll Exp $	*/
 /*-
  * Copyright (c) 2010 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.29 2016/08/23 07:29:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.30 2016/10/31 12:49:04 skrll Exp $");
 #include "opt_ddb.h"
 #include "opt_cputype.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>
 @@ -275,26 +275,30 @@ cpu_attach_common(device_t self, struct
 	    EVCNT_TYPE_MISC, NULL, xname,
 	    "syncicache deferred request");
 	evcnt_attach_dynamic(&ci->ci_evcnt_synci_ipi_rqst,
 	    EVCNT_TYPE_MISC, NULL, xname,
 	    "syncicache ipi request");
 	evcnt_attach_dynamic(&ci->ci_evcnt_synci_onproc_rqst,
 	    EVCNT_TYPE_MISC, NULL, xname,
 	    "syncicache onproc request");
 	/*
 	 * Initialize IPI framework for this cpu instance
 	 */
 	ipi_init(ci);
 	kcpuset_create(&ci->ci_multicastcpus, true);
 	kcpuset_create(&ci->ci_watchcpus, true);
 	kcpuset_create(&ci->ci_ddbcpus, true);
 #endif
+}
 void
 cpu_startup_common(void)
+{
 	vaddr_t minaddr, maxaddr;
 	char pbuf[9];	/* "99999 MB" */
 	pmap_tlb_info_evcnt_attach(&pmap_tlb0_info);
 #ifdef MULTIPROCESSOR
 	kcpuset_create(&cpus_halted, true);
 @@ -649,77 +653,74 @@ cpu_intr_p(void)
 #ifdef MULTIPROCESSOR
 void
 cpu_broadcast_ipi(int tag)
+{
 	// No reason to remove ourselves since multicast_ipi will do that for us
 	cpu_multicast_ipi(cpus_running, tag);
+}
 void
 cpu_multicast_ipi(const kcpuset_t *kcp, int tag)
+{
 	struct cpu_info * const ci = curcpu();
-	kcpuset_t *kcp2;
+	kcpuset_t *kcp2 = ci->ci_multicastcpus;
 	if (kcpuset_match(cpus_running, ci->ci_data.cpu_kcpuset))
 		return;
-	kcpuset_clone(&kcp2, kcp);
+	kcpuset_copy(kcp2, kcp);
 	kcpuset_remove(kcp2, ci->ci_data.cpu_kcpuset);
 	for (cpuid_t cii; (cii = kcpuset_ffs(kcp2)) != 0; ) {
 		kcpuset_clear(kcp2, --cii);
 		(void)cpu_send_ipi(cpu_lookup(cii), tag);
+	}
 	kcpuset_destroy(kcp2);
+}
 int
 cpu_send_ipi(struct cpu_info *ci, int tag)
+{
 	return (*mips_locoresw.lsw_send_ipi)(ci, tag);
+}
 static void
 cpu_ipi_wait(const char *s, const kcpuset_t *watchset, const kcpuset_t *wanted)
+{
 	bool done = false;
-	kcpuset_t *kcp;
+	struct cpu_info * const ci = curcpu();
-	kcpuset_create(&kcp, false);
+	kcpuset_t *kcp = ci->ci_watchcpus;
 	/* some finite amount of time */
 	for (u_long limit = curcpu()->ci_cpu_freq/10; !done && limit--; ) {
 		kcpuset_copy(kcp, watchset);
 		kcpuset_intersect(kcp, wanted);
 		done = kcpuset_match(kcp, wanted);
+	}
 	if (!done) {
 		cpuid_t cii;
 		kcpuset_copy(kcp, wanted);
 		kcpuset_remove(kcp, watchset);
 		if ((cii = kcpuset_ffs(kcp)) != 0) {
 			printf("Failed to %s:", s);
 			do {
 				kcpuset_clear(kcp, --cii);
 				printf(" cpu%lu", cii);
 			} while ((cii = kcpuset_ffs(kcp)) != 0);
 			printf("\n");
+		}
+	}
 	kcpuset_destroy(kcp);
+}
 /*
  * Halt this cpu
  */
 void
 cpu_halt(void)
+{
 	cpuid_t cii = cpu_index(curcpu());
 	printf("cpu%lu: shutting down\n", cii);
 	kcpuset_atomic_set(cpus_halted, cii);
 	spl0();		/* allow interrupts e.g. further ipi ? */
 @@ -787,81 +788,76 @@ cpu_pause(struct reg *regsp)
 #endif
 	} while (false);
 	splx(s);
+}
 /*
  * Pause all running cpus, excluding current cpu.
  */
 void
 cpu_pause_others(void)
+{
 	struct cpu_info * const ci = curcpu();
 	kcpuset_t *kcp;
 	if (cold || kcpuset_match(cpus_running, ci->ci_data.cpu_kcpuset))
 		return;
-	kcpuset_clone(&kcp, cpus_running);
+	kcpuset_t *kcp = ci->ci_ddbcpus;
 	kcpuset_copy(kcp, cpus_running);
 	kcpuset_remove(kcp, ci->ci_data.cpu_kcpuset);
 	kcpuset_remove(kcp, cpus_paused);
 	cpu_broadcast_ipi(IPI_SUSPEND);
 	cpu_ipi_wait("pause", cpus_paused, kcp);
 	kcpuset_destroy(kcp);
+}
 /*
  * Resume a single cpu
  */
 void
 cpu_resume(cpuid_t cii)
+{
 	kcpuset_t *kcp;
 	if (__predict_false(cold))
 		return;
-	kcpuset_create(&kcp, true);
+	struct cpu_info * const ci = curcpu();
 	kcpuset_t *kcp = ci->ci_ddbcpus;
 	kcpuset_set(kcp, cii);
 	kcpuset_atomicly_remove(cpus_resumed, cpus_resumed);
 	kcpuset_atomic_clear(cpus_paused, cii);
 	cpu_ipi_wait("resume", cpus_resumed, kcp);
 	kcpuset_destroy(kcp);
+}
 /*
  * Resume all paused cpus.
  */
 void
 cpu_resume_others(void)
+{
 	kcpuset_t *kcp;
 	if (__predict_false(cold))
 		return;
 	struct cpu_info * const ci = curcpu();
 	kcpuset_t *kcp = ci->ci_ddbcpus;
 	kcpuset_atomicly_remove(cpus_resumed, cpus_resumed);
-	kcpuset_clone(&kcp, cpus_paused);
+	kcpuset_copy(kcp, cpus_paused);
 	kcpuset_atomicly_remove(cpus_paused, cpus_paused);
 	/* CPUs awake on cpus_paused clear */
 	cpu_ipi_wait("resume", cpus_resumed, kcp);
 	kcpuset_destroy(kcp);
+}
 bool
 cpu_is_paused(cpuid_t cii)
+{
 	return !cold && kcpuset_isset(cpus_paused, cii);
+}
 #ifdef DDB
 void
 cpu_debug_dump(void)
+{