openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

allwinner-a10-pit: avoid generation of spurious interrupts 

The model was generating interrupts for all enabled timers after the
expiration of one of them. Avoid this by passing explicitly the timer
index to the callback function.

Signed-off-by: Beniamino Galvani <b.galvani@gmail.com>
Reviewed-by: Li Guang <lig.fnst@cn.fujitsu.com>
Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com>
Message-id: 1395771730-16882-4-git-send-email-b.galvani@gmail.com
[PMM: avoid duplicate typedef of AwA10PITState]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Beniamino Galvani 2014-03-25 19:22:06 +01:00 committed by Peter Maydell
parent 2237094d96
commit 323a8771cf
2 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/timer/allwinner-a10-pit.c
View File

@ -193,18 +193,17 @@ static void a10_pit_reset(DeviceState *dev)
static void a10_pit_timer_cb(void *opaque) static void a10_pit_timer_cb(void *opaque)
{ {
AwA10PITState *s = AW_A10_PIT(opaque); AwA10TimerContext *tc = opaque;
uint8_t i; AwA10PITState *s = tc->container;
uint8_t i = tc->index;
for (i = 0; i < AW_A10_PIT_TIMER_NR; i++) { if (s->control[i] & AW_A10_PIT_TIMER_EN) {
if (s->control[i] & AW_A10_PIT_TIMER_EN) { s->irq_status |= 1 << i;
s->irq_status |= 1 << i; if (s->control[i] & AW_A10_PIT_TIMER_MODE) {
if (s->control[i] & AW_A10_PIT_TIMER_MODE) { ptimer_stop(s->timer[i]);
ptimer_stop(s->timer[i]); s->control[i] &= ~AW_A10_PIT_TIMER_EN;
s->control[i] &= ~AW_A10_PIT_TIMER_EN;
}
qemu_irq_pulse(s->irq[i]);
} }
qemu_irq_pulse(s->irq[i]);
} }
} }
@ -223,7 +222,11 @@ static void a10_pit_init(Object *obj)
sysbus_init_mmio(sbd, &s->iomem); sysbus_init_mmio(sbd, &s->iomem);
for (i = 0; i < AW_A10_PIT_TIMER_NR; i++) { for (i = 0; i < AW_A10_PIT_TIMER_NR; i++) {
bh[i] = qemu_bh_new(a10_pit_timer_cb, s); AwA10TimerContext *tc = &s->timer_context[i];
tc->container = s;
tc->index = i;
bh[i] = qemu_bh_new(a10_pit_timer_cb, tc);
s->timer[i] = ptimer_init(bh[i]); s->timer[i] = ptimer_init(bh[i]);
ptimer_set_freq(s->timer[i], 240000); ptimer_set_freq(s->timer[i], 240000);
} }

12
include/hw/timer/allwinner-a10-pit.h
View File

@ -35,12 +35,20 @@
#define AW_A10_PIT_DEFAULT_CLOCK 0x4 #define AW_A10_PIT_DEFAULT_CLOCK 0x4
typedef struct AwA10PITState { typedef struct AwA10PITState AwA10PITState;
typedef struct AwA10TimerContext {
AwA10PITState *container;
int index;
} AwA10TimerContext;
struct AwA10PITState {
/*< private >*/ /*< private >*/
SysBusDevice parent_obj; SysBusDevice parent_obj;
/*< public >*/ /*< public >*/
qemu_irq irq[AW_A10_PIT_TIMER_NR]; qemu_irq irq[AW_A10_PIT_TIMER_NR];
ptimer_state * timer[AW_A10_PIT_TIMER_NR]; ptimer_state * timer[AW_A10_PIT_TIMER_NR];
AwA10TimerContext timer_context[AW_A10_PIT_TIMER_NR];
MemoryRegion iomem; MemoryRegion iomem;
uint32_t irq_enable; uint32_t irq_enable;
@ -53,6 +61,6 @@ typedef struct AwA10PITState {
uint32_t count_lo; uint32_t count_lo;
uint32_t count_hi; uint32_t count_hi;
uint32_t count_ctl; uint32_t count_ctl;
} AwA10PITState; };
#endif #endif