summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/amd64/genassym.cf3
-rw-r--r--sys/arch/amd64/amd64/intr.c34
-rw-r--r--sys/arch/amd64/amd64/ipi.c3
-rw-r--r--sys/arch/amd64/amd64/vector.S6
-rw-r--r--sys/arch/amd64/include/cpu.h4
-rw-r--r--sys/arch/amd64/include/intr.h3
6 files changed, 6 insertions, 47 deletions
diff --git a/sys/arch/amd64/amd64/genassym.cf b/sys/arch/amd64/amd64/genassym.cf
index fdfbdee976d..638ea1e5ffc 100644
--- a/sys/arch/amd64/amd64/genassym.cf
+++ b/sys/arch/amd64/amd64/genassym.cf
@@ -1,4 +1,4 @@
-# $OpenBSD: genassym.cf,v 1.10 2007/05/07 19:10:31 kettenis Exp $
+# $OpenBSD: genassym.cf,v 1.11 2007/05/10 17:59:23 deraadt Exp $
# Written by Artur Grabowski art@openbsd.org, Public Domain
include <sys/param.h>
@@ -111,7 +111,6 @@ member CPU_INFO_GDT ci_gdt
struct intrsource
member is_recurse
member is_resume
-member is_evcnt
member is_handlers
member is_pic
member is_flags
diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c
index 1d62077f8bd..c127cdbf12b 100644
--- a/sys/arch/amd64/amd64/intr.c
+++ b/sys/arch/amd64/amd64/intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.c,v 1.13 2007/01/15 23:19:05 jsg Exp $ */
+/* $OpenBSD: intr.c,v 1.14 2007/05/10 17:59:23 deraadt Exp $ */
/* $NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $ */
/*
@@ -232,10 +232,6 @@ intr_allocate_slot_cpu(struct cpu_info *ci, struct pic *pic, int pin,
memset(isp, 0, sizeof(struct intrsource));
snprintf(isp->is_evname, sizeof (isp->is_evname),
"pin %d", pin);
-#if notyet
- evcnt_attach_dynamic(&isp->is_evcnt, EVCNT_TYPE_INTR, NULL,
- pic->pic_dev.dv_xname, isp->is_evname);
-#endif
ci->ci_isources[slot] = isp;
}
simple_unlock(&ci->ci_slock);
@@ -286,10 +282,6 @@ intr_allocate_slot(struct pic *pic, int legacy_irq, int pin, int level,
snprintf(isp->is_evname, sizeof (isp->is_evname),
"pin %d", pin);
-#if notyet
- evcnt_attach_dynamic(&isp->is_evcnt, EVCNT_TYPE_INTR,
- NULL, pic->pic_dev.dv_xname, isp->is_evname);
-#endif
simple_lock(&ci->ci_slock);
ci->ci_isources[slot] = isp;
simple_unlock(&ci->ci_slock);
@@ -528,9 +520,6 @@ intr_disestablish(struct intrhand *ih)
#endif
if (source->is_handlers == NULL) {
-#if notyet
- evcnt_detach(&source->is_evcnt);
-#endif
FREE(source, M_DEVBUF);
ci->ci_isources[ih->ih_slot] = NULL;
if (pic != &i8259_pic)
@@ -582,10 +571,6 @@ cpu_intr_init(struct cpu_info *ci)
isp->is_handlers = &fake_softclock_intrhand;
isp->is_pic = &softintr_pic;
ci->ci_isources[SIR_CLOCK] = isp;
-#if notyet
- evcnt_attach_dynamic(&isp->is_evcnt, EVCNT_TYPE_INTR, NULL,
- ci->ci_dev->dv_xname, "softclock");
-#endif
MALLOC(isp, struct intrsource *, sizeof (struct intrsource), M_DEVBUF,
M_WAITOK);
if (isp == NULL)
@@ -597,10 +582,6 @@ cpu_intr_init(struct cpu_info *ci)
isp->is_handlers = &fake_softnet_intrhand;
isp->is_pic = &softintr_pic;
ci->ci_isources[SIR_NET] = isp;
-#if notyet
- evcnt_attach_dynamic(&isp->is_evcnt, EVCNT_TYPE_INTR, NULL,
- ci->ci_dev->dv_xname, "softnet");
-#endif
MALLOC(isp, struct intrsource *, sizeof (struct intrsource), M_DEVBUF,
M_WAITOK);
if (isp == NULL)
@@ -612,10 +593,6 @@ cpu_intr_init(struct cpu_info *ci)
isp->is_handlers = &fake_softserial_intrhand;
isp->is_pic = &softintr_pic;
ci->ci_isources[SIR_SERIAL] = isp;
-#if notyet
- evcnt_attach_dynamic(&isp->is_evcnt, EVCNT_TYPE_INTR, NULL,
- ci->ci_dev->dv_xname, "softserial");
-#endif
#if NLAPIC > 0
MALLOC(isp, struct intrsource *, sizeof (struct intrsource), M_DEVBUF,
M_WAITOK);
@@ -628,10 +605,6 @@ cpu_intr_init(struct cpu_info *ci)
isp->is_handlers = &fake_timer_intrhand;
isp->is_pic = &local_pic;
ci->ci_isources[LIR_TIMER] = isp;
-#if notyet
- evcnt_attach_dynamic(&isp->is_evcnt, EVCNT_TYPE_INTR, NULL,
- ci->ci_dev->dv_xname, "timer");
-#endif
#ifdef MULTIPROCESSOR
MALLOC(isp, struct intrsource *, sizeof (struct intrsource), M_DEVBUF,
M_WAITOK);
@@ -645,11 +618,6 @@ cpu_intr_init(struct cpu_info *ci)
isp->is_pic = &local_pic;
ci->ci_isources[LIR_IPI] = isp;
-#ifdef notyet
- for (i = 0; i < X86_NIPI; i++)
- evcnt_attach_dynamic(&ci->ci_ipi_events[i], EVCNT_TYPE_INTR,
- NULL, ci->ci_dev->dv_xname, x86_ipi_names[i]);
-#endif
#endif
#endif
diff --git a/sys/arch/amd64/amd64/ipi.c b/sys/arch/amd64/amd64/ipi.c
index 32dd38f8bd3..30054c80fee 100644
--- a/sys/arch/amd64/amd64/ipi.c
+++ b/sys/arch/amd64/amd64/ipi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipi.c,v 1.5 2006/03/10 21:21:08 brad Exp $ */
+/* $OpenBSD: ipi.c,v 1.6 2007/05/10 17:59:23 deraadt Exp $ */
/* $NetBSD: ipi.c,v 1.2 2003/03/01 13:05:37 fvdl Exp $ */
/*-
@@ -125,7 +125,6 @@ x86_ipi_handler(void)
for (bit = 0; bit < X86_NIPI && pending; bit++) {
if (pending & (1<<bit)) {
pending &= ~(1<<bit);
- ci->ci_ipi_events[bit].ev_count++;
(*ipifunc[bit])(ci);
ipi_count.ec_count++;
}
diff --git a/sys/arch/amd64/amd64/vector.S b/sys/arch/amd64/amd64/vector.S
index 60fa6215af3..e77ef0a45b7 100644
--- a/sys/arch/amd64/amd64/vector.S
+++ b/sys/arch/amd64/amd64/vector.S
@@ -1,4 +1,4 @@
-/* $OpenBSD: vector.S,v 1.7 2005/10/09 17:09:34 fgsch Exp $ */
+/* $OpenBSD: vector.S,v 1.8 2007/05/10 17:59:23 deraadt Exp $ */
/* $NetBSD: vector.S,v 1.5 2004/06/28 09:13:11 fvdl Exp $ */
/*
@@ -394,7 +394,6 @@ IDTVEC(intr_/**/name/**/num) ;\
cmpl %ebx,%r13d ;\
jae 10f /* currently masked; hold it */ ;\
incl MY_COUNT+V_INTR /* statistical info */ ;\
- incq IS_EVCNT(%r14) ;\
1: \
pushq %r13 ;\
movl %ebx,CPUVAR(ILEVEL) ;\
@@ -742,7 +741,6 @@ IDTVEC(softserial)
call _C_LABEL(x86_softintlock)
#endif
movq CPUVAR(ISOURCES) + SIR_SERIAL * 8, %r12
- incq IS_EVCNT(%r12)
movl $X86_SOFTINTR_SOFTSERIAL,%edi
call _C_LABEL(softintr_dispatch)
#ifdef MULTIPROCESSOR
@@ -759,7 +757,6 @@ IDTVEC(softnet)
call _C_LABEL(x86_softintlock)
#endif
movq CPUVAR(ISOURCES) + SIR_NET * 8, %r12
- incq IS_EVCNT(%r12)
xorq %r12,%r12
xchgl _C_LABEL(netisr),%r12d
@@ -789,7 +786,6 @@ IDTVEC(softclock)
call _C_LABEL(x86_softintlock)
#endif
movq CPUVAR(ISOURCES) + SIR_CLOCK * 8, %r12
- incq IS_EVCNT(%r12)
movl $X86_SOFTINTR_SOFTCLOCK,%edi
call _C_LABEL(softintr_dispatch)
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h
index 4d5d5c9a211..ef0bce98095 100644
--- a/sys/arch/amd64/include/cpu.h
+++ b/sys/arch/amd64/include/cpu.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpu.h,v 1.28 2007/05/07 19:10:31 kettenis Exp $ */
+/* $OpenBSD: cpu.h,v 1.29 2007/05/10 17:59:24 deraadt Exp $ */
/* $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $ */
/*-
@@ -127,8 +127,6 @@ struct cpu_info {
struct x86_64_tss ci_doubleflt_tss;
char *ci_doubleflt_stack;
-
- struct evcnt ci_ipi_events[X86_NIPI];
};
#define CPUF_BSP 0x0001 /* CPU is the original BSP */
diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h
index 0aadd1e8edf..9e4e0188241 100644
--- a/sys/arch/amd64/include/intr.h
+++ b/sys/arch/amd64/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.8 2007/05/06 03:37:08 gwk Exp $ */
+/* $OpenBSD: intr.h,v 1.9 2007/05/10 17:59:24 deraadt Exp $ */
/* $NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */
/*-
@@ -78,7 +78,6 @@ struct intrsource {
struct pic *is_pic; /* originating PIC */
void *is_recurse; /* entry for spllower */
void *is_resume; /* entry for doreti */
- struct evcnt is_evcnt; /* interrupt counter */
char is_evname[32]; /* event counter name */
int is_flags; /* see below */
int is_type; /* level, edge */
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-14 14:54:32 +0000