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

Convert the protection of hte i8254 from critical_enter/exit like it is

Browse Source 
on the x86.
This commit is contained in:
John Baldwin 2001-04-18 21:47:48 +00:00
parent 1e64a6acd6
commit 08b0f4f908
4 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sys/alpha/alpha/clock.c
View File

@ -49,6 +49,8 @@
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/queue.h> #include <sys/queue.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -80,6 +82,7 @@ int tickfixinterval;
int adjkerntz; /* local offset from GMT in seconds */ int adjkerntz; /* local offset from GMT in seconds */
int disable_rtc_set; /* disable resettodr() if != 0 */ int disable_rtc_set; /* disable resettodr() if != 0 */
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */ int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
struct mtx clock_lock;
static int beeping = 0; static int beeping = 0;
#define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x)) #define TIMER_DIV(x) ((timer_freq + (x) / 2) / (x))
@ -267,9 +270,8 @@ static int
getit(void) getit(void)
{ {
int high, low; int high, low;
critical_t s;
s = critical_enter(); mtx_lock_spin(&clock_lock);
/* Select timer0 and latch counter value. */ /* Select timer0 and latch counter value. */
outb(TIMER_MODE, TIMER_SEL0 | TIMER_LATCH); outb(TIMER_MODE, TIMER_SEL0 | TIMER_LATCH);
@ -277,7 +279,7 @@ getit(void)
low = inb(TIMER_CNTR0); low = inb(TIMER_CNTR0);
high = inb(TIMER_CNTR0); high = inb(TIMER_CNTR0);
critical_exit(s); mtx_unlock_spin(&clock_lock);
return ((high << 8) | low); return ((high << 8) | low);
} }
@ -368,9 +370,8 @@ static void
set_timer_freq(u_int freq, int intr_freq) set_timer_freq(u_int freq, int intr_freq)
{ {
int new_timer0_max_count; int new_timer0_max_count;
critical_t s;
s = critical_enter(); mtx_lock_spin(&clock_lock);
timer_freq = freq; timer_freq = freq;
new_timer0_max_count = TIMER_DIV(intr_freq); new_timer0_max_count = TIMER_DIV(intr_freq);
if (new_timer0_max_count != timer0_max_count) { if (new_timer0_max_count != timer0_max_count) {
@ -379,16 +380,14 @@ set_timer_freq(u_int freq, int intr_freq)
outb(TIMER_CNTR0, timer0_max_count & 0xff); outb(TIMER_CNTR0, timer0_max_count & 0xff);
outb(TIMER_CNTR0, timer0_max_count >> 8); outb(TIMER_CNTR0, timer0_max_count >> 8);
} }
critical_exit(s); mtx_unlock_spin(&clock_lock);
} }
static void static void
handleclock(void* arg) handleclock(void* arg)
{ {
if (timecounter->tc_get_timecount == i8254_get_timecount) { if (timecounter->tc_get_timecount == i8254_get_timecount) {
critical_t s; mtx_lock_spin(&clock_lock);
s = critical_enter();
if (i8254_ticked) if (i8254_ticked)
i8254_ticked = 0; i8254_ticked = 0;
else { else {
@ -396,7 +395,7 @@ handleclock(void* arg)
i8254_lastcount = 0; i8254_lastcount = 0;
} }
clkintr_pending = 0; clkintr_pending = 0;
critical_exit(s); mtx_unlock_spin(&clock_lock);
} }
hardclock(arg); hardclock(arg);
@ -566,9 +565,8 @@ i8254_get_timecount(struct timecounter *tc)
{ {
u_int count; u_int count;
u_int high, low; u_int high, low;
critical_t s;
s = critical_enter(); mtx_lock_spin(&clock_lock);
/* Select timer0 and latch counter value. */ /* Select timer0 and latch counter value. */
outb(TIMER_MODE, TIMER_SEL0 | TIMER_LATCH); outb(TIMER_MODE, TIMER_SEL0 | TIMER_LATCH);
@ -586,7 +584,7 @@ i8254_get_timecount(struct timecounter *tc)
i8254_lastcount = count; i8254_lastcount = count;
count += i8254_offset; count += i8254_offset;
critical_exit(s); mtx_unlock_spin(&clock_lock);
return (count); return (count);
} }
@ -638,14 +636,13 @@ sysbeepstop(void *chan)
int int
sysbeep(int pitch, int period) sysbeep(int pitch, int period)
{ {
critical_t s;
s = critical_enter(); mtx_lock_spin(&clock_lock);
if (acquire_timer2(TIMER_SQWAVE|TIMER_16BIT)) if (acquire_timer2(TIMER_SQWAVE|TIMER_16BIT))
if (!beeping) { if (!beeping) {
/* Something else owns it. */ /* Something else owns it. */
critical_exit(s); mtx_unlock_spin(&clock_lock);
return (-1); /* XXX Should be EBUSY, but nobody cares anyway. */ return (-1); /* XXX Should be EBUSY, but nobody cares anyway. */
} }
@ -659,7 +656,7 @@ sysbeep(int pitch, int period)
beeping = period; beeping = period;
timeout(sysbeepstop, (void *)NULL, period); timeout(sysbeepstop, (void *)NULL, period);
} }
critical_exit(s); mtx_unlock_spin(&clock_lock);
return (0); return (0);
} }

1
sys/alpha/alpha/machdep.c
View File

@ -1017,6 +1017,7 @@ alpha_init(pfn, ptb, bim, bip, biv)
mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE); mtx_init(&Giant, "Giant", MTX_DEF | MTX_RECURSE);
mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE); mtx_init(&sched_lock, "sched lock", MTX_SPIN | MTX_RECURSE);
mtx_init(&proc0.p_mtx, "process lock", MTX_DEF); mtx_init(&proc0.p_mtx, "process lock", MTX_DEF);
mtx_init(&clock_lock, "clk", MTX_SPIN);
mtx_lock(&Giant); mtx_lock(&Giant);
/* /*

3
sys/alpha/include/mutex.h
View File

@ -36,6 +36,9 @@
#ifdef _KERNEL #ifdef _KERNEL
/* Global locks */
extern struct mtx clock_lock;
#define mtx_intr_enable(mutex) (mutex)->mtx_savecrit = ALPHA_PSL_IPL_0 #define mtx_intr_enable(mutex) (mutex)->mtx_savecrit = ALPHA_PSL_IPL_0
#endif /* _KERNEL */ #endif /* _KERNEL */

3
sys/powerpc/include/mutex.h
View File

@ -36,6 +36,9 @@
#ifdef _KERNEL #ifdef _KERNEL
/* Global locks */
extern struct mtx clock_lock;
#define mtx_intr_enable(mutex) (mutex)->mtx_savecrit = ALPHA_PSL_IPL_0 #define mtx_intr_enable(mutex) (mutex)->mtx_savecrit = ALPHA_PSL_IPL_0
#endif /* _KERNEL */ #endif /* _KERNEL */