[src/trunk]: src/sys/arch/arm/cortex If we are committing a deferred splhigh(...

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

details:   https://anonhg.NetBSD.org/src/rev/ddd2aa442321
branches:  trunk
changeset: 953000:ddd2aa442321
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Feb 23 10:03:04 2021 +0000

description:
If we are committing a deferred splhigh() to hardware, no need to continue.

diffstat:

 sys/arch/arm/cortex/gic.c   |  7 +++++--
 sys/arch/arm/cortex/gicv3.c |  7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diffs (56 lines):

diff -r 9299622612c3 -r ddd2aa442321 sys/arch/arm/cortex/gic.c
--- a/sys/arch/arm/cortex/gic.c Tue Feb 23 09:28:00 2021 +0000
+++ b/sys/arch/arm/cortex/gic.c Tue Feb 23 10:03:04 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: gic.c,v 1.45 2021/02/21 15:45:30 jmcneill Exp $        */
+/*     $NetBSD: gic.c,v 1.46 2021/02/23 10:03:04 jmcneill Exp $        */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -34,7 +34,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.45 2021/02/21 15:45:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.46 2021/02/23 10:03:04 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -331,6 +331,9 @@
        if (ci->ci_hwpl != priority) {
                ci->ci_hwpl = priority;
                gicc_write(sc, GICC_PMR, priority);
+               if (old_ipl == IPL_HIGH) {
+                       return;
+               }
        }
 
        for (;;) {
diff -r 9299622612c3 -r ddd2aa442321 sys/arch/arm/cortex/gicv3.c
--- a/sys/arch/arm/cortex/gicv3.c       Tue Feb 23 09:28:00 2021 +0000
+++ b/sys/arch/arm/cortex/gicv3.c       Tue Feb 23 10:03:04 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.42 2021/02/21 15:00:05 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.43 2021/02/23 10:03:04 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -31,7 +31,7 @@
 #define        _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.42 2021/02/21 15:00:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.43 2021/02/23 10:03:04 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -738,6 +738,9 @@
        if (ci->ci_hwpl != pmr) {
                ci->ci_hwpl = pmr;
                icc_pmr_write(pmr);
+               if (oldipl == IPL_HIGH) {
+                       return;
+               }
        }
 
        for (;;) {