Patchwork stellaris: Calculate system clock period on reset

login
register
mail settings
Submitter Peter Maydell
Date Dec. 15, 2011, 6:58 p.m.
Message ID <1323975506-21941-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/131719/
State New
Headers show

Comments

Peter Maydell - Dec. 15, 2011, 6:58 p.m.
Calculate the system clock period on reset; otherwise it remains
set to the default value of zero and attempting to use it provokes
a hang. This is one of the issues noted in LP:696094.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/stellaris.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
Stefan Hajnoczi - Dec. 16, 2011, 10:40 a.m.
On Thu, Dec 15, 2011 at 06:58:26PM +0000, Peter Maydell wrote:
> Calculate the system clock period on reset; otherwise it remains
> set to the default value of zero and attempting to use it provokes
> a hang. This is one of the issues noted in LP:696094.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
>  hw/stellaris.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Thanks, applied to the trivial patches tree:
http://repo.or.cz/w/qemu/stefanha.git/shortlog/refs/heads/trivial-patches

Stefan

Patch

diff --git a/hw/stellaris.c b/hw/stellaris.c
index ce62a98..7a73074 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -621,6 +621,7 @@  static void ssys_reset(void *opaque)
     s->rcgc[0] = 1;
     s->scgc[0] = 1;
     s->dcgc[0] = 1;
+    ssys_calculate_system_clock(s);
 }
 
 static int stellaris_sys_post_load(void *opaque, int version_id)