From patchwork Fri Feb 17 11:29:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 141783 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 5C11DB6EF1 for ; Fri, 17 Feb 2012 22:39:02 +1100 (EST) Received: from localhost ([::1]:59962 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyM9S-0004Zq-Dd for incoming@patchwork.ozlabs.org; Fri, 17 Feb 2012 06:38:58 -0500 Received: from eggs.gnu.org ([140.186.70.92]:39576) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyM9J-0004ZO-6W for qemu-devel@nongnu.org; Fri, 17 Feb 2012 06:38:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RyM9D-0008J0-4F for qemu-devel@nongnu.org; Fri, 17 Feb 2012 06:38:49 -0500 Received: from mnementh.archaic.org.uk ([81.2.115.146]:50496) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RyM9C-0006Q6-U5 for qemu-devel@nongnu.org; Fri, 17 Feb 2012 06:38:43 -0500 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RyM0Q-0003pR-4h; Fri, 17 Feb 2012 11:29:38 +0000 From: Peter Maydell To: Anthony Liguori Date: Fri, 17 Feb 2012 11:29:37 +0000 Message-Id: <1329478177-14650-23-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1329478177-14650-1-git-send-email-peter.maydell@linaro.org> References: <1329478177-14650-1-git-send-email-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: qemu-devel@nongnu.org, Paul Brook Subject: [Qemu-devel] [PATCH 22/22] hw/pl031: Actually raise interrupt on timer expiry 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 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. Reported-by: Daniel Forsgren Signed-off-by: Peter Maydell Acked-by: Andreas Färber --- hw/pl031.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pl031.c b/hw/pl031.c index 05b5b11..69abc4f 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); }