[src/trunk]: src/sys/dev/fdt Add 'const char *xname' param to fdtbus_intr_est...

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

details:   https://anonhg.NetBSD.org/src/rev/b88a04db0241
branches:  trunk
changeset: 949742:b88a04db0241
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Fri Jan 15 22:59:49 2021 +0000

description:
Add 'const char *xname' param to fdtbus_intr_establish_byname

diffstat:

 sys/arch/arm/rockchip/rk3399_pcie.c |  6 +++---
 sys/arch/arm/ti/ti_edma.c           |  6 +++---
 sys/dev/fdt/fdt_intr.c              |  9 +++++----
 sys/dev/fdt/fdtvar.h                |  4 ++--
 4 files changed, 13 insertions(+), 12 deletions(-)

diffs (109 lines):

diff -r e957e357b67a -r b88a04db0241 sys/arch/arm/rockchip/rk3399_pcie.c
--- a/sys/arch/arm/rockchip/rk3399_pcie.c       Fri Jan 15 22:58:49 2021 +0000
+++ b/sys/arch/arm/rockchip/rk3399_pcie.c       Fri Jan 15 22:59:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_pcie.c,v 1.13 2021/01/15 00:38:23 jmcneill Exp $ */
+/* $NetBSD: rk3399_pcie.c,v 1.14 2021/01/15 22:59:50 jmcneill Exp $ */
 /*
  * Copyright (c) 2018 Mark Kettenis <kettenis%openbsd.org@localhost>
  *
@@ -17,7 +17,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.13 2021/01/15 00:38:23 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.14 2021/01/15 22:59:50 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -629,7 +629,7 @@
            PCIM_INTx_ENAB(2) | PCIM_INTx_ENAB(3));
 
        cookie = fdtbus_intr_establish_byname(sc->sc_phsc.sc_phandle,
-           "legacy", ipl, flags, func, arg);
+           "legacy", ipl, flags, func, arg, xname);
 
        return cookie;
 }
diff -r e957e357b67a -r b88a04db0241 sys/arch/arm/ti/ti_edma.c
--- a/sys/arch/arm/ti/ti_edma.c Fri Jan 15 22:58:49 2021 +0000
+++ b/sys/arch/arm/ti/ti_edma.c Fri Jan 15 22:59:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_edma.c,v 1.1 2019/10/27 12:14:51 jmcneill Exp $ */
+/* $NetBSD: ti_edma.c,v 1.2 2021/01/15 22:59:50 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_edma.c,v 1.1 2019/10/27 12:14:51 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_edma.c,v 1.2 2021/01/15 22:59:50 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -159,7 +159,7 @@
        edma_init(sc);
 
        sc->sc_ih = fdtbus_intr_establish_byname(phandle, "edma3_ccint",
-           IPL_VM, FDT_INTR_MPSAFE, edma_intr, sc);
+           IPL_VM, FDT_INTR_MPSAFE, edma_intr, sc, device_xname(self));
        if (sc->sc_ih == NULL) {
                aprint_error_dev(self, "failed to establish interrupt\n");
                return;
diff -r e957e357b67a -r b88a04db0241 sys/dev/fdt/fdt_intr.c
--- a/sys/dev/fdt/fdt_intr.c    Fri Jan 15 22:58:49 2021 +0000
+++ b/sys/dev/fdt/fdt_intr.c    Fri Jan 15 22:59:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_intr.c,v 1.28 2021/01/15 17:17:04 ryo Exp $ */
+/* $NetBSD: fdt_intr.c,v 1.29 2021/01/15 22:59:49 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015-2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_intr.c,v 1.28 2021/01/15 17:17:04 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_intr.c,v 1.29 2021/01/15 22:59:49 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -202,7 +202,7 @@
 
 void *
 fdtbus_intr_establish_byname(int phandle, const char *name, int ipl,
-    int flags, int (*func)(void *), void *arg)
+    int flags, int (*func)(void *), void *arg, const char *xname)
 {
        u_int index;
        int err;
@@ -211,7 +211,8 @@
        if (err != 0)
                return NULL;
 
-       return fdtbus_intr_establish(phandle, index, ipl, flags, func, arg);
+       return fdtbus_intr_establish_xname(phandle, index, ipl, flags, func,
+           arg, xname);
 }
 
 void *
diff -r e957e357b67a -r b88a04db0241 sys/dev/fdt/fdtvar.h
--- a/sys/dev/fdt/fdtvar.h      Fri Jan 15 22:58:49 2021 +0000
+++ b/sys/dev/fdt/fdtvar.h      Fri Jan 15 22:59:49 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.66 2021/01/15 17:17:04 ryo Exp $ */
+/* $NetBSD: fdtvar.h,v 1.67 2021/01/15 22:59:49 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2015 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -322,7 +322,7 @@
 void *         fdtbus_intr_establish_xname(int, u_int, int, int,
                    int (*func)(void *), void *arg, const char *);
 void *         fdtbus_intr_establish_byname(int, const char *, int, int,
-                   int (*func)(void *), void *arg);
+                   int (*func)(void *), void *arg, const char *);
 void *         fdtbus_intr_establish_raw(int, const u_int *, int, int,
                    int (*func)(void *), void *arg, const char *);
 void           fdtbus_intr_mask(int, void *);