Module Name: src
Committed By: jmcneill
Date: Wed Jun 12 10:27:59 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: gicv3.c
Log Message:
Revert "Route all interrupts to the primary PE by default"
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/cortex/gicv3.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/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.15 src/sys/arch/arm/cortex/gicv3.c:1.16
--- src/sys/arch/arm/cortex/gicv3.c:1.15 Wed Jun 12 10:03:28 2019
+++ src/sys/arch/arm/cortex/gicv3.c Wed Jun 12 10:27:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.15 2019/06/12 10:03:28 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.16 2019/06/12 10:27:59 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.15 2019/06/12 10:03:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.16 2019/06/12 10:27:59 jmcneill Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -178,7 +178,6 @@ gicv3_establish_irq(struct pic_softc *pi
gicr_write_4(sc, n, GICR_IPRIORITYRn(is->is_irq / 4), ipriority);
}
} else {
-#if notyet
if (is->is_mpsafe) {
/* Route MP-safe interrupts to all participating PEs */
irouter = GICD_IROUTER_Interrupt_Routing_mode;
@@ -186,10 +185,6 @@ gicv3_establish_irq(struct pic_softc *pi
/* Route non-MP-safe interrupts to the primary PE only */
irouter = sc->sc_irouter[0];
}
-#else
- /* Route interrupts to the primary PE by default */
- irouter = sc->sc_irouter[0];
-#endif
gicd_write_8(sc, GICD_IROUTER(is->is_irq), irouter);
/* Update interrupt configuration */
