Patchwork hw/pl031: Actually raise interrupt on timer expiry

login
register
mail settings
Submitter Peter Maydell
Date Feb. 14, 2012, 5:40 p.m.
Message ID <1329241239-9327-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/141164/
State New
Headers show

Comments

Peter Maydell - Feb. 14, 2012, 5:40 p.m.
Fix a typo in pl031_interrupt() which meant we were setting a bit
in the interrupt mask rather than the interrupt status register
and thus not actually raising an interrupt. This fix allows the
rtctest program from the kernel's Documentation/rtc.txt to pass
rather than hanging.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Looks like our PL031 has always had this bug since it was added
in 2007... Daniel Forsgren reported this, suggested the fix and
pointed me at the test program. Thanks!
 https://bugs.launchpad.net/qemu-linaro/+bug/931940

 hw/pl031.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch

diff --git a/hw/pl031.c b/hw/pl031.c
index 8416a60..f06b5ae 100644
--- a/hw/pl031.c
+++ b/hw/pl031.c
@@ -76,7 +76,7 @@  static void pl031_interrupt(void * opaque)
 {
     pl031_state *s = (pl031_state *)opaque;
 
-    s->im = 1;
+    s->is = 1;
     DPRINTF("Alarm raised\n");
     pl031_update(s);
 }