diff options
Diffstat (limited to 'hw/etraxfs_timer.c')
| -rw-r--r-- | hw/etraxfs_timer.c | 133 |
1 files changed, 108 insertions, 25 deletions
diff --git a/hw/etraxfs_timer.c b/hw/etraxfs_timer.c index 9d8799f21..e0fde9c2c 100644 --- a/hw/etraxfs_timer.c +++ b/hw/etraxfs_timer.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <sys/time.h> #include "hw.h" +#include "sysemu.h" #include "qemu-timer.h" #define D(x) @@ -36,6 +37,7 @@ #define RW_TMR1_CTRL 0x18 #define R_TIME 0x38 #define RW_WD_CTRL 0x40 +#define R_WD_STAT 0x44 #define RW_INTR_MASK 0x48 #define RW_ACK_INTR 0x4c #define R_INTR 0x50 @@ -46,8 +48,12 @@ struct fs_timer_t { qemu_irq *irq; target_phys_addr_t base; - QEMUBH *bh; - ptimer_state *ptimer; + QEMUBH *bh_t0; + QEMUBH *bh_t1; + QEMUBH *bh_wd; + ptimer_state *ptimer_t0; + ptimer_state *ptimer_t1; + ptimer_state *ptimer_wd; struct timeval last; /* Control registers. */ @@ -59,6 +65,8 @@ struct fs_timer_t { uint32_t r_tmr1_data; uint32_t rw_tmr1_ctrl; + uint32_t rw_wd_ctrl; + uint32_t rw_intr_mask; uint32_t rw_ack_intr; uint32_t r_intr; @@ -114,15 +122,28 @@ timer_winvalid (void *opaque, target_phys_addr_t addr, uint32_t value) } #define TIMER_SLOWDOWN 1 -static void update_ctrl(struct fs_timer_t *t) +static void update_ctrl(struct fs_timer_t *t, int tnum) { unsigned int op; unsigned int freq; unsigned int freq_hz; unsigned int div; + uint32_t ctrl; + ptimer_state *timer; + + if (tnum == 0) { + ctrl = t->rw_tmr0_ctrl; + div = t->rw_tmr0_div; + timer = t->ptimer_t0; + } else { + ctrl = t->rw_tmr1_ctrl; + div = t->rw_tmr1_div; + timer = t->ptimer_t1; + } + - op = t->rw_tmr0_ctrl & 3; - freq = t->rw_tmr0_ctrl >> 2; + op = ctrl & 3; + freq = ctrl >> 2; freq_hz = 32000000; switch (freq) @@ -134,33 +155,32 @@ static void update_ctrl(struct fs_timer_t *t) case 4: freq_hz = 29493000; break; case 5: freq_hz = 32000000; break; case 6: freq_hz = 32768000; break; - case 7: freq_hz = 100000000; break; + case 7: freq_hz = 100001000; break; default: abort(); break; } - D(printf ("freq_hz=%d div=%d\n", freq_hz, t->rw_tmr0_div)); - div = t->rw_tmr0_div * TIMER_SLOWDOWN; + D(printf ("freq_hz=%d div=%d\n", freq_hz, div)); + div = div * TIMER_SLOWDOWN; div >>= 15; freq_hz >>= 15; - ptimer_set_freq(t->ptimer, freq_hz); - ptimer_set_limit(t->ptimer, div, 0); + ptimer_set_freq(timer, freq_hz); + ptimer_set_limit(timer, div, 0); switch (op) { case 0: /* Load. */ - ptimer_set_limit(t->ptimer, div, 1); - ptimer_run(t->ptimer, 1); + ptimer_set_limit(timer, div, 1); break; case 1: /* Hold. */ - ptimer_stop(t->ptimer); + ptimer_stop(timer); break; case 2: /* Run. */ - ptimer_run(t->ptimer, 0); + ptimer_run(timer, 0); break; default: abort(); @@ -180,13 +200,55 @@ static void timer_update_irq(struct fs_timer_t *t) qemu_irq_lower(t->irq[0]); } -static void timer_hit(void *opaque) +static void timer0_hit(void *opaque) { struct fs_timer_t *t = opaque; t->r_intr |= 1; timer_update_irq(t); } +static void timer1_hit(void *opaque) +{ + struct fs_timer_t *t = opaque; + t->r_intr |= 2; + timer_update_irq(t); +} + +static void watchdog_hit(void *opaque) +{ + qemu_system_reset_request(); +} + +static inline void timer_watchdog_update(struct fs_timer_t *t, uint32_t value) +{ + unsigned int wd_en = t->rw_wd_ctrl & (1 << 8); + unsigned int wd_key = t->rw_wd_ctrl >> 9; + unsigned int wd_cnt = t->rw_wd_ctrl & 511; + unsigned int new_key = value >> 9 & ((1 << 7) - 1); + unsigned int new_cmd = (value >> 8) & 1; + + /* If the watchdog is enabled, they written key must match the + complement of the previous. */ + wd_key = ~wd_key & ((1 << 7) - 1); + + if (wd_en && wd_key != new_key) + return; + + D(printf("en=%d new_key=%x oldkey=%x cmd=%d cnt=%d\n", + wd_en, new_key, wd_key, wd_cmd, wd_cnt)); + + ptimer_set_freq(t->ptimer_wd, 760); + if (wd_cnt == 0) + wd_cnt = 256; + ptimer_set_count(t->ptimer_wd, wd_cnt); + if (new_cmd) + ptimer_run(t->ptimer_wd, 1); + else + ptimer_stop(t->ptimer_wd); + + t->rw_wd_ctrl = value; +} + static void timer_writel (void *opaque, target_phys_addr_t addr, uint32_t value) { @@ -203,13 +265,15 @@ timer_writel (void *opaque, target_phys_addr_t addr, uint32_t value) case RW_TMR0_CTRL: D(printf ("RW_TMR0_CTRL=%x\n", value)); t->rw_tmr0_ctrl = value; - update_ctrl(t); + update_ctrl(t, 0); break; case RW_TMR1_DIV: t->rw_tmr1_div = value; break; case RW_TMR1_CTRL: D(printf ("RW_TMR1_CTRL=%x\n", value)); + t->rw_tmr1_ctrl = value; + update_ctrl(t, 1); break; case RW_INTR_MASK: D(printf ("RW_INTR_MASK=%x\n", value)); @@ -217,7 +281,7 @@ timer_writel (void *opaque, target_phys_addr_t addr, uint32_t value) timer_update_irq(t); break; case RW_WD_CTRL: - D(printf ("RW_WD_CTRL=%x\n", value)); + timer_watchdog_update(t, value); break; case RW_ACK_INTR: t->rw_ack_intr = value; @@ -232,17 +296,30 @@ timer_writel (void *opaque, target_phys_addr_t addr, uint32_t value) } static CPUReadMemoryFunc *timer_read[] = { - &timer_rinvalid, - &timer_rinvalid, - &timer_readl, + &timer_rinvalid, + &timer_rinvalid, + &timer_readl, }; static CPUWriteMemoryFunc *timer_write[] = { - &timer_winvalid, - &timer_winvalid, - &timer_writel, + &timer_winvalid, + &timer_winvalid, + &timer_writel, }; +static void etraxfs_timer_reset(void *opaque) +{ + struct fs_timer_t *t = opaque; + + ptimer_stop(t->ptimer_t0); + ptimer_stop(t->ptimer_t1); + ptimer_stop(t->ptimer_wd); + t->rw_wd_ctrl = 0; + t->r_intr = 0; + t->rw_intr_mask = 0; + qemu_irq_lower(t->irq[0]); +} + void etraxfs_timer_init(CPUState *env, qemu_irq *irqs, target_phys_addr_t base) { @@ -253,12 +330,18 @@ void etraxfs_timer_init(CPUState *env, qemu_irq *irqs, if (!t) return; - t->bh = qemu_bh_new(timer_hit, t); - t->ptimer = ptimer_init(t->bh); + t->bh_t0 = qemu_bh_new(timer0_hit, t); + t->bh_t1 = qemu_bh_new(timer1_hit, t); + t->bh_wd = qemu_bh_new(watchdog_hit, t); + t->ptimer_t0 = ptimer_init(t->bh_t0); + t->ptimer_t1 = ptimer_init(t->bh_t1); + t->ptimer_wd = ptimer_init(t->bh_wd); t->irq = irqs; t->env = env; t->base = base; timer_regs = cpu_register_io_memory(0, timer_read, timer_write, t); cpu_register_physical_memory (base, 0x5c, timer_regs); + + qemu_register_reset(etraxfs_timer_reset, t); } |