Module Name: src
Committed By: jmcneill
Date: Fri Jan 15 00:38:23 UTC 2021
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_gpio.c bcm2835_intr.c
src/sys/arch/arm/fdt: gic_fdt.c gicv3_fdt.c
src/sys/arch/arm/nvidia: tegra_lic.c
src/sys/arch/arm/nxp: imx6_gpc.c imx7_gpc.c imx_gpio.c
src/sys/arch/arm/rockchip: rk3399_pcie.c
src/sys/arch/arm/samsung: exynos_combiner.c
src/sys/arch/arm/sunxi: sunxi_gpio.c sunxi_intc.c sunxi_nmi.c
src/sys/arch/arm/ti: ti_gpio.c ti_omapintc.c
src/sys/arch/mips/cavium/dev: octeon_cib.c octeon_intc.c
src/sys/dev/fdt: fdt_intr.c fdtvar.h
Log Message:
Add 'const char *xname' arg to fdtbus_interrupt_controller_func .establish
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/broadcom/bcm2835_gpio.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/broadcom/bcm2835_intr.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/fdt/gic_fdt.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/fdt/gicv3_fdt.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_lic.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_gpc.c \
src/sys/arch/arm/nxp/imx7_gpc.c src/sys/arch/arm/nxp/imx_gpio.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/rockchip/rk3399_pcie.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/samsung/exynos_combiner.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/sunxi/sunxi_gpio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/sunxi/sunxi_intc.c \
src/sys/arch/arm/sunxi/sunxi_nmi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/ti/ti_gpio.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/ti/ti_omapintc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/cavium/dev/octeon_cib.c \
src/sys/arch/mips/cavium/dev/octeon_intc.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/fdt/fdt_intr.c
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/fdt/fdtvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/broadcom/bcm2835_gpio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.16 src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.17
--- src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.16 Sat Oct 12 09:46:18 2019
+++ src/sys/arch/arm/broadcom/bcm2835_gpio.c Fri Jan 15 00:38:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_gpio.c,v 1.16 2019/10/12 09:46:18 mlelstv Exp $ */
+/* $NetBSD: bcm2835_gpio.c,v 1.17 2021/01/15 00:38:22 jmcneill Exp $ */
/*-
* Copyright (c) 2013, 2014, 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.16 2019/10/12 09:46:18 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.17 2021/01/15 00:38:22 jmcneill Exp $");
/*
* Driver for BCM2835 GPIO
@@ -150,7 +150,7 @@ static struct fdtbus_gpio_controller_fun
};
static void * bcmgpio_fdt_intr_establish(device_t, u_int *, int, int,
- int (*func)(void *), void *);
+ int (*func)(void *), void *, const char *);
static void bcmgpio_fdt_intr_disestablish(device_t, void *);
static bool bcmgpio_fdt_intrstr(device_t, u_int *, char *, size_t);
@@ -567,7 +567,7 @@ bcmgpio_intr_disable(struct bcmgpio_soft
static void *
bcmgpio_fdt_intr_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct bcmgpio_softc * const sc = device_private(dev);
int eint_flags = (flags & FDT_INTR_MPSAFE) ? BCMGPIO_INTR_MPSAFE : 0;
Index: src/sys/arch/arm/broadcom/bcm2835_intr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_intr.c:1.33 src/sys/arch/arm/broadcom/bcm2835_intr.c:1.34
--- src/sys/arch/arm/broadcom/bcm2835_intr.c:1.33 Wed Dec 16 19:49:04 2020
+++ src/sys/arch/arm/broadcom/bcm2835_intr.c Fri Jan 15 00:38:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_intr.c,v 1.33 2020/12/16 19:49:04 christos Exp $ */
+/* $NetBSD: bcm2835_intr.c,v 1.34 2021/01/15 00:38:22 jmcneill Exp $ */
/*-
* Copyright (c) 2012, 2015, 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.33 2020/12/16 19:49:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.34 2021/01/15 00:38:22 jmcneill Exp $");
#define _INTR_PRIVATE
@@ -83,7 +83,7 @@ static void bcm2836mp_send_ipi(struct pi
static int bcm2835_icu_fdt_decode_irq(u_int *);
static void *bcm2835_icu_fdt_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void bcm2835_icu_fdt_disestablish(device_t, void *);
static bool bcm2835_icu_fdt_intrstr(device_t, u_int *, char *, size_t);
@@ -91,7 +91,7 @@ static int bcm2835_icu_intr(void *);
static int bcm2836mp_icu_fdt_decode_irq(u_int *);
static void *bcm2836mp_icu_fdt_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void bcm2836mp_icu_fdt_disestablish(device_t, void *);
static bool bcm2836mp_icu_fdt_intrstr(device_t, u_int *, char *, size_t);
@@ -467,7 +467,7 @@ bcm2835_icu_fdt_decode_irq(u_int *specif
static void *
bcm2835_icu_fdt_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct bcm2835icu_softc * const sc = device_private(dev);
struct bcm2835icu_irq *firq;
@@ -493,11 +493,11 @@ bcm2835_icu_fdt_establish(device_t dev,
firq->intr_irq = irq;
TAILQ_INIT(&firq->intr_handlers);
if (arg == NULL) {
- firq->intr_ih = intr_establish(irq, ipl,
- IST_LEVEL | iflags, func, NULL);
+ firq->intr_ih = intr_establish_xname(irq, ipl,
+ IST_LEVEL | iflags, func, NULL, xname);
} else {
- firq->intr_ih = intr_establish(irq, ipl,
- IST_LEVEL | iflags, bcm2835_icu_intr, firq);
+ firq->intr_ih = intr_establish_xname(irq, ipl,
+ IST_LEVEL | iflags, bcm2835_icu_intr, firq, xname);
}
if (firq->intr_ih == NULL) {
kmem_free(firq, sizeof(*firq));
@@ -864,7 +864,7 @@ bcm2836mp_icu_fdt_decode_irq(u_int *spec
static void *
bcm2836mp_icu_fdt_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
int iflags = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0;
struct bcm2836mp_interrupt *bip;
@@ -896,8 +896,9 @@ bcm2836mp_icu_fdt_establish(device_t dev
*/
if (!cold) {
for (cpuid_t cpuid = 0; cpuid < BCM2836_NCPUS; cpuid++) {
- ih = intr_establish(BCM2836_INT_BASECPUN(cpuid) + irq, ipl,
- IST_LEVEL | iflags, func, arg);
+ ih = intr_establish_xname(
+ BCM2836_INT_BASECPUN(cpuid) + irq, ipl,
+ IST_LEVEL | iflags, func, arg, xname);
if (!ih) {
kmem_free(bip, sizeof(*bip));
return NULL;
@@ -915,8 +916,8 @@ bcm2836mp_icu_fdt_establish(device_t dev
* delay until bcm2836mp_intr_init is called for each AP, e.g.
* gtmr
*/
- ih = intr_establish(BCM2836_INT_BASECPUN(0) + irq, ipl,
- IST_LEVEL | iflags, func, arg);
+ ih = intr_establish_xname(BCM2836_INT_BASECPUN(0) + irq, ipl,
+ IST_LEVEL | iflags, func, arg, xname);
if (!ih) {
kmem_free(bip, sizeof(*bip));
return NULL;
Index: src/sys/arch/arm/fdt/gic_fdt.c
diff -u src/sys/arch/arm/fdt/gic_fdt.c:1.19 src/sys/arch/arm/fdt/gic_fdt.c:1.20
--- src/sys/arch/arm/fdt/gic_fdt.c:1.19 Wed Nov 25 20:59:20 2020
+++ src/sys/arch/arm/fdt/gic_fdt.c Fri Jan 15 00:38:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_fdt.c,v 1.19 2020/11/25 20:59:20 jmcneill Exp $ */
+/* $NetBSD: gic_fdt.c,v 1.20 2021/01/15 00:38:22 jmcneill Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "pci.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.19 2020/11/25 20:59:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.20 2021/01/15 00:38:22 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -66,7 +66,7 @@ static void gic_fdt_attach_v2m(struct gi
static int gic_fdt_intr(void *);
static void * gic_fdt_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void gic_fdt_disestablish(device_t, void *);
static bool gic_fdt_intrstr(device_t, u_int *, char *, size_t);
@@ -235,7 +235,7 @@ gic_fdt_attach_v2m(struct gic_fdt_softc
static void *
gic_fdt_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct gic_fdt_softc * const sc = device_private(dev);
struct gic_fdt_irq *firq;
@@ -266,11 +266,11 @@ gic_fdt_establish(device_t dev, u_int *s
TAILQ_INIT(&firq->intr_handlers);
firq->intr_irq = irq;
if (arg == NULL) {
- firq->intr_ih = intr_establish(irq, ipl, level | mpsafe,
- func, NULL);
+ firq->intr_ih = intr_establish_xname(irq, ipl,
+ level | mpsafe, func, NULL, xname);
} else {
- firq->intr_ih = intr_establish(irq, ipl, level | mpsafe,
- gic_fdt_intr, firq);
+ firq->intr_ih = intr_establish_xname(irq, ipl,
+ level | mpsafe, gic_fdt_intr, firq, xname);
}
if (firq->intr_ih == NULL) {
kmem_free(firq, sizeof(*firq));
Index: src/sys/arch/arm/fdt/gicv3_fdt.c
diff -u src/sys/arch/arm/fdt/gicv3_fdt.c:1.10 src/sys/arch/arm/fdt/gicv3_fdt.c:1.11
--- src/sys/arch/arm/fdt/gicv3_fdt.c:1.10 Wed Nov 25 21:02:35 2020
+++ src/sys/arch/arm/fdt/gicv3_fdt.c Fri Jan 15 00:38:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_fdt.c,v 1.10 2020/11/25 21:02:35 jmcneill Exp $ */
+/* $NetBSD: gicv3_fdt.c,v 1.11 2021/01/15 00:38:22 jmcneill Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill <[email protected]>
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3_fdt.c,v 1.10 2020/11/25 21:02:35 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_fdt.c,v 1.11 2021/01/15 00:38:22 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -70,7 +70,7 @@ static void gicv3_fdt_attach_its(struct
static int gicv3_fdt_intr(void *);
static void * gicv3_fdt_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void gicv3_fdt_disestablish(device_t, void *);
static bool gicv3_fdt_intrstr(device_t, u_int *, char *, size_t);
@@ -336,7 +336,7 @@ gicv3_fdt_attach_its(struct gicv3_fdt_so
static void *
gicv3_fdt_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct gicv3_fdt_softc * const sc = device_private(dev);
struct gicv3_fdt_irq *firq;
@@ -368,11 +368,11 @@ gicv3_fdt_establish(device_t dev, u_int
TAILQ_INIT(&firq->intr_handlers);
firq->intr_irq = irq;
if (arg == NULL) {
- firq->intr_ih = intr_establish(irq, ipl, level | mpsafe,
- func, NULL);
+ firq->intr_ih = intr_establish_xname(irq, ipl,
+ level | mpsafe, func, NULL, xname);
} else {
- firq->intr_ih = intr_establish(irq, ipl, level | mpsafe,
- gicv3_fdt_intr, firq);
+ firq->intr_ih = intr_establish_xname(irq, ipl,
+ level | mpsafe, gicv3_fdt_intr, firq, xname);
}
if (firq->intr_ih == NULL) {
kmem_free(firq, sizeof(*firq));
Index: src/sys/arch/arm/nvidia/tegra_lic.c
diff -u src/sys/arch/arm/nvidia/tegra_lic.c:1.6 src/sys/arch/arm/nvidia/tegra_lic.c:1.7
--- src/sys/arch/arm/nvidia/tegra_lic.c:1.6 Sat Jan 26 14:38:29 2019
+++ src/sys/arch/arm/nvidia/tegra_lic.c Fri Jan 15 00:38:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_lic.c,v 1.6 2019/01/26 14:38:29 thorpej Exp $ */
+/* $NetBSD: tegra_lic.c,v 1.7 2021/01/15 00:38:22 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_lic.c,v 1.6 2019/01/26 14:38:29 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_lic.c,v 1.7 2021/01/15 00:38:22 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -51,7 +51,7 @@ static int tegra_lic_match(device_t, cfd
static void tegra_lic_attach(device_t, device_t, void *);
static void * tegra_lic_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void tegra_lic_disestablish(device_t, void *);
static bool tegra_lic_intrstr(device_t, u_int *, char *, size_t);
@@ -130,7 +130,7 @@ tegra_lic_attach(device_t parent, device
static void *
tegra_lic_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
int iflags = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0;
@@ -145,7 +145,8 @@ tegra_lic_establish(device_t dev, u_int
const u_int level = (trig & FDT_INTR_TYPE_DOUBLE_EDGE)
? IST_EDGE : IST_LEVEL;
- return intr_establish(irq, ipl, level | iflags, func, arg);
+ return intr_establish_xname(irq, ipl, level | iflags, func, arg,
+ xname);
}
static void
Index: src/sys/arch/arm/nxp/imx6_gpc.c
diff -u src/sys/arch/arm/nxp/imx6_gpc.c:1.1 src/sys/arch/arm/nxp/imx6_gpc.c:1.2
--- src/sys/arch/arm/nxp/imx6_gpc.c:1.1 Wed Dec 23 14:42:38 2020
+++ src/sys/arch/arm/nxp/imx6_gpc.c Fri Jan 15 00:38:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx6_gpc.c,v 1.1 2020/12/23 14:42:38 skrll Exp $ */
+/* $NetBSD: imx6_gpc.c,v 1.2 2021/01/15 00:38:22 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx6_gpc.c,v 1.1 2020/12/23 14:42:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_gpc.c,v 1.2 2021/01/15 00:38:22 jmcneill Exp $");
#include "opt_fdt.h"
@@ -51,7 +51,7 @@ static int imxgpc_match(device_t, struct
static void imxgpc_attach(device_t, device_t, void *);
static void *imxgpc_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void imxgpc_disestablish(device_t, void *);
static bool imxgpc_intrstr(device_t, u_int *, char *, size_t);
@@ -113,7 +113,7 @@ imxgpc_attach(device_t parent, device_t
static void *
imxgpc_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
/* 1st cell is the interrupt type; 0 is SPI, 1 is PPI */
/* 2nd cell is the interrupt number */
@@ -128,7 +128,8 @@ imxgpc_establish(device_t dev, u_int *sp
const u_int mpsafe = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0;
aprint_debug_dev(dev, "intr establish irq %d, level %d\n", irq, level);
- return intr_establish(irq, ipl, level | mpsafe, func, arg);
+ return intr_establish_xname(irq, ipl, level | mpsafe, func, arg,
+ xname);
}
static void
Index: src/sys/arch/arm/nxp/imx7_gpc.c
diff -u src/sys/arch/arm/nxp/imx7_gpc.c:1.1 src/sys/arch/arm/nxp/imx7_gpc.c:1.2
--- src/sys/arch/arm/nxp/imx7_gpc.c:1.1 Wed Dec 23 14:42:38 2020
+++ src/sys/arch/arm/nxp/imx7_gpc.c Fri Jan 15 00:38:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx7_gpc.c,v 1.1 2020/12/23 14:42:38 skrll Exp $ */
+/* $NetBSD: imx7_gpc.c,v 1.2 2021/01/15 00:38:22 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx7_gpc.c,v 1.1 2020/12/23 14:42:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx7_gpc.c,v 1.2 2021/01/15 00:38:22 jmcneill Exp $");
#include "opt_fdt.h"
@@ -78,7 +78,7 @@ static void imx7gpc_mask(struct imx7gpc_
static void imx7gpc_unmask(struct imx7gpc_softc *, u_int, bool);
static void *imx7gpc_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void imx7gpc_disestablish(device_t, void *);
static bool imx7gpc_intrstr(device_t, u_int *, char *, size_t);
@@ -201,7 +201,7 @@ imx7gpc_unmask(struct imx7gpc_softc *sc,
static void *
imx7gpc_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct imx7gpc_softc * const sc = device_private(dev);
void *ih;
@@ -225,7 +225,7 @@ imx7gpc_establish(device_t dev, u_int *s
aprint_debug_dev(dev, "intr establish irq %d, level %d\n", irq, level);
- ih = intr_establish(irq, ipl, level | mpsafe, func, arg);
+ ih = intr_establish_xname(irq, ipl, level | mpsafe, func, arg, xname);
if (ih != NULL)
imx7gpc_unmask(sc, irq - 32, mpsafe == IST_MPSAFE);
Index: src/sys/arch/arm/nxp/imx_gpio.c
diff -u src/sys/arch/arm/nxp/imx_gpio.c:1.1 src/sys/arch/arm/nxp/imx_gpio.c:1.2
--- src/sys/arch/arm/nxp/imx_gpio.c:1.1 Wed Dec 23 14:42:38 2020
+++ src/sys/arch/arm/nxp/imx_gpio.c Fri Jan 15 00:38:22 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: imx_gpio.c,v 1.1 2020/12/23 14:42:38 skrll Exp $ */
+/* $NetBSD: imx_gpio.c,v 1.2 2021/01/15 00:38:22 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Genetec Corporation. All rights reserved.
* Written by Hashimoto Kenichi for Genetec Corporation.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx_gpio.c,v 1.1 2020/12/23 14:42:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx_gpio.c,v 1.2 2021/01/15 00:38:22 jmcneill Exp $");
#include "opt_fdt.h"
#include "gpio.h"
@@ -58,7 +58,7 @@ static int imx6_gpio_fdt_read(device_t,
static void imx6_gpio_fdt_write(device_t, void *, int, bool);
static void *imxgpio_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void imxgpio_disestablish(device_t, void *);
static bool imxgpio_intrstr(device_t, u_int *, char *, size_t);
@@ -220,7 +220,7 @@ imx6_gpio_fdt_write(device_t dev, void *
static void *
imxgpio_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct imxgpio_softc * const sc = device_private(dev);
@@ -246,7 +246,8 @@ imxgpio_establish(device_t dev, u_int *s
aprint_debug_dev(dev, "intr establish irq %d, level %d\n",
sc->gpio_irqbase + intr, level);
- return intr_establish(sc->gpio_irqbase + intr, ipl, level | mpsafe, func, arg);
+ return intr_establish_xname(sc->gpio_irqbase + intr, ipl,
+ level | mpsafe, func, arg, xname);
}
static void
Index: src/sys/arch/arm/rockchip/rk3399_pcie.c
diff -u src/sys/arch/arm/rockchip/rk3399_pcie.c:1.12 src/sys/arch/arm/rockchip/rk3399_pcie.c:1.13
--- src/sys/arch/arm/rockchip/rk3399_pcie.c:1.12 Sun Oct 11 15:33:18 2020
+++ src/sys/arch/arm/rockchip/rk3399_pcie.c Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_pcie.c,v 1.12 2020/10/11 15:33:18 tnn Exp $ */
+/* $NetBSD: rk3399_pcie.c,v 1.13 2021/01/15 00:38:23 jmcneill Exp $ */
/*
* Copyright (c) 2018 Mark Kettenis <[email protected]>
*
@@ -17,7 +17,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.12 2020/10/11 15:33:18 tnn Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.13 2021/01/15 00:38:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -614,7 +614,7 @@ rkpcie_conf_hook(void *v, int b, int d,
/* INTx interrupt controller */
static void *
rkpcie_intx_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct rkpcie_softc *sc = device_private(dev);
void *cookie;
@@ -628,7 +628,8 @@ rkpcie_intx_establish(device_t dev, u_in
PCIM_INTx_ENAB(0) | PCIM_INTx_ENAB(1) |
PCIM_INTx_ENAB(2) | PCIM_INTx_ENAB(3));
- cookie = fdtbus_intr_establish_byname(sc->sc_phsc.sc_phandle, "legacy", ipl, flags, func, arg);
+ cookie = fdtbus_intr_establish_byname(sc->sc_phsc.sc_phandle,
+ "legacy", ipl, flags, func, arg);
return cookie;
}
Index: src/sys/arch/arm/samsung/exynos_combiner.c
diff -u src/sys/arch/arm/samsung/exynos_combiner.c:1.11 src/sys/arch/arm/samsung/exynos_combiner.c:1.12
--- src/sys/arch/arm/samsung/exynos_combiner.c:1.11 Fri Oct 18 06:13:38 2019
+++ src/sys/arch/arm/samsung/exynos_combiner.c Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_combiner.c,v 1.11 2019/10/18 06:13:38 skrll Exp $ */
+/* $NetBSD: exynos_combiner.c,v 1.12 2021/01/15 00:38:23 jmcneill Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.11 2019/10/18 06:13:38 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.12 2021/01/15 00:38:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -91,7 +91,7 @@ static int exynos_combiner_match(device_
static void exynos_combiner_attach(device_t, device_t, void *);
static void * exynos_combiner_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void exynos_combiner_disestablish(device_t, void *);
static bool exynos_combiner_intrstr(device_t, u_int *, char *,
size_t);
@@ -235,7 +235,7 @@ exynos_combiner_irq(void *cookie)
static void *
exynos_combiner_establish(device_t dev, u_int *specifier,
int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct exynos_combiner_softc * const sc = device_private(dev);
struct exynos_combiner_irq_group *groupp;
@@ -250,12 +250,12 @@ exynos_combiner_establish(device_t dev,
if (!groupp) {
groupp = exynos_combiner_new_group(sc, group);
if (arg == NULL) {
- groupp->irq_ih = fdtbus_intr_establish(sc->sc_phandle, group,
- ipl /* XXX */, flags, func, NULL);
+ groupp->irq_ih = fdtbus_intr_establish(sc->sc_phandle,
+ group, ipl /* XXX */, flags, func, NULL);
} else {
- groupp->irq_ih = fdtbus_intr_establish(sc->sc_phandle, group,
- ipl /* XXX */, FDT_INTR_MPSAFE, exynos_combiner_irq,
- groupp);
+ groupp->irq_ih = fdtbus_intr_establish(sc->sc_phandle,
+ group, ipl /* XXX */, FDT_INTR_MPSAFE,
+ exynos_combiner_irq, groupp);
}
KASSERT(groupp->irq_ih != NULL);
groupp->irq_ipl = ipl;
Index: src/sys/arch/arm/sunxi/sunxi_gpio.c
diff -u src/sys/arch/arm/sunxi/sunxi_gpio.c:1.28 src/sys/arch/arm/sunxi/sunxi_gpio.c:1.29
--- src/sys/arch/arm/sunxi/sunxi_gpio.c:1.28 Thu Aug 27 16:35:13 2020
+++ src/sys/arch/arm/sunxi/sunxi_gpio.c Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gpio.c,v 1.28 2020/08/27 16:35:13 skrll Exp $ */
+/* $NetBSD: sunxi_gpio.c,v 1.29 2021/01/15 00:38:23 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_soc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.28 2020/08/27 16:35:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.29 2021/01/15 00:38:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -520,7 +520,7 @@ sunxi_intr_disable(struct sunxi_gpio_sof
static void *
sunxi_fdt_intr_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct sunxi_gpio_softc * const sc = device_private(dev);
bool mpsafe = (flags & FDT_INTR_MPSAFE) != 0;
Index: src/sys/arch/arm/sunxi/sunxi_intc.c
diff -u src/sys/arch/arm/sunxi/sunxi_intc.c:1.5 src/sys/arch/arm/sunxi/sunxi_intc.c:1.6
--- src/sys/arch/arm/sunxi/sunxi_intc.c:1.5 Tue Jan 7 10:20:07 2020
+++ src/sys/arch/arm/sunxi/sunxi_intc.c Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_intc.c,v 1.5 2020/01/07 10:20:07 skrll Exp $ */
+/* $NetBSD: sunxi_intc.c,v 1.6 2021/01/15 00:38:23 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_intc.c,v 1.5 2020/01/07 10:20:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_intc.c,v 1.6 2021/01/15 00:38:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -132,7 +132,7 @@ static const struct pic_ops sunxi_intc_p
static void *
sunxi_intc_fdt_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
/* 1st cell is the interrupt number */
const u_int irq = be32toh(specifier[0]);
@@ -146,7 +146,8 @@ sunxi_intc_fdt_establish(device_t dev, u
const u_int mpsafe = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0;
- return intr_establish(irq, ipl, IST_LEVEL | mpsafe, func, arg);
+ return intr_establish_xname(irq, ipl, IST_LEVEL | mpsafe, func, arg,
+ xname);
}
static void
Index: src/sys/arch/arm/sunxi/sunxi_nmi.c
diff -u src/sys/arch/arm/sunxi/sunxi_nmi.c:1.5 src/sys/arch/arm/sunxi/sunxi_nmi.c:1.6
--- src/sys/arch/arm/sunxi/sunxi_nmi.c:1.5 Sun Feb 16 20:29:36 2020
+++ src/sys/arch/arm/sunxi/sunxi_nmi.c Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_nmi.c,v 1.5 2020/02/16 20:29:36 thorpej Exp $ */
+/* $NetBSD: sunxi_nmi.c,v 1.6 2021/01/15 00:38:23 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_nmi.c,v 1.5 2020/02/16 20:29:36 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_nmi.c,v 1.6 2021/01/15 00:38:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -170,7 +170,7 @@ sunxi_nmi_intr(void *priv)
static void *
sunxi_nmi_fdt_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct sunxi_nmi_softc * const sc = device_private(dev);
u_int irq_type;
Index: src/sys/arch/arm/ti/ti_gpio.c
diff -u src/sys/arch/arm/ti/ti_gpio.c:1.4 src/sys/arch/arm/ti/ti_gpio.c:1.5
--- src/sys/arch/arm/ti/ti_gpio.c:1.4 Wed Jun 3 16:00:00 2020
+++ src/sys/arch/arm/ti/ti_gpio.c Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_gpio.c,v 1.4 2020/06/03 16:00:00 jmcneill Exp $ */
+/* $NetBSD: ti_gpio.c,v 1.5 2021/01/15 00:38:23 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.4 2020/06/03 16:00:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_gpio.c,v 1.5 2021/01/15 00:38:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -283,7 +283,7 @@ ti_gpio_intr_disestablish(device_t dev,
static void *
ti_gpio_intr_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct ti_gpio_softc * const sc = device_private(dev);
uint32_t val;
Index: src/sys/arch/arm/ti/ti_omapintc.c
diff -u src/sys/arch/arm/ti/ti_omapintc.c:1.3 src/sys/arch/arm/ti/ti_omapintc.c:1.4
--- src/sys/arch/arm/ti/ti_omapintc.c:1.3 Sat Sep 26 10:06:26 2020
+++ src/sys/arch/arm/ti/ti_omapintc.c Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_omapintc.c,v 1.3 2020/09/26 10:06:26 skrll Exp $ */
+/* $NetBSD: ti_omapintc.c,v 1.4 2021/01/15 00:38:23 jmcneill Exp $ */
/*
* Define the SDP2430 specific information and then include the generic OMAP
* interrupt header.
@@ -29,7 +29,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ti_omapintc.c,v 1.3 2020/09/26 10:06:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_omapintc.c,v 1.4 2021/01/15 00:38:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/evcnt.h>
@@ -184,7 +184,7 @@ omap2icu_set_priority(struct pic_softc *
static void *
omapintc_fdt_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
const u_int irq = be32toh(specifier[0]);
if (irq >= INTC_MAX_SOURCES) {
@@ -193,7 +193,8 @@ omapintc_fdt_establish(device_t dev, u_i
}
const u_int mpsafe = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0;
- return intr_establish(irq, ipl, IST_LEVEL | mpsafe, func, arg);
+ return intr_establish_xname(irq, ipl, IST_LEVEL | mpsafe, func, arg,
+ xname);
}
static void
Index: src/sys/arch/mips/cavium/dev/octeon_cib.c
diff -u src/sys/arch/mips/cavium/dev/octeon_cib.c:1.1 src/sys/arch/mips/cavium/dev/octeon_cib.c:1.2
--- src/sys/arch/mips/cavium/dev/octeon_cib.c:1.1 Thu Jul 16 18:39:19 2020
+++ src/sys/arch/mips/cavium/dev/octeon_cib.c Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_cib.c,v 1.1 2020/07/16 18:39:19 jmcneill Exp $ */
+/* $NetBSD: octeon_cib.c,v 1.2 2021/01/15 00:38:23 jmcneill Exp $ */
/*-
* Copyright (c) 2020 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_cib.c,v 1.1 2020/07/16 18:39:19 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_cib.c,v 1.2 2021/01/15 00:38:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -47,7 +47,7 @@ static int octeon_cib_match(device_t, cf
static void octeon_cib_attach(device_t, device_t, void *);
static void * octeon_cib_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void octeon_cib_disestablish(device_t, void *);
static bool octeon_cib_intrstr(device_t, u_int *, char *, size_t);
@@ -173,7 +173,7 @@ octeon_cib_attach(device_t parent, devic
static void *
octeon_cib_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct octeon_cib_softc * const sc = device_private(dev);
struct octeon_cib_intr *ih;
Index: src/sys/arch/mips/cavium/dev/octeon_intc.c
diff -u src/sys/arch/mips/cavium/dev/octeon_intc.c:1.1 src/sys/arch/mips/cavium/dev/octeon_intc.c:1.2
--- src/sys/arch/mips/cavium/dev/octeon_intc.c:1.1 Thu Jul 16 11:49:37 2020
+++ src/sys/arch/mips/cavium/dev/octeon_intc.c Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_intc.c,v 1.1 2020/07/16 11:49:37 jmcneill Exp $ */
+/* $NetBSD: octeon_intc.c,v 1.2 2021/01/15 00:38:23 jmcneill Exp $ */
/*-
* Copyright (c) 2020 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_intc.c,v 1.1 2020/07/16 11:49:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_intc.c,v 1.2 2021/01/15 00:38:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -45,7 +45,7 @@ static int octeon_intc_match(device_t, c
static void octeon_intc_attach(device_t, device_t, void *);
static void * octeon_intc_establish(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
static void octeon_intc_disestablish(device_t, void *);
static bool octeon_intc_intrstr(device_t, u_int *, char *, size_t);
@@ -113,7 +113,7 @@ octeon_intc_attach(device_t parent, devi
static void *
octeon_intc_establish(device_t dev, u_int *specifier, int ipl, int flags,
- int (*func)(void *), void *arg)
+ int (*func)(void *), void *arg, const char *xname)
{
struct octeon_intc_softc * const sc = device_private(dev);
Index: src/sys/dev/fdt/fdt_intr.c
diff -u src/sys/dev/fdt/fdt_intr.c:1.26 src/sys/dev/fdt/fdt_intr.c:1.27
--- src/sys/dev/fdt/fdt_intr.c:1.26 Sun Mar 8 08:25:36 2020
+++ src/sys/dev/fdt/fdt_intr.c Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_intr.c,v 1.26 2020/03/08 08:25:36 skrll Exp $ */
+/* $NetBSD: fdt_intr.c,v 1.27 2021/01/15 00:38:23 jmcneill Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdt_intr.c,v 1.26 2020/03/08 08:25:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_intr.c,v 1.27 2021/01/15 00:38:23 jmcneill Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -235,7 +235,7 @@ fdtbus_intr_establish_raw(int ihandle, c
* and hope that the device won't actually interrupt until we return.
*/
ih = ic->ic_funcs->establish(ic->ic_dev, __UNCONST(specifier),
- ipl, flags, func, arg);
+ ipl, flags, func, arg, NULL);
if (ih != NULL) {
atomic_store_release(&c->c_ih, ih);
} else {
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.64 src/sys/dev/fdt/fdtvar.h:1.65
--- src/sys/dev/fdt/fdtvar.h:1.64 Wed Dec 23 16:02:11 2020
+++ src/sys/dev/fdt/fdtvar.h Fri Jan 15 00:38:23 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.64 2020/12/23 16:02:11 thorpej Exp $ */
+/* $NetBSD: fdtvar.h,v 1.65 2021/01/15 00:38:23 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -72,7 +72,7 @@ struct fdt_attach_args {
struct fdtbus_interrupt_controller_func {
void * (*establish)(device_t, u_int *, int, int,
- int (*)(void *), void *);
+ int (*)(void *), void *, const char *);
void (*disestablish)(device_t, void *);
bool (*intrstr)(device_t, u_int *, char *, size_t);
void (*mask)(device_t, void *);
