Module Name: src
Committed By: ryo
Date: Fri Sep 28 20:08:13 UTC 2012
Modified Files:
src/sys/arch/arm/xscale: ixp425_intr.c ixp425var.h
src/sys/arch/evbarm/ixdp425: ixdp425_mainbus.c
src/sys/arch/evbarm/nslu2: nslu2_mainbus.c
Log Message:
Defer attaching interrupt evcnts in the same way as i80321.c by matt@
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/xscale/ixp425_intr.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/ixp425var.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/nslu2/nslu2_mainbus.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/xscale/ixp425_intr.c
diff -u src/sys/arch/arm/xscale/ixp425_intr.c:1.23 src/sys/arch/arm/xscale/ixp425_intr.c:1.24
--- src/sys/arch/arm/xscale/ixp425_intr.c:1.23 Fri Jul 1 20:32:51 2011
+++ src/sys/arch/arm/xscale/ixp425_intr.c Fri Sep 28 20:08:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425_intr.c,v 1.23 2011/07/01 20:32:51 dyoung Exp $ */
+/* $NetBSD: ixp425_intr.c,v 1.24 2012/09/28 20:08:13 ryo Exp $ */
/*
* Copyright (c) 2003
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixp425_intr.c,v 1.23 2011/07/01 20:32:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_intr.c,v 1.24 2012/09/28 20:08:13 ryo Exp $");
#ifndef EVBARM_SPL_NOINLINE
#define EVBARM_SPL_NOINLINE
@@ -308,8 +308,6 @@ ixp425_intr_init(void)
TAILQ_INIT(&iq->iq_list);
sprintf(iq->iq_name, "irq %d", i);
- evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
- NULL, "ixp425", iq->iq_name);
}
ixp425_intr_calculate_masks();
@@ -318,6 +316,19 @@ ixp425_intr_init(void)
enable_interrupts(I32_bit);
}
+void
+ixp425_intr_evcnt_attach(void)
+{
+ struct intrq *iq;
+ int i;
+
+ for (i = 0; i < NIRQ; i++) {
+ iq = &intrq[i];
+ evcnt_attach_dynamic(&iq->iq_ev, EVCNT_TYPE_INTR,
+ NULL, "ixp425", iq->iq_name);
+ }
+}
+
void *
ixp425_intr_establish(int irq, int ipl, int (*func)(void *), void *arg)
{
Index: src/sys/arch/arm/xscale/ixp425var.h
diff -u src/sys/arch/arm/xscale/ixp425var.h:1.13 src/sys/arch/arm/xscale/ixp425var.h:1.14
--- src/sys/arch/arm/xscale/ixp425var.h:1.13 Fri Jul 1 20:32:51 2011
+++ src/sys/arch/arm/xscale/ixp425var.h Fri Sep 28 20:08:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ixp425var.h,v 1.13 2011/07/01 20:32:51 dyoung Exp $ */
+/* $NetBSD: ixp425var.h,v 1.14 2012/09/28 20:08:13 ryo Exp $ */
/*
* Copyright (c) 2003
@@ -146,6 +146,7 @@ void ixp425_attach(struct ixp425_softc *
void ixp425_icu_init(void);
void ixp425_clk_bootstrap(bus_space_tag_t);
void ixp425_intr_init(void);
+void ixp425_intr_evcnt_attach(void);
void *ixp425_intr_establish(int, int, int (*)(void *), void *);
void ixp425_intr_disestablish(void *);
Index: src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c
diff -u src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c:1.7 src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c:1.8
--- src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c:1.7 Fri Jul 1 20:42:36 2011
+++ src/sys/arch/evbarm/ixdp425/ixdp425_mainbus.c Fri Sep 28 20:08:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ixdp425_mainbus.c,v 1.7 2011/07/01 20:42:36 dyoung Exp $ */
+/* $NetBSD: ixdp425_mainbus.c,v 1.8 2012/09/28 20:08:13 ryo Exp $ */
/*
* Copyright (c) 2003
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_mainbus.c,v 1.7 2011/07/01 20:42:36 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_mainbus.c,v 1.8 2012/09/28 20:08:13 ryo Exp $");
/*
* front-end for the ixp425 NetworkProcessor.
@@ -65,5 +65,6 @@ ixp425_mainbus_attach(struct device *par
{
struct ixp425_softc *sc = (void *) self;
+ ixp425_intr_evcnt_attach();
ixp425_attach(sc);
}
Index: src/sys/arch/evbarm/nslu2/nslu2_mainbus.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_mainbus.c:1.2 src/sys/arch/evbarm/nslu2/nslu2_mainbus.c:1.3
--- src/sys/arch/evbarm/nslu2/nslu2_mainbus.c:1.2 Mon Apr 28 20:23:17 2008
+++ src/sys/arch/evbarm/nslu2/nslu2_mainbus.c Fri Sep 28 20:08:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_mainbus.c,v 1.2 2008/04/28 20:23:17 martin Exp $ */
+/* $NetBSD: nslu2_mainbus.c,v 1.3 2012/09/28 20:08:13 ryo Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_mainbus.c,v 1.2 2008/04/28 20:23:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_mainbus.c,v 1.3 2012/09/28 20:08:13 ryo Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,6 +52,7 @@ static void
ixp425_mainbus_attach(struct device *parent, struct device *self, void *arg)
{
+ ixp425_intr_evcnt_attach();
ixp425_attach((struct ixp425_softc *) self);
}
