Fixup mips/rmi for the new mips timer code(r210403). This will get XLR
booting again. The code is a copy of the mips/mips/tick.c with minor modifications for XLR interrupt handling. Disable mips/rmi/clock.c for now, the PIC based timer code will be added later.
This commit is contained in:
parent
56a6a014a3
commit
14fecff4af
sys/mips/rmi
@ -1,7 +1,7 @@
|
||||
# $FreeBSD$
|
||||
#mips/rmi/xlr_boot1_console.c standard
|
||||
mips/rmi/xlr_machdep.c standard
|
||||
mips/rmi/clock.c standard
|
||||
#mips/rmi/clock.c standard
|
||||
mips/rmi/tick.c standard
|
||||
mips/rmi/iodi.c standard
|
||||
mips/rmi/msgring.c standard
|
||||
|
@ -144,11 +144,11 @@ cpu_intr(struct trapframe *tf)
|
||||
return;
|
||||
}
|
||||
/*
|
||||
* No need to clear the EIRR here. the handler is gonna write to
|
||||
* compare which clears eirr also
|
||||
* No need to clear the EIRR here as the handler writes to
|
||||
* compare which ACKs the interrupt.
|
||||
*/
|
||||
if (eirr & (1 << IRQ_TIMER)) {
|
||||
count_compare_clockhandler(tf);
|
||||
intr_event_handle(mips_intr_events[IRQ_TIMER], tf);
|
||||
critical_exit();
|
||||
return;
|
||||
}
|
||||
|
@ -1,16 +1,16 @@
|
||||
/*-
|
||||
* Copyright (c) 2006-2009 RMI Corporation
|
||||
* Copyright (c) 2006 Bruce M. Simpson
|
||||
* Copyright (c) 2006-2007 Bruce M. Simpson.
|
||||
* Copyright (c) 2003-2004 Juli Mallett.
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
* 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.
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
@ -28,48 +28,121 @@
|
||||
/*
|
||||
* Simple driver for the 32-bit interval counter built in to all
|
||||
* MIPS32 CPUs.
|
||||
* XXX: For calibration this either needs an external clock, or
|
||||
* to be explicitly told what the frequency is.
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__FBSDID("$FreeBSD$");
|
||||
|
||||
#include "opt_cputype.h"
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
#include <sys/sysctl.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/timetc.h>
|
||||
#include <sys/bus.h>
|
||||
#include <sys/kernel.h>
|
||||
#include <sys/module.h>
|
||||
#include <sys/rman.h>
|
||||
#include <sys/power.h>
|
||||
#include <sys/smp.h>
|
||||
#include <sys/time.h>
|
||||
#include <sys/timeet.h>
|
||||
#include <sys/timetc.h>
|
||||
|
||||
#include <machine/hwfunc.h>
|
||||
#include <machine/clock.h>
|
||||
#include <machine/locore.h>
|
||||
#include <machine/md_var.h>
|
||||
#include <machine/hwfunc.h>
|
||||
#include <machine/intr_machdep.h>
|
||||
#include <mips/rmi/interrupt.h>
|
||||
|
||||
uint64_t counter_freq;
|
||||
|
||||
struct timecounter counter_timecounter = {
|
||||
platform_get_timecount, /* get_timecount */
|
||||
0, /* no poll_pps */
|
||||
~0u, /* counter_mask */
|
||||
0, /* frequency */
|
||||
"MIPS32", /* name */
|
||||
800, /* quality (adjusted in code) */
|
||||
struct timecounter *platform_timecounter;
|
||||
|
||||
static DPCPU_DEFINE(uint32_t, cycles_per_tick);
|
||||
static uint32_t cycles_per_usec;
|
||||
|
||||
static u_int32_t counter_upper = 0;
|
||||
static u_int32_t counter_lower_last = 0;
|
||||
|
||||
static DPCPU_DEFINE(uint32_t, compare_ticks);
|
||||
static DPCPU_DEFINE(uint32_t, lost_ticks);
|
||||
|
||||
struct clock_softc {
|
||||
int intr_rid;
|
||||
struct resource *intr_res;
|
||||
void *intr_handler;
|
||||
struct timecounter tc;
|
||||
struct eventtimer et;
|
||||
};
|
||||
static struct clock_softc *softc;
|
||||
|
||||
void tick_init(void);
|
||||
/*
|
||||
* Device methods
|
||||
*/
|
||||
static int clock_probe(device_t);
|
||||
static void clock_identify(driver_t *, device_t);
|
||||
static int clock_attach(device_t);
|
||||
static unsigned counter_get_timecount(struct timecounter *tc);
|
||||
|
||||
void
|
||||
mips_timer_early_init(uint64_t clock_hz)
|
||||
{
|
||||
/* Initialize clock early so that we can use DELAY sooner */
|
||||
counter_freq = clock_hz;
|
||||
cycles_per_usec = (clock_hz / (1000 * 1000));
|
||||
}
|
||||
|
||||
void
|
||||
tick_init(void)
|
||||
platform_initclocks(void)
|
||||
{
|
||||
counter_freq = platform_get_frequency();
|
||||
if (bootverbose)
|
||||
printf("MIPS32 clock: %u MHz", cpu_clock);
|
||||
|
||||
counter_timecounter.tc_frequency = counter_freq;
|
||||
tc_init(&counter_timecounter);
|
||||
if (platform_timecounter != NULL)
|
||||
tc_init(platform_timecounter);
|
||||
}
|
||||
|
||||
static uint64_t
|
||||
tick_ticker(void)
|
||||
{
|
||||
uint64_t ret;
|
||||
uint32_t ticktock;
|
||||
|
||||
/*
|
||||
* XXX: MIPS64 platforms can read 64-bits of counter directly.
|
||||
* Also: the tc code is supposed to cope with things wrapping
|
||||
* from the time counter, so I'm not sure why all these hoops
|
||||
* are even necessary.
|
||||
*/
|
||||
ticktock = mips_rd_count();
|
||||
critical_enter();
|
||||
if (ticktock < counter_lower_last)
|
||||
counter_upper++;
|
||||
counter_lower_last = ticktock;
|
||||
critical_exit();
|
||||
|
||||
ret = ((uint64_t) counter_upper << 32) | counter_lower_last;
|
||||
return (ret);
|
||||
}
|
||||
|
||||
void
|
||||
mips_timer_init_params(uint64_t platform_counter_freq, int double_count)
|
||||
{
|
||||
|
||||
/*
|
||||
* XXX: Do not use printf here: uart code 8250 may use DELAY so this
|
||||
* function should be called before cninit.
|
||||
*/
|
||||
counter_freq = platform_counter_freq;
|
||||
/*
|
||||
* XXX: Some MIPS32 cores update the Count register only every two
|
||||
* pipeline cycles.
|
||||
* We know this because of status registers in CP0, make it automatic.
|
||||
*/
|
||||
if (double_count != 0)
|
||||
counter_freq /= 2;
|
||||
|
||||
cycles_per_usec = counter_freq / (1 * 1000 * 1000);
|
||||
set_cputicker(tick_ticker, counter_freq, 1);
|
||||
}
|
||||
|
||||
static int
|
||||
@ -78,22 +151,225 @@ sysctl_machdep_counter_freq(SYSCTL_HANDLER_ARGS)
|
||||
int error;
|
||||
uint64_t freq;
|
||||
|
||||
/*
|
||||
* RRS wonders if this will really work. You don't change the req of
|
||||
* the system here, it would require changes to the RMI PIC in order
|
||||
* to get the TC to run at a differrent frequency.
|
||||
*/
|
||||
|
||||
if (counter_timecounter.tc_frequency == 0)
|
||||
if (softc == NULL)
|
||||
return (EOPNOTSUPP);
|
||||
freq = counter_freq;
|
||||
error = sysctl_handle_int(oidp, &freq, sizeof(freq), req);
|
||||
if (error == 0 && req->newptr != NULL) {
|
||||
counter_freq = freq;
|
||||
counter_timecounter.tc_frequency = counter_freq;
|
||||
softc->et.et_frequency = counter_freq;
|
||||
softc->tc.tc_frequency = counter_freq;
|
||||
}
|
||||
return (error);
|
||||
}
|
||||
|
||||
SYSCTL_PROC(_machdep, OID_AUTO, counter_freq, CTLTYPE_QUAD | CTLFLAG_RW,
|
||||
0, sizeof(u_int), sysctl_machdep_counter_freq, "IU", "");
|
||||
0, sizeof(u_int), sysctl_machdep_counter_freq, "IU",
|
||||
"Timecounter frequency in Hz");
|
||||
|
||||
static unsigned
|
||||
counter_get_timecount(struct timecounter *tc)
|
||||
{
|
||||
|
||||
return (mips_rd_count());
|
||||
}
|
||||
|
||||
/*
|
||||
* Wait for about n microseconds (at least!).
|
||||
*/
|
||||
void
|
||||
DELAY(int n)
|
||||
{
|
||||
uint32_t cur, last, delta, usecs;
|
||||
|
||||
/*
|
||||
* This works by polling the timer and counting the number of
|
||||
* microseconds that go by.
|
||||
*/
|
||||
last = mips_rd_count();
|
||||
delta = usecs = 0;
|
||||
|
||||
while (n > usecs) {
|
||||
cur = mips_rd_count();
|
||||
|
||||
/* Check to see if the timer has wrapped around. */
|
||||
if (cur < last)
|
||||
delta += cur + (0xffffffff - last) + 1;
|
||||
else
|
||||
delta += cur - last;
|
||||
|
||||
last = cur;
|
||||
|
||||
if (delta >= cycles_per_usec) {
|
||||
usecs += delta / cycles_per_usec;
|
||||
delta %= cycles_per_usec;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
clock_start(struct eventtimer *et,
|
||||
struct bintime *first, struct bintime *period)
|
||||
{
|
||||
uint32_t fdiv, div, next;
|
||||
|
||||
if (period != NULL) {
|
||||
div = (et->et_frequency * (period->frac >> 32)) >> 32;
|
||||
if (period->sec != 0)
|
||||
div += et->et_frequency * period->sec;
|
||||
} else
|
||||
div = 0;
|
||||
if (first != NULL) {
|
||||
fdiv = (et->et_frequency * (first->frac >> 32)) >> 32;
|
||||
if (first->sec != 0)
|
||||
fdiv += et->et_frequency * first->sec;
|
||||
} else
|
||||
fdiv = div;
|
||||
DPCPU_SET(cycles_per_tick, div);
|
||||
next = mips_rd_count() + fdiv;
|
||||
DPCPU_SET(compare_ticks, next);
|
||||
mips_wr_compare(next);
|
||||
return (0);
|
||||
}
|
||||
|
||||
static int
|
||||
clock_stop(struct eventtimer *et)
|
||||
{
|
||||
|
||||
DPCPU_SET(cycles_per_tick, 0);
|
||||
mips_wr_compare(0xffffffff);
|
||||
return (0);
|
||||
}
|
||||
|
||||
/*
|
||||
* Device section of file below
|
||||
*/
|
||||
static int
|
||||
clock_intr(void *arg)
|
||||
{
|
||||
struct clock_softc *sc = (struct clock_softc *)arg;
|
||||
uint32_t cycles_per_tick;
|
||||
uint32_t count, compare_last, compare_next, lost_ticks;
|
||||
|
||||
cycles_per_tick = DPCPU_GET(cycles_per_tick);
|
||||
/*
|
||||
* Set next clock edge.
|
||||
*/
|
||||
count = mips_rd_count();
|
||||
compare_last = DPCPU_GET(compare_ticks);
|
||||
if (cycles_per_tick > 0) {
|
||||
compare_next = count + cycles_per_tick;
|
||||
DPCPU_SET(compare_ticks, compare_next);
|
||||
mips_wr_compare(compare_next);
|
||||
} else /* In one-shot mode timer should be stopped after the event. */
|
||||
mips_wr_compare(0xffffffff);
|
||||
|
||||
critical_enter();
|
||||
if (count < counter_lower_last) {
|
||||
counter_upper++;
|
||||
counter_lower_last = count;
|
||||
}
|
||||
|
||||
if (cycles_per_tick > 0) {
|
||||
|
||||
/*
|
||||
* Account for the "lost time" between when the timer interrupt
|
||||
* fired and when 'clock_intr' actually started executing.
|
||||
*/
|
||||
lost_ticks = DPCPU_GET(lost_ticks);
|
||||
lost_ticks += count - compare_last;
|
||||
|
||||
/*
|
||||
* If the COUNT and COMPARE registers are no longer in sync
|
||||
* then make up some reasonable value for the 'lost_ticks'.
|
||||
*
|
||||
* This could happen, for e.g., after we resume normal
|
||||
* operations after exiting the debugger.
|
||||
*/
|
||||
if (lost_ticks > 2 * cycles_per_tick)
|
||||
lost_ticks = cycles_per_tick;
|
||||
|
||||
while (lost_ticks >= cycles_per_tick) {
|
||||
if (sc->et.et_active)
|
||||
sc->et.et_event_cb(&sc->et, sc->et.et_arg);
|
||||
lost_ticks -= cycles_per_tick;
|
||||
}
|
||||
DPCPU_SET(lost_ticks, lost_ticks);
|
||||
}
|
||||
if (sc->et.et_active)
|
||||
sc->et.et_event_cb(&sc->et, sc->et.et_arg);
|
||||
critical_exit();
|
||||
return (FILTER_HANDLED);
|
||||
}
|
||||
|
||||
static int
|
||||
clock_probe(device_t dev)
|
||||
{
|
||||
|
||||
if (device_get_unit(dev) != 0)
|
||||
panic("can't attach more clocks");
|
||||
|
||||
device_set_desc(dev, "Generic MIPS32 ticker");
|
||||
return (0);
|
||||
}
|
||||
|
||||
static void
|
||||
clock_identify(driver_t * drv, device_t parent)
|
||||
{
|
||||
|
||||
BUS_ADD_CHILD(parent, 0, "clock", 0);
|
||||
}
|
||||
|
||||
static int
|
||||
clock_attach(device_t dev)
|
||||
{
|
||||
struct clock_softc *sc;
|
||||
|
||||
softc = sc = device_get_softc(dev);
|
||||
cpu_establish_hardintr("compare", clock_intr, NULL,
|
||||
sc, IRQ_TIMER, INTR_TYPE_CLK, &sc->intr_handler);
|
||||
|
||||
sc->tc.tc_get_timecount = counter_get_timecount;
|
||||
sc->tc.tc_counter_mask = 0xffffffff;
|
||||
sc->tc.tc_frequency = counter_freq;
|
||||
sc->tc.tc_name = "MIPS32";
|
||||
sc->tc.tc_quality = 800;
|
||||
sc->tc.tc_priv = sc;
|
||||
tc_init(&sc->tc);
|
||||
sc->et.et_name = "MIPS32";
|
||||
sc->et.et_flags = ET_FLAGS_PERIODIC | ET_FLAGS_ONESHOT |
|
||||
ET_FLAGS_PERCPU;
|
||||
sc->et.et_quality = 800;
|
||||
sc->et.et_frequency = counter_freq;
|
||||
sc->et.et_min_period.sec = 0;
|
||||
sc->et.et_min_period.frac = 0x00004000LLU << 32; /* To be safe. */
|
||||
sc->et.et_max_period.sec = 0xfffffffeU / sc->et.et_frequency;
|
||||
sc->et.et_max_period.frac =
|
||||
((0xfffffffeLLU << 32) / sc->et.et_frequency) << 32;
|
||||
sc->et.et_start = clock_start;
|
||||
sc->et.et_stop = clock_stop;
|
||||
sc->et.et_priv = sc;
|
||||
et_register(&sc->et);
|
||||
return (0);
|
||||
}
|
||||
|
||||
static device_method_t clock_methods[] = {
|
||||
/* Device interface */
|
||||
DEVMETHOD(device_probe, clock_probe),
|
||||
DEVMETHOD(device_identify, clock_identify),
|
||||
DEVMETHOD(device_attach, clock_attach),
|
||||
DEVMETHOD(device_detach, bus_generic_detach),
|
||||
DEVMETHOD(device_shutdown, bus_generic_shutdown),
|
||||
|
||||
{0, 0}
|
||||
};
|
||||
|
||||
static driver_t clock_driver = {
|
||||
"clock",
|
||||
clock_methods,
|
||||
sizeof(struct clock_softc),
|
||||
};
|
||||
|
||||
static devclass_t clock_devclass;
|
||||
|
||||
DRIVER_MODULE(clock, nexus, clock_driver, clock_devclass, 0, 0);
|
||||
|
@ -322,11 +322,8 @@ platform_start(__register_t a0 __unused,
|
||||
* platform_get_frequency(). Thus we do not use
|
||||
* xlr_boot1_info.cpu_frequency here.
|
||||
*/
|
||||
mips_timer_early_init(platform_get_frequency());
|
||||
mips_timer_early_init(xlr_boot1_info.cpu_frequency);
|
||||
|
||||
/* Init the time counter in the PIC and local putc routine*/
|
||||
rmi_early_counter_init();
|
||||
|
||||
/* Init console please */
|
||||
cninit();
|
||||
init_static_kenv(boot1_env, sizeof(boot1_env));
|
||||
@ -445,7 +442,7 @@ platform_start(__register_t a0 __unused,
|
||||
*/
|
||||
rmi_spin_mutex_safe = 1;
|
||||
on_chip_init();
|
||||
mips_timer_init_params(platform_get_frequency(), 0);
|
||||
mips_timer_init_params(xlr_boot1_info.cpu_frequency, 0);
|
||||
printf("Platform specific startup now completes\n");
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user