Commit e7ea81c3 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Peter Maydell
Browse files

hw/ptimer: Introduce timer policy feature 



Some of the timer devices may behave differently from what ptimer
provides. Introduce ptimer policy feature that allows ptimer users to
change default and wrong timer behaviour, for example to continuously
trigger periodic timer when load value is equal to "0".

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Message-id: 994cd608ec392da6e58f0643800dda595edb9d97.1473252818.git.digetx@gmail.com
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 780d23e5

hw/arm/musicpal.c

+1 −1
Original line number Diff line number Diff line
@@ -837,7 +837,7 @@ static void mv88w8618_timer_init(SysBusDevice *dev, mv88w8618_timer_state *s, 
    s->freq = freq;



    bh = qemu_bh_new(mv88w8618_timer_tick, s);

    s->ptimer = ptimer_init(bh);

    s->ptimer = ptimer_init(bh, PTIMER_POLICY_DEFAULT);

}



static uint64_t mv88w8618_pit_read(void *opaque, hwaddr offset,

hw/core/ptimer.c

+3 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ struct ptimer_state 
    int64_t period;

    int64_t last_event;

    int64_t next_event;

    uint8_t policy_mask;

    QEMUBH *bh;

    QEMUTimer *timer;

};
@@ -243,12 +244,13 @@ const VMStateDescription vmstate_ptimer = { 
    }

};



ptimer_state *ptimer_init(QEMUBH *bh)

ptimer_state *ptimer_init(QEMUBH *bh, uint8_t policy_mask)

{

    ptimer_state *s;



    s = (ptimer_state *)g_malloc0(sizeof(ptimer_state));

    s->bh = bh;

    s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, ptimer_tick, s);

    s->policy_mask = policy_mask;

    return s;

}

hw/dma/xilinx_axidma.c

+1 −1
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static void xilinx_axidma_realize(DeviceState *dev, Error **errp) 


        st->nr = i;

        st->bh = qemu_bh_new(timer_hit, st);

        st->ptimer = ptimer_init(st->bh);

        st->ptimer = ptimer_init(st->bh, PTIMER_POLICY_DEFAULT);

        ptimer_set_freq(st->ptimer, s->freqhz);

    }

    return;

hw/m68k/mcf5206.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ static m5206_timer_state *m5206_timer_init(qemu_irq irq) 


    s = (m5206_timer_state *)g_malloc0(sizeof(m5206_timer_state));

    bh = qemu_bh_new(m5206_timer_trigger, s);

    s->timer = ptimer_init(bh);

    s->timer = ptimer_init(bh, PTIMER_POLICY_DEFAULT);

    s->irq = irq;

    m5206_timer_reset(s);

    return s;

hw/m68k/mcf5208.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static void mcf5208_sys_init(MemoryRegion *address_space, qemu_irq *pic) 
    for (i = 0; i < 2; i++) {

        s = (m5208_timer_state *)g_malloc0(sizeof(m5208_timer_state));

        bh = qemu_bh_new(m5208_timer_trigger, s);

        s->timer = ptimer_init(bh);

        s->timer = ptimer_init(bh, PTIMER_POLICY_DEFAULT);

        memory_region_init_io(&s->iomem, NULL, &m5208_timer_ops, s,

                              "m5208-timer", 0x00004000);

        memory_region_add_subregion(address_space, 0xfc080000 + 0x4000 * i,