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

Fixes setup of clock. It was not properly

Browse Source 
initialized, thus backward time warnings
were being spewed to the console.
This commit is contained in:
rrs 2010-01-26 05:07:41 +00:00
parent d2749dcd63
commit 7fcbb3e319
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/mips/rmi/clock.c
View File

@ -26,9 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* RMI_BSD */ * RMI_BSD
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__FBSDID("$FreeBSD$");
#include <sys/param.h> #include <sys/param.h>
#include <sys/kernel.h> #include <sys/kernel.h>
@ -129,6 +131,8 @@ count_compare_clockhandler(struct trapframe *tf)
return (FILTER_HANDLED); return (FILTER_HANDLED);
} }
unsigned long clock_tick_foo=0;
int int
pic_hardclockhandler(struct trapframe *tf) pic_hardclockhandler(struct trapframe *tf)
{ {
@ -138,6 +142,12 @@ pic_hardclockhandler(struct trapframe *tf)
if (cpu == 0) { if (cpu == 0) {
scale_factor++; scale_factor++;
clock_tick_foo++;
/*
if ((clock_tick_foo % 10000) == 0) {
printf("Clock tick foo at %ld\n", clock_tick_foo);
}
*/
hardclock(USERMODE(tf->sr), tf->pc); hardclock(USERMODE(tf->sr), tf->pc);
if (scale_factor == STAT_PROF_CLOCK_SCALE_FACTOR) { if (scale_factor == STAT_PROF_CLOCK_SCALE_FACTOR) {
statclock(USERMODE(tf->sr)); statclock(USERMODE(tf->sr));
@ -179,7 +189,7 @@ rmi_early_counter_init()
xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_1, (0xffffffff & 0xffffffff)); xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_1, (0xffffffff & 0xffffffff));
xlr_write_reg(mmio, PIC_IRT_0_TIMER_6, (1 << cpu)); xlr_write_reg(mmio, PIC_IRT_0_TIMER_6, (1 << cpu));
xlr_write_reg(mmio, PIC_IRT_1_TIMER_6, (1 << 31) | (0 << 30) | (1 << 6) | (PIC_TIMER_6_IRQ)); xlr_write_reg(mmio, PIC_IRT_1_TIMER_6, (1 << 31) | (0 << 30) | (1 << 6) | (PIC_TIMER_6_IRQ));
pic_update_control(1 << (8 + 6)); pic_update_control(1 << (8 + 6), 0);
} }
void tick_init(void); void tick_init(void);
@ -237,13 +247,13 @@ platform_initclocks(void)
/* Reg 80 is upper bits 63-32 and holds */ /* Reg 80 is upper bits 63-32 and holds */
/* Valid Edge Local IRQ */ /* Valid Edge Local IRQ */
xlr_write_reg(mmio, PIC_IRT_1_TIMER_7, (1 << 31) | (0 << 30) | (1 << 6) | (PIC_TIMER_7_IRQ)); xlr_write_reg(mmio, PIC_IRT_1_TIMER_7, (1 << 31) | (0 << 30) | (1 << 6) | (PIC_TIMER_7_IRQ));
pic_update_control(1 << (8 + 7));
pic_update_control(1 << (8 + 7), 1);
xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_0, (0xffffffff & 0xffffffff)); xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_0, (0xffffffff & 0xffffffff));
xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_1, (0x0 & 0xffffffff)); xlr_write_reg(mmio, PIC_TIMER_6_MAXVAL_1, (0xffffffff & 0xffffffff));
xlr_write_reg(mmio, PIC_IRT_0_TIMER_6, (1 << cpu)); xlr_write_reg(mmio, PIC_IRT_0_TIMER_6, (1 << cpu));
xlr_write_reg(mmio, PIC_IRT_1_TIMER_6, (1 << 31) | (0 << 30) | (1 << 6) | (PIC_TIMER_6_IRQ)); xlr_write_reg(mmio, PIC_IRT_1_TIMER_6, (1 << 31) | (0 << 30) | (1 << 6) | (PIC_TIMER_6_IRQ));
pic_update_control(1 << (8 + 6)); pic_update_control(1 << (8 + 6), 1);
if (rmi_spin_mutex_safe) if (rmi_spin_mutex_safe)
mtx_unlock_spin(&xlr_pic_lock); mtx_unlock_spin(&xlr_pic_lock);
} else { } else {