From patchwork Thu Dec 15 18:58:26 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 131719 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 729171007D6 for ; Fri, 16 Dec 2011 05:58:39 +1100 (EST) Received: from localhost ([::1]:42048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbGVo-0003a8-4F for incoming@patchwork.ozlabs.org; Thu, 15 Dec 2011 13:58:36 -0500 Received: from eggs.gnu.org ([140.186.70.92]:58243) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbGVi-0003XD-9g for qemu-devel@nongnu.org; Thu, 15 Dec 2011 13:58:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RbGVh-0000kf-9Z for qemu-devel@nongnu.org; Thu, 15 Dec 2011 13:58:30 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:56006) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RbGVg-0000eP-Vg; Thu, 15 Dec 2011 13:58:29 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RbGVe-0005iK-Ey; Thu, 15 Dec 2011 18:58:26 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 15 Dec 2011 18:58:26 +0000 Message-Id: <1323975506-21941-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: qemu-trivial@nongnu.org, patches@linaro.org Subject: [Qemu-devel] [PATCH] stellaris: Calculate system clock period on reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- hw/stellaris.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) 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)