Move IPL/spl interrupt code to intr.h; this include file is expected to

exist in some networking code.
This commit is contained in:
simonb 2002-05-25 04:27:21 +00:00
parent 1f3bc4331e
commit efd6a59812
2 changed files with 200 additions and 157 deletions

View File

@ -0,0 +1,199 @@
/* $NetBSD: intr.h,v 1.1 2002/05/25 04:27:21 simonb Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
* All rights reserved.
*
* This code is derived from software contributed to Berkeley by
* William Jolitz.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* This product includes software developed by the University of
* California, Berkeley and its contributors.
* 4. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* @(#)psl.h 5.2 (Berkeley) 1/18/91
*/
#ifndef _NS532_INTR_H_
#define _NS532_INTR_H_
#ifdef _KERNEL
#include <machine/icu.h>
/*
* Interrupt levels
*/
#define IPL_ZERO 0 /* level 0 */
#define IPL_HIGH 1 /* block all interrupts */
#define IPL_BIO 2 /* block I/O */
#define IPL_NET 3 /* network */
#define IPL_TTY 4 /* terminal */
#define IPL_CLOCK 5 /* clock */
#define IPL_IMP 6 /* memory allocation */
#define IPL_SOFTCLOCK 7 /* softlock */
#define IPL_SOFTNET 8 /* softnet */
#define NIPL 9 /* number of interrupt priority levels */
#define IPL_NAMES {"zero", "", "bio", "net", "tty", "clock", "imp", \
"softclock", "softnet" }
/* IPL_RTTY (for the scn driver) is the same as IPL_HIGH. */
#define IPL_RTTY IPL_HIGH
/*
* Preassigned software interrupts
*/
#define SOFTINT 16
#define SIR_CLOCK (SOFTINT+0)
#define SIR_CLOCKMASK ((1 << SIR_CLOCK) | (1 << IR_SOFT))
#define SIR_NET (SOFTINT+1)
#define SIR_NETMASK ((1 << SIR_NET) | SIR_CLOCKMASK)
#define SIR_ALLMASK 0xffff0000
#ifndef _LOCORE
/*
* Structure of the software interrupt table
*/
struct iv {
void (*iv_vec) __P((void *));
void *iv_arg;
long iv_level;
long iv_mask;
long iv_cnt;
char *iv_use;
};
extern struct iv ivt[];
extern unsigned int imask[], Cur_pl, sirpending, astpending;
#if defined(NO_INLINE_SPLX) || defined(DEFINE_SPLX)
# define INTR_STATIC
#else
# define INTR_STATIC static
#endif
#if defined(NO_INLINE_SPLX)
# define INTR_INLINE
#else
# define INTR_INLINE __inline
#endif
void intr_init __P((void));
void check_sir __P((void *));
int intr_establish __P((int, void (*)(void *), void *, char *,
int, int, int));
INTR_STATIC INTR_INLINE int splraise __P((unsigned int));
INTR_STATIC INTR_INLINE int splx __P((unsigned int));
/*
* Disable/Enable CPU-Interrupts
*/
#define di() /* Removing the nop will give you *BIG* trouble */ \
__asm __volatile("bicpsrw 0x800 ; nop" : : : "cc")
#define ei() __asm __volatile("bispsrw 0x800" : : : "cc")
/*
* Add a mask to Cur_pl, and return the old value of Cur_pl.
*/
#if !defined(NO_INLINE_SPLX) || defined(DEFINE_SPLX)
INTR_STATIC INTR_INLINE int
splraise(ncpl)
register unsigned int ncpl;
{
register unsigned int ocpl;
di();
ocpl = Cur_pl;
ncpl |= ocpl;
ICUW(IMSK) = ncpl;
Cur_pl = ncpl;
ei();
return(ocpl);
}
/*
* Restore a value to Cur_pl (cpu interrupts will get unmasked).
*
* NOTE: We go to the trouble of returning the old value of cpl for
* the benefit of some splsoftclock() callers. This extra work is
* usually optimized away by the compiler.
*/
INTR_STATIC INTR_INLINE int
splx(ncpl)
register unsigned int ncpl;
{
register unsigned int ocpl;
di();
ocpl = Cur_pl;
ICUW(IMSK) = ncpl;
Cur_pl = ncpl;
ei();
return(ocpl);
}
#endif
/*
* Hardware interrupt masks
*/
#define splbio() splraise(imask[IPL_BIO])
#define splnet() splraise(imask[IPL_NET])
#define spltty() splraise(imask[IPL_TTY])
#define splclock() splraise(imask[IPL_CLOCK])
#define splvm() splraise(imask[IPL_IMP])
#define splrtty() splraise(imask[IPL_RTTY])
#define splstatclock() splclock()
/*
* Software interrupt masks
*
* NOTE: splsoftclock() is used by hardclock() to lower the priority from
* clock to softclock before it calls softclock().
*/
#define spllowersoftclock() splx(imask[IPL_SOFTCLOCK])
#define splsoftclock() splraise(imask[IPL_SOFTCLOCK])
#define splsoftnet() splraise(imask[IPL_SOFTNET])
/*
* Miscellaneous
*/
#define splhigh() splraise(imask[IPL_HIGH])
#define splsched() splhigh()
#define spllock() splhigh()
#define spl0() splx(imask[IPL_ZERO])
#define splnone() spl0()
/*
* Software interrupt registration
*/
#define softintr(n) ((sirpending |= (1 << (n))), setsofticu(IR_SOFT))
#define setsoftast() (astpending = 1)
#define setsoftclock() softintr(SIR_CLOCK)
#define setsoftnet() softintr(SIR_NET)
#undef INTR_INLINE
#undef INTR_STATIC
#endif /* !_LOCORE */
#endif /* _KERNEL */
#endif /* _NS532_INTR_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: psl.h,v 1.26 2001/04/13 23:30:03 thorpej Exp $ */
/* $NetBSD: psl.h,v 1.27 2002/05/25 04:27:22 simonb Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@ -64,160 +64,4 @@
/* The PSR versions ... */
#define PSR_USR PSL_USER
#ifdef _KERNEL
#include <machine/icu.h>
/*
* Interrupt levels
*/
#define IPL_ZERO 0 /* level 0 */
#define IPL_HIGH 1 /* block all interrupts */
#define IPL_BIO 2 /* block I/O */
#define IPL_NET 3 /* network */
#define IPL_TTY 4 /* terminal */
#define IPL_CLOCK 5 /* clock */
#define IPL_IMP 6 /* memory allocation */
#define IPL_SOFTCLOCK 7 /* softlock */
#define IPL_SOFTNET 8 /* softnet */
#define NIPL 9 /* number of interrupt priority levels */
#define IPL_NAMES {"zero", "", "bio", "net", "tty", "clock", "imp", \
"softclock", "softnet" }
/* IPL_RTTY (for the scn driver) is the same as IPL_HIGH. */
#define IPL_RTTY IPL_HIGH
/*
* Preassigned software interrupts
*/
#define SOFTINT 16
#define SIR_CLOCK (SOFTINT+0)
#define SIR_CLOCKMASK ((1 << SIR_CLOCK) | (1 << IR_SOFT))
#define SIR_NET (SOFTINT+1)
#define SIR_NETMASK ((1 << SIR_NET) | SIR_CLOCKMASK)
#define SIR_ALLMASK 0xffff0000
#ifndef _LOCORE
/*
* Structure of the software interrupt table
*/
struct iv {
void (*iv_vec) __P((void *));
void *iv_arg;
long iv_level;
long iv_mask;
long iv_cnt;
char *iv_use;
};
extern struct iv ivt[];
extern unsigned int imask[], Cur_pl, sirpending, astpending;
#if defined(NO_INLINE_SPLX) || defined(DEFINE_SPLX)
# define PSL_STATIC
#else
# define PSL_STATIC static
#endif
#if defined(NO_INLINE_SPLX)
# define PSL_INLINE
#else
# define PSL_INLINE __inline
#endif
void intr_init __P((void));
void check_sir __P((void *));
int intr_establish __P((int, void (*)(void *), void *, char *,
int, int, int));
PSL_STATIC PSL_INLINE int splraise __P((unsigned int));
PSL_STATIC PSL_INLINE int splx __P((unsigned int));
/*
* Disable/Enable CPU-Interrupts
*/
#define di() /* Removing the nop will give you *BIG* trouble */ \
__asm __volatile("bicpsrw 0x800 ; nop" : : : "cc")
#define ei() __asm __volatile("bispsrw 0x800" : : : "cc")
/*
* Add a mask to Cur_pl, and return the old value of Cur_pl.
*/
#if !defined(NO_INLINE_SPLX) || defined(DEFINE_SPLX)
PSL_STATIC PSL_INLINE int
splraise(ncpl)
register unsigned int ncpl;
{
register unsigned int ocpl;
di();
ocpl = Cur_pl;
ncpl |= ocpl;
ICUW(IMSK) = ncpl;
Cur_pl = ncpl;
ei();
return(ocpl);
}
/*
* Restore a value to Cur_pl (cpu interrupts will get unmasked).
*
* NOTE: We go to the trouble of returning the old value of cpl for
* the benefit of some splsoftclock() callers. This extra work is
* usually optimized away by the compiler.
*/
PSL_STATIC PSL_INLINE int
splx(ncpl)
register unsigned int ncpl;
{
register unsigned int ocpl;
di();
ocpl = Cur_pl;
ICUW(IMSK) = ncpl;
Cur_pl = ncpl;
ei();
return(ocpl);
}
#endif
/*
* Hardware interrupt masks
*/
#define splbio() splraise(imask[IPL_BIO])
#define splnet() splraise(imask[IPL_NET])
#define spltty() splraise(imask[IPL_TTY])
#define splclock() splraise(imask[IPL_CLOCK])
#define splvm() splraise(imask[IPL_IMP])
#define splrtty() splraise(imask[IPL_RTTY])
#define splstatclock() splclock()
/*
* Software interrupt masks
*
* NOTE: splsoftclock() is used by hardclock() to lower the priority from
* clock to softclock before it calls softclock().
*/
#define spllowersoftclock() splx(imask[IPL_SOFTCLOCK])
#define splsoftclock() splraise(imask[IPL_SOFTCLOCK])
#define splsoftnet() splraise(imask[IPL_SOFTNET])
/*
* Miscellaneous
*/
#define splhigh() splraise(imask[IPL_HIGH])
#define splsched() splhigh()
#define spllock() splhigh()
#define spl0() splx(imask[IPL_ZERO])
#define splnone() spl0()
/*
* Software interrupt registration
*/
#define softintr(n) ((sirpending |= (1 << (n))), setsofticu(IR_SOFT))
#define setsoftast() (astpending = 1)
#define setsoftclock() softintr(SIR_CLOCK)
#define setsoftnet() softintr(SIR_NET)
#undef PSL_INLINE
#undef PSL_STATIC
#endif /* !_LOCORE */
#endif /* _KERNEL */
#endif /* _NS532_PSL_H_ */