[src/trunk]: src/sys/arch/aarch64/aarch64 interrupt: enable interrupts before...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f36351f3da30
branches:  trunk
changeset: 959486:f36351f3da30
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Feb 15 17:46:36 2021 +0000

description:
interrupt: enable interrupts before running soft intr handlers. To avoid
stack usage going out of control, only do this at ci_intr_depth==0.

diffstat:

 sys/arch/aarch64/aarch64/trap.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 1f8c43f4b60a -r f36351f3da30 sys/arch/aarch64/aarch64/trap.c
--- a/sys/arch/aarch64/aarch64/trap.c   Mon Feb 15 17:44:09 2021 +0000
+++ b/sys/arch/aarch64/aarch64/trap.c   Mon Feb 15 17:46:36 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.41 2020/12/11 18:03:33 skrll Exp $ */
+/* $NetBSD: trap.c,v 1.42 2021/02/15 17:46:36 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.41 2020/12/11 18:03:33 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.42 2021/02/15 17:46:36 jmcneill Exp $");
 
 #include "opt_arm_intr_impl.h"
 #include "opt_compat_netbsd32.h"
@@ -521,7 +521,10 @@
        ARM_IRQ_HANDLER(tf);
        ci->ci_intr_depth--;
 
-       cpu_dosoftints();
+       if (ci->ci_intr_depth == 0 && (ci->ci_softints >> ci->ci_cpl) > 0) {
+               ENABLE_INTERRUPT();
+               cpu_dosoftints();
+       }
 }
 
 #ifdef COMPAT_NETBSD32