From 015640667fb7604fdaefee8237039ce534be494c Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Mon, 28 Apr 2008 18:09:01 +0000 Subject: Rename IPL_SOFTSERIAL to IPL_SOFTTY and rename the associated symbols. Remove IPL_SERIAL since it is unused. ok krw@, weingart@, deraadt@ --- sys/arch/amd64/amd64/intr.c | 14 +++++++------- sys/arch/amd64/amd64/softintr.c | 8 ++++---- sys/arch/amd64/amd64/vector.S | 10 +++++----- sys/arch/amd64/include/intr.h | 9 ++++----- sys/arch/amd64/include/intrdefs.h | 10 +++------- 5 files changed, 23 insertions(+), 28 deletions(-) (limited to 'sys/arch') diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c index a1101788861..aa5de4eecbe 100644 --- a/sys/arch/amd64/amd64/intr.c +++ b/sys/arch/amd64/amd64/intr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.c,v 1.16 2008/04/25 19:27:36 kettenis Exp $ */ +/* $OpenBSD: intr.c,v 1.17 2008/04/28 18:09:00 kettenis Exp $ */ /* $NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $ */ /* @@ -545,7 +545,7 @@ intr_disestablish(struct intrhand *ih) */ struct intrhand fake_softclock_intrhand; struct intrhand fake_softnet_intrhand; -struct intrhand fake_softserial_intrhand; +struct intrhand fake_softtty_intrhand; struct intrhand fake_timer_intrhand; struct intrhand fake_ipi_intrhand; @@ -586,12 +586,12 @@ cpu_intr_init(struct cpu_info *ci) isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_WAITOK|M_ZERO); if (isp == NULL) panic("can't allocate fixed interrupt source"); - isp->is_recurse = Xsoftserial; - isp->is_resume = Xsoftserial; - fake_softserial_intrhand.ih_level = IPL_SOFTSERIAL; - isp->is_handlers = &fake_softserial_intrhand; + isp->is_recurse = Xsofttty; + isp->is_resume = Xsofttty; + fake_softtty_intrhand.ih_level = IPL_SOFTTTY; + isp->is_handlers = &fake_softtty_intrhand; isp->is_pic = &softintr_pic; - ci->ci_isources[SIR_SERIAL] = isp; + ci->ci_isources[SIR_TTY] = isp; #if NLAPIC > 0 isp = malloc(sizeof (struct intrsource), M_DEVBUF, M_WAITOK|M_ZERO); if (isp == NULL) diff --git a/sys/arch/amd64/amd64/softintr.c b/sys/arch/amd64/amd64/softintr.c index 57ce947e086..c1840757331 100644 --- a/sys/arch/amd64/amd64/softintr.c +++ b/sys/arch/amd64/amd64/softintr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softintr.c,v 1.1 2004/01/28 01:39:39 mickey Exp $ */ +/* $OpenBSD: softintr.c,v 1.2 2008/04/28 18:09:00 kettenis Exp $ */ /* $NetBSD: softintr.c,v 1.1 2003/02/26 21:26:12 fvdl Exp $ */ /*- @@ -53,7 +53,7 @@ struct x86_soft_intr x86_soft_intrs[X86_NSOFTINTR]; const int x86_soft_intr_to_ssir[X86_NSOFTINTR] = { SIR_CLOCK, SIR_NET, - SIR_SERIAL, + SIR_TTY, }; /* @@ -125,8 +125,8 @@ softintr_establish(int ipl, void (*func)(void *), void *arg) break; case IPL_TTY: - case IPL_SOFTSERIAL: - which = X86_SOFTINTR_SOFTSERIAL; + case IPL_SOFTTTY: + which = X86_SOFTINTR_SOFTTTY; break; default: diff --git a/sys/arch/amd64/amd64/vector.S b/sys/arch/amd64/amd64/vector.S index 145b5c23608..682ab95235a 100644 --- a/sys/arch/amd64/amd64/vector.S +++ b/sys/arch/amd64/amd64/vector.S @@ -1,4 +1,4 @@ -/* $OpenBSD: vector.S,v 1.10 2007/06/01 21:01:51 art Exp $ */ +/* $OpenBSD: vector.S,v 1.11 2008/04/28 18:09:00 kettenis Exp $ */ /* $NetBSD: vector.S,v 1.5 2004/06/28 09:13:11 fvdl Exp $ */ /* @@ -782,15 +782,15 @@ _C_LABEL(ioapic_level_stubs): _C_LABEL(netisr): .word 0 -IDTVEC(softserial) - movl $IPL_SOFTSERIAL, CPUVAR(ILEVEL) +IDTVEC(softtty) + movl $IPL_SOFTTTY, CPUVAR(ILEVEL) sti incl CPUVAR(IDEPTH) #ifdef MULTIPROCESSOR call _C_LABEL(x86_softintlock) #endif - movq CPUVAR(ISOURCES) + SIR_SERIAL * 8, %r12 - movl $X86_SOFTINTR_SOFTSERIAL,%edi + movq CPUVAR(ISOURCES) + SIR_TTY * 8, %r12 + movl $X86_SOFTINTR_SOFTTTY,%edi call _C_LABEL(softintr_dispatch) #ifdef MULTIPROCESSOR call _C_LABEL(x86_softintunlock) diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h index 17bbb6a115b..317405fe16e 100644 --- a/sys/arch/amd64/include/intr.h +++ b/sys/arch/amd64/include/intr.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intr.h,v 1.11 2007/05/25 16:22:11 art Exp $ */ +/* $OpenBSD: intr.h,v 1.12 2008/04/28 18:09:00 kettenis Exp $ */ /* $NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */ /*- @@ -140,7 +140,6 @@ void softintr(int); #define splaudio() splraise(IPL_AUDIO) #define splclock() splraise(IPL_CLOCK) #define splstatclock() splclock() -#define splserial() splraise(IPL_SERIAL) #define splipi() splraise(IPL_IPI) #define spllpt() spltty() @@ -152,7 +151,7 @@ void softintr(int); */ #define splsoftclock() splraise(IPL_SOFTCLOCK) #define splsoftnet() splraise(IPL_SOFTNET) -#define splsoftserial() splraise(IPL_SOFTSERIAL) +#define splsofttty() splraise(IPL_SOFTTTY) /* * Miscellaneous @@ -198,7 +197,7 @@ void splassert_check(int, const char *); extern void Xsoftclock(void); extern void Xsoftnet(void); -extern void Xsoftserial(void); +extern void Xsofttty(void); extern struct intrstub i8259_stubs[]; extern struct intrstub ioapic_edge_stubs[]; @@ -244,7 +243,7 @@ extern void (*ipifunc[X86_NIPI])(struct cpu_info *); #define X86_SOFTINTR_SOFTCLOCK 0 #define X86_SOFTINTR_SOFTNET 1 -#define X86_SOFTINTR_SOFTSERIAL 2 +#define X86_SOFTINTR_SOFTTTY 2 #define X86_NSOFTINTR 3 #ifndef _LOCORE diff --git a/sys/arch/amd64/include/intrdefs.h b/sys/arch/amd64/include/intrdefs.h index 64a6d3394a9..46f26aeecc4 100644 --- a/sys/arch/amd64/include/intrdefs.h +++ b/sys/arch/amd64/include/intrdefs.h @@ -1,4 +1,4 @@ -/* $OpenBSD: intrdefs.h,v 1.5 2007/05/06 03:37:08 gwk Exp $ */ +/* $OpenBSD: intrdefs.h,v 1.6 2008/04/28 18:09:00 kettenis Exp $ */ /* $NetBSD: intrdefs.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $ */ #ifndef _i386_INTRDEFS_H @@ -15,9 +15,6 @@ * * IPL_HIGH must block everything that can manipulate a run queue. * - * We need serial drivers to run at the absolute highest priority to - * avoid overruns, so serial > high. - * * The level numbers are picked to fit into APIC vector priorities. * */ @@ -26,7 +23,7 @@ #define IPL_SOFTNET 0x5 /* protocol stacks */ #define IPL_BIO 0x6 /* block I/O */ #define IPL_NET 0x7 /* network */ -#define IPL_SOFTSERIAL 0x8 /* serial */ +#define IPL_SOFTTTY 0x8 /* delayed terminal handling */ #define IPL_TTY 0x9 /* terminal */ #define IPL_VM 0xa /* memory allocation */ #define IPL_AUDIO 0xb /* audio */ @@ -34,7 +31,6 @@ #define IPL_SCHED IPL_CLOCK #define IPL_STATCLOCK IPL_CLOCK #define IPL_HIGH 0xd /* everything */ -#define IPL_SERIAL 0xd /* serial */ #define IPL_IPI 0xe /* inter-processor interrupts */ #define NIPL 16 @@ -54,7 +50,7 @@ /* Soft interrupt masks. */ #define SIR_CLOCK 29 #define SIR_NET 28 -#define SIR_SERIAL 27 +#define SIR_TTY 27 /* -- cgit v1.2.3