Module Name: src Committed By: jmcneill Date: Fri Jan 15 22:59:50 UTC 2021
Modified Files: src/sys/arch/arm/rockchip: rk3399_pcie.c src/sys/arch/arm/ti: ti_edma.c src/sys/dev/fdt: fdt_intr.c fdtvar.h Log Message: Add 'const char *xname' param to fdtbus_intr_establish_byname To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/rockchip/rk3399_pcie.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/ti/ti_edma.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/fdt/fdt_intr.c cvs rdiff -u -r1.66 -r1.67 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/rockchip/rk3399_pcie.c diff -u src/sys/arch/arm/rockchip/rk3399_pcie.c:1.13 src/sys/arch/arm/rockchip/rk3399_pcie.c:1.14 --- src/sys/arch/arm/rockchip/rk3399_pcie.c:1.13 Fri Jan 15 00:38:23 2021 +++ src/sys/arch/arm/rockchip/rk3399_pcie.c Fri Jan 15 22:59:50 2021 @@ -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 <kette...@openbsd.org> * @@ -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 @@ rkpcie_intx_establish(device_t dev, u_in 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; } Index: src/sys/arch/arm/ti/ti_edma.c diff -u src/sys/arch/arm/ti/ti_edma.c:1.1 src/sys/arch/arm/ti/ti_edma.c:1.2 --- src/sys/arch/arm/ti/ti_edma.c:1.1 Sun Oct 27 12:14:51 2019 +++ src/sys/arch/arm/ti/ti_edma.c Fri Jan 15 22:59:50 2021 @@ -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 <jmcne...@invisible.ca> @@ -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_attach(device_t parent, device_t se 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; Index: src/sys/dev/fdt/fdt_intr.c diff -u src/sys/dev/fdt/fdt_intr.c:1.28 src/sys/dev/fdt/fdt_intr.c:1.29 --- src/sys/dev/fdt/fdt_intr.c:1.28 Fri Jan 15 17:17:04 2021 +++ src/sys/dev/fdt/fdt_intr.c Fri Jan 15 22:59:49 2021 @@ -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 <jmcne...@invisible.ca> @@ -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 @@ fdtbus_intr_establish_xname(int phandle, 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 @@ fdtbus_intr_establish_byname(int phandle 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 * Index: src/sys/dev/fdt/fdtvar.h diff -u src/sys/dev/fdt/fdtvar.h:1.66 src/sys/dev/fdt/fdtvar.h:1.67 --- src/sys/dev/fdt/fdtvar.h:1.66 Fri Jan 15 17:17:04 2021 +++ src/sys/dev/fdt/fdtvar.h Fri Jan 15 22:59:49 2021 @@ -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 <jmcne...@invisible.ca> @@ -322,7 +322,7 @@ void * fdtbus_intr_establish(int, u_int 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 *);