Module Name: src Committed By: thorpej Date: Fri Jun 25 18:08:34 UTC 2021
Modified Files: src/sys/arch/alpha/common: shared_intr.c src/sys/arch/alpha/jensenio: jensenio_intr.c src/sys/arch/alpha/pci: pci_1000.c pci_1000a.c pci_2100_a500.c pci_550.c pci_6600.c pci_eb164.c pci_eb64plus.c pci_eb66.c pci_kn20aa.c pci_kn300.c pci_machdep.c sio_pic.c Log Message: Tweak how the IRQ description strings are generated to enable additional duplicated code re-factoring. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/alpha/common/shared_intr.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/alpha/jensenio/jensenio_intr.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/alpha/pci/pci_1000.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/alpha/pci/pci_1000a.c \ src/sys/arch/alpha/pci/pci_6600.c src/sys/arch/alpha/pci/pci_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/pci/pci_2100_a500.c cvs rdiff -u -r1.39 -r1.40 src/sys/arch/alpha/pci/pci_550.c cvs rdiff -u -r1.47 -r1.48 src/sys/arch/alpha/pci/pci_eb164.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/alpha/pci/pci_eb64plus.c \ src/sys/arch/alpha/pci/pci_eb66.c cvs rdiff -u -r1.56 -r1.57 src/sys/arch/alpha/pci/pci_kn20aa.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/alpha/pci/pci_kn300.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/alpha/pci/sio_pic.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/alpha/common/shared_intr.c diff -u src/sys/arch/alpha/common/shared_intr.c:1.27 src/sys/arch/alpha/common/shared_intr.c:1.28 --- src/sys/arch/alpha/common/shared_intr.c:1.27 Fri May 7 16:58:33 2021 +++ src/sys/arch/alpha/common/shared_intr.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: shared_intr.c,v 1.27 2021/05/07 16:58:33 thorpej Exp $ */ +/* $NetBSD: shared_intr.c,v 1.28 2021/06/25 18:08:34 thorpej Exp $ */ /* * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.27 2021/05/07 16:58:33 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: shared_intr.c,v 1.28 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -170,7 +170,7 @@ alpha_shared_intr_alloc_intrhand(struct struct alpha_shared_intrhand *ih; if (intr[num].intr_sharetype == IST_UNUSABLE) { - printf("%s: %s %d: unusable\n", __func__, + printf("%s: %s irq %d: unusable\n", __func__, basename, num); return NULL; } @@ -249,12 +249,12 @@ alpha_shared_intr_link(struct alpha_shar case IST_PULSE: if (type != IST_NONE) { if (intr[num].intr_q.tqh_first == NULL) { - printf("alpha_shared_intr_establish: %s %d: warning: using %s on %s\n", + printf("alpha_shared_intr_establish: %s irq %d: warning: using %s on %s\n", basename, num, intr_typename(type), intr_typename(intr[num].intr_sharetype)); type = intr[num].intr_sharetype; } else { - printf("alpha_shared_intr_establish: %s %d: can't share %s with %s\n", + printf("alpha_shared_intr_establish: %s irq %d: can't share %s with %s\n", basename, num, intr_typename(type), intr_typename(intr[num].intr_sharetype)); return (false); @@ -381,7 +381,7 @@ alpha_shared_intr_stray(struct alpha_sha return; if (intr[num].intr_nstrays <= intr[num].intr_maxstrays) - log(LOG_ERR, "stray %s %d%s\n", basename, num, + log(LOG_ERR, "stray %s irq %d%s\n", basename, num, intr[num].intr_nstrays >= intr[num].intr_maxstrays ? "; stopped logging" : ""); } Index: src/sys/arch/alpha/jensenio/jensenio_intr.c diff -u src/sys/arch/alpha/jensenio/jensenio_intr.c:1.14 src/sys/arch/alpha/jensenio/jensenio_intr.c:1.15 --- src/sys/arch/alpha/jensenio/jensenio_intr.c:1.14 Fri May 7 16:58:34 2021 +++ src/sys/arch/alpha/jensenio/jensenio_intr.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: jensenio_intr.c,v 1.14 2021/05/07 16:58:34 thorpej Exp $ */ +/* $NetBSD: jensenio_intr.c,v 1.15 2021/06/25 18:08:34 thorpej Exp $ */ /*- * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: jensenio_intr.c,v 1.14 2021/05/07 16:58:34 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: jensenio_intr.c,v 1.15 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -269,14 +269,14 @@ jensenio_eisa_intr_establish(void *v, in } cookie = alpha_shared_intr_alloc_intrhand(jensenio_eisa_intr, irq, - type, level, 0, fn, arg, "eisa irq"); + type, level, 0, fn, arg, "eisa"); if (cookie == NULL) return NULL; mutex_enter(&cpu_lock); - if (! alpha_shared_intr_link(jensenio_eisa_intr, cookie, "eisa irq")) { + if (! alpha_shared_intr_link(jensenio_eisa_intr, cookie, "eisa")) { mutex_exit(&cpu_lock); alpha_shared_intr_free_intrhand(cookie); return NULL; @@ -310,7 +310,7 @@ jensenio_eisa_intr_disestablish(void *v, scb_free(0x800 + SCB_IDXTOVEC(irq)); } - alpha_shared_intr_unlink(jensenio_eisa_intr, cookie, "eisa irq"); + alpha_shared_intr_unlink(jensenio_eisa_intr, cookie, "eisa"); mutex_exit(&cpu_lock); @@ -333,7 +333,7 @@ jensenio_iointr(void *framep, u_long vec irq = SCB_VECTOIDX(vec - 0x800); if (!alpha_shared_intr_dispatch(jensenio_eisa_intr, irq)) - alpha_shared_intr_stray(jensenio_eisa_intr, irq, "eisa irq"); + alpha_shared_intr_stray(jensenio_eisa_intr, irq, "eisa"); jensenio_specific_eoi(irq); } Index: src/sys/arch/alpha/pci/pci_1000.c diff -u src/sys/arch/alpha/pci/pci_1000.c:1.28 src/sys/arch/alpha/pci/pci_1000.c:1.29 --- src/sys/arch/alpha/pci/pci_1000.c:1.28 Sat Jun 19 16:59:07 2021 +++ src/sys/arch/alpha/pci/pci_1000.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_1000.c,v 1.28 2021/06/19 16:59:07 thorpej Exp $ */ +/* $NetBSD: pci_1000.c,v 1.29 2021/06/25 18:08:34 thorpej Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.28 2021/06/19 16:59:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_1000.c,v 1.29 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -119,7 +119,7 @@ pci_1000_pickintr(void *core, bus_space_ #define PCI_1000_IRQ_STR 8 pc->pc_shared_intrs = alpha_shared_intr_alloc(PCI_NIRQ, PCI_1000_IRQ_STR); - pc->pc_intr_desc = "dec 1000 irq"; + pc->pc_intr_desc = "dec 1000"; pc->pc_vecbase = 0x900; pc->pc_nirq = PCI_NIRQ; @@ -134,7 +134,7 @@ pci_1000_pickintr(void *core, bus_space_ snprintf(cp, PCI_1000_IRQ_STR, "irq %d", i); evcnt_attach_dynamic(alpha_shared_intr_evcnt( pc->pc_shared_intrs, i), EVCNT_TYPE_INTR, NULL, - "dec 1000", cp); + pc->pc_intr_desc, cp); } pci_1000_imi(); Index: src/sys/arch/alpha/pci/pci_1000a.c diff -u src/sys/arch/alpha/pci/pci_1000a.c:1.30 src/sys/arch/alpha/pci/pci_1000a.c:1.31 --- src/sys/arch/alpha/pci/pci_1000a.c:1.30 Sat Jun 19 16:59:07 2021 +++ src/sys/arch/alpha/pci/pci_1000a.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_1000a.c,v 1.30 2021/06/19 16:59:07 thorpej Exp $ */ +/* $NetBSD: pci_1000a.c,v 1.31 2021/06/25 18:08:34 thorpej Exp $ */ /* * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -60,7 +60,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.30 2021/06/19 16:59:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_1000a.c,v 1.31 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -123,7 +123,7 @@ pci_1000a_pickintr(void *core, bus_space #define PCI_1000A_IRQ_STR 8 pc->pc_shared_intrs = alpha_shared_intr_alloc(PCI_NIRQ, PCI_1000A_IRQ_STR); - pc->pc_intr_desc = "dec 1000a irq"; + pc->pc_intr_desc = "dec 1000a"; pc->pc_vecbase = 0x900; pc->pc_nirq = PCI_NIRQ; @@ -138,7 +138,7 @@ pci_1000a_pickintr(void *core, bus_space snprintf(cp, PCI_1000A_IRQ_STR, "irq %d", i); evcnt_attach_dynamic(alpha_shared_intr_evcnt( pc->pc_shared_intrs, i), EVCNT_TYPE_INTR, NULL, - "dec 1000a", cp); + pc->pc_intr_desc, cp); } pci_1000a_imi(); Index: src/sys/arch/alpha/pci/pci_6600.c diff -u src/sys/arch/alpha/pci/pci_6600.c:1.30 src/sys/arch/alpha/pci/pci_6600.c:1.31 --- src/sys/arch/alpha/pci/pci_6600.c:1.30 Sat Jun 19 16:59:07 2021 +++ src/sys/arch/alpha/pci/pci_6600.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_6600.c,v 1.30 2021/06/19 16:59:07 thorpej Exp $ */ +/* $NetBSD: pci_6600.c,v 1.31 2021/06/25 18:08:34 thorpej Exp $ */ /*- * Copyright (c) 1999 by Ross Harvey. All rights reserved. @@ -33,7 +33,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.30 2021/06/19 16:59:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_6600.c,v 1.31 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -124,7 +124,7 @@ pci_6600_pickintr(void *core, bus_space_ pc->pc_pciide_compat_intr_establish = NULL; - pc->pc_intr_desc = "dec 6600 irq"; + pc->pc_intr_desc = "dec 6600"; pc->pc_vecbase = 0x900; pc->pc_nirq = PCI_NIRQ; @@ -166,7 +166,7 @@ pci_6600_pickintr(void *core, bus_space_ snprintf(cp, PCI_6600_IRQ_STR, "irq %d", i); evcnt_attach_dynamic(alpha_shared_intr_evcnt( pc->pc_shared_intrs, i), EVCNT_TYPE_INTR, NULL, - "dec 6600", cp); + pc->pc_intr_desc, cp); } #if NSIO sio_intr_setup(pc, iot); Index: src/sys/arch/alpha/pci/pci_machdep.c diff -u src/sys/arch/alpha/pci/pci_machdep.c:1.30 src/sys/arch/alpha/pci/pci_machdep.c:1.31 --- src/sys/arch/alpha/pci/pci_machdep.c:1.30 Fri Jun 25 03:44:10 2021 +++ src/sys/arch/alpha/pci/pci_machdep.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.30 2021/06/25 03:44:10 thorpej Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.31 2021/06/25 18:08:34 thorpej Exp $ */ /*- * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.30 2021/06/25 03:44:10 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.31 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -225,7 +225,7 @@ alpha_pci_generic_intr_string(pci_chipse KASSERT(irq < pc->pc_nirq); - snprintf(buf, len, "%s %u", pc->pc_intr_desc, irq); + snprintf(buf, len, "%s irq %u", pc->pc_intr_desc, irq); return buf; } Index: src/sys/arch/alpha/pci/pci_2100_a500.c diff -u src/sys/arch/alpha/pci/pci_2100_a500.c:1.15 src/sys/arch/alpha/pci/pci_2100_a500.c:1.16 --- src/sys/arch/alpha/pci/pci_2100_a500.c:1.15 Sat Jun 19 16:59:07 2021 +++ src/sys/arch/alpha/pci/pci_2100_a500.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_2100_a500.c,v 1.15 2021/06/19 16:59:07 thorpej Exp $ */ +/* $NetBSD: pci_2100_a500.c,v 1.16 2021/06/25 18:08:34 thorpej Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_2100_a500.c,v 1.15 2021/06/19 16:59:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_2100_a500.c,v 1.16 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -206,7 +206,7 @@ pci_2100_a500_pickintr(void *core, bus_s pc->pc_shared_intrs = alpha_shared_intr_alloc(SABLE_MAX_IRQ, PCI_2100_IRQ_STR); - pc->pc_intr_desc = "T2 irq"; + pc->pc_intr_desc = "T2"; /* 64 16-byte vectors per hose. */ pc->pc_vecbase = 0x800 + ((64 * 16) * tcp->tc_hose); @@ -438,14 +438,14 @@ dec_2100_a500_intr_establish(pci_chipset KASSERT(irq < SABLE_MAX_IRQ); cookie = alpha_shared_intr_alloc_intrhand(pc->pc_shared_intrs, irq, - dec_2100_a500_intr_deftype[irq], level, flags, func, arg, "T2 irq"); + dec_2100_a500_intr_deftype[irq], level, flags, func, arg, "T2"); if (cookie == NULL) return NULL; mutex_enter(&cpu_lock); - if (! alpha_shared_intr_link(pc->pc_shared_intrs, cookie, "T2 irq")) { + if (! alpha_shared_intr_link(pc->pc_shared_intrs, cookie, "T2")) { mutex_exit(&cpu_lock); alpha_shared_intr_free_intrhand(cookie); return NULL; @@ -478,7 +478,7 @@ dec_2100_a500_intr_disestablish(pci_chip scb_free(pc->pc_vecbase + SCB_IDXTOVEC(irq)); } - alpha_shared_intr_unlink(pc->pc_shared_intrs, cookie, "T2 irq"); + alpha_shared_intr_unlink(pc->pc_shared_intrs, cookie, "T2"); mutex_exit(&cpu_lock); @@ -573,14 +573,14 @@ dec_2100_a500_eisa_intr_establish(void * } cookie = alpha_shared_intr_alloc_intrhand(pc->pc_shared_intrs, irq, - type, level, 0, fn, arg, "T2 irq"); + type, level, 0, fn, arg, "T2"); if (cookie == NULL) return NULL; mutex_enter(&cpu_lock); - if (! alpha_shared_intr_link(pc->pc_shared_intrs, cookie, "T2 irq")) { + if (! alpha_shared_intr_link(pc->pc_shared_intrs, cookie, "T2")) { mutex_exit(&cpu_lock); alpha_shared_intr_free_intrhand(cookie); return NULL; @@ -618,7 +618,7 @@ dec_2100_a500_eisa_intr_disestablish(voi } /* Remove it from the link. */ - alpha_shared_intr_unlink(pc->pc_shared_intrs, cookie, "T2 irq"); + alpha_shared_intr_unlink(pc->pc_shared_intrs, cookie, "T2"); mutex_exit(&cpu_lock); @@ -669,7 +669,7 @@ dec_2100_a500_iointr(void *arg, u_long v rv = alpha_shared_intr_dispatch(pc->pc_shared_intrs, irq); (*tcp->tc_eoi)(tcp, irq); if (rv == 0) { - alpha_shared_intr_stray(pc->pc_shared_intrs, irq, "T2 irq"); + alpha_shared_intr_stray(pc->pc_shared_intrs, irq, "T2"); if (ALPHA_SHARED_INTR_DISABLE(pc->pc_shared_intrs, irq)) (*tcp->tc_enable_intr)(tcp, irq, 0); } else Index: src/sys/arch/alpha/pci/pci_550.c diff -u src/sys/arch/alpha/pci/pci_550.c:1.39 src/sys/arch/alpha/pci/pci_550.c:1.40 --- src/sys/arch/alpha/pci/pci_550.c:1.39 Sat Jun 19 16:59:07 2021 +++ src/sys/arch/alpha/pci/pci_550.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_550.c,v 1.39 2021/06/19 16:59:07 thorpej Exp $ */ +/* $NetBSD: pci_550.c,v 1.40 2021/06/25 18:08:34 thorpej Exp $ */ /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.39 2021/06/19 16:59:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_550.c,v 1.40 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -145,7 +145,7 @@ pci_550_pickintr(void *core, bus_space_t #define PCI_550_IRQ_STR 8 pc->pc_shared_intrs = alpha_shared_intr_alloc(DEC_550_MAX_IRQ, PCI_550_IRQ_STR); - pc->pc_intr_desc = "dec 550 irq"; + pc->pc_intr_desc = "dec 550"; pc->pc_vecbase = 0x900; pc->pc_nirq = DEC_550_MAX_IRQ; @@ -161,7 +161,7 @@ pci_550_pickintr(void *core, bus_space_t snprintf(cp, PCI_550_IRQ_STR, "irq %d", i); evcnt_attach_dynamic(alpha_shared_intr_evcnt( pc->pc_shared_intrs, i), EVCNT_TYPE_INTR, NULL, - "dec 550", cp); + pc->pc_intr_desc, cp); } #if NSIO Index: src/sys/arch/alpha/pci/pci_eb164.c diff -u src/sys/arch/alpha/pci/pci_eb164.c:1.47 src/sys/arch/alpha/pci/pci_eb164.c:1.48 --- src/sys/arch/alpha/pci/pci_eb164.c:1.47 Sat Jun 19 16:59:07 2021 +++ src/sys/arch/alpha/pci/pci_eb164.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_eb164.c,v 1.47 2021/06/19 16:59:07 thorpej Exp $ */ +/* $NetBSD: pci_eb164.c,v 1.48 2021/06/25 18:08:34 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.47 2021/06/19 16:59:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_eb164.c,v 1.48 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -128,7 +128,7 @@ pci_eb164_pickintr(void *core, bus_space #define PCI_EB164_IRQ_STR 8 pc->pc_shared_intrs = alpha_shared_intr_alloc(EB164_MAX_IRQ, PCI_EB164_IRQ_STR); - pc->pc_intr_desc = "eb164 irq"; + pc->pc_intr_desc = "eb164"; pc->pc_vecbase = 0x900; pc->pc_nirq = EB164_MAX_IRQ; @@ -148,7 +148,7 @@ pci_eb164_pickintr(void *core, bus_space snprintf(cp, PCI_EB164_IRQ_STR, "irq %d", i); evcnt_attach_dynamic(alpha_shared_intr_evcnt( pc->pc_shared_intrs, i), EVCNT_TYPE_INTR, NULL, - "eb164", cp); + pc->pc_intr_desc, cp); } #if NSIO Index: src/sys/arch/alpha/pci/pci_eb64plus.c diff -u src/sys/arch/alpha/pci/pci_eb64plus.c:1.26 src/sys/arch/alpha/pci/pci_eb64plus.c:1.27 --- src/sys/arch/alpha/pci/pci_eb64plus.c:1.26 Sat Jun 19 16:59:07 2021 +++ src/sys/arch/alpha/pci/pci_eb64plus.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_eb64plus.c,v 1.26 2021/06/19 16:59:07 thorpej Exp $ */ +/* $NetBSD: pci_eb64plus.c,v 1.27 2021/06/25 18:08:34 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.26 2021/06/19 16:59:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_eb64plus.c,v 1.27 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -121,7 +121,7 @@ pci_eb64plus_pickintr(void *core, bus_sp #define PCI_EB64PLUS_IRQ_STR 8 pc->pc_shared_intrs = alpha_shared_intr_alloc(EB64PLUS_MAX_IRQ, PCI_EB64PLUS_IRQ_STR); - pc->pc_intr_desc = "eb64+ irq"; + pc->pc_intr_desc = "eb64+"; pc->pc_vecbase = 0x900; pc->pc_nirq = EB64PLUS_MAX_IRQ; @@ -136,7 +136,7 @@ pci_eb64plus_pickintr(void *core, bus_sp snprintf(cp, PCI_EB64PLUS_IRQ_STR, "irq %d", i); evcnt_attach_dynamic(alpha_shared_intr_evcnt( pc->pc_shared_intrs, i), EVCNT_TYPE_INTR, NULL, - "eb64+", cp); + pc->pc_intr_desc, cp); } #if NSIO Index: src/sys/arch/alpha/pci/pci_eb66.c diff -u src/sys/arch/alpha/pci/pci_eb66.c:1.26 src/sys/arch/alpha/pci/pci_eb66.c:1.27 --- src/sys/arch/alpha/pci/pci_eb66.c:1.26 Sat Jun 19 16:59:07 2021 +++ src/sys/arch/alpha/pci/pci_eb66.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_eb66.c,v 1.26 2021/06/19 16:59:07 thorpej Exp $ */ +/* $NetBSD: pci_eb66.c,v 1.27 2021/06/25 18:08:34 thorpej Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.26 2021/06/19 16:59:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_eb66.c,v 1.27 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -121,7 +121,7 @@ pci_eb66_pickintr(void *core, bus_space_ #define PCI_EB66_IRQ_STR 8 pc->pc_shared_intrs = alpha_shared_intr_alloc(EB66_MAX_IRQ, PCI_EB66_IRQ_STR); - pc->pc_intr_desc = "eb66 irq"; + pc->pc_intr_desc = "eb66"; pc->pc_vecbase = 0x900; pc->pc_nirq = EB66_MAX_IRQ; @@ -136,7 +136,7 @@ pci_eb66_pickintr(void *core, bus_space_ snprintf(cp, PCI_EB66_IRQ_STR, "irq %d", i); evcnt_attach_dynamic(alpha_shared_intr_evcnt( pc->pc_shared_intrs, i), EVCNT_TYPE_INTR, NULL, - "eb66", cp); + pc->pc_intr_desc, cp); } #if NSIO Index: src/sys/arch/alpha/pci/pci_kn20aa.c diff -u src/sys/arch/alpha/pci/pci_kn20aa.c:1.56 src/sys/arch/alpha/pci/pci_kn20aa.c:1.57 --- src/sys/arch/alpha/pci/pci_kn20aa.c:1.56 Sat Jun 19 16:59:07 2021 +++ src/sys/arch/alpha/pci/pci_kn20aa.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_kn20aa.c,v 1.56 2021/06/19 16:59:07 thorpej Exp $ */ +/* $NetBSD: pci_kn20aa.c,v 1.57 2021/06/25 18:08:34 thorpej Exp $ */ /* * Copyright (c) 1995, 1996 Carnegie-Mellon University. @@ -29,7 +29,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.56 2021/06/19 16:59:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_kn20aa.c,v 1.57 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -84,7 +84,7 @@ pci_kn20aa_pickintr(void *core, bus_spac #define PCI_KN20AA_IRQ_STR 8 pc->pc_shared_intrs = alpha_shared_intr_alloc(KN20AA_MAX_IRQ, PCI_KN20AA_IRQ_STR); - pc->pc_intr_desc = "kn20aa irq"; + pc->pc_intr_desc = "kn20aa"; pc->pc_vecbase = 0x900; pc->pc_nirq = KN20AA_MAX_IRQ; @@ -99,7 +99,7 @@ pci_kn20aa_pickintr(void *core, bus_spac snprintf(cp, PCI_KN20AA_IRQ_STR, "irq %d", i); evcnt_attach_dynamic(alpha_shared_intr_evcnt( pc->pc_shared_intrs, i), EVCNT_TYPE_INTR, NULL, - "kn20aa", cp); + pc->pc_intr_desc, cp); } #if NSIO > 0 || NPCEB > 0 Index: src/sys/arch/alpha/pci/pci_kn300.c diff -u src/sys/arch/alpha/pci/pci_kn300.c:1.40 src/sys/arch/alpha/pci/pci_kn300.c:1.41 --- src/sys/arch/alpha/pci/pci_kn300.c:1.40 Sat Jun 19 16:59:07 2021 +++ src/sys/arch/alpha/pci/pci_kn300.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_kn300.c,v 1.40 2021/06/19 16:59:07 thorpej Exp $ */ +/* $NetBSD: pci_kn300.c,v 1.41 2021/06/25 18:08:34 thorpej Exp $ */ /* * Copyright (c) 1998 by Matthew Jacob @@ -32,7 +32,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.40 2021/06/19 16:59:07 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_kn300.c,v 1.41 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -217,14 +217,14 @@ dec_kn300_intr_establish( const u_int flags = alpha_pci_intr_handle_get_flags(&ih); cookie = alpha_shared_intr_alloc_intrhand(kn300_pci_intr, irq, - IST_LEVEL, level, flags, func, arg, "kn300 irq"); + IST_LEVEL, level, flags, func, arg, "kn300"); if (cookie == NULL) return NULL; mutex_enter(&cpu_lock); - if (! alpha_shared_intr_link(kn300_pci_intr, cookie, "kn300 irq")) { + if (! alpha_shared_intr_link(kn300_pci_intr, cookie, "kn300")) { mutex_exit(&cpu_lock); alpha_shared_intr_free_intrhand(cookie); return NULL; @@ -289,7 +289,7 @@ kn300_iointr(void * const arg __unused, * Stray interrupt; disable the IRQ on the appropriate MCPCIA * if we've reached the limit. */ - alpha_shared_intr_stray(kn300_pci_intr, irq, "kn300 irq"); + alpha_shared_intr_stray(kn300_pci_intr, irq, "kn300"); if (ALPHA_SHARED_INTR_DISABLE(kn300_pci_intr, irq) == 0) return; kn300_disable_intr(mcp->mcpcia_cc, savirqs[irq]); Index: src/sys/arch/alpha/pci/sio_pic.c diff -u src/sys/arch/alpha/pci/sio_pic.c:1.49 src/sys/arch/alpha/pci/sio_pic.c:1.50 --- src/sys/arch/alpha/pci/sio_pic.c:1.49 Fri Jun 25 13:41:33 2021 +++ src/sys/arch/alpha/pci/sio_pic.c Fri Jun 25 18:08:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: sio_pic.c,v 1.49 2021/06/25 13:41:33 thorpej Exp $ */ +/* $NetBSD: sio_pic.c,v 1.50 2021/06/25 18:08:34 thorpej Exp $ */ /*- * Copyright (c) 1998, 2000, 2020 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.49 2021/06/25 13:41:33 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sio_pic.c,v 1.50 2021/06/25 18:08:34 thorpej Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -446,14 +446,14 @@ sio_intr_establish(void *v, int irq, int panic("sio_intr_establish: bogus irq or type"); cookie = alpha_shared_intr_alloc_intrhand(sio_intr, irq, type, level, - flags, fn, arg, "isa irq"); + flags, fn, arg, "isa"); if (cookie == NULL) return NULL; mutex_enter(&cpu_lock); - if (! alpha_shared_intr_link(sio_intr, cookie, "isa irq")) { + if (! alpha_shared_intr_link(sio_intr, cookie, "isa")) { mutex_exit(&cpu_lock); alpha_shared_intr_free_intrhand(cookie); return NULL; @@ -525,7 +525,7 @@ sio_intr_disestablish(void *v, void *coo } /* Remove it from the link. */ - alpha_shared_intr_unlink(sio_intr, cookie, "isa irq"); + alpha_shared_intr_unlink(sio_intr, cookie, "isa"); mutex_exit(&cpu_lock); @@ -648,7 +648,7 @@ sio_iointr(void *arg, unsigned long vec) #endif if (!alpha_shared_intr_dispatch(sio_intr, irq)) - alpha_shared_intr_stray(sio_intr, irq, "isa irq"); + alpha_shared_intr_stray(sio_intr, irq, "isa"); else alpha_shared_intr_reset_strays(sio_intr, irq);