Module Name: src
Committed By: jmcneill
Date: Tue Jan 23 21:56:07 UTC 2024
Modified Files:
src/sys/arch/evbppc/wii/dev: bwai.c ehci_hollywood.c hollywood.c
hollywood.h ohci_hollywood.c resetbtn.c sdhc_hollywood.c
Log Message:
wii: provide device names to intr_establish
wii$ intrctl list
interrupt id CPU0 device name(s)
pi irq 14 64769* hollywood0
hollywood irq 36 5872* ehci0
hollywood irq 39 58907* sdhc0
hollywood irq 40 4* sdhc1
hollywood irq 49 0* resetbtn0
pi irq 5 0* bwai0
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbppc/wii/dev/bwai.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbppc/wii/dev/ehci_hollywood.c \
src/sys/arch/evbppc/wii/dev/hollywood.c \
src/sys/arch/evbppc/wii/dev/hollywood.h \
src/sys/arch/evbppc/wii/dev/ohci_hollywood.c \
src/sys/arch/evbppc/wii/dev/resetbtn.c \
src/sys/arch/evbppc/wii/dev/sdhc_hollywood.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/evbppc/wii/dev/bwai.c
diff -u src/sys/arch/evbppc/wii/dev/bwai.c:1.2 src/sys/arch/evbppc/wii/dev/bwai.c:1.3
--- src/sys/arch/evbppc/wii/dev/bwai.c:1.2 Tue Jan 23 21:49:20 2024
+++ src/sys/arch/evbppc/wii/dev/bwai.c Tue Jan 23 21:56:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: bwai.c,v 1.2 2024/01/23 21:49:20 jmcneill Exp $ */
+/* $NetBSD: bwai.c,v 1.3 2024/01/23 21:56:07 jmcneill Exp $ */
/*-
* Copyright (c) 2024 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bwai.c,v 1.2 2024/01/23 21:49:20 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwai.c,v 1.3 2024/01/23 21:56:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -118,7 +118,8 @@ bwai_dsp_init(kmutex_t *intr_lock)
sc->sc_intr_lock = intr_lock;
- intr_establish(sc->sc_irq, IST_LEVEL, IPL_AUDIO, bwai_intr, sc);
+ intr_establish_xname(sc->sc_irq, IST_LEVEL, IPL_AUDIO, bwai_intr, sc,
+ device_xname(dev));
return &sc->sc_dai;
}
Index: src/sys/arch/evbppc/wii/dev/ehci_hollywood.c
diff -u src/sys/arch/evbppc/wii/dev/ehci_hollywood.c:1.1 src/sys/arch/evbppc/wii/dev/ehci_hollywood.c:1.2
--- src/sys/arch/evbppc/wii/dev/ehci_hollywood.c:1.1 Sat Jan 20 21:36:00 2024
+++ src/sys/arch/evbppc/wii/dev/ehci_hollywood.c Tue Jan 23 21:56:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci_hollywood.c,v 1.1 2024/01/20 21:36:00 jmcneill Exp $ */
+/* $NetBSD: ehci_hollywood.c,v 1.2 2024/01/23 21:56:07 jmcneill Exp $ */
/*-
* Copyright (c) 2024 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ehci_hollywood.c,v 1.1 2024/01/20 21:36:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci_hollywood.c,v 1.2 2024/01/23 21:56:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -84,7 +84,8 @@ ehci_hollywood_attach(device_t parent, d
sc->sc_offs = EREAD1(sc, EHCI_CAPLENGTH);
EOWRITE4(sc, EHCI_USBINTR, 0);
- hollywood_intr_establish(haa->haa_irq, IPL_USB, ehci_intr, sc);
+ hollywood_intr_establish(haa->haa_irq, IPL_USB, ehci_intr, sc,
+ device_xname(self));
error = ehci_init(sc);
if (error != 0) {
Index: src/sys/arch/evbppc/wii/dev/hollywood.c
diff -u src/sys/arch/evbppc/wii/dev/hollywood.c:1.1 src/sys/arch/evbppc/wii/dev/hollywood.c:1.2
--- src/sys/arch/evbppc/wii/dev/hollywood.c:1.1 Sat Jan 20 21:36:00 2024
+++ src/sys/arch/evbppc/wii/dev/hollywood.c Tue Jan 23 21:56:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: hollywood.c,v 1.1 2024/01/20 21:36:00 jmcneill Exp $ */
+/* $NetBSD: hollywood.c,v 1.2 2024/01/23 21:56:07 jmcneill Exp $ */
/*-
* Copyright (c) 2024 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hollywood.c,v 1.1 2024/01/20 21:36:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hollywood.c,v 1.2 2024/01/23 21:56:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -206,15 +206,16 @@ hollywood_intr_init(int irq)
pic_add(&hollywood_pic);
- intr_establish(irq, IST_LEVEL, IPL_SCHED, pic_handle_intr,
- &hollywood_pic);
+ intr_establish_xname(irq, IST_LEVEL, IPL_SCHED, pic_handle_intr,
+ &hollywood_pic, "hollywood0");
}
void *
-hollywood_intr_establish(int irq, int ipl, int (*func)(void *), void *arg)
+hollywood_intr_establish(int irq, int ipl, int (*func)(void *), void *arg,
+ const char *name)
{
KASSERT(hollywood_pic.pic_intrbase != 0);
- return intr_establish(hollywood_pic.pic_intrbase + irq,
- IST_LEVEL, ipl, func, arg);
+ return intr_establish_xname(hollywood_pic.pic_intrbase + irq,
+ IST_LEVEL, ipl, func, arg, name);
}
Index: src/sys/arch/evbppc/wii/dev/hollywood.h
diff -u src/sys/arch/evbppc/wii/dev/hollywood.h:1.1 src/sys/arch/evbppc/wii/dev/hollywood.h:1.2
--- src/sys/arch/evbppc/wii/dev/hollywood.h:1.1 Sat Jan 20 21:36:00 2024
+++ src/sys/arch/evbppc/wii/dev/hollywood.h Tue Jan 23 21:56:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: hollywood.h,v 1.1 2024/01/20 21:36:00 jmcneill Exp $ */
+/* $NetBSD: hollywood.h,v 1.2 2024/01/23 21:56:07 jmcneill Exp $ */
/*-
* Copyright (c) 2024 Jared McNeill <jmcne...@invisible.ca>
@@ -36,6 +36,6 @@ struct hollywood_attach_args {
bus_dma_tag_t haa_dmat;
};
-void *hollywood_intr_establish(int, int, int (*)(void *), void *);
+void *hollywood_intr_establish(int, int, int (*)(void *), void *, const char *);
#endif /* _WII_DEV_HOLLYWOOD_H_ */
Index: src/sys/arch/evbppc/wii/dev/ohci_hollywood.c
diff -u src/sys/arch/evbppc/wii/dev/ohci_hollywood.c:1.1 src/sys/arch/evbppc/wii/dev/ohci_hollywood.c:1.2
--- src/sys/arch/evbppc/wii/dev/ohci_hollywood.c:1.1 Sat Jan 20 21:36:00 2024
+++ src/sys/arch/evbppc/wii/dev/ohci_hollywood.c Tue Jan 23 21:56:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci_hollywood.c,v 1.1 2024/01/20 21:36:00 jmcneill Exp $ */
+/* $NetBSD: ohci_hollywood.c,v 1.2 2024/01/23 21:56:07 jmcneill Exp $ */
/*-
* Copyright (c) 2024 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci_hollywood.c,v 1.1 2024/01/20 21:36:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci_hollywood.c,v 1.2 2024/01/23 21:56:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -89,7 +89,8 @@ ohci_hollywood_attach(device_t parent, d
out32(USB_CHICKENBITS, in32(USB_CHICKENBITS) | OHCI_INTR_ENABLE);
- hollywood_intr_establish(haa->haa_irq, IPL_USB, ohci_intr, sc);
+ hollywood_intr_establish(haa->haa_irq, IPL_USB, ohci_intr, sc,
+ device_xname(self));
error = ohci_init(sc);
if (error != 0) {
Index: src/sys/arch/evbppc/wii/dev/resetbtn.c
diff -u src/sys/arch/evbppc/wii/dev/resetbtn.c:1.1 src/sys/arch/evbppc/wii/dev/resetbtn.c:1.2
--- src/sys/arch/evbppc/wii/dev/resetbtn.c:1.1 Sat Jan 20 21:36:00 2024
+++ src/sys/arch/evbppc/wii/dev/resetbtn.c Tue Jan 23 21:56:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: resetbtn.c,v 1.1 2024/01/20 21:36:00 jmcneill Exp $ */
+/* $NetBSD: resetbtn.c,v 1.2 2024/01/23 21:56:07 jmcneill Exp $ */
/*-
* Copyright (c) 2024 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: resetbtn.c,v 1.1 2024/01/20 21:36:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: resetbtn.c,v 1.2 2024/01/23 21:56:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -81,7 +81,8 @@ resetbtn_attach(device_t parent, device_
smpsw = NULL;
}
- hollywood_intr_establish(haa->haa_irq, IPL_HIGH, resetbtn_intr, smpsw);
+ hollywood_intr_establish(haa->haa_irq, IPL_HIGH, resetbtn_intr, smpsw,
+ device_xname(self));
}
static int
Index: src/sys/arch/evbppc/wii/dev/sdhc_hollywood.c
diff -u src/sys/arch/evbppc/wii/dev/sdhc_hollywood.c:1.1 src/sys/arch/evbppc/wii/dev/sdhc_hollywood.c:1.2
--- src/sys/arch/evbppc/wii/dev/sdhc_hollywood.c:1.1 Sat Jan 20 21:36:00 2024
+++ src/sys/arch/evbppc/wii/dev/sdhc_hollywood.c Tue Jan 23 21:56:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc_hollywood.c,v 1.1 2024/01/20 21:36:00 jmcneill Exp $ */
+/* $NetBSD: sdhc_hollywood.c,v 1.2 2024/01/23 21:56:07 jmcneill Exp $ */
/*-
* Copyright (c) 2024 Jared McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc_hollywood.c,v 1.1 2024/01/20 21:36:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc_hollywood.c,v 1.2 2024/01/23 21:56:07 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -90,7 +90,7 @@ sdhc_hollywood_attach(device_t parent, d
aprint_normal(": SDHC\n");
hollywood_intr_establish(haa->haa_irq, IPL_SDMMC, sdhc_intr,
- &sc->sc_base);
+ &sc->sc_base, device_xname(self));
error = sdhc_host_found(&sc->sc_base, bst, bsh, SDHC_SIZE);
if (error != 0) {
