[src/trunk]: src/sys/arch/arm/pic splx: only dispatch hard interrupts if inte...

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

details:   https://anonhg.NetBSD.org/src/rev/261b2bd2071d
branches:  trunk
changeset: 959480:261b2bd2071d
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Feb 15 15:42:58 2021 +0000

description:
splx: only dispatch hard interrupts if interrupts are enabled

diffstat:

 sys/arch/arm/pic/pic_splfuncs.c |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (41 lines):

diff -r 40461873e301 -r 261b2bd2071d sys/arch/arm/pic/pic_splfuncs.c
--- a/sys/arch/arm/pic/pic_splfuncs.c   Mon Feb 15 15:38:43 2021 +0000
+++ b/sys/arch/arm/pic/pic_splfuncs.c   Mon Feb 15 15:42:58 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pic_splfuncs.c,v 1.9 2021/02/15 15:07:47 jmcneill Exp $        */
+/*     $NetBSD: pic_splfuncs.c,v 1.10 2021/02/15 15:42:58 jmcneill Exp $       */
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -28,7 +28,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_splfuncs.c,v 1.9 2021/02/15 15:07:47 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_splfuncs.c,v 1.10 2021/02/15 15:42:58 jmcneill Exp $");
 
 #define _INTR_PRIVATE
 #include <sys/param.h>
@@ -90,15 +90,17 @@
        KASSERTMSG(panicstr != NULL || savedipl < ci->ci_cpl,
            "splx(%d) to a higher ipl than %d", savedipl, ci->ci_cpl);
 
-       ci->ci_intr_depth++;
-       pic_do_pending_ints(psw, savedipl, NULL);
-       ci->ci_intr_depth--;
-       KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
-           ci->ci_cpl, savedipl);
        if ((psw & I32_bit) == 0) {
+               ci->ci_intr_depth++;
+               pic_do_pending_ints(psw, savedipl, NULL);
+               ci->ci_intr_depth--;
+               KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
+                   ci->ci_cpl, savedipl);
+
                cpsie(I32_bit);
                cpu_dosoftints();
        }
+
        KASSERTMSG(ci->ci_cpl == savedipl, "cpl %d savedipl %d",
            ci->ci_cpl, savedipl);
 }