[src/trunk]: src/sys/arch/arm/fdt Handle NULL arg interrupt handlers that wan...

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

details:   https://anonhg.NetBSD.org/src/rev/d779c71bc1d7
branches:  trunk
changeset: 357857:d779c71bc1d7
user:      skrll <skrll%NetBSD.org@localhost>
date:      Thu Nov 30 14:42:37 2017 +0000

description:
Handle NULL arg interrupt handlers that want the clock frame.

diffstat:

 sys/arch/arm/fdt/gic_fdt.c |  46 +++++++++++++++++++++++++++++-----------------
 1 files changed, 29 insertions(+), 17 deletions(-)

diffs (72 lines):

diff -r eb75eb98688a -r d779c71bc1d7 sys/arch/arm/fdt/gic_fdt.c
--- a/sys/arch/arm/fdt/gic_fdt.c        Thu Nov 30 14:19:27 2017 +0000
+++ b/sys/arch/arm/fdt/gic_fdt.c        Thu Nov 30 14:42:37 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_fdt.c,v 1.7 2017/07/02 21:59:14 jmcneill Exp $ */
+/* $NetBSD: gic_fdt.c,v 1.8 2017/11/30 14:42:37 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.7 2017/07/02 21:59:14 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.8 2017/11/30 14:42:37 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -190,26 +190,38 @@
                firq->intr_level = level;
                firq->intr_mpsafe = mpsafe;
                TAILQ_INIT(&firq->intr_handlers);
-               firq->intr_ih = intr_establish(irq, ipl, level | mpsafe,
-                   gic_fdt_intr, firq);
+               if (arg == NULL) {
+                       firq->intr_ih = intr_establish(irq, ipl, level | mpsafe,
+                           func, NULL);
+               } else {
+                       firq->intr_ih = intr_establish(irq, ipl, level | mpsafe,
+                           gic_fdt_intr, firq);
+               }
                if (firq->intr_ih == NULL) {
                        kmem_free(firq, sizeof(*firq));
                        return NULL;
                }
                sc->sc_irq[irq] = firq;
-       }
-
-       if (firq->intr_ipl != ipl) {
-               device_printf(dev, "cannot share irq with different ipl\n");
-               return NULL;
-       }
-       if (firq->intr_level != level) {
-               device_printf(dev, "cannot share edge and level interrupts\n");
-               return NULL;
-       }
-       if (firq->intr_mpsafe != mpsafe) {
-               device_printf(dev, "cannot share between mpsafe/non-mpsafe\n");
-               return NULL;
+       } else {
+               if (arg) {
+                       device_printf(dev, "cannot share irq with NULL arg\n");
+                       return NULL;
+               }
+               if (firq->intr_ipl != ipl) {
+                       device_printf(dev, "cannot share irq with different "
+                           "ipl\n");
+                       return NULL;
+               }
+               if (firq->intr_level != level) {
+                       device_printf(dev, "cannot share edge and level "
+                           "interrupts\n");
+                       return NULL;
+               }
+               if (firq->intr_mpsafe != mpsafe) {
+                       device_printf(dev, "cannot share between "
+                           "mpsafe/non-mpsafe\n");
+                       return NULL;
+               }
        }
 
        firq->intr_refcnt++;