From patchwork Thu Oct 26 20:45:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ~lbryndza X-Patchwork-Id: 1857236 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SK4m95xvyz1yQ4 for ; Tue, 31 Oct 2023 07:35:53 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxYxf-0007Bx-Hf; Mon, 30 Oct 2023 16:34:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxYPr-00064W-EI for qemu-devel@nongnu.org; Mon, 30 Oct 2023 15:59:15 -0400 Received: from mail-b.sr.ht ([173.195.146.151]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxYPo-0000Re-NU for qemu-devel@nongnu.org; Mon, 30 Oct 2023 15:59:15 -0400 Authentication-Results: mail-b.sr.ht; dkim=none Received: from git.sr.ht (unknown [173.195.146.142]) by mail-b.sr.ht (Postfix) with ESMTPSA id 8FDFA11EEDB; Mon, 30 Oct 2023 19:59:10 +0000 (UTC) From: ~lbryndza Date: Thu, 26 Oct 2023 22:45:26 +0200 Subject: [PATCH qemu v2] Fixing the basic functionality of STM32 timers Message-ID: <169869595054.30747.1587003712699663871-0@git.sr.ht> X-Mailer: git.sr.ht To: qemu-devel@nongnu.org Cc: alistair@alistair23.me MIME-Version: 1.0 Received-SPF: pass client-ip=173.195.146.151; envelope-from=outgoing@sr.ht; helo=mail-b.sr.ht X-Spam_score_int: 2 X-Spam_score: 0.2 X-Spam_bar: / X-Spam_report: (0.2 / 5.0 requ) BAYES_00=-1.9, FREEMAIL_FORGED_REPLYTO=2.095, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Mon, 30 Oct 2023 16:34:08 -0400 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ~lbryndza Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Lucjan Bryndza The current implementation of timers does not work properly even in basic functionality. A counter configured to report an interrupt every 10ms reports the first interrupts after a few seconds. There are also no properly implemented count up and count down modes. This commit fixes bugs with interrupt reporting and implements the basic modes of the counter's time-base block. Signed-off-by: Lucjan Bryndza --- hw/arm/stm32f405_soc.c | 2 +- hw/timer/stm32f2xx_timer.c | 262 +++++++++++++++++++---------- include/hw/timer/stm32f2xx_timer.h | 23 ++- 3 files changed, 189 insertions(+), 98 deletions(-) diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c index cef23d7ee4..69316181b3 100644 --- a/hw/arm/stm32f405_soc.c +++ b/hw/arm/stm32f405_soc.c @@ -183,7 +183,7 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp) /* Timer 2 to 5 */ for (i = 0; i < STM_NUM_TIMERS; i++) { dev = DEVICE(&(s->timer[i])); - qdev_prop_set_uint64(dev, "clock-frequency", 1000000000); + qdev_prop_set_uint64(dev, "clock-frequency", 48000000); if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer[i]), errp)) { return; } diff --git a/hw/timer/stm32f2xx_timer.c b/hw/timer/stm32f2xx_timer.c index ba8694dcd3..9a992231fa 100644 --- a/hw/timer/stm32f2xx_timer.c +++ b/hw/timer/stm32f2xx_timer.c @@ -23,12 +23,17 @@ */ #include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/irq.h" #include "hw/qdev-properties.h" #include "hw/timer/stm32f2xx_timer.h" #include "migration/vmstate.h" #include "qemu/log.h" #include "qemu/module.h" +#include "qemu/typedefs.h" +#include "qemu/timer.h" +#include "qemu/main-loop.h" +#include "sysemu/dma.h" #ifndef STM_TIMER_ERR_DEBUG #define STM_TIMER_ERR_DEBUG 0 @@ -42,63 +47,87 @@ #define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) -static void stm32f2xx_timer_set_alarm(STM32F2XXTimerState *s, int64_t now); -static void stm32f2xx_timer_interrupt(void *opaque) +static uint32_t stm32f2xx_timer_get_count(STM32F2XXTimerState *s) { - STM32F2XXTimerState *s = opaque; - - DB_PRINT("Interrupt\n"); - - if (s->tim_dier & TIM_DIER_UIE && s->tim_cr1 & TIM_CR1_CEN) { - s->tim_sr |= 1; - qemu_irq_pulse(s->irq); - stm32f2xx_timer_set_alarm(s, s->hit_time); - } - - if (s->tim_ccmr1 & (TIM_CCMR1_OC2M2 | TIM_CCMR1_OC2M1) && - !(s->tim_ccmr1 & TIM_CCMR1_OC2M0) && - s->tim_ccmr1 & TIM_CCMR1_OC2PE && - s->tim_ccer & TIM_CCER_CC2E) { - /* PWM 2 - Mode 1 */ - DB_PRINT("PWM2 Duty Cycle: %d%%\n", - s->tim_ccr2 / (100 * (s->tim_psc + 1))); + uint64_t cnt = ptimer_get_count(s->timer); + if (s->count_mode == TIMER_UP_COUNT) { + return s->tim_arr - (cnt & 0xffff); + } else { + return cnt & 0xffff; } } -static inline int64_t stm32f2xx_ns_to_ticks(STM32F2XXTimerState *s, int64_t t) + +static void stm32f2xx_timer_set_count(STM32F2XXTimerState *s, uint32_t cnt) { - return muldiv64(t, s->freq_hz, 1000000000ULL) / (s->tim_psc + 1); + if (s->count_mode == TIMER_UP_COUNT) { + ptimer_set_count(s->timer, s->tim_arr - (cnt & 0xffff)); + } else { + ptimer_set_count(s->timer, cnt & 0xffff); + } } -static void stm32f2xx_timer_set_alarm(STM32F2XXTimerState *s, int64_t now) +static void stm32f2xx_timer_update(STM32F2XXTimerState *s) { - uint64_t ticks; - int64_t now_ticks; + if (s->tim_cr1 & TIM_CR1_DIR) { + s->count_mode = TIMER_DOWN_COUNT; + } else { + s->count_mode = TIMER_UP_COUNT; + } - if (s->tim_arr == 0) { - return; + if (s->tim_cr1 & TIM_CR1_CMS) { + s->count_mode = TIMER_UP_COUNT; } - DB_PRINT("Alarm set at: 0x%x\n", s->tim_cr1); + if (s->tim_cr1 & TIM_CR1_CEN) { + DB_PRINT("Enabling timer\n"); + ptimer_set_freq(s->timer, s->freq_hz); + ptimer_run(s->timer, !(s->tim_cr1 & 0x04)); + } else { + DB_PRINT("Disabling timer\n"); + ptimer_stop(s->timer); + } +} - now_ticks = stm32f2xx_ns_to_ticks(s, now); - ticks = s->tim_arr - (now_ticks - s->tick_offset); +static void stm32f2xx_timer_update_uif(STM32F2XXTimerState *s, uint8_t value) +{ + s->tim_sr &= ~TIM_SR1_UIF; + s->tim_sr |= (value & TIM_SR1_UIF); + qemu_set_irq(s->irq, value); +} - DB_PRINT("Alarm set in %d ticks\n", (int) ticks); +static void stm32f2xx_timer_tick(void *opaque) +{ + STM32F2XXTimerState *s = (STM32F2XXTimerState *)opaque; + DB_PRINT("Alarm raised\n"); + stm32f2xx_timer_update_uif(s, 1); + + if (s->count_mode == TIMER_UP_COUNT) { + stm32f2xx_timer_set_count(s, 0); + } else { + stm32f2xx_timer_set_count(s, s->tim_arr); + } - s->hit_time = muldiv64((ticks + (uint64_t) now_ticks) * (s->tim_psc + 1), - 1000000000ULL, s->freq_hz); + if (s->tim_cr1 & TIM_CR1_CMS) { + if (s->count_mode == TIMER_UP_COUNT) { + s->count_mode = TIMER_DOWN_COUNT; + } else { + s->count_mode = TIMER_UP_COUNT; + } + } - timer_mod(s->timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + s->hit_time); - DB_PRINT("Wait Time: %" PRId64 " ticks\n", s->hit_time); + if (s->tim_cr1 & TIM_CR1_OPM) { + s->tim_cr1 &= ~TIM_CR1_CEN; + } else { + stm32f2xx_timer_update(s); + } } + static void stm32f2xx_timer_reset(DeviceState *dev) { STM32F2XXTimerState *s = STM32F2XXTIMER(dev); - int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - s->tim_cr1 = 0; s->tim_cr2 = 0; s->tim_smcr = 0; @@ -117,8 +146,6 @@ static void stm32f2xx_timer_reset(DeviceState *dev) s->tim_dcr = 0; s->tim_dmar = 0; s->tim_or = 0; - - s->tick_offset = stm32f2xx_ns_to_ticks(s, now); } static uint64_t stm32f2xx_timer_read(void *opaque, hwaddr offset, @@ -132,15 +159,18 @@ static uint64_t stm32f2xx_timer_read(void *opaque, hwaddr offset, case TIM_CR1: return s->tim_cr1; case TIM_CR2: - return s->tim_cr2; + qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: CR2 not supported"); + return 0; case TIM_SMCR: - return s->tim_smcr; + qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: SMCR not supported"); + return 0; case TIM_DIER: return s->tim_dier; case TIM_SR: return s->tim_sr; case TIM_EGR: - return s->tim_egr; + qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: EGR write only"); + return 0; case TIM_CCMR1: return s->tim_ccmr1; case TIM_CCMR2: @@ -148,8 +178,7 @@ static uint64_t stm32f2xx_timer_read(void *opaque, hwaddr offset, case TIM_CCER: return s->tim_ccer; case TIM_CNT: - return stm32f2xx_ns_to_ticks(s, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL)) - - s->tick_offset; + return stm32f2xx_timer_get_count(s); case TIM_PSC: return s->tim_psc; case TIM_ARR: @@ -163,105 +192,152 @@ static uint64_t stm32f2xx_timer_read(void *opaque, hwaddr offset, case TIM_CCR4: return s->tim_ccr4; case TIM_DCR: - return s->tim_dcr; + qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: DCR not supported"); + return 0; case TIM_DMAR: - return s->tim_dmar; + qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: CR2 not supported"); + return 0; case TIM_OR: return s->tim_or; default: qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%"HWADDR_PRIx"\n", __func__, offset); } - return 0; } +static void stm32f2xx_update_cr1(STM32F2XXTimerState *s, uint64_t value) +{ + s->tim_cr1 = value & 0x3FF; + ptimer_transaction_begin(s->timer); + stm32f2xx_timer_update(s); + ptimer_transaction_commit(s->timer); + DB_PRINT("write cr1 = %x\n", s->tim_cr1); +} + +static void stm32f2xx_update_sr(STM32F2XXTimerState *s, uint64_t value) +{ + s->tim_sr ^= (value ^ 0xFFFF); + s->tim_sr &= 0x1eFF; + ptimer_transaction_begin(s->timer); + stm32f2xx_timer_update_uif(s, s->tim_sr & 0x1); + ptimer_transaction_commit(s->timer); + DB_PRINT("write sr = %x\n", s->tim_sr); +} + +static void stm32f2xx_update_psc(STM32F2XXTimerState *s, uint64_t value) +{ + s->tim_psc = value & 0xffff; + ptimer_transaction_begin(s->timer); + ptimer_set_freq(s->timer, s->freq_hz); + ptimer_transaction_commit(s->timer); + DB_PRINT("write psc = %x\n", s->tim_psc); +} + +static void stm32f2xx_update_egr(STM32F2XXTimerState *s, uint64_t value) +{ + s->tim_egr = value & 0x1E; + if (value & TIM_EGR_TG) { + s->tim_sr |= TIM_EGR_TG; + } + if (value & TIM_EGR_UG) { + /* UG bit - reload */ + ptimer_transaction_begin(s->timer); + ptimer_set_limit(s->timer, s->tim_arr, 1); + ptimer_transaction_commit(s->timer); + } + DB_PRINT("write EGR = %x\n", s->tim_egr); +} + +static void stm32f2xx_update_cnt(STM32F2XXTimerState *s, uint64_t value) +{ + ptimer_transaction_begin(s->timer); + stm32f2xx_timer_set_count(s, value & 0xffff); + ptimer_transaction_commit(s->timer); + DB_PRINT("write cnt = %x\n", stm32f2xx_timer_get_count(s)); +} + +static void stm32f2xx_update_arr(STM32F2XXTimerState *s, uint64_t value) +{ + s->tim_arr = value & 0xffff; + ptimer_transaction_begin(s->timer); + ptimer_set_limit(s->timer, s->tim_arr, 1); + ptimer_transaction_commit(s->timer); + DB_PRINT("write arr = %x\n", s->tim_arr); +} + static void stm32f2xx_timer_write(void *opaque, hwaddr offset, - uint64_t val64, unsigned size) + uint64_t value, unsigned size) { STM32F2XXTimerState *s = opaque; - uint32_t value = val64; - int64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); - uint32_t timer_val = 0; - - DB_PRINT("Write 0x%x, 0x%"HWADDR_PRIx"\n", value, offset); switch (offset) { case TIM_CR1: - s->tim_cr1 = value; + stm32f2xx_update_cr1(s, value); return; case TIM_CR2: - s->tim_cr2 = value; + qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: CR2 not supported"); return; case TIM_SMCR: - s->tim_smcr = value; + qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: SCMR not supported"); return; case TIM_DIER: - s->tim_dier = value; + s->tim_dier = value & 0x5F5F; + DB_PRINT("write dier = %x\n", s->tim_dier); return; case TIM_SR: - /* This is set by hardware and cleared by software */ - s->tim_sr &= value; + stm32f2xx_update_sr(s, value); return; case TIM_EGR: - s->tim_egr = value; - if (s->tim_egr & TIM_EGR_UG) { - timer_val = 0; - break; - } + stm32f2xx_update_egr(s, value); return; case TIM_CCMR1: - s->tim_ccmr1 = value; + s->tim_ccmr1 = value & 0xffff; + DB_PRINT("write ccmr1 = %x\n", s->tim_ccmr1); return; case TIM_CCMR2: - s->tim_ccmr2 = value; + s->tim_ccmr2 = value & 0xffff; + DB_PRINT("write ccmr2 = %x\n", s->tim_ccmr2); return; case TIM_CCER: - s->tim_ccer = value; + s->tim_ccer = value & 0x3333; + DB_PRINT("write ccer = %x\n", s->tim_ccer); return; case TIM_PSC: - timer_val = stm32f2xx_ns_to_ticks(s, now) - s->tick_offset; - s->tim_psc = value & 0xFFFF; - break; + stm32f2xx_update_psc(s, value); + return; case TIM_CNT: - timer_val = value; - break; + stm32f2xx_update_cnt(s, value); + return; case TIM_ARR: - s->tim_arr = value; - stm32f2xx_timer_set_alarm(s, now); + stm32f2xx_update_arr(s, value); return; case TIM_CCR1: - s->tim_ccr1 = value; + s->tim_ccr1 = value & 0xffff; return; case TIM_CCR2: - s->tim_ccr2 = value; + s->tim_ccr2 = value & 0xffff; return; case TIM_CCR3: - s->tim_ccr3 = value; + s->tim_ccr3 = value & 0xffff; return; case TIM_CCR4: - s->tim_ccr4 = value; + s->tim_ccr4 = value & 0xffff; return; case TIM_DCR: - s->tim_dcr = value; + qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: DCR not supported"); return; case TIM_DMAR: - s->tim_dmar = value; + qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: DMAR not supported"); return; case TIM_OR: - s->tim_or = value; + qemu_log_mask(LOG_GUEST_ERROR, "stm32_timer: OR not supported"); return; default: qemu_log_mask(LOG_GUEST_ERROR, "%s: Bad offset 0x%"HWADDR_PRIx"\n", __func__, offset); return; } - - /* This means that a register write has affected the timer in a way that - * requires a refresh of both tick_offset and the alarm. - */ - s->tick_offset = stm32f2xx_ns_to_ticks(s, now) - timer_val; - stm32f2xx_timer_set_alarm(s, now); } static const MemoryRegionOps stm32f2xx_timer_ops = { @@ -272,10 +348,10 @@ static const MemoryRegionOps stm32f2xx_timer_ops = { static const VMStateDescription vmstate_stm32f2xx_timer = { .name = TYPE_STM32F2XX_TIMER, - .version_id = 1, - .minimum_version_id = 1, + .version_id = 2, + .minimum_version_id = 2, .fields = (VMStateField[]) { - VMSTATE_INT64(tick_offset, STM32F2XXTimerState), + VMSTATE_INT32(count_mode, STM32F2XXTimerState), VMSTATE_UINT32(tim_cr1, STM32F2XXTimerState), VMSTATE_UINT32(tim_cr2, STM32F2XXTimerState), VMSTATE_UINT32(tim_smcr, STM32F2XXTimerState), @@ -300,7 +376,7 @@ static const VMStateDescription vmstate_stm32f2xx_timer = { static Property stm32f2xx_timer_properties[] = { DEFINE_PROP_UINT64("clock-frequency", struct STM32F2XXTimerState, - freq_hz, 1000000000), + freq_hz, 0), DEFINE_PROP_END_OF_LIST(), }; @@ -318,7 +394,11 @@ static void stm32f2xx_timer_init(Object *obj) static void stm32f2xx_timer_realize(DeviceState *dev, Error **errp) { STM32F2XXTimerState *s = STM32F2XXTIMER(dev); - s->timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, stm32f2xx_timer_interrupt, s); + if (s->freq_hz == 0) { + error_setg(errp, "stm32f2xx_timer: Timer clock not defined"); + return; + } + s->timer = ptimer_init(stm32f2xx_timer_tick, s, PTIMER_POLICY_LEGACY); } static void stm32f2xx_timer_class_init(ObjectClass *klass, void *data) diff --git a/include/hw/timer/stm32f2xx_timer.h b/include/hw/timer/stm32f2xx_timer.h index 90f40f1746..c83f7b0d6f 100644 --- a/include/hw/timer/stm32f2xx_timer.h +++ b/include/hw/timer/stm32f2xx_timer.h @@ -28,6 +28,7 @@ #include "hw/sysbus.h" #include "qemu/timer.h" #include "qom/object.h" +#include "hw/ptimer.h" #define TIM_CR1 0x00 #define TIM_CR2 0x04 @@ -49,9 +50,15 @@ #define TIM_DMAR 0x4C #define TIM_OR 0x50 -#define TIM_CR1_CEN 1 +#define TIM_CR1_CEN 0x0001 +#define TIM_CR1_DIR 0x0010 +#define TIM_CR1_CMS 0x0060 +#define TIM_CR1_OPM 0x0008 -#define TIM_EGR_UG 1 +#define TIM_SR1_UIF 0x0001 + +#define TIM_EGR_UG 0x0001 +#define TIM_EGR_TG 0x0040 #define TIM_CCER_CC2E (1 << 4) #define TIM_CCMR1_OC2M2 (1 << 14) @@ -61,6 +68,7 @@ #define TIM_DIER_UIE 1 + #define TYPE_STM32F2XX_TIMER "stm32f2xx-timer" typedef struct STM32F2XXTimerState STM32F2XXTimerState; DECLARE_INSTANCE_CHECKER(STM32F2XXTimerState, STM32F2XXTIMER, @@ -72,12 +80,10 @@ struct STM32F2XXTimerState { /* */ MemoryRegion iomem; - QEMUTimer *timer; + ptimer_state *timer; qemu_irq irq; - - int64_t tick_offset; - uint64_t hit_time; uint64_t freq_hz; + int count_mode; uint32_t tim_cr1; uint32_t tim_cr2; @@ -99,4 +105,9 @@ struct STM32F2XXTimerState { uint32_t tim_or; }; +enum { + TIMER_UP_COUNT = 0, + TIMER_DOWN_COUNT = 1 +}; + #endif /* HW_STM32F2XX_TIMER_H */