Module Name: src
Committed By: rin
Date: Fri Mar 5 07:15:53 UTC 2021
Modified Files:
src/sys/arch/macppc/dev: adb.c awacs.c com_mainbus.c cuda.c esp.c
gpio.c if_bm.c if_gm.c if_mc.c if_wi_obio.c kauai.c mediabay.c
mesh.c pmu.c smu.c snapper.c wdc_obio.c zs.c
src/sys/arch/macppc/macppc: ipi_hammerhead.c pic_ohare.c pic_u3_ht.c
Log Message:
Convert to intr_establish_xname().
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/macppc/dev/adb.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/macppc/dev/awacs.c \
src/sys/arch/macppc/dev/zs.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/macppc/dev/com_mainbus.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/macppc/dev/cuda.c \
src/sys/arch/macppc/dev/if_mc.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/macppc/dev/esp.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/macppc/dev/gpio.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/macppc/dev/if_bm.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/macppc/dev/if_gm.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/macppc/dev/if_wi_obio.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/macppc/dev/kauai.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/macppc/dev/mediabay.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/macppc/dev/mesh.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/macppc/dev/pmu.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/dev/smu.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/macppc/dev/snapper.c
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/macppc/dev/wdc_obio.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/macppc/macppc/ipi_hammerhead.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/macppc/macppc/pic_ohare.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/macppc/macppc/pic_u3_ht.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/macppc/dev/adb.c
diff -u src/sys/arch/macppc/dev/adb.c:1.34 src/sys/arch/macppc/dev/adb.c:1.35
--- src/sys/arch/macppc/dev/adb.c:1.34 Sat Oct 27 17:18:00 2012
+++ src/sys/arch/macppc/dev/adb.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: adb.c,v 1.34 2012/10/27 17:18:00 chs Exp $ */
+/* $NetBSD: adb.c,v 1.35 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (C) 1994 Bradley A. Grantham
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.34 2012/10/27 17:18:00 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: adb.c,v 1.35 2021/03/05 07:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -132,10 +132,12 @@ adbattach(device_t parent, device_t self
switch (adbHardware) {
case ADB_HW_CUDA:
- intr_establish(irq, IST_LEVEL, IPL_TTY, adb_intr_cuda, sc);
+ intr_establish_xname(irq, IST_LEVEL, IPL_TTY, adb_intr_cuda, sc,
+ device_xname(self));
break;
case ADB_HW_PMU:
- intr_establish(irq, IST_LEVEL, IPL_TTY, pm_intr, sc);
+ intr_establish_xname(irq, IST_LEVEL, IPL_TTY, pm_intr, sc,
+ device_xname(self));
pm_init();
break;
}
Index: src/sys/arch/macppc/dev/awacs.c
diff -u src/sys/arch/macppc/dev/awacs.c:1.50 src/sys/arch/macppc/dev/awacs.c:1.51
--- src/sys/arch/macppc/dev/awacs.c:1.50 Sat Feb 6 07:20:36 2021
+++ src/sys/arch/macppc/dev/awacs.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: awacs.c,v 1.50 2021/02/06 07:20:36 isaki Exp $ */
+/* $NetBSD: awacs.c,v 1.51 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.50 2021/02/06 07:20:36 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awacs.c,v 1.51 2021/03/05 07:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -307,7 +307,7 @@ awacs_attach(device_t parent, device_t s
int cirq, oirq, iirq, cirq_type, oirq_type, iirq_type;
int len = -1, perch;
int root_node;
- char compat[256];
+ char compat[256], intr_xname[INTRDEVNAMEBUF];
sc = device_private(self);
sc->sc_dev = self;
@@ -361,9 +361,18 @@ awacs_attach(device_t parent, device_t s
cirq_type = oirq_type = iirq_type = IST_EDGE;
}
- intr_establish(cirq, cirq_type, IPL_BIO, awacs_status_intr, sc);
- intr_establish(oirq, oirq_type, IPL_AUDIO, awacs_intr, sc);
- intr_establish(iirq, iirq_type, IPL_AUDIO, awacs_intr, sc);
+ snprintf(intr_xname, sizeof(intr_xname), "%s status",
+ device_xname(self));
+ intr_establish_xname(cirq, cirq_type, IPL_BIO, awacs_status_intr, sc,
+ intr_xname);
+
+ snprintf(intr_xname, sizeof(intr_xname), "%s out", device_xname(self));
+ intr_establish_xname(oirq, oirq_type, IPL_AUDIO, awacs_intr, sc,
+ intr_xname);
+
+ snprintf(intr_xname, sizeof(intr_xname), "%s in", device_xname(self));
+ intr_establish_xname(iirq, iirq_type, IPL_AUDIO, awacs_intr, sc,
+ intr_xname);
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
mutex_init(&sc->sc_intr_lock, MUTEX_DEFAULT, IPL_AUDIO);
Index: src/sys/arch/macppc/dev/zs.c
diff -u src/sys/arch/macppc/dev/zs.c:1.50 src/sys/arch/macppc/dev/zs.c:1.51
--- src/sys/arch/macppc/dev/zs.c:1.50 Thu Jun 30 00:52:57 2011
+++ src/sys/arch/macppc/dev/zs.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.50 2011/06/30 00:52:57 matt Exp $ */
+/* $NetBSD: zs.c,v 1.51 2021/03/05 07:15:53 rin Exp $ */
/*
* Copyright (c) 1996, 1998 Bill Studenmund
@@ -49,7 +49,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.50 2011/06/30 00:52:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.51 2021/03/05 07:15:53 rin Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -211,6 +211,7 @@ zsc_attach(device_t parent, device_t sel
int s, chip, theflags;
int node, intr[2][3];
u_int regs[6];
+ char intr_xname[INTRDEVNAMEBUF];
zsc_attached = 1;
@@ -377,12 +378,18 @@ zsc_attach(device_t parent, device_t sel
}
/* XXX - Now safe to install interrupt handlers. */
- intr_establish(intr[0][0], IST_EDGE, IPL_TTY, zshard, zsc);
- intr_establish(intr[1][0], IST_EDGE, IPL_TTY, zshard, zsc);
+ for (channel = 0; channel < 2; channel++) {
+ snprintf(intr_xname, sizeof(intr_xname), "%s pio%d",
+ device_xname(self), channel);
+ intr_establish_xname(intr[channel][0], IST_EDGE, IPL_TTY,
+ zshard, zsc, intr_xname);
#ifdef ZS_TXDMA
- intr_establish(intr[0][1], IST_EDGE, IPL_TTY, zs_txdma_int, (void *)0);
- intr_establish(intr[1][1], IST_EDGE, IPL_TTY, zs_txdma_int, (void *)1);
+ snprintf(intr_xname, sizeof(intr_xname), "%s dma%d",
+ device_xname(self), channel);
+ intr_establish_xname(intr[channel][1], IST_EDGE, IPL_TTY,
+ zs_txdma_int, (void *)channel, intr_xname);
#endif
+ }
zsc->zsc_si = softint_establish(SOFTINT_SERIAL,
(void (*)(void *)) zsc_intr_soft, zsc);
Index: src/sys/arch/macppc/dev/com_mainbus.c
diff -u src/sys/arch/macppc/dev/com_mainbus.c:1.6 src/sys/arch/macppc/dev/com_mainbus.c:1.7
--- src/sys/arch/macppc/dev/com_mainbus.c:1.6 Sat Dec 8 17:46:11 2018
+++ src/sys/arch/macppc/dev/com_mainbus.c Fri Mar 5 07:15:53 2021
@@ -108,7 +108,8 @@ com_mainbus_attach(device_t parent, devi
com_attach_subr(sc);
#if 1
msc->sc_ih =
- intr_establish(interrupts[0], IST_LEVEL, IPL_SERIAL, comintr, sc);
+ intr_establish_xname(interrupts[0], IST_LEVEL, IPL_SERIAL, comintr, sc,
+ device_xname(self));
if (msc->sc_ih == NULL)
panic("failed to establish int handler");
Index: src/sys/arch/macppc/dev/cuda.c
diff -u src/sys/arch/macppc/dev/cuda.c:1.26 src/sys/arch/macppc/dev/cuda.c:1.27
--- src/sys/arch/macppc/dev/cuda.c:1.26 Tue Jul 14 08:58:03 2020
+++ src/sys/arch/macppc/dev/cuda.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: cuda.c,v 1.26 2020/07/14 08:58:03 martin Exp $ */
+/* $NetBSD: cuda.c,v 1.27 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.26 2020/07/14 08:58:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cuda.c,v 1.27 2021/03/05 07:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -203,7 +203,8 @@ cuda_attach(device_t parent, device_t se
aprint_normal(": unable to map registers\n");
return;
}
- sc->sc_ih = intr_establish(irq, IST_EDGE, IPL_TTY, cuda_intr, sc);
+ sc->sc_ih = intr_establish_xname(irq, IST_EDGE, IPL_TTY, cuda_intr, sc,
+ device_xname(self));
printf("\n");
for (i = 0; i < 16; i++) {
Index: src/sys/arch/macppc/dev/if_mc.c
diff -u src/sys/arch/macppc/dev/if_mc.c:1.26 src/sys/arch/macppc/dev/if_mc.c:1.27
--- src/sys/arch/macppc/dev/if_mc.c:1.26 Thu Dec 5 06:28:20 2019
+++ src/sys/arch/macppc/dev/if_mc.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mc.c,v 1.26 2019/12/05 06:28:20 msaitoh Exp $ */
+/* $NetBSD: if_mc.c,v 1.27 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 1997 David Huang <[email protected]>
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.26 2019/12/05 06:28:20 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mc.c,v 1.27 2021/03/05 07:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -108,6 +108,7 @@ mc_attach(device_t parent, device_t self
struct mc_softc *sc = device_private(self);
uint8_t myaddr[ETHER_ADDR_LEN];
u_int *reg;
+ char intr_xname[INTRDEVNAMEBUF];
sc->sc_dev = self;
sc->sc_node = ca->ca_node;
@@ -169,9 +170,16 @@ mc_attach(device_t parent, device_t self
dbdma_reset(sc->sc_txdma);
/* Install interrupt handlers */
+
/*intr_establish(ca->ca_intr[1], IST_EDGE, IPL_NET, mc_dmaintr, sc);*/
- intr_establish(ca->ca_intr[2], IST_EDGE, IPL_NET, mc_dmaintr, sc);
- intr_establish(ca->ca_intr[0], IST_EDGE, IPL_NET, mcintr, sc);
+
+ snprintf(intr_xname, sizeof(intr_xname), "%s dma", device_xname(self));
+ intr_establish_xname(ca->ca_intr[2], IST_EDGE, IPL_NET, mc_dmaintr, sc,
+ intr_xname);
+
+ snprintf(intr_xname, sizeof(intr_xname), "%s pio", device_xname(self));
+ intr_establish_xname(ca->ca_intr[0], IST_EDGE, IPL_NET, mcintr, sc,
+ intr_xname);
sc->sc_biucc = XMTSP_64;
sc->sc_fifocc = XMTFW_16 | RCVFW_64 | XMTFWU | RCVFWU |
Index: src/sys/arch/macppc/dev/esp.c
diff -u src/sys/arch/macppc/dev/esp.c:1.32 src/sys/arch/macppc/dev/esp.c:1.33
--- src/sys/arch/macppc/dev/esp.c:1.32 Fri Jul 15 22:10:47 2016
+++ src/sys/arch/macppc/dev/esp.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: esp.c,v 1.32 2016/07/15 22:10:47 macallan Exp $ */
+/* $NetBSD: esp.c,v 1.33 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.32 2016/07/15 22:10:47 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.33 2021/03/05 07:15:53 rin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -232,7 +232,8 @@ espattach(device_t parent, device_t self
sc->sc_maxxfer = 64 * 1024;
/* and the interuppts */
- intr_establish(esc->sc_pri, IST_EDGE, IPL_BIO, ncr53c9x_intr, sc);
+ intr_establish_xname(esc->sc_pri, IST_EDGE, IPL_BIO, ncr53c9x_intr, sc,
+ device_xname(self));
/* Do the common parts of attachment. */
sc->sc_adapter.adapt_minphys = minphys;
Index: src/sys/arch/macppc/dev/gpio.c
diff -u src/sys/arch/macppc/dev/gpio.c:1.12 src/sys/arch/macppc/dev/gpio.c:1.13
--- src/sys/arch/macppc/dev/gpio.c:1.12 Sat Oct 27 17:18:00 2012
+++ src/sys/arch/macppc/dev/gpio.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: gpio.c,v 1.12 2012/10/27 17:18:00 chs Exp $ */
+/* $NetBSD: gpio.c,v 1.13 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.12 2012/10/27 17:18:00 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gpio.c,v 1.13 2021/03/05 07:15:53 rin Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -159,7 +159,8 @@ gpio_gpio_attach(device_t parent, device
sc->sc_port = device_private(parent)->sc_port;
- intr_establish(ca->ca_intr[0], IST_LEVEL, IPL_HIGH, gpio_intr, sc);
+ intr_establish_xname(ca->ca_intr[0], IST_LEVEL, IPL_HIGH, gpio_intr, sc,
+ device_xname(self));
printf(" irq %d\n", ca->ca_intr[0]);
}
Index: src/sys/arch/macppc/dev/if_bm.c
diff -u src/sys/arch/macppc/dev/if_bm.c:1.63 src/sys/arch/macppc/dev/if_bm.c:1.64
--- src/sys/arch/macppc/dev/if_bm.c:1.63 Tue Feb 4 13:47:34 2020
+++ src/sys/arch/macppc/dev/if_bm.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bm.c,v 1.63 2020/02/04 13:47:34 martin Exp $ */
+/* $NetBSD: if_bm.c,v 1.64 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (C) 1998, 1999, 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.63 2020/02/04 13:47:34 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bm.c,v 1.64 2021/03/05 07:15:53 rin Exp $");
#include "opt_inet.h"
@@ -178,6 +178,7 @@ bmac_attach(device_t parent, device_t se
struct ifnet *ifp = &sc->sc_if;
struct mii_data *mii = &sc->sc_mii;
u_char laddr[6];
+ char intr_xname[INTRDEVNAMEBUF];
callout_init(&sc->sc_tick_ch, 0);
@@ -224,8 +225,13 @@ bmac_attach(device_t parent, device_t se
ca->ca_intr[0], ca->ca_intr[2],
ether_sprintf(laddr));
- intr_establish(ca->ca_intr[0], IST_EDGE, IPL_NET, bmac_intr, sc);
- intr_establish(ca->ca_intr[2], IST_EDGE, IPL_NET, bmac_rint, sc);
+ snprintf(intr_xname, sizeof(intr_xname), "%s tx", device_xname(self));
+ intr_establish_xname(ca->ca_intr[0], IST_EDGE, IPL_NET, bmac_intr, sc,
+ intr_xname);
+
+ snprintf(intr_xname, sizeof(intr_xname), "%s rx", device_xname(self));
+ intr_establish_xname(ca->ca_intr[2], IST_EDGE, IPL_NET, bmac_rint, sc,
+ intr_xname);
memcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);
ifp->if_softc = sc;
Index: src/sys/arch/macppc/dev/if_gm.c
diff -u src/sys/arch/macppc/dev/if_gm.c:1.57 src/sys/arch/macppc/dev/if_gm.c:1.58
--- src/sys/arch/macppc/dev/if_gm.c:1.57 Tue Feb 4 07:36:36 2020
+++ src/sys/arch/macppc/dev/if_gm.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gm.c,v 1.57 2020/02/04 07:36:36 skrll Exp $ */
+/* $NetBSD: if_gm.c,v 1.58 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.57 2020/02/04 07:36:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gm.c,v 1.58 2021/03/05 07:15:53 rin Exp $");
#include "opt_inet.h"
@@ -173,7 +173,8 @@ gmac_attach(device_t parent, device_t se
}
intrstr = pci_intr_string(pa->pa_pc, ih, buf, sizeof(buf));
- if (pci_intr_establish(pa->pa_pc, ih, IPL_NET, gmac_intr, sc) == NULL) {
+ if (pci_intr_establish_xname(pa->pa_pc, ih, IPL_NET, gmac_intr, sc,
+ device_xname(self)) == NULL) {
printf(": unable to establish interrupt");
if (intrstr)
printf(" at %s", intrstr);
Index: src/sys/arch/macppc/dev/if_wi_obio.c
diff -u src/sys/arch/macppc/dev/if_wi_obio.c:1.24 src/sys/arch/macppc/dev/if_wi_obio.c:1.25
--- src/sys/arch/macppc/dev/if_wi_obio.c:1.24 Sat Oct 27 17:18:00 2012
+++ src/sys/arch/macppc/dev/if_wi_obio.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wi_obio.c,v 1.24 2012/10/27 17:18:00 chs Exp $ */
+/* $NetBSD: if_wi_obio.c,v 1.25 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 2001 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wi_obio.c,v 1.24 2012/10/27 17:18:00 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wi_obio.c,v 1.25 2021/03/05 07:15:53 rin Exp $");
#include "opt_inet.h"
@@ -92,7 +92,8 @@ wi_obio_attach(device_t parent, device_t
struct confargs * const ca = aux;
aprint_normal(" irq %d:", ca->ca_intr[0]);
- intr_establish(ca->ca_intr[0], IST_LEVEL, IPL_NET, wi_intr, sc);
+ intr_establish_xname(ca->ca_intr[0], IST_LEVEL, IPL_NET, wi_intr, sc,
+ device_xname(self));
wisc->sc_dev = self;
sc->sc_tag = wisc->sc_iot = ca->ca_tag;
Index: src/sys/arch/macppc/dev/kauai.c
diff -u src/sys/arch/macppc/dev/kauai.c:1.40 src/sys/arch/macppc/dev/kauai.c:1.41
--- src/sys/arch/macppc/dev/kauai.c:1.40 Mon Sep 3 16:29:25 2018
+++ src/sys/arch/macppc/dev/kauai.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: kauai.c,v 1.40 2018/09/03 16:29:25 riastradh Exp $ */
+/* $NetBSD: kauai.c,v 1.41 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 2003 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.40 2018/09/03 16:29:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.41 2021/03/05 07:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -187,7 +187,8 @@ kauai_attach(device_t parent, device_t s
}
}
- if (pci_intr_establish(pa->pa_pc, ih, IPL_BIO, wdcintr, chp) == NULL) {
+ if (pci_intr_establish_xname(pa->pa_pc, ih, IPL_BIO, wdcintr, chp,
+ device_xname(self)) == NULL) {
aprint_error_dev(self, "unable to establish interrupt\n");
return;
}
Index: src/sys/arch/macppc/dev/mediabay.c
diff -u src/sys/arch/macppc/dev/mediabay.c:1.23 src/sys/arch/macppc/dev/mediabay.c:1.24
--- src/sys/arch/macppc/dev/mediabay.c:1.23 Tue Jan 26 14:49:41 2021
+++ src/sys/arch/macppc/dev/mediabay.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mediabay.c,v 1.23 2021/01/26 14:49:41 thorpej Exp $ */
+/* $NetBSD: mediabay.c,v 1.24 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (C) 1999 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.23 2021/01/26 14:49:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.24 2021/03/05 07:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -145,7 +145,8 @@ mediabay_attach(device_t parent, device_
printf(" irq %d %s\n", irq, intr_typename(itype));
- intr_establish(irq, itype, IPL_BIO, mediabay_intr, sc);
+ intr_establish_xname(irq, itype, IPL_BIO, mediabay_intr, sc,
+ device_xname(self));
sc->sc_content = NULL;
Index: src/sys/arch/macppc/dev/mesh.c
diff -u src/sys/arch/macppc/dev/mesh.c:1.39 src/sys/arch/macppc/dev/mesh.c:1.40
--- src/sys/arch/macppc/dev/mesh.c:1.39 Fri Mar 31 08:38:13 2017
+++ src/sys/arch/macppc/dev/mesh.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mesh.c,v 1.39 2017/03/31 08:38:13 msaitoh Exp $ */
+/* $NetBSD: mesh.c,v 1.40 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 2000 Tsubai Masanari.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.39 2017/03/31 08:38:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mesh.c,v 1.40 2021/03/05 07:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -261,7 +261,8 @@ mesh_attach(device_t parent, device_t se
config_found(self, &sc->sc_channel, scsiprint);
- intr_establish(sc->sc_irq, IST_EDGE, IPL_BIO, mesh_intr, sc);
+ intr_establish_xname(sc->sc_irq, IST_EDGE, IPL_BIO, mesh_intr, sc,
+ device_xname(self));
/* Reset SCSI bus when halt. */
if (!pmf_device_register1(self, NULL, NULL, mesh_shutdown))
Index: src/sys/arch/macppc/dev/pmu.c
diff -u src/sys/arch/macppc/dev/pmu.c:1.35 src/sys/arch/macppc/dev/pmu.c:1.36
--- src/sys/arch/macppc/dev/pmu.c:1.35 Tue Jan 26 14:49:41 2021
+++ src/sys/arch/macppc/dev/pmu.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pmu.c,v 1.35 2021/01/26 14:49:41 thorpej Exp $ */
+/* $NetBSD: pmu.c,v 1.36 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.35 2021/01/26 14:49:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmu.c,v 1.36 2021/03/05 07:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -313,7 +313,8 @@ pmu_attach(device_t parent, device_t sel
aprint_error_dev(self, "unable to map registers\n");
return;
}
- sc->sc_ih = intr_establish(irq, type, IPL_TTY, pmu_intr, sc);
+ sc->sc_ih = intr_establish_xname(irq, type, IPL_TTY, pmu_intr, sc,
+ device_xname(self));
pmu_init(sc);
Index: src/sys/arch/macppc/dev/smu.c
diff -u src/sys/arch/macppc/dev/smu.c:1.10 src/sys/arch/macppc/dev/smu.c:1.11
--- src/sys/arch/macppc/dev/smu.c:1.10 Thu Feb 25 20:49:08 2021
+++ src/sys/arch/macppc/dev/smu.c Fri Mar 5 07:15:53 2021
@@ -277,7 +277,8 @@ smu_setup_doorbell(struct smu_softc *sc)
aprint_normal(" mbox 0x%x gpio 0x%x irq %d",
sc->sc_dbell_mbox, sc->sc_dbell_gpio, irq);
- intr_establish(irq, IST_EDGE_FALLING, IPL_TTY, smu_dbell_gpio_intr, sc);
+ intr_establish_xname(irq, IST_EDGE_FALLING, IPL_TTY,
+ smu_dbell_gpio_intr, sc, device_xname(sc->sc_dev));
return 0;
}
Index: src/sys/arch/macppc/dev/snapper.c
diff -u src/sys/arch/macppc/dev/snapper.c:1.55 src/sys/arch/macppc/dev/snapper.c:1.56
--- src/sys/arch/macppc/dev/snapper.c:1.55 Sat Aug 8 22:37:19 2020
+++ src/sys/arch/macppc/dev/snapper.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: snapper.c,v 1.55 2020/08/08 22:37:19 macallan Exp $ */
+/* $NetBSD: snapper.c,v 1.56 2021/03/05 07:15:53 rin Exp $ */
/* Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp */
/* Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp */
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.55 2020/08/08 22:37:19 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.56 2021/03/05 07:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/audioio.h>
@@ -710,7 +710,7 @@ snapper_attach(device_t parent, device_t
struct confargs *ca;
int cirq, oirq, iirq, /*cirq_type,*/ oirq_type, iirq_type, soundbus;
uint32_t intr[6], reg[6];
- char compat[32];
+ char compat[32], intr_xname[INTRDEVNAMEBUF];
sc = device_private(self);
sc->sc_dev = self;
@@ -781,8 +781,14 @@ snapper_attach(device_t parent, device_t
iirq_type = (intr[5] & 1) ? IST_LEVEL : IST_EDGE;
/* intr_establish(cirq, cirq_type, IPL_AUDIO, snapper_intr, sc); */
- intr_establish(oirq, oirq_type, IPL_AUDIO, snapper_intr, sc);
- intr_establish(iirq, iirq_type, IPL_AUDIO, snapper_intr, sc);
+
+ snprintf(intr_xname, sizeof(intr_xname), "%s out", device_xname(self));
+ intr_establish_xname(oirq, oirq_type, IPL_AUDIO, snapper_intr, sc,
+ intr_xname);
+
+ snprintf(intr_xname, sizeof(intr_xname), "%s in", device_xname(self));
+ intr_establish_xname(iirq, iirq_type, IPL_AUDIO, snapper_intr, sc,
+ intr_xname);
aprint_normal(": irq %d,%d,%d\n", cirq, oirq, iirq);
@@ -2064,6 +2070,7 @@ snapper_init(struct snapper_softc *sc, i
int gpio;
int headphone_detect_intr;
uint32_t gpio_base, reg[1], fcreg;
+ char intr_xname[INTRDEVNAMEBUF];
#ifdef SNAPPER_DEBUG
char fcr[32];
@@ -2147,9 +2154,12 @@ snapper_init(struct snapper_softc *sc, i
DPRINTF(" headphone-detect intr %x\n", headphone_detect_intr);
DPRINTF(" audio-hw-reset %x\n", audio_hw_reset);
- if (headphone_detect_intr != -1)
- intr_establish(headphone_detect_intr, IST_EDGE, IPL_AUDIO,
- snapper_cint, sc);
+ if (headphone_detect_intr != -1) {
+ snprintf(intr_xname, sizeof(intr_xname), "%s headphone",
+ device_xname(sc->sc_dev));
+ intr_establish_xname(headphone_detect_intr, IST_EDGE, IPL_AUDIO,
+ snapper_cint, sc, intr_xname);
+ }
sc->sc_rate = 44100; /* default rate */
sc->sc_bitspersample = 16;
Index: src/sys/arch/macppc/dev/wdc_obio.c
diff -u src/sys/arch/macppc/dev/wdc_obio.c:1.62 src/sys/arch/macppc/dev/wdc_obio.c:1.63
--- src/sys/arch/macppc/dev/wdc_obio.c:1.62 Tue Jan 26 14:49:41 2021
+++ src/sys/arch/macppc/dev/wdc_obio.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc_obio.c,v 1.62 2021/01/26 14:49:41 thorpej Exp $ */
+/* $NetBSD: wdc_obio.c,v 1.63 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.62 2021/01/26 14:49:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc_obio.c,v 1.63 2021/03/05 07:15:53 rin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -178,7 +178,8 @@ wdc_obio_attach(device_t parent, device_
wdr->data32ioh = wdr->cmd_ioh;
#endif
- sc->sc_ih = intr_establish(intr, type, IPL_BIO, wdcintr, chp);
+ sc->sc_ih = intr_establish_xname(intr, type, IPL_BIO, wdcintr, chp,
+ device_xname(self));
if (use_dma) {
sc->sc_dmacmd = dbdma_alloc(sizeof(dbdma_command_t) * 20,
Index: src/sys/arch/macppc/macppc/ipi_hammerhead.c
diff -u src/sys/arch/macppc/macppc/ipi_hammerhead.c:1.5 src/sys/arch/macppc/macppc/ipi_hammerhead.c:1.6
--- src/sys/arch/macppc/macppc/ipi_hammerhead.c:1.5 Sun Jun 5 16:52:24 2011
+++ src/sys/arch/macppc/macppc/ipi_hammerhead.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi_hammerhead.c,v 1.5 2011/06/05 16:52:24 matt Exp $ */
+/* $NetBSD: ipi_hammerhead.c,v 1.6 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipi_hammerhead.c,v 1.5 2011/06/05 16:52:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipi_hammerhead.c,v 1.6 2021/03/05 07:15:53 rin Exp $");
#include "opt_multiprocessor.h"
#include <sys/param.h>
@@ -93,7 +93,8 @@ hh_send_ipi(cpuid_t target, uint32_t mes
static void
hh_establish_ipi(int type, int level, void *ih_args)
{
- intr_establish(ipiops.ppc_ipi_vector, type, level, ipi_intr, ih_args);
+ intr_establish_xname(ipiops.ppc_ipi_vector, type, level, ipi_intr,
+ ih_args, "hh ipi");
}
#endif /*MULTIPROCESSOR*/
Index: src/sys/arch/macppc/macppc/pic_ohare.c
diff -u src/sys/arch/macppc/macppc/pic_ohare.c:1.16 src/sys/arch/macppc/macppc/pic_ohare.c:1.17
--- src/sys/arch/macppc/macppc/pic_ohare.c:1.16 Mon Sep 3 16:29:25 2018
+++ src/sys/arch/macppc/macppc/pic_ohare.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_ohare.c,v 1.16 2018/09/03 16:29:25 riastradh Exp $ */
+/* $NetBSD: pic_ohare.c,v 1.17 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_ohare.c,v 1.16 2018/09/03 16:29:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_ohare.c,v 1.17 2021/03/05 07:15:53 rin Exp $");
#include "opt_interrupt.h"
@@ -157,7 +157,8 @@ setup_ohare2(uint32_t addr, int irq)
pic = setup_ohare(addr, 0);
strcpy(pic->pic.pic_name, "ohare2");
- intr_establish(irq, IST_LEVEL, IPL_HIGH, pic_handle_intr, pic);
+ intr_establish_xname(irq, IST_LEVEL, IPL_HIGH, pic_handle_intr, pic,
+ "ohara2");
}
static void
Index: src/sys/arch/macppc/macppc/pic_u3_ht.c
diff -u src/sys/arch/macppc/macppc/pic_u3_ht.c:1.10 src/sys/arch/macppc/macppc/pic_u3_ht.c:1.11
--- src/sys/arch/macppc/macppc/pic_u3_ht.c:1.10 Tue Jan 26 14:49:41 2021
+++ src/sys/arch/macppc/macppc/pic_u3_ht.c Fri Mar 5 07:15:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_u3_ht.c,v 1.10 2021/01/26 14:49:41 thorpej Exp $ */
+/* $NetBSD: pic_u3_ht.c,v 1.11 2021/03/05 07:15:53 rin Exp $ */
/*-
* Copyright (c) 2013 Phileas Fogg
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_u3_ht.c,v 1.10 2021/01/26 14:49:41 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_u3_ht.c,v 1.11 2021/03/05 07:15:53 rin Exp $");
#include "opt_openpic.h"
#include "opt_interrupt.h"
@@ -632,7 +632,8 @@ u3_ht_send_ipi(cpuid_t target, uint32_t
static void
u3_ht_establish_ipi(int type, int level, void *ih_args)
{
- intr_establish(ipiops.ppc_ipi_vector, type, level, ipi_intr, ih_args);
+ intr_establish_xname(ipiops.ppc_ipi_vector, type, level, ipi_intr,
+ ih_args, "u3_ht ipi");
}
#endif /*MULTIPROCESSOR*/
