Revision ba3c64fb hw/slavio_timer.c

b/hw/slavio_timer.c
42 42
 * The 31-bit counter is incremented every 500ns by bit 9. Bits 8..0
43 43
 * are zero. Bit 31 is 1 when count has been reached.
44 44
 *
45
 * Per-CPU timers interrupt local CPU, system timer uses normal
46
 * interrupt routing.
47
 *
45 48
 */
46 49

  
47 50
typedef struct SLAVIO_TIMERState {
......
53 56
    int irq;
54 57
    int reached, stopped;
55 58
    int mode; // 0 = processor, 1 = user, 2 = system
59
    unsigned int cpu;
56 60
} SLAVIO_TIMERState;
57 61

  
58 62
#define TIMER_MAXADDR 0x1f
59 63
#define CNT_FREQ 2000000
60
#define MAX_CPUS 16
61 64

  
62 65
// Update count, set irq, update expire_time
63 66
static void slavio_timer_get_out(SLAVIO_TIMERState *s)
......
73 76
    else
74 77
	ticks = qemu_get_clock(vm_clock) - s->tick_offset;
75 78

  
76
    out = (ticks >= s->expire_time);
79
    out = (ticks > s->expire_time);
77 80
    if (out)
78 81
	s->reached = 0x80000000;
79 82
    if (!s->limit)
......
100 103
    DPRINTF("irq %d limit %d reached %d d %lld count %d s->c %x diff %lld stopped %d mode %d\n", s->irq, limit, s->reached?1:0, (ticks-s->count_load_time), count, s->count, s->expire_time - ticks, s->stopped, s->mode);
101 104

  
102 105
    if (s->mode != 1)
103
	pic_set_irq(s->irq, out);
106
	pic_set_irq_cpu(s->irq, out, s->cpu);
104 107
}
105 108

  
106 109
// timer callback
......
127 130
	// part of counter (user mode)
128 131
	if (s->mode != 1) {
129 132
	    // clear irq
130
	    pic_set_irq(s->irq, 0);
133
	    pic_set_irq_cpu(s->irq, 0, s->cpu);
131 134
	    s->count_load_time = qemu_get_clock(vm_clock);
132 135
	    s->reached = 0;
133 136
	    return s->limit;
......
263 266
    slavio_timer_get_out(s);
264 267
}
265 268

  
266
static void slavio_timer_init_internal(uint32_t addr, int irq, int mode)
269
void slavio_timer_init(uint32_t addr, int irq, int mode, unsigned int cpu)
267 270
{
268 271
    int slavio_timer_io_memory;
269 272
    SLAVIO_TIMERState *s;
......
273 276
        return;
274 277
    s->irq = irq;
275 278
    s->mode = mode;
279
    s->cpu = cpu;
276 280
    s->irq_timer = qemu_new_timer(vm_clock, slavio_timer_irq, s);
277 281

  
278 282
    slavio_timer_io_memory = cpu_register_io_memory(0, slavio_timer_mem_read,
......
282 286
    qemu_register_reset(slavio_timer_reset, s);
283 287
    slavio_timer_reset(s);
284 288
}
285

  
286
void slavio_timer_init(uint32_t addr1, int irq1, uint32_t addr2, int irq2)
287
{
288
    int i;
289

  
290
    for (i = 0; i < MAX_CPUS; i++) {
291
	slavio_timer_init_internal(addr1 + i * TARGET_PAGE_SIZE, irq1, 0);
292
    }
293

  
294
    slavio_timer_init_internal(addr2, irq2, 2);
295
}

Also available in: Unified diff