Module Name: src
Committed By: jmcneill
Date: Wed Sep 1 22:11:35 UTC 2021
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_intr.c
Log Message:
Install IPI handler with non-NULL context.
A side effect of interrupt handlers with NULL context when using armpic
is that the interrupt handler is only called from interrupt context, not
when lowering spl!
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/broadcom/bcm2835_intr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_intr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_intr.c:1.39 src/sys/arch/arm/broadcom/bcm2835_intr.c:1.40
--- src/sys/arch/arm/broadcom/bcm2835_intr.c:1.39 Wed Sep 1 03:08:08 2021
+++ src/sys/arch/arm/broadcom/bcm2835_intr.c Wed Sep 1 22:11:35 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_intr.c,v 1.39 2021/09/01 03:08:08 rin Exp $ */
+/* $NetBSD: bcm2835_intr.c,v 1.40 2021/09/01 22:11:35 jmcneill Exp $ */
/*-
* Copyright (c) 2012, 2015, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.39 2021/09/01 03:08:08 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.40 2021/09/01 22:11:35 jmcneill Exp $");
#define _INTR_PRIVATE
@@ -842,7 +842,7 @@ bcm2836mp_send_ipi(struct pic_softc *pic
int
bcm2836mp_ipi_handler(void *priv)
{
- const struct cpu_info *ci = curcpu();
+ const struct cpu_info *ci = priv;
const cpuid_t cpuid = ci->ci_core_id;
uint32_t ipimask, bit;
@@ -898,7 +898,7 @@ bcm2836mp_intr_init(void *priv, struct c
#if defined(MULTIPROCESSOR)
intr_establish(BCM2836_INT_MAILBOX0_CPUN(cpuid), IPL_HIGH,
- IST_LEVEL | IST_MPSAFE, bcm2836mp_ipi_handler, NULL);
+ IST_LEVEL | IST_MPSAFE, bcm2836mp_ipi_handler, ci);
struct bcm2836mp_interrupt *bip;
TAILQ_FOREACH(bip, &bcm2836mp_interrupts, bi_next) {
