 @@ -1,14 +1,14 @@
-/*	$NetBSD: octeon_intr.c,v 1.16 2020/07/17 17:57:16 jmcneill Exp $	*/
+/*	$NetBSD: octeon_intr.c,v 1.17 2020/07/17 19:40:47 jmcneill Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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
 @@ -34,27 +34,27 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Platform-specific interrupt support for the MIPS Malta.
  */
 #include "opt_multiprocessor.h"
 #include "cpunode.h"
 #define __INTR_PRIVATE
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_intr.c,v 1.16 2020/07/17 17:57:16 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_intr.c,v 1.17 2020/07/17 19:40:47 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/atomic.h>
 #include <lib/libkern/libkern.h>
 #include <mips/locore.h>
 @@ -162,26 +162,42 @@ struct octeon_intrhand ipi_intrhands[2]
 	[0] = {
 		.ih_func = octeon_ipi_intr,
 		.ih_arg = (void *)(uintptr_t)__BITS(15,0),
 		.ih_irq = CIU_INT_MBOX_15_0,
 		.ih_ipl = IPL_SCHED,
 	},
 	[1] = {
 		.ih_func = octeon_ipi_intr,
 		.ih_arg = (void *)(uintptr_t)__BITS(31,16),
 		.ih_irq = CIU_INT_MBOX_31_16,
 		.ih_ipl = IPL_HIGH,
 	},
 };
 #define	OCTEON_IPI_SCHED(n)	__BIT((n) + 0)
 #define	OCTEON_IPI_HIGH(n)	__BIT((n) + 16)
 static uint64_t octeon_ipi_mask[NIPIS] = {
 	[IPI_NOP]		= OCTEON_IPI_SCHED(IPI_NOP),
 	[IPI_AST]		= OCTEON_IPI_SCHED(IPI_AST),
 	[IPI_SHOOTDOWN]		= OCTEON_IPI_SCHED(IPI_SHOOTDOWN),
 	[IPI_SYNCICACHE]	= OCTEON_IPI_SCHED(IPI_SYNCICACHE),
 	[IPI_KPREEMPT]		= OCTEON_IPI_SCHED(IPI_KPREEMPT),
 	[IPI_SUSPEND]		= OCTEON_IPI_HIGH(IPI_SUSPEND),
 	[IPI_HALT]		= OCTEON_IPI_HIGH(IPI_HALT),
 	[IPI_XCALL]		= OCTEON_IPI_HIGH(IPI_XCALL),
 	[IPI_GENERIC]		= OCTEON_IPI_HIGH(IPI_GENERIC),
 	[IPI_WDOG]		= OCTEON_IPI_HIGH(IPI_WDOG),
 };
 #endif
 struct octeon_intrhand *octciu_intrs[NIRQS] = {
 #ifdef MULTIPROCESSOR
 	[CIU_INT_MBOX_15_0] = &ipi_intrhands[0],
 	[CIU_INT_MBOX_31_16] = &ipi_intrhands[1],
 #endif
 };
 kmutex_t octeon_intr_lock;
 #define X(a)	MIPS_PHYS_TO_XKPHYS(OCTEON_CCA_NONE, (a))
 @@ -582,29 +598,26 @@ octeon_ipi_intr(void *arg)
 	struct cpu_info * const ci = curcpu();
 	struct cpu_softc * const cpu = ci->ci_softc;
 	uint32_t ipi_mask = (uintptr_t) arg;
 	KASSERTMSG((ipi_mask & __BITS(31,16)) == 0 || ci->ci_cpl >= IPL_SCHED,
 	    "ipi_mask %#"PRIx32" cpl %d", ipi_mask, ci->ci_cpl);
 	ipi_mask &= mips3_ld(cpu->cpu_mbox_set);
 	if (ipi_mask == 0)
 		return 0;
 	mips3_sd(cpu->cpu_mbox_clr, ipi_mask);
 	ipi_mask |= (ipi_mask >> 16);
 	ipi_mask &= __BITS(15,0);
 	KASSERT(ipi_mask < __BIT(NIPIS));
 #if NWDOG > 0
 	// Handle WDOG requests ourselves.
 	if (ipi_mask & __BIT(IPI_WDOG)) {
 		softint_schedule(cpu->cpu_wdog_sih);
 		atomic_and_64(&ci->ci_request_ipis, ~__BIT(IPI_WDOG));
 		ipi_mask &= ~__BIT(IPI_WDOG);
 		ci->ci_evcnt_per_ipi[IPI_WDOG].ev_count++;
 		if (__predict_true(ipi_mask == 0))
 			return 1;
+	}
 #endif
 @@ -631,24 +644,22 @@ octeon_send_ipi(struct cpu_info *ci, int
 		CPU_INFO_ITERATOR cii;
 		for (CPU_INFO_FOREACH(cii, ci)) {
 			if (ci != curcpu()) {
 				octeon_send_ipi(ci, req);
+			}
+		}
 		return 0;
+	}
 	KASSERT(cold || ci->ci_softc != NULL);
 	if (ci->ci_softc == NULL)
 		return -1;
 	struct cpu_softc * const cpu = ci->ci_softc;
-	uint64_t ipi_mask = __BIT(req);
+	const uint64_t ipi_mask = octeon_ipi_mask[req];
 	atomic_or_64(&ci->ci_request_ipis, ipi_mask);
 	if (req == IPI_SUSPEND || req == IPI_WDOG) {
 		ipi_mask <<= 16;
 	mips3_sd(cpu->cpu_mbox_set, ipi_mask);
 	return 0;
+}
 #endif	/* MULTIPROCESSOR */