Module Name: src
Committed By: rmind
Date: Wed Nov 25 14:28:50 UTC 2009
Modified Files:
src/sys/arch/acorn26/ioc: arcpp.c
src/sys/arch/alpha/include: lock.h
src/sys/arch/amd64/amd64: genassym.cf locore.S spl.S
src/sys/arch/arm/gemini: gemini_ipi.c
src/sys/arch/i386/i386: genassym.cf locore.S machdep.c spl.S vector.S
src/sys/arch/sparc64/include: psl.h
src/sys/arch/x86/x86: intr.c pmap.c
src/sys/dev/ic: lpt.c sl811hs.c
src/sys/sys: intr.h
Log Message:
Remove IPL_LPT and IPL_IPI aliases, use the actual IPLs.
Fix some broken comments.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/acorn26/ioc/arcpp.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/alpha/include/lock.h
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amd64/amd64/spl.S
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/gemini/gemini_ipi.c
cvs rdiff -u -r1.82 -r1.83 src/sys/arch/i386/i386/genassym.cf
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/i386/i386/locore.S
cvs rdiff -u -r1.676 -r1.677 src/sys/arch/i386/i386/machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/i386/i386/spl.S
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/i386/i386/vector.S
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/sparc64/include/psl.h
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/x86/x86/intr.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/ic/lpt.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.8 -r1.9 src/sys/sys/intr.h
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/acorn26/ioc/arcpp.c
diff -u src/sys/arch/acorn26/ioc/arcpp.c:1.10 src/sys/arch/acorn26/ioc/arcpp.c:1.11
--- src/sys/arch/acorn26/ioc/arcpp.c:1.10 Wed Jan 7 23:05:46 2009
+++ src/sys/arch/acorn26/ioc/arcpp.c Wed Nov 25 14:28:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: arcpp.c,v 1.10 2009/01/07 23:05:46 bjh21 Exp $ */
+/* $NetBSD: arcpp.c,v 1.11 2009/11/25 14:28:49 rmind Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -52,7 +52,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.10 2009/01/07 23:05:46 bjh21 Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arcpp.c,v 1.11 2009/11/25 14:28:49 rmind Exp $");
#include <sys/conf.h>
#include <sys/device.h>
@@ -158,9 +158,9 @@
device_xname(self), "ack intr");
evcnt_attach_dynamic(&sc->sc_bintrcnt, EVCNT_TYPE_INTR, NULL,
device_xname(self), "busy intr");
- sc->sc_aih = irq_establish(IRQ_PACK, IPL_LPT, arcppintr, sc,
+ sc->sc_aih = irq_establish(IRQ_PACK, IPL_VM, arcppintr, sc,
&sc->sc_aintrcnt);
- sc->sc_bih = irq_establish(IRQ_PBSY, IPL_LPT, arcppintr, sc,
+ sc->sc_bih = irq_establish(IRQ_PBSY, IPL_VM, arcppintr, sc,
&sc->sc_bintrcnt);
/* We're not interested in interrupts while the device is closed. */
@@ -200,7 +200,7 @@
iot = sc->sc_iot;
ioh = sc->sc_ioh;
- s = spllpt();
+ s = splvm();
/* wait till ready (printer running diagnostics) */
irq_enable(sc->sc_bih);
/* XXX Is it really appropriate to time out? */
@@ -253,7 +253,7 @@
while (sc->sc_count > 0) {
/* if the printer is ready for a char, give it one */
if ((sc->sc_state & ARCPP_OBUSY) == 0) {
- s = spllpt();
+ s = splvm();
arcppintr(sc);
splx(s);
}
Index: src/sys/arch/alpha/include/lock.h
diff -u src/sys/arch/alpha/include/lock.h:1.27 src/sys/arch/alpha/include/lock.h:1.28
--- src/sys/arch/alpha/include/lock.h:1.27 Mon Apr 28 20:23:11 2008
+++ src/sys/arch/alpha/include/lock.h Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lock.h,v 1.27 2008/04/28 20:23:11 martin Exp $ */
+/* $NetBSD: lock.h,v 1.28 2009/11/25 14:28:50 rmind Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -166,7 +166,7 @@
if (__ci->ci_ipis != 0) { \
/* printf("CPU %lu has IPIs pending\n", \
__ci->ci_cpuid); */ \
- __s = splipi(); \
+ __s = splhigh(); \
alpha_ipi_process(__ci, NULL); \
splx(__s); \
} \
Index: src/sys/arch/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.41 src/sys/arch/amd64/amd64/genassym.cf:1.42
--- src/sys/arch/amd64/amd64/genassym.cf:1.41 Sat Nov 21 03:11:01 2009
+++ src/sys/arch/amd64/amd64/genassym.cf Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.41 2009/11/21 03:11:01 rmind Exp $
+# $NetBSD: genassym.cf,v 1.42 2009/11/25 14:28:50 rmind Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -324,7 +324,6 @@
define IPL_PREEMPT IPL_PREEMPT
define IPL_CLOCK IPL_CLOCK
define IPL_HIGH IPL_HIGH
-define IPL_IPI IPL_IPI
define LIR_IPI LIR_IPI
define LIR_TIMER LIR_TIMER
Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.52 src/sys/arch/amd64/amd64/locore.S:1.53
--- src/sys/arch/amd64/amd64/locore.S:1.52 Mon Oct 19 18:41:10 2009
+++ src/sys/arch/amd64/amd64/locore.S Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.52 2009/10/19 18:41:10 bouyer Exp $ */
+/* $NetBSD: locore.S,v 1.53 2009/11/25 14:28:50 rmind Exp $ */
/*
* Copyright-o-rama!
@@ -948,13 +948,13 @@
jne 5f
/*
- * Restore cr0 (including FPU state). Raise the IPL to IPL_IPI.
+ * Restore cr0 (including FPU state). Raise the IPL to IPL_HIGH.
* FPU IPIs can alter the LWP's saved cr0. Dropping the priority
* is deferred until mi_switch(), when cpu_switchto() returns.
*/
2:
#ifndef XEN
- movl $IPL_IPI,CPUVAR(ILEVEL)
+ movl $IPL_HIGH,CPUVAR(ILEVEL)
movl PCB_CR0(%r14),%ecx /* has CR0_TS clear */
movq %cr0,%rdx
Index: src/sys/arch/amd64/amd64/spl.S
diff -u src/sys/arch/amd64/amd64/spl.S:1.21 src/sys/arch/amd64/amd64/spl.S:1.22
--- src/sys/arch/amd64/amd64/spl.S:1.21 Thu Apr 2 00:19:02 2009
+++ src/sys/arch/amd64/amd64/spl.S Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.21 2009/04/02 00:19:02 enami Exp $ */
+/* $NetBSD: spl.S,v 1.22 2009/11/25 14:28:50 rmind Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -265,7 +265,7 @@
* It is important that the bit scan instruction is bsr, it will get
* the highest 2 bits (currently the IPI and clock handlers) first,
* to avoid deadlocks where one CPU sends an IPI, another one is at
- * splipi() and defers it, lands in here via splx(), and handles
+ * splhigh() and defers it, lands in here via splx(), and handles
* a lower-prio one first, which needs to take the kernel lock -->
* the sending CPU will never see the that CPU accept the IPI
* (see pmap_tlb_shootnow).
Index: src/sys/arch/arm/gemini/gemini_ipi.c
diff -u src/sys/arch/arm/gemini/gemini_ipi.c:1.4 src/sys/arch/arm/gemini/gemini_ipi.c:1.5
--- src/sys/arch/arm/gemini/gemini_ipi.c:1.4 Sat Dec 6 05:22:39 2008
+++ src/sys/arch/arm/gemini/gemini_ipi.c Wed Nov 25 14:28:50 2009
@@ -7,7 +7,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_ipi.c,v 1.4 2008/12/06 05:22:39 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_ipi.c,v 1.5 2009/11/25 14:28:50 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -58,10 +58,9 @@
panic("%s: Cannot map registers", device_xname(self));
/*
- * NOTE we are using IPL_NET, not IPL_IPI a.k.a. IPL_HIGH
- * use of IPI on this system is (mainly) networking
- * keep simple (for now) and force all IPIs to same level
- * so splnet() can block them as any other NIC.
+ * NOTE: we are using IPL_NET, not IPL_HIGH use of IPI on this system
+ * is (mainly) networking keep simple (for now) and force all IPIs
+ * to same level so splnet() can block them as any other NIC.
*/
#if 0
ih = intr_establish(obio->obio_intr, IPL_NET, IST_LEVEL_HIGH,
Index: src/sys/arch/i386/i386/genassym.cf
diff -u src/sys/arch/i386/i386/genassym.cf:1.82 src/sys/arch/i386/i386/genassym.cf:1.83
--- src/sys/arch/i386/i386/genassym.cf:1.82 Sat Nov 21 03:11:00 2009
+++ src/sys/arch/i386/i386/genassym.cf Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.82 2009/11/21 03:11:00 rmind Exp $
+# $NetBSD: genassym.cf,v 1.83 2009/11/25 14:28:50 rmind Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -391,7 +391,6 @@
define IPL_SCHED IPL_SCHED
define IPL_CLOCK IPL_CLOCK
define IPL_HIGH IPL_HIGH
-define IPL_IPI IPL_IPI
define IPL_SOFTNET IPL_SOFTNET
define IPL_SOFTCLOCK IPL_SOFTCLOCK
Index: src/sys/arch/i386/i386/locore.S
diff -u src/sys/arch/i386/i386/locore.S:1.89 src/sys/arch/i386/i386/locore.S:1.90
--- src/sys/arch/i386/i386/locore.S:1.89 Mon Oct 19 18:41:10 2009
+++ src/sys/arch/i386/i386/locore.S Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.89 2009/10/19 18:41:10 bouyer Exp $ */
+/* $NetBSD: locore.S,v 1.90 2009/11/25 14:28:50 rmind Exp $ */
/*
* Copyright-o-rama!
@@ -129,7 +129,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.89 2009/10/19 18:41:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: locore.S,v 1.90 2009/11/25 14:28:50 rmind Exp $");
#include "opt_compat_oldboot.h"
#include "opt_ddb.h"
@@ -989,13 +989,13 @@
jne 5f
/*
- * Restore cr0 (including FPU state). Raise the IPL to IPL_IPI.
+ * Restore cr0 (including FPU state). Raise the IPL to IPL_HIGH.
* FPU IPIs can alter the LWP's saved cr0. Dropping the priority
* is deferred until mi_switch(), when cpu_switchto() returns.
*/
2:
#ifndef XEN
- movl $IPL_IPI,CPUVAR(ILEVEL)
+ movl $IPL_HIGH,CPUVAR(ILEVEL)
movl PCB_CR0(%ebx),%ecx /* has CR0_TS clear */
movl %cr0,%edx
Index: src/sys/arch/i386/i386/machdep.c
diff -u src/sys/arch/i386/i386/machdep.c:1.676 src/sys/arch/i386/i386/machdep.c:1.677
--- src/sys/arch/i386/i386/machdep.c:1.676 Mon Nov 23 05:01:12 2009
+++ src/sys/arch/i386/i386/machdep.c Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.676 2009/11/23 05:01:12 dholland Exp $ */
+/* $NetBSD: machdep.c,v 1.677 2009/11/25 14:28:50 rmind Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.676 2009/11/23 05:01:12 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.677 2009/11/25 14:28:50 rmind Exp $");
#include "opt_beep.h"
#include "opt_compat_ibcs2.h"
@@ -1598,7 +1598,7 @@
intr_default_setup();
#endif
- splraise(IPL_IPI);
+ splraise(IPL_HIGH);
x86_enable_intr();
#ifdef DDB
Index: src/sys/arch/i386/i386/spl.S
diff -u src/sys/arch/i386/i386/spl.S:1.33 src/sys/arch/i386/i386/spl.S:1.34
--- src/sys/arch/i386/i386/spl.S:1.33 Tue Nov 3 05:23:27 2009
+++ src/sys/arch/i386/i386/spl.S Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: spl.S,v 1.33 2009/11/03 05:23:27 dyoung Exp $ */
+/* $NetBSD: spl.S,v 1.34 2009/11/25 14:28:50 rmind Exp $ */
/*
* Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.33 2009/11/03 05:23:27 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spl.S,v 1.34 2009/11/25 14:28:50 rmind Exp $");
#include "opt_vm86.h"
#include "opt_ddb.h"
@@ -157,7 +157,7 @@
* It is important that the bit scan instruction is bsr, it will get
* the highest 2 bits (currently the IPI and clock handlers) first,
* to avoid deadlocks where one CPU sends an IPI, another one is at
- * splipi() and defers it, lands in here via splx(), and handles
+ * splhigh() and defers it, lands in here via splx(), and handles
* a lower-prio one first, which needs to take the kernel lock -->
* the sending CPU will never see the that CPU accept the IPI
* (see pmap_tlb_shootnow).
Index: src/sys/arch/i386/i386/vector.S
diff -u src/sys/arch/i386/i386/vector.S:1.48 src/sys/arch/i386/i386/vector.S:1.49
--- src/sys/arch/i386/i386/vector.S:1.48 Wed Jul 29 12:02:06 2009
+++ src/sys/arch/i386/i386/vector.S Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: vector.S,v 1.48 2009/07/29 12:02:06 cegger Exp $ */
+/* $NetBSD: vector.S,v 1.49 2009/11/25 14:28:50 rmind Exp $ */
/*
* Copyright 2002 (c) Wasabi Systems, Inc.
@@ -65,7 +65,7 @@
*/
#include <machine/asm.h>
-__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.48 2009/07/29 12:02:06 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vector.S,v 1.49 2009/11/25 14:28:50 rmind Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -150,14 +150,14 @@
INTRENTRY
movl $0,_C_LABEL(local_apic)+LAPIC_EOI
movl CPUVAR(ILEVEL),%ebx
- cmpl $IPL_IPI,%ebx
+ cmpl $IPL_HIGH,%ebx
jae 2f
IDTVEC_END(intr_lapic_ipi)
IDTVEC(resume_lapic_ipi)
1:
pushl %ebx
IDEPTH_INCR
- movl $IPL_IPI,CPUVAR(ILEVEL)
+ movl $IPL_HIGH,CPUVAR(ILEVEL)
sti
call _C_LABEL(x86_ipi_handler)
cli
Index: src/sys/arch/sparc64/include/psl.h
diff -u src/sys/arch/sparc64/include/psl.h:1.41 src/sys/arch/sparc64/include/psl.h:1.42
--- src/sys/arch/sparc64/include/psl.h:1.41 Sat May 16 19:15:34 2009
+++ src/sys/arch/sparc64/include/psl.h Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.41 2009/05/16 19:15:34 nakayama Exp $ */
+/* $NetBSD: psl.h,v 1.42 2009/11/25 14:28:50 rmind Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -478,8 +478,6 @@
SPLHOLD(splsched, PIL_SCHED)
SPLHOLD(spllock, PIL_LOCK)
-SPLHOLD(splipi, PIL_HIGH)
-
SPLHOLD(splhigh, PIL_HIGH)
/* splx does not have a return value */
@@ -500,7 +498,6 @@
#define spllock() spllockX(__FILE__, __LINE__)
#define splhigh() splhighX(__FILE__, __LINE__)
#define splx(x) splxX((x),__FILE__, __LINE__)
-#define splipi() splhighX(__FILE__, __LINE__)
static __inline void splxX(int newpil, const char *file, int line)
#else
Index: src/sys/arch/x86/x86/intr.c
diff -u src/sys/arch/x86/x86/intr.c:1.65 src/sys/arch/x86/x86/intr.c:1.66
--- src/sys/arch/x86/x86/intr.c:1.65 Tue Aug 18 16:41:03 2009
+++ src/sys/arch/x86/x86/intr.c Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.65 2009/08/18 16:41:03 jmcneill Exp $ */
+/* $NetBSD: intr.c,v 1.66 2009/11/25 14:28:50 rmind Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -133,7 +133,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.65 2009/08/18 16:41:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.66 2009/11/25 14:28:50 rmind Exp $");
#include "opt_intrdebug.h"
#include "opt_multiprocessor.h"
@@ -1005,7 +1005,7 @@
KASSERT(isp != NULL);
isp->is_recurse = Xrecurse_lapic_ipi;
isp->is_resume = Xresume_lapic_ipi;
- fake_ipi_intrhand.ih_level = IPL_IPI;
+ fake_ipi_intrhand.ih_level = IPL_HIGH;
isp->is_handlers = &fake_ipi_intrhand;
isp->is_pic = &local_pic;
ci->ci_isources[LIR_IPI] = isp;
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.97 src/sys/arch/x86/x86/pmap.c:1.98
--- src/sys/arch/x86/x86/pmap.c:1.97 Sat Nov 21 03:11:01 2009
+++ src/sys/arch/x86/x86/pmap.c Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.97 2009/11/21 03:11:01 rmind Exp $ */
+/* $NetBSD: pmap.c,v 1.98 2009/11/25 14:28:50 rmind Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -149,7 +149,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.97 2009/11/21 03:11:01 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.98 2009/11/25 14:28:50 rmind Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -2647,7 +2647,7 @@
ncsw = l->l_ncsw;
/* should be able to take ipis. */
- KASSERT(ci->ci_ilevel < IPL_IPI);
+ KASSERT(ci->ci_ilevel < IPL_HIGH);
#ifdef XEN
/* XXX not yet KASSERT(x86_read_psl() != 0); */
#else
Index: src/sys/dev/ic/lpt.c
diff -u src/sys/dev/ic/lpt.c:1.77 src/sys/dev/ic/lpt.c:1.78
--- src/sys/dev/ic/lpt.c:1.77 Mon Nov 23 02:13:46 2009
+++ src/sys/dev/ic/lpt.c Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: lpt.c,v 1.77 2009/11/23 02:13:46 rmind Exp $ */
+/* $NetBSD: lpt.c,v 1.78 2009/11/25 14:28:50 rmind Exp $ */
/*
* Copyright (c) 1993, 1994 Charles M. Hannum.
@@ -54,7 +54,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.77 2009/11/23 02:13:46 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpt.c,v 1.78 2009/11/25 14:28:50 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -246,7 +246,7 @@
struct lpt_softc *sc = arg;
int s;
- s = spllpt();
+ s = splvm();
lptintr(sc);
splx(s);
@@ -334,7 +334,7 @@
LPRINTF(("%s: write %lu\n",
device_xname(sc->sc_dev),
(u_long)sc->sc_count));
- s = spllpt();
+ s = splvm();
(void) lptintr(sc);
splx(s);
}
Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.24 src/sys/dev/ic/sl811hs.c:1.25
--- src/sys/dev/ic/sl811hs.c:1.24 Thu Nov 12 19:35:59 2009
+++ src/sys/dev/ic/sl811hs.c Wed Nov 25 14:28:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.24 2009/11/12 19:35:59 dyoung Exp $ */
+/* $NetBSD: sl811hs.c,v 1.25 2009/11/25 14:28:50 rmind Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -59,9 +59,7 @@
* This driver does fine grained locking for its own data structures, however
* the general USB code does not yet have locks, some of which would need to
* be used in this driver. This is mostly for debug use on single processor
- * systems. Actual MP use of this driver would be unreliable on ports where
- * splipi is above splhigh unless splipi can be safely blocked when
- * calculating remaining bus time prior to transfers.
+ * systems.
*
* The theory of the wait lock is that start is the only function that would
* be frequently called from arbitrary processors, so it should not need to
@@ -86,7 +84,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.24 2009/11/12 19:35:59 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.25 2009/11/25 14:28:50 rmind Exp $");
#include <sys/cdefs.h>
#include <sys/param.h>
@@ -2204,8 +2202,8 @@
/* We have about 6 us to get from the bus time check to
* starting the transfer or we might babble or the chip might fail to
* signal transfer complete. This leaves no time for any other
- * interrupts. Some ports have splipi (MP only) higher than splhigh
- * which might cause longer delays. */
+ * interrupts.
+ */
s = splhigh();
remaining_bustime = (int)(slhci_read(sc, SL811_CSOF)) << 6;
remaining_bustime -= SLHCI_END_BUSTIME;
Index: src/sys/sys/intr.h
diff -u src/sys/sys/intr.h:1.8 src/sys/sys/intr.h:1.9
--- src/sys/sys/intr.h:1.8 Sat Dec 13 21:13:30 2008
+++ src/sys/sys/intr.h Wed Nov 25 14:28:49 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.8 2008/12/13 21:13:30 ad Exp $ */
+/* $NetBSD: intr.h,v 1.9 2009/11/25 14:28:49 rmind Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -79,19 +79,15 @@
#define IPL_BIO IPL_VM
#define IPL_NET IPL_VM
#define IPL_TTY IPL_VM
-#define IPL_LPT IPL_VM
#define IPL_AUDIO IPL_VM
#define IPL_CLOCK IPL_SCHED
-#define IPL_IPI IPL_HIGH
#define IPL_SERIAL IPL_HIGH
#define splbio() splvm()
#define splnet() splvm()
#define spltty() splvm()
-#define spllpt() splvm()
#define splaudio() splvm()
#define splclock() splsched()
-#define splipi() splhigh()
#define splserial() splhigh()
#endif /* _KERNEL */
