From patchwork Thu Jan 21 19:03:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 8084451 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5B441BEEE5 for ; Thu, 21 Jan 2016 19:08:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 288B620390 for ; Thu, 21 Jan 2016 19:08:17 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id E7DA020384 for ; Thu, 21 Jan 2016 19:08:15 +0000 (UTC) Received: from localhost ([::1]:49382 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMKad-00053V-8f for patchwork-qemu-devel@patchwork.kernel.org; Thu, 21 Jan 2016 14:08:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54710) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMKXM-0007TT-4D for qemu-devel@nongnu.org; Thu, 21 Jan 2016 14:04:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMKXK-0001EF-5N for qemu-devel@nongnu.org; Thu, 21 Jan 2016 14:04:52 -0500 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:33510) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMKXJ-0001DO-NZ; Thu, 21 Jan 2016 14:04:50 -0500 Received: by mail-lf0-x244.google.com with SMTP id z62so2821374lfd.0; Thu, 21 Jan 2016 11:04:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=9+RW3qd1AWou/TyvQEkErILLfnQG8LkjfunUrCP8/xA=; b=SZeCfj7dvloOZW9iwgN/4TDbg0IawbQ1v8RcPyHPGtpOmd5g5WJgAd6J4hmzan2aEs Bc7rDvA4K08scewk28rl/VvDispSuRah37JE9WeDvfFV1DPUD9jGTITMyCU2GAyYZBD5 6JqcYPi1o1F1hS0n51rmJVfyhuydmEjRUi60zhakp0l1eaa6hIR4pc6JNuzbvRare0K4 K3WqI+zD9QyVOnybpFQXKmG5rnCN3+BbUHrwI8NQksnRjfIOfvKrmibzP4+Sfvdaju91 dvQA2HvRt6P0L9ope+niYDhMaEJ3Fx6hgyVe5Jj/K3fboHTRFzkurKip+d9R70Zvhdup b9mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=9+RW3qd1AWou/TyvQEkErILLfnQG8LkjfunUrCP8/xA=; b=AnLoxwXQOrE41F/t/sezHiOxHddBJFbLR5pEplqOF/zQlWTXNekGEdL0gBYm05UoFV 5UkYMOMH0HOPkibpgZT2eqt7kecRozj2hgdTAHPTbK920LYb0yd3MsgcG7bnanIu6gDc NR3UuxF/7sWvILQFoJi90r2zWvwqJZS1QL1WQFarWh9N0QAIVzkHaKUlRZ0Qxv+BHSeI YRK0nJj1ciuayOyoStVQImTgIF3mem8lQsS/IOipB7rUFlN0DZJ7RNONBVbQeew+P/zr +hWmbq89YdT6esRwmubz3BqYyrFKyUg0wqaGb/2KfRVqvkcgL6bgIdiDRbLOpoRpEUOO ZEaQ== X-Gm-Message-State: ALoCoQmMvrFIchaZIMlsRWjYkF2nmYsyO6omZDQHzFUzZFTjJv3XiMxz+UPIPvRbeT6BqDQHX9HbU1vsY0YnUgeyjmu4/+AYYQ== X-Received: by 10.25.40.139 with SMTP id o133mr13280141lfo.10.1453403088983; Thu, 21 Jan 2016 11:04:48 -0800 (PST) Received: from localhost.localdomain (ppp46-138-151-163.pppoe.spdop.ru. [46.138.151.163]) by smtp.gmail.com with ESMTPSA id m21sm382496lfe.29.2016.01.21.11.04.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Jan 2016 11:04:48 -0800 (PST) From: Dmitry Osipenko To: QEMU Developers , qemu-arm@nongnu.org Date: Thu, 21 Jan 2016 22:03:50 +0300 Message-Id: <7b18c0c2ca44c938a198f56094327ab695f09f9b.1453402860.git.digetx@gmail.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::244 Cc: Peter Maydell , Peter Crosthwaite Subject: [Qemu-devel] [PATCH v11 7/7] arm_mptimer: Convert to use ptimer 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Current ARM MPTimer implementation uses QEMUTimer for the actual timer, this implementation isn't complete and mostly tries to duplicate of what generic ptimer is already doing fine. Conversion to ptimer brings the following benefits and fixes: - Simple timer pausing implementation - Fixes counter value preservation after stopping the timer - Correctly handles prescaler != 0 cases - Code simplification and reduction Bump VMSD to version 3, since VMState is changed and is not compatible with the previous implementation. Signed-off-by: Dmitry Osipenko --- hw/timer/arm_mptimer.c | 131 +++++++++++++++++++++-------------------- include/hw/timer/arm_mptimer.h | 5 +- 2 files changed, 67 insertions(+), 69 deletions(-) diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c index 3e59c2a..a5f46df 100644 --- a/hw/timer/arm_mptimer.c +++ b/hw/timer/arm_mptimer.c @@ -19,8 +19,9 @@ * with this program; if not, see . */ +#include "hw/ptimer.h" #include "hw/timer/arm_mptimer.h" -#include "qemu/timer.h" +#include "qemu/main-loop.h" #include "qom/cpu.h" /* This device implements the per-cpu private timer and watchdog block @@ -42,33 +43,34 @@ static inline void timerblock_update_irq(TimerBlock *tb) } /* Return conversion factor from mpcore timer ticks to qemu timer ticks. */ -static inline uint32_t timerblock_scale(TimerBlock *tb) +static inline uint32_t timerblock_scale(uint32_t control) { - return (((tb->control >> 8) & 0xff) + 1) * 10; + return (((control >> 8) & 0xff) + 1) * 10; } -static void timerblock_reload(TimerBlock *tb, int restart) +static inline void timerblock_set_count(struct ptimer_state *timer, + uint32_t control, uint64_t *count) { - if (tb->count == 0) { - return; + /* PTimer would immediately trigger interrupt for periodic timer + * when counter set to 0, MPtimer under certain condition only. */ + if ((control & 3) == 3 && (*count == 0) && (control & 0xff00) == 0) { + *count = ptimer_get_limit(timer); } - if (restart) { - tb->tick = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + ptimer_set_count(timer, *count); +} + +static inline void timerblock_run(struct ptimer_state *timer, uint32_t control, + bool cond) +{ + if (cond) { + ptimer_run(timer, !(control & 2)); } - tb->tick += (int64_t)tb->count * timerblock_scale(tb); - timer_mod(tb->timer, tb->tick); } static void timerblock_tick(void *opaque) { TimerBlock *tb = (TimerBlock *)opaque; tb->status = 1; - if (tb->control & 2) { - tb->count = tb->load; - timerblock_reload(tb, 0); - } else { - tb->count = 0; - } timerblock_update_irq(tb); } @@ -76,21 +78,11 @@ static uint64_t timerblock_read(void *opaque, hwaddr addr, unsigned size) { TimerBlock *tb = (TimerBlock *)opaque; - int64_t val; switch (addr) { case 0: /* Load */ - return tb->load; + return ptimer_get_limit(tb->timer); case 4: /* Counter. */ - if (((tb->control & 1) == 0) || (tb->count == 0)) { - return 0; - } - /* Slow and ugly, but hopefully won't happen too often. */ - val = tb->tick - qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - val /= timerblock_scale(tb); - if (val < 0) { - val = 0; - } - return val; + return ptimer_get_count(tb->timer); case 8: /* Control. */ return tb->control; case 12: /* Interrupt status. */ @@ -104,39 +96,51 @@ static void timerblock_write(void *opaque, hwaddr addr, uint64_t value, unsigned size) { TimerBlock *tb = (TimerBlock *)opaque; - int64_t old; + uint32_t control = tb->control; switch (addr) { case 0: /* Load */ - tb->load = value; - /* Fall through. */ - case 4: /* Counter. */ - if ((tb->control & 1) && tb->count) { - /* Cancel the previous timer. */ - timer_del(tb->timer); + /* Setting load to 0 stops the timer if prescaler == 0. */ + if ((control & 1) && (value == 0) && (control & 0xff00) == 0) { + ptimer_stop(tb->timer); + control &= ~1; } - tb->count = value; - if (tb->control & 1) { - timerblock_reload(tb, 1); + ptimer_set_limit(tb->timer, value, 1); + timerblock_run(tb->timer, control, (control & 1)); + break; + case 4: /* Counter. */ + /* Setting counter to 0 stops the one-shot timer if prescaler == 0 + * and periodic if load = 0. */ + if ((control & 1) && (value == 0) && (control & 0xff00) == 0) { + if (!(control & 2) || ptimer_get_limit(tb->timer) == 0) { + ptimer_stop(tb->timer); + control &= ~1; + } } + timerblock_set_count(tb->timer, control, &value); + timerblock_run(tb->timer, control, (value != 0) && (control & 1)); break; case 8: /* Control. */ - old = tb->control; - tb->control = value; - if (value & 1) { - if ((old & 1) && (tb->count != 0)) { - /* Do nothing if timer is ticking right now. */ - break; + if ((value & 1) && (control & 3) != (value & 3)) { + uint64_t count = (value & 0xff00) ? 1 : ptimer_get_count(tb->timer); + if ((count == 0) && (value & 2)) { + timerblock_set_count(tb->timer, value, &count); } - if (tb->control & 2) { - tb->count = tb->load; - } - timerblock_reload(tb, 1); - } else if (old & 1) { - /* Shutdown the timer. */ - timer_del(tb->timer); + timerblock_run(tb->timer, value, (count != 0)); + } else if ((control & 1) && !(value & 1)) { + ptimer_stop(tb->timer); + } + if ((control & 0xff00) != (value & 0xff00)) { + ptimer_set_period(tb->timer, timerblock_scale(value)); } + tb->control = value; break; case 12: /* Interrupt status. */ + /* Simulate continuous IRQ gen. */ + if ((control & 3) == 3 && (control & 0xff00) != 0) { + if (ptimer_get_limit(tb->timer) == 0) { + break; + } + } tb->status &= ~value; timerblock_update_irq(tb); break; @@ -184,13 +188,12 @@ static const MemoryRegionOps timerblock_ops = { static void timerblock_reset(TimerBlock *tb) { - tb->count = 0; - tb->load = 0; tb->control = 0; tb->status = 0; - tb->tick = 0; if (tb->timer) { - timer_del(tb->timer); + ptimer_stop(tb->timer); + ptimer_set_limit(tb->timer, 0, 1); + ptimer_set_period(tb->timer, timerblock_scale(0)); } } @@ -235,7 +238,8 @@ static void arm_mptimer_realize(DeviceState *dev, Error **errp) */ for (i = 0; i < s->num_cpu; i++) { TimerBlock *tb = &s->timerblock[i]; - tb->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, timerblock_tick, tb); + QEMUBH *bh = qemu_bh_new(timerblock_tick, tb); + tb->timer = ptimer_init(bh); sysbus_init_irq(sbd, &tb->irq); memory_region_init_io(&tb->iomem, OBJECT(s), &timerblock_ops, tb, "arm_mptimer_timerblock", 0x20); @@ -245,26 +249,23 @@ static void arm_mptimer_realize(DeviceState *dev, Error **errp) static const VMStateDescription vmstate_timerblock = { .name = "arm_mptimer_timerblock", - .version_id = 2, - .minimum_version_id = 2, + .version_id = 3, + .minimum_version_id = 3, .fields = (VMStateField[]) { - VMSTATE_UINT32(count, TimerBlock), - VMSTATE_UINT32(load, TimerBlock), VMSTATE_UINT32(control, TimerBlock), VMSTATE_UINT32(status, TimerBlock), - VMSTATE_INT64(tick, TimerBlock), - VMSTATE_TIMER_PTR(timer, TimerBlock), + VMSTATE_PTIMER(timer, TimerBlock), VMSTATE_END_OF_LIST() } }; static const VMStateDescription vmstate_arm_mptimer = { .name = "arm_mptimer", - .version_id = 2, - .minimum_version_id = 2, + .version_id = 3, + .minimum_version_id = 3, .fields = (VMStateField[]) { VMSTATE_STRUCT_VARRAY_UINT32(timerblock, ARMMPTimerState, num_cpu, - 2, vmstate_timerblock, TimerBlock), + 3, vmstate_timerblock, TimerBlock), VMSTATE_END_OF_LIST() } }; diff --git a/include/hw/timer/arm_mptimer.h b/include/hw/timer/arm_mptimer.h index b34cba0..c46d8d2 100644 --- a/include/hw/timer/arm_mptimer.h +++ b/include/hw/timer/arm_mptimer.h @@ -27,12 +27,9 @@ /* State of a single timer or watchdog block */ typedef struct { - uint32_t count; - uint32_t load; uint32_t control; uint32_t status; - int64_t tick; - QEMUTimer *timer; + struct ptimer_state *timer; qemu_irq irq; MemoryRegion iomem; } TimerBlock;