Module Name: src
Committed By: rin
Date: Sat Feb 27 20:43:58 UTC 2021
Modified Files:
src/sys/arch/powerpc/ibm4xx: pic_uic.c
src/sys/arch/powerpc/ibm4xx/dev: com_opb.c dwctwo_plb.c ecc_plb.c
if_emac.c mal.c
Log Message:
Switch to intr_establish_xname().
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/ibm4xx/pic_uic.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/ibm4xx/dev/mal.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/powerpc/ibm4xx/pic_uic.c
diff -u src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.7 src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.8
--- src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.7 Mon Jul 6 10:35:28 2020
+++ src/sys/arch/powerpc/ibm4xx/pic_uic.c Sat Feb 27 20:43:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pic_uic.c,v 1.7 2020/07/06 10:35:28 rin Exp $ */
+/* $NetBSD: pic_uic.c,v 1.8 2021/02/27 20:43:58 rin Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v 1.7 2020/07/06 10:35:28 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v 1.8 2021/02/27 20:43:58 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ppcarch.h"
@@ -217,7 +217,8 @@ extern struct pic_ops pic_uic1;
static void
uic1_finish_setup(struct pic_ops *pic)
{
- intr_establish(30, IST_LEVEL, IPL_HIGH, pic_handle_intr, &pic_uic1);
+ intr_establish_xname(30, IST_LEVEL, IPL_HIGH, pic_handle_intr,
+ &pic_uic1, "uic1");
}
struct uic uic1 = {
@@ -272,7 +273,8 @@ extern struct pic_ops pic_uic2;
static void
uic2_finish_setup(struct pic_ops *pic)
{
- intr_establish(28, IST_LEVEL, IPL_HIGH, pic_handle_intr, &pic_uic2);
+ intr_establish_xname(28, IST_LEVEL, IPL_HIGH, pic_handle_intr,
+ &pic_uic2, "uic2");
}
static struct uic uic2 = {
Index: src/sys/arch/powerpc/ibm4xx/dev/com_opb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.24 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.25
--- src/sys/arch/powerpc/ibm4xx/dev/com_opb.c:1.24 Mon Jul 6 09:34:17 2020
+++ src/sys/arch/powerpc/ibm4xx/dev/com_opb.c Sat Feb 27 20:43:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: com_opb.c,v 1.24 2020/07/06 09:34:17 rin Exp $ */
+/* $NetBSD: com_opb.c,v 1.25 2021/02/27 20:43:58 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.24 2020/07/06 09:34:17 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_opb.c,v 1.25 2021/02/27 20:43:58 rin Exp $");
#include "com.h"
@@ -133,7 +133,8 @@ com_opb_attach(device_t parent, device_t
com_attach_subr(sc);
- intr_establish(oaa->opb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc);
+ intr_establish_xname(oaa->opb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc,
+ device_xname(self));
}
/*
Index: src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.5 src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.6
--- src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c:1.5 Sat Apr 23 10:15:30 2016
+++ src/sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c Sat Feb 27 20:43:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: dwctwo_plb.c,v 1.5 2016/04/23 10:15:30 skrll Exp $ */
+/* $NetBSD: dwctwo_plb.c,v 1.6 2021/02/27 20:43:58 rin Exp $ */
/*
* Copyright (c) 2013 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dwctwo_plb.c,v 1.5 2016/04/23 10:15:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwctwo_plb.c,v 1.6 2021/02/27 20:43:58 rin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -112,7 +112,8 @@ dwctwo_plb_attach(device_t parent, devic
bus_space_map(sc->sc_iot, paa->plb_addr, DWCTWO_SIZE, 0, &sc->sc_ioh);
sc->sc_bus.ub_dmatag = paa->plb_dmat;
- intr_establish(paa->plb_irq, IST_LEVEL, IPL_VM, dwc2_intr, sc);
+ intr_establish_xname(paa->plb_irq, IST_LEVEL, IPL_VM, dwc2_intr, sc,
+ device_xname(self));
/* Enable the USB interface. */
mtsdr(DCR_SDR0_PFC1, mfsdr(DCR_SDR0_PFC1) | SDR0_PFC1_USBEN);
Index: src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c:1.15 src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c:1.16
--- src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c:1.15 Tue Feb 25 14:09:13 2014
+++ src/sys/arch/powerpc/ibm4xx/dev/ecc_plb.c Sat Feb 27 20:43:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ecc_plb.c,v 1.15 2014/02/25 14:09:13 martin Exp $ */
+/* $NetBSD: ecc_plb.c,v 1.16 2021/02/27 20:43:58 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ecc_plb.c,v 1.15 2014/02/25 14:09:13 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ecc_plb.c,v 1.16 2021/02/27 20:43:58 rin Exp $");
#include "locators.h"
@@ -127,7 +127,8 @@ ecc_plb_deferred(device_t self)
{
struct ecc_plb_softc *sc = device_private(self);
- intr_establish(sc->sc_irq, IST_LEVEL, IPL_SERIAL, ecc_plb_intr, sc);
+ intr_establish_xname(sc->sc_irq, IST_LEVEL, IPL_SERIAL, ecc_plb_intr,
+ sc, device_xname(self));
}
/*
Index: src/sys/arch/powerpc/ibm4xx/dev/if_emac.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.54 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.55
--- src/sys/arch/powerpc/ibm4xx/dev/if_emac.c:1.54 Sun Jan 24 05:22:21 2021
+++ src/sys/arch/powerpc/ibm4xx/dev/if_emac.c Sat Feb 27 20:43:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_emac.c,v 1.54 2021/01/24 05:22:21 rin Exp $ */
+/* $NetBSD: if_emac.c,v 1.55 2021/02/27 20:43:58 rin Exp $ */
/*
* Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.54 2021/01/24 05:22:21 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_emac.c,v 1.55 2021/02/27 20:43:58 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_emac.h"
@@ -507,7 +507,8 @@ emac_attach(device_t parent, device_t se
sc->sc_stacr_completed = true;
}
- intr_establish(oaa->opb_irq, IST_LEVEL, IPL_NET, emac_intr, sc);
+ intr_establish_xname(oaa->opb_irq, IST_LEVEL, IPL_NET, emac_intr, sc,
+ device_xname(self));
mal_intr_establish(sc->sc_instance, sc);
if (oaa->opb_flags & OPB_FLAGS_EMAC_HT256)
Index: src/sys/arch/powerpc/ibm4xx/dev/mal.c
diff -u src/sys/arch/powerpc/ibm4xx/dev/mal.c:1.3 src/sys/arch/powerpc/ibm4xx/dev/mal.c:1.4
--- src/sys/arch/powerpc/ibm4xx/dev/mal.c:1.3 Sat Jun 18 08:17:58 2011
+++ src/sys/arch/powerpc/ibm4xx/dev/mal.c Sat Feb 27 20:43:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: mal.c,v 1.3 2011/06/18 08:17:58 matt Exp $ */
+/* $NetBSD: mal.c,v 1.4 2021/02/27 20:43:58 rin Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mal.c,v 1.3 2011/06/18 08:17:58 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mal.c,v 1.4 2021/02/27 20:43:58 rin Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -93,16 +93,16 @@ mal_attach(int pvr)
}
/* establish MAL interrupts */
- intr_establish(maltbl[i].intrs[0], IST_LEVEL, IPL_NET,
- mal_txeob_intr, NULL);
- intr_establish(maltbl[i].intrs[1], IST_LEVEL, IPL_NET,
- mal_rxeob_intr, NULL);
- intr_establish(maltbl[i].intrs[2], IST_LEVEL, IPL_NET,
- mal_txde_intr, NULL);
- intr_establish(maltbl[i].intrs[3], IST_LEVEL, IPL_NET,
- mal_rxde_intr, NULL);
- intr_establish(maltbl[i].intrs[4], IST_LEVEL, IPL_NET,
- mal_serr_intr, NULL);
+ intr_establish_xname(maltbl[i].intrs[0], IST_LEVEL, IPL_NET,
+ mal_txeob_intr, NULL, "mal txeob");
+ intr_establish_xname(maltbl[i].intrs[1], IST_LEVEL, IPL_NET,
+ mal_rxeob_intr, NULL, "mal rxeob");
+ intr_establish_xname(maltbl[i].intrs[2], IST_LEVEL, IPL_NET,
+ mal_txde_intr, NULL, "mal txde");
+ intr_establish_xname(maltbl[i].intrs[3], IST_LEVEL, IPL_NET,
+ mal_rxde_intr, NULL, "mal rxde");
+ intr_establish_xname(maltbl[i].intrs[4], IST_LEVEL, IPL_NET,
+ mal_serr_intr, NULL, "mal serr");
/* Set the MAL configuration register */
if (maltbl[i].flags & MAL_GEN2)
