From patchwork Fri Oct 14 03:43:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 9376101 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 30E8460839 for ; Fri, 14 Oct 2016 03:44:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1F3AB2A28E for ; Fri, 14 Oct 2016 03:44:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 13EC12A294; Fri, 14 Oct 2016 03:44:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1F6702A28E for ; Fri, 14 Oct 2016 03:44:41 +0000 (UTC) Received: from localhost ([::1]:44802 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1butQF-0002cq-D2 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 13 Oct 2016 23:44:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1butPm-0002TQ-4N for qemu-devel@nongnu.org; Thu, 13 Oct 2016 23:44:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1butPj-0006mJ-UJ for qemu-devel@nongnu.org; Thu, 13 Oct 2016 23:44:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37162) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1butPe-0006kS-6W; Thu, 13 Oct 2016 23:44:02 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 281513D95F; Fri, 14 Oct 2016 03:44:01 +0000 (UTC) Received: from javelin.localdomain (vpn1-4-151.sin2.redhat.com [10.67.4.151]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u9E3hsPm012921 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 13 Oct 2016 23:43:56 -0400 From: P J P To: Qemu Developers Date: Fri, 14 Oct 2016 09:13:51 +0530 Message-Id: <1476416631-2870-1-git-send-email-ppandit@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 14 Oct 2016 03:44:01 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v6] timer: a9gtimer: remove loop to auto-increment comparator X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , qemu-arm , Li Qiang , Prasad J Pandit Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Prasad J Pandit ARM A9MP processor has a peripheral timer with an auto-increment register, which holds an increment step value. A user could set this value to zero. When auto-increment control bit is enabled, it leads to an infinite loop in 'a9_gtimer_update' while updating comparator value. Remove this loop incrementing the comparator value. Reported-by: Li Qiang Signed-off-by: Prasad J Pandit Reviewed-by: Peter Maydell --- hw/timer/a9gtimer.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) Update per -> https://lists.gnu.org/archive/html/qemu-devel/2016-10/msg02891.html diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c index 772f85f..03dfaf2 100644 --- a/hw/timer/a9gtimer.c +++ b/hw/timer/a9gtimer.c @@ -73,6 +73,7 @@ static void a9_gtimer_update(A9GTimerState *s, bool sync) A9GTimerUpdate update = a9_gtimer_get_update(s); int i; + uint64_t inc; int64_t next_cdiff = 0; for (i = 0; i < s->num_cpu; ++i) { @@ -82,15 +83,15 @@ static void a9_gtimer_update(A9GTimerState *s, bool sync) if ((s->control & R_CONTROL_TIMER_ENABLE) && (gtb->control & R_CONTROL_COMP_ENABLE)) { /* R2p0+, where the compare function is >= */ - while (gtb->compare < update.new) { + if (gtb->compare < update.new) { DB_PRINT("Compare event happened for CPU %d\n", i); gtb->status = 1; - if (gtb->control & R_CONTROL_AUTO_INCREMENT) { - DB_PRINT("Auto incrementing timer compare by %" PRId32 "\n", - gtb->inc); - gtb->compare += gtb->inc; - } else { - break; + if (gtb->control & R_CONTROL_AUTO_INCREMENT && gtb->inc) { + inc = update.new + gtb->inc - gtb->compare - 1; + inc = QEMU_ALIGN_DOWN(inc, gtb->inc); + DB_PRINT("Auto incrementing timer compare by %" + PRId64 "\n", inc); + gtb->compare += inc; } } cdiff = (int64_t)gtb->compare - (int64_t)update.new + 1;