d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename disable_intr() to ia64_disable_intr() and rename enable_intr()

Browse Source 
to ia64_enable_intr(). This reduces confusion with intr_disable() and
intr_restore().

Have configure_final() call ia64_finalize_intr() instead of enable_intr()
in preparation of adding support for binding interrupts to all CPUs.
This commit is contained in:
Marcel Moolenaar 2010-03-26 21:22:02 +00:00
parent 739fd8c533
commit 1764e57174
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=205713
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/ia64/ia64/autoconf.c
View File

@ -39,15 +39,9 @@
#include <sys/bus.h> #include <sys/bus.h>
#include <sys/cons.h> #include <sys/cons.h>
#include <machine/md_var.h>
#include <machine/bootinfo.h> #include <machine/bootinfo.h>
#include <machine/intr.h>
#include <cam/cam.h> #include <machine/md_var.h>
#include <cam/cam_ccb.h>
#include <cam/cam_sim.h>
#include <cam/cam_periph.h>
#include <cam/cam_xpt_sim.h>
#include <cam/cam_debug.h>
static void configure_first(void *); static void configure_first(void *);
static void configure(void *); static void configure(void *);
@ -97,12 +91,9 @@ static void
configure_final(void *dummy) configure_final(void *dummy)
{ {
/*
* Now we're ready to handle (pending) interrupts.
* XXX this is slightly misplaced.
*/
enable_intr();
cninit_finish(); cninit_finish();
ia64_finalize_intr();
cold = 0; cold = 0;
} }

11
sys/ia64/ia64/interrupt.c
View File

@ -280,6 +280,13 @@ ia64_teardown_intr(void *cookie)
return (intr_event_remove_handler(cookie)); return (intr_event_remove_handler(cookie));
} }
void
ia64_finalize_intr(void)
{
ia64_enable_intr();
}
/* /*
* Interrupt handlers. * Interrupt handlers.
*/ */
@ -318,9 +325,9 @@ ia64_handle_intr(struct trapframe *tf)
out: out:
if (TRAPF_USERMODE(tf)) { if (TRAPF_USERMODE(tf)) {
while (td->td_flags & (TDF_ASTPENDING|TDF_NEEDRESCHED)) { while (td->td_flags & (TDF_ASTPENDING|TDF_NEEDRESCHED)) {
enable_intr(); ia64_enable_intr();
ast(tf); ast(tf);
disable_intr(); ia64_disable_intr();
} }
} }
} }

2
sys/ia64/ia64/mp_machdep.c
View File

@ -210,7 +210,7 @@ ia64_ap_startup(void)
ia64_set_itv(0x10000); ia64_set_itv(0x10000);
ia64_set_tpr(0); ia64_set_tpr(0);
ia64_srlz_d(); ia64_srlz_d();
enable_intr(); ia64_enable_intr();
sched_throw(NULL); sched_throw(NULL);
/* NOTREACHED */ /* NOTREACHED */

6
sys/ia64/ia64/trap.c
View File

@ -334,11 +334,11 @@ int
do_ast(struct trapframe *tf) do_ast(struct trapframe *tf)
{ {
disable_intr(); ia64_disable_intr();
while (curthread->td_flags & (TDF_ASTPENDING|TDF_NEEDRESCHED)) { while (curthread->td_flags & (TDF_ASTPENDING|TDF_NEEDRESCHED)) {
enable_intr(); ia64_enable_intr();
ast(tf); ast(tf);
disable_intr(); ia64_disable_intr();
} }
/* /*
* Keep interrupts disabled. We return r10 as a favor to the EPC * Keep interrupts disabled. We return r10 as a favor to the EPC

4
sys/ia64/include/acpica_machdep.h
View File

@ -56,8 +56,8 @@
#define ACPI_ASM_MACROS #define ACPI_ASM_MACROS
#define BREAKPOINT3 #define BREAKPOINT3
#define ACPI_DISABLE_IRQS() disable_intr() #define ACPI_DISABLE_IRQS() ia64_disable_intr()
#define ACPI_ENABLE_IRQS() enable_intr() #define ACPI_ENABLE_IRQS() ia64_enable_intr()
#define ACPI_FLUSH_CPU_CACHE() /* XXX ia64_fc()? */ #define ACPI_FLUSH_CPU_CACHE() /* XXX ia64_fc()? */

9
sys/ia64/include/cpufunc.h
View File

@ -56,13 +56,13 @@ breakpoint(void)
static __inline void static __inline void
disable_intr(void) ia64_disable_intr(void)
{ {
__asm __volatile ("rsm psr.i"); __asm __volatile ("rsm psr.i");
} }
static __inline void static __inline void
enable_intr(void) ia64_enable_intr(void)
{ {
__asm __volatile ("ssm psr.i;; srlz.d"); __asm __volatile ("ssm psr.i;; srlz.d");
} }
@ -71,8 +71,9 @@ static __inline register_t
intr_disable(void) intr_disable(void)
{ {
register_t psr; register_t psr;
__asm __volatile ("mov %0=psr;;" : "=r"(psr)); __asm __volatile ("mov %0=psr;;" : "=r"(psr));
disable_intr(); ia64_disable_intr();
return ((psr & IA64_PSR_I) ? 1 : 0); return ((psr & IA64_PSR_I) ? 1 : 0);
} }
@ -80,7 +81,7 @@ static __inline void
intr_restore(register_t ie) intr_restore(register_t ie)
{ {
if (ie) if (ie)
enable_intr(); ia64_enable_intr();
} }
#endif /* __GNUCLIKE_ASM */ #endif /* __GNUCLIKE_ASM */

1
sys/ia64/include/intr.h
View File

@ -65,6 +65,7 @@ typedef u_int (ia64_ihtype)(struct thread *, u_int, struct trapframe *);
extern struct ia64_pib *ia64_pib; extern struct ia64_pib *ia64_pib;
void ia64_finalize_intr(void);
void ia64_handle_intr(struct trapframe *); void ia64_handle_intr(struct trapframe *);
int ia64_setup_intr(const char *, int, driver_filter_t, driver_intr_t, int ia64_setup_intr(const char *, int, driver_filter_t, driver_intr_t,
void *, enum intr_type, void **); void *, enum intr_type, void **);