Module Name: src
Committed By: skrll
Date: Fri Jan 29 14:11:14 UTC 2021
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_bsc_fdt.c bcm2835_com.c
bcm2835_dmac.c bcm2835_dwctwo.c bcm2835_emmc.c bcm2835_gpio.c
bcm2835_mbox_fdt.c bcm2835_sdhost.c bcm2835_spi.c bcm2835_tmr.c
Log Message:
fdtbus_intr_establish -> fdtbus_intr_establish_xname
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/broadcom/bcm2835_com.c \
src/sys/arch/arm/broadcom/bcm2835_sdhost.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/broadcom/bcm2835_dmac.c \
src/sys/arch/arm/broadcom/bcm2835_gpio.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/arm/broadcom/bcm2835_emmc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835_mbox_fdt.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/broadcom/bcm2835_spi.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/broadcom/bcm2835_tmr.c
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_bsc_fdt.c
diff -u src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c:1.5 src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c:1.6
--- src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c:1.5 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm2835_bsc_fdt.c Fri Jan 29 14:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_bsc_fdt.c,v 1.5 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_bsc_fdt.c,v 1.6 2021/01/29 14:11:14 skrll Exp $ */
/*
* Copyright (c) 2019 Jason R. Thorpe
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_fdt.c,v 1.5 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_bsc_fdt.c,v 1.6 2021/01/29 14:11:14 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -118,8 +118,8 @@ bsciic_fdt_attach(device_t parent, devic
aprint_error_dev(sc->sc_dev, "failed to decode interrupt\n");
return;
}
- sc->sc_inth = fdtbus_intr_establish(phandle, 0, IPL_VM,
- FDT_INTR_MPSAFE, bsciic_intr, sc);
+ sc->sc_inth = fdtbus_intr_establish_xname(phandle, 0, IPL_VM,
+ FDT_INTR_MPSAFE, bsciic_intr, sc, device_xname(sc->sc_dev));
if (sc->sc_inth == NULL) {
aprint_error_dev(sc->sc_dev,
"failed to establish interrupt %s\n", intrstr);
Index: src/sys/arch/arm/broadcom/bcm2835_com.c
diff -u src/sys/arch/arm/broadcom/bcm2835_com.c:1.7 src/sys/arch/arm/broadcom/bcm2835_com.c:1.8
--- src/sys/arch/arm/broadcom/bcm2835_com.c:1.7 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm2835_com.c Fri Jan 29 14:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_com.c,v 1.7 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_com.c,v 1.8 2021/01/29 14:11:14 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_com.c,v 1.7 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_com.c,v 1.8 2021/01/29 14:11:14 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -116,8 +116,8 @@ bcm_com_attach(device_t parent, device_t
return;
}
- ih = fdtbus_intr_establish(phandle, 0, IPL_SERIAL, FDT_INTR_MPSAFE,
- comintr, sc);
+ ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SERIAL, FDT_INTR_MPSAFE,
+ comintr, sc, device_xname(sc->sc_dev));
if (ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %s\n",
intrstr);
Index: src/sys/arch/arm/broadcom/bcm2835_sdhost.c
diff -u src/sys/arch/arm/broadcom/bcm2835_sdhost.c:1.7 src/sys/arch/arm/broadcom/bcm2835_sdhost.c:1.8
--- src/sys/arch/arm/broadcom/bcm2835_sdhost.c:1.7 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm2835_sdhost.c Fri Jan 29 14:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_sdhost.c,v 1.7 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_sdhost.c,v 1.8 2021/01/29 14:11:14 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_sdhost.c,v 1.7 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_sdhost.c,v 1.8 2021/01/29 14:11:14 skrll Exp $");
#include "bcmdmac.h"
@@ -243,8 +243,8 @@ sdhost_attach(device_t parent, device_t
return;
}
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_SDMMC,
- FDT_INTR_MPSAFE, sdhost_intr, sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SDMMC,
+ FDT_INTR_MPSAFE, sdhost_intr, sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %s\n",
intrstr);
Index: src/sys/arch/arm/broadcom/bcm2835_dmac.c
diff -u src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.18 src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.19
--- src/sys/arch/arm/broadcom/bcm2835_dmac.c:1.18 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm2835_dmac.c Fri Jan 29 14:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dmac.c,v 1.18 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_dmac.c,v 1.19 2021/01/29 14:11:14 skrll Exp $ */
/*-
* Copyright (c) 2014 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_dmac.c,v 1.18 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_dmac.c,v 1.19 2021/01/29 14:11:14 skrll Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -235,8 +235,11 @@ bcm_dmac_alloc(enum bcm_dmac_type type,
return NULL;
}
- ch->ch_ih = fdtbus_intr_establish(phandle, ch->ch_index, ipl, 0,
- bcm_dmac_intr, ch);
+ char xname[16];
+ snprintf(xname, sizeof(xname), "%s #%u", device_xname(sc->sc_dev),
+ ch->ch_index);
+ ch->ch_ih = fdtbus_intr_establish_xname(phandle, ch->ch_index, ipl, 0,
+ bcm_dmac_intr, ch, xname);
if (ch->ch_ih == NULL) {
aprint_error_dev(sc->sc_dev,
"failed to establish interrupt for DMA%d and %s\n", ch->ch_index,
Index: src/sys/arch/arm/broadcom/bcm2835_gpio.c
diff -u src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.18 src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.19
--- src/sys/arch/arm/broadcom/bcm2835_gpio.c:1.18 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm2835_gpio.c Fri Jan 29 14:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_gpio.c,v 1.18 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_gpio.c,v 1.19 2021/01/29 14:11:14 skrll 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.18 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_gpio.c,v 1.19 2021/01/29 14:11:14 skrll Exp $");
/*
* Driver for BCM2835 GPIO
@@ -337,12 +337,14 @@ bcmgpio_attach(device_t parent, device_t
continue;
}
+ char xname[16];
+ snprintf(xname, sizeof(xname), "%s #%u", device_xname(self),
+ bank);
sc->sc_banks[bank].sc_bankno = bank;
sc->sc_banks[bank].sc_bcm = sc;
- sc->sc_banks[bank].sc_ih =
- fdtbus_intr_establish(phandle, bank, IPL_VM,
- FDT_INTR_MPSAFE,
- bcmgpio_intr, &sc->sc_banks[bank]);
+ sc->sc_banks[bank].sc_ih = fdtbus_intr_establish_xname(phandle,
+ bank, IPL_VM, FDT_INTR_MPSAFE, bcmgpio_intr,
+ &sc->sc_banks[bank], xname);
if (sc->sc_banks[bank].sc_ih) {
aprint_normal_dev(self,
"pins %d..%d interrupting on %s\n",
Index: src/sys/arch/arm/broadcom/bcm2835_dwctwo.c
diff -u src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.9 src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.10
--- src/sys/arch/arm/broadcom/bcm2835_dwctwo.c:1.9 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm2835_dwctwo.c Fri Jan 29 14:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_dwctwo.c,v 1.9 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_dwctwo.c,v 1.10 2021/01/29 14:11:14 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.9 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_dwctwo.c,v 1.10 2021/01/29 14:11:14 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,8 +149,8 @@ bcmdwc2_attach(device_t parent, device_t
return;
}
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
- dwc2_intr, &sc->sc_dwc2);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, FDT_INTR_MPSAFE,
+ dwc2_intr, &sc->sc_dwc2, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %s\n",
Index: src/sys/arch/arm/broadcom/bcm2835_emmc.c
diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.42 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.43
--- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.42 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Fri Jan 29 14:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_emmc.c,v 1.42 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_emmc.c,v 1.43 2021/01/29 14:11:14 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.42 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.43 2021/01/29 14:11:14 skrll Exp $");
#include "bcmdmac.h"
@@ -172,8 +172,8 @@ bcmemmc_attach(device_t parent, device_t
return;
}
- sc->sc_ih = fdtbus_intr_establish(phandle, 0, IPL_SDMMC, 0,
- sdhc_intr, &sc->sc);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, 0, IPL_SDMMC, 0,
+ sdhc_intr, &sc->sc, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error_dev(self, "failed to establish interrupt %s\n",
Index: src/sys/arch/arm/broadcom/bcm2835_mbox_fdt.c
diff -u src/sys/arch/arm/broadcom/bcm2835_mbox_fdt.c:1.2 src/sys/arch/arm/broadcom/bcm2835_mbox_fdt.c:1.3
--- src/sys/arch/arm/broadcom/bcm2835_mbox_fdt.c:1.2 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm2835_mbox_fdt.c Fri Jan 29 14:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_mbox_fdt.c,v 1.2 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_mbox_fdt.c,v 1.3 2021/01/29 14:11:14 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox_fdt.c,v 1.2 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_mbox_fdt.c,v 1.3 2021/01/29 14:11:14 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -99,8 +99,8 @@ bcmmbox_fdt_attach(device_t parent, devi
aprint_naive("\n");
aprint_normal(": VC mailbox\n");
- sc->sc_intrh = fdtbus_intr_establish(phandle, 0, IPL_VM, 0,
- bcmmbox_intr, sc);
+ sc->sc_intrh = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, 0,
+ bcmmbox_intr, sc, device_xname(self));
if (sc->sc_intrh == NULL) {
aprint_error_dev(self, "failed to establish interrupt %s\n",
intrstr);
Index: src/sys/arch/arm/broadcom/bcm2835_spi.c
diff -u src/sys/arch/arm/broadcom/bcm2835_spi.c:1.8 src/sys/arch/arm/broadcom/bcm2835_spi.c:1.9
--- src/sys/arch/arm/broadcom/bcm2835_spi.c:1.8 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm2835_spi.c Fri Jan 29 14:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_spi.c,v 1.8 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_spi.c,v 1.9 2021/01/29 14:11:14 skrll Exp $ */
/*
* Copyright (c) 2012 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_spi.c,v 1.8 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_spi.c,v 1.9 2021/01/29 14:11:14 skrll Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -124,8 +124,8 @@ bcmspi_attach(device_t parent, device_t
return;
}
- sc->sc_intrh = fdtbus_intr_establish(phandle, 0, IPL_VM, 0,
- bcmspi_intr, sc);
+ sc->sc_intrh = fdtbus_intr_establish_xname(phandle, 0, IPL_VM, 0,
+ bcmspi_intr, sc, device_xname(self));
if (sc->sc_intrh == NULL) {
aprint_error_dev(sc->sc_dev, "unable to establish interrupt\n");
return;
Index: src/sys/arch/arm/broadcom/bcm2835_tmr.c
diff -u src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.11 src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.12
--- src/sys/arch/arm/broadcom/bcm2835_tmr.c:1.11 Wed Jan 27 03:10:19 2021
+++ src/sys/arch/arm/broadcom/bcm2835_tmr.c Fri Jan 29 14:11:14 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_tmr.c,v 1.11 2021/01/27 03:10:19 thorpej Exp $ */
+/* $NetBSD: bcm2835_tmr.c,v 1.12 2021/01/29 14:11:14 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.11 2021/01/27 03:10:19 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_tmr.c,v 1.12 2021/01/29 14:11:14 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -149,8 +149,8 @@ bcmtmr_attach(device_t parent, device_t
return;
}
- sc->sc_ih = fdtbus_intr_establish(phandle, BCMTIMER, IPL_CLOCK,
- FDT_INTR_MPSAFE, clockhandler, NULL);
+ sc->sc_ih = fdtbus_intr_establish_xname(phandle, BCMTIMER, IPL_CLOCK,
+ FDT_INTR_MPSAFE, clockhandler, NULL, device_xname(self));
if (sc->sc_ih == NULL) {
aprint_error(": failed to establish interrupt on %s\n",
intrstr);
