Add QTimer device
cover Add QTimer device
This series provides the qtimer device.
It is based on the l2vic series recently reviewed at
https://lore.kernel.org/qemu-devel/[email protected]/
This tree is also available at https://github.com/qualcomm/qemu/tree/bcain/l2vic
Brian Cain (3):
hw/timer: Add QCT QTimer device model
hw/hexagon: connect qtimer device
tests/qtest: add qct-qtimer qtest
MAINTAINERS | 3 + include/hw/hexagon/hexagon.h | 1 + include/hw/hexagon/hexagon_globalreg.h | 4 + include/hw/timer/qct-qtimer.h | 78 ++++ hw/hexagon/hexagon_dsp.c | 14 + hw/hexagon/hexagon_globalreg.c | 17 +- hw/hexagon/virt.c | 16 + hw/timer/qct-qtimer.c | 613 +++++++++++++++++++++++++ tests/qtest/qct-qtimer-test.c | 213 +++++++++ hw/hexagon/Kconfig | 1 + hw/timer/Kconfig | 3 + hw/timer/meson.build | 2 + hw/timer/trace-events | 5 + tests/qtest/meson.build | 2 +- 14 files changed, 969 insertions(+), 3 deletions(-) create mode 100644 include/hw/timer/qct-qtimer.h create mode 100644 hw/timer/qct-qtimer.c create mode 100644 tests/qtest/qct-qtimer-test.c
Signature · 1 line
2.34.1
PATCH 1/3 hw/timer: Add QCT QTimer device model
Implement the QCT QTimer generic timer device used by Hexagon DSP systems.
--- MAINTAINERS | 2 + include/hw/timer/qct-qtimer.h | 78 +++++ hw/timer/qct-qtimer.c | 613 ++++++++++++++++++++++++++++++++++ hw/timer/Kconfig | 3 + hw/timer/meson.build | 2 + hw/timer/trace-events | 5 + 6 files changed, 703 insertions(+) create mode 100644 include/hw/timer/qct-qtimer.h create mode 100644 hw/timer/qct-qtimer.c
MAINTAINERS +2 -0
@@ -253,6 +253,8 @@ F: target/hexagon/ F: hw/intc/hex-l2vic.c F: include/hw/intc/hex-l2vic.h F: tests/qtest/l2vic-test.c +F: hw/timer/qct-qtimer.c +F: include/hw/timer/qct-qtimer.h X: target/hexagon/idef-parser/ X: target/hexagon/gen_idef_parser_funcs.py F: linux-user/hexagon/
include/hw/timer/qct-qtimer.h new file +78 -0
78 lines not on this page · raw message
hw/timer/qct-qtimer.c new file +613 -0
613 lines not on this page · raw message
hw/timer/Kconfig +3 -0
@@ -65,3 +65,6 @@ config STELLARIS_GPTM config AVR_TIMER16 bool + +config HEX_QTIMER + bool
hw/timer/meson.build +2 -0
@@ -34,3 +34,5 @@ specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_timer.c')) system_ss.add(when: 'CONFIG_SIFIVE_PWM', if_true: files('sifive_pwm.c')) system_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c')) + +specific_ss.add(when: 'CONFIG_HEX_QTIMER', if_true: files('qct-qtimer.c'))
hw/timer/trace-events +5 -0
@@ -128,3 +128,8 @@ imx_epit_get_freq(uint32_t freq) "ptimer frequency is %u" imx_epit_read(const char *name, uint32_t value) "(%s) = 0x%08x" imx_epit_write(const char *name, uint64_t value) "(%s, value = 0x%08" PRIx64 ")" imx_epit_cmp(uint32_t sr) "sr was %d" + +# qct-qtimer.c +qtimer_interrupt(void) "qtimer interrupt line updated" +qtimer_read(uint64_t offset) "offset 0x%" PRIx64 +qtimer_write(uint64_t offset, uint64_t value) "offset 0x%" PRIx64 " value 0x%" PRIx64
Signature · 1 line
2.34.1
Re: [PATCH 1/3] hw/timer: Add QCT QTimer device model
Quoted 325 lines · Brian Cain
Implement the QCT QTimer generic timer device used by Hexagon DSP systems.
Co-authored-by Damien Hedde <[email protected]>Co-authored-by Tobias Röhmel <[email protected]>Co-authored-by Sid Manning <[email protected]>Co-authored-by Thomas Marceron <[email protected]>Co-authored-by Mahmoud Kamel <[email protected]>Signed-off-by Brian Cain <[email protected]>--- MAINTAINERS | 2 + include/hw/timer/qct-qtimer.h | 78 +++++ hw/timer/qct-qtimer.c | 613 ++++++++++++++++++++++++++++++++++ hw/timer/Kconfig | 3 + hw/timer/meson.build | 2 + hw/timer/trace-events | 5 + 6 files changed, 703 insertions(+) create mode 100644 include/hw/timer/qct-qtimer.h create mode 100644 hw/timer/qct-qtimer.cMAINTAINERS +2
-0@@ -253,6 +253,8 @@ F: target/hexagon/ F: hw/intc/hex-l2vic.c F: include/hw/intc/hex-l2vic.h F: tests/qtest/l2vic-test.c +F: hw/timer/qct-qtimer.c +F: include/hw/timer/qct-qtimer.h X: target/hexagon/idef-parser/ X: target/hexagon/gen_idef_parser_funcs.py F: linux-user/hexagon/include/hw/timer/qct-qtimer.h new file +78
-0@@ -0,0 +1,78 @@ +/* +* Qualcomm QCT QTimer +* +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_TIMER_QCT_QTIMER_H +#define HW_TIMER_QCT_QTIMER_H + +#include "qom/object.h" + +#define TYPE_QCT_QTIMER "qct-qtimer" + +#define QCT_QTIMER_TIMER_FRAME_ELTS (16) +#define QCT_QTIMER_TIMER_VIEW_ELTS (2) + +#define QCT_QTIMER_AC_CNTFRQ (0x000) +#define QCT_QTIMER_AC_CNTSR (0x004) +#define QCT_QTIMER_AC_CNTTID_0 (0x08) +#define QCT_QTIMER_AC_CNTACR_START (0x40) +#define QCT_QTIMER_AC_CNTACR_END (0x5c) +#define QCT_QTIMER_AC_CNTTID_1 (0x108) +#define QCT_QTIMER_AC_CNTACR_RWPT (1 << 5)/* R/W of CNTP_* regs */ +#define QCT_QTIMER_AC_CNTACR_RWVT (1 << 4)/* R/W of CNTV_* regs */ +#define QCT_QTIMER_AC_CNTACR_RVOFF (1 << 3)/* R/W of CNTVOFF register */ +#define QCT_QTIMER_AC_CNTACR_RFRQ (1 << 2)/* R/W of CNTFRQ register */ +#define QCT_QTIMER_AC_CNTACR_RPVCT (1 << 1)/* R/W of CNTVCT register */ +#define QCT_QTIMER_AC_CNTACR_RPCT (1 << 0)/* R/W of CNTPCT register */ +#define QCT_QTIMER_VERSION (0x0fd0) + +#define QCT_QTIMER_CNTPCT_LO (0x000) +#define QCT_QTIMER_CNTPCT_HI (0x004) +#define QCT_QTIMER_CNT_FREQ (0x010) +#define QCT_QTIMER_CNTPL0ACR (0x014) +#define QCT_QTIMER_CNTPL0ACR_PL0CTEN (1 << 9) +#define QCT_QTIMER_CNTPL0ACR_PL0TVEN (1 << 8) +#define QCT_QTIMER_CNTPL0ACR_PL0VCTEN (1 << 1) +#define QCT_QTIMER_CNTPL0ACR_PL0PCTEN (1 << 0) +#define QCT_QTIMER_CNTP_CVAL_LO (0x020) +#define QCT_QTIMER_CNTP_CVAL_HI (0x024) +#define QCT_QTIMER_CNT_MASK 0x00ffffffffffffffULL +#define QCT_QTIMER_CNT_HI_BITS 24 +#define QCT_QTIMER_CNTP_TVAL (0x028) +#define QCT_QTIMER_CNTP_CTL (0x02c) +#define QCT_QTIMER_CNTP_CTL_ENABLE (1 << 0) +#define QCT_QTIMER_CNTP_CTL_INTEN (1 << 1) +#define QCT_QTIMER_CNTP_CTL_ISTAT (1 << 2) + +/* QTimer interface for external access from hexagon_globalreg */ +#define TYPE_QCT_QTIMER_INTERFACE "qct-qtimer-if" + +typedef struct QctQtimerInterface QctQtimerInterface ; + +typedef struct QctQtimerInterfaceClass { +InterfaceClass parent_class; + +/* Read the live physical counter, backing HEX_SREG_TIMERLO/TIMERHI */ +uint32_t (*get_timer_lo)(QctQtimerInterface *qtimer); +uint32_t (*get_timer_hi)(QctQtimerInterface *qtimer); +}QctQtimerInterfaceClass ; + +DECLARE_OBJ_CHECKERS (QctQtimerInterface, QctQtimerInterfaceClass, +QCT_QTIMER_INTERFACE ,TYPE_QCT_QTIMER_INTERFACE ); + +static inline uint32_t qct_qtimer_get_timer_lo (QctQtimerInterface *qtimer) +{ +QctQtimerInterfaceClass *k =QCT_QTIMER_INTERFACE_GET_CLASS (qtimer); +return k->get_timer_lo (qtimer); +} + +static inline uint32_t qct_qtimer_get_timer_hi (QctQtimerInterface *qtimer) +{ +QctQtimerInterfaceClass *k =QCT_QTIMER_INTERFACE_GET_CLASS (qtimer); +return k->get_timer_hi (qtimer); +} + +#endif /* HW_TIMER_QCT_QTIMER_H */ hw/timer/qct-qtimer.c new file +202
-0@@ -0,0 +1,613 @@ +/* +* Qualcomm QCT QTimer +* +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#include "qemu/osdep.h" +#include "hw/core/irq.h" +#include "hw/core/qdev-properties.h" +#include "hw/core/sysbus.h" +#include "hw/timer/qct-qtimer.h" +#include "migration/vmstate.h" +#include "qemu/bitops.h" +#include "qemu/log.h" +#include "qemu/module.h" +#include "qemu/timer.h" +#include "qapi/error.h" +#include "trace.h" + +#define QTIMER_MEM_SIZE_BYTES 0x1000 +#define QTIMER_DEFAULT_FREQ_HZ 19200000ULL + +OBJECT_DECLARE_SIMPLE_TYPE(QCTQtimerState, QCT_QTIMER) + +typedef struct QCTHextimerState { +QCTQtimerState *qtimer; +QEMUTimer *timer;/* one-shot deadline timer */ +int64_t offset_ns;/* QEMU_CLOCK_VIRTUAL ns at which cntpct == 0 */ +uint64_t cntval;/* 64-bit physical timer compare value */ +uint32_t control; +uint32_t cnt_ctrl; +uint32_t cntpl0acr; +uint32_t freq; +uint32_t int_level; +qemu_irq irq; +}QCTHextimerState ; + +struct QCTQtimerState { +SysBusDevice parent_obj; + +MemoryRegion iomem; +MemoryRegion view_iomem; +uint32_t secure; +QCTHextimerState timer[QCT_QTIMER_TIMER_FRAME_ELTS ]; +uint32_t freq; +uint32_t nr_frames; +uint32_t nr_views; +uint32_t frame_stride; +uint32_t cnttid_0; +uint32_t cnttid_1; +uint32_t freq_scale; +}; + +/* +* QTimer version register: +* +* 3 2 1 +* 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 +* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +* | Major | Minor | Step | +* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +*/ +#define QCT_QTIMER_VERSION_VALUE 0x20020000 + +/* Counter value derived on-demand from QEMU_CLOCK_VIRTUAL. */ +static uint64_t hex_timer_now (QCTHextimerState *s) +{ +int64_t now =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ); +uint32_t scaler; +uint64_t scaled_elapsed; + +if (now <= s->offset_ns) { +return 0 ; + } + scaler =MAX (s->qtimer->freq_scale,1u ); + scaled_elapsed = (uint64_t )(now - s->offset_ns) / scaler; +return muldiv64 (scaled_elapsed, s->freq,NANOSECONDS_PER_SECOND ) & +QCT_QTIMER_CNT_MASK ; +} + +/* Arm (or disarm) the one-shot deadline timer. */ +static void hex_timer_rearm (QCTHextimerState *s) +{ +uint32_t scaler; +uint64_t base_ns; +int64_t deadline_ns; + +if (!(s->control &QCT_QTIMER_CNTP_CTL_ENABLE )) { +timer_del (s->timer); +return ; + } + + scaler =MAX (s->qtimer->freq_scale,1u ); + base_ns =muldiv64 (s->cntval,NANOSECONDS_PER_SECOND , s->freq); +if (base_ns > + ((uint64_t )INT64_MAX - (uint64_t )s->offset_ns -1 ) / scaler) { +timer_del (s->timer); +return ; + } +/* +* muldiv64() truncates, so the computed deadline can land up to 1 ns +* before the true cntval crossing. Add 1 ns so hex_timer_now() is +* guaranteed to be >= cntval when the QEMUTimer fires; without this, +* hex_timer_tick() would re-arm at the same deadline and loop. +*/ + deadline_ns = s->offset_ns + (int64_t )(base_ns * scaler) +1 ; +timer_mod (s->timer, deadline_ns); +} + +static void hex_timer_update (QCTHextimerState *s) +{ +int level = s->int_level && + (s->control &QCT_QTIMER_CNTP_CTL_ENABLE ) && + !(s->control &QCT_QTIMER_CNTP_CTL_INTEN ); + +trace_qtimer_interrupt (); +qemu_set_irq (s->irq, level); +} + +/* +* Access-control (AC) region: offsets below 0x1000, gates CNTFRQ/CNTSR/ +* CNTTID/CNTACR per frame plus the shared VERSION register. +*/ +static uint64_t qct_qtimer_ac_read (void *opaque,hwaddr offset,unsigned size) +{ +QCTQtimerState *s = opaque; +uint32_t frame; + +switch (offset) { +case QCT_QTIMER_AC_CNTFRQ : +return s->freq; +case QCT_QTIMER_AC_CNTSR : +return s->secure; +case QCT_QTIMER_AC_CNTTID_0 : +return s->cnttid_0; +case QCT_QTIMER_AC_CNTTID_1 : +return s->cnttid_1; + case QCT_QTIMER_AC_CNTACR_START ... QCT_QTIMER_AC_CNTACR_END: + frame = (offset -QCT_QTIMER_AC_CNTACR_START ) /4 ; +if (frame >= s->nr_frames) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad CNTACR offset 0x%x\n" , + __func__, (int )offset); +return 0 ; + } +return s->timer[frame].cnt_ctrl; +case QCT_QTIMER_VERSION : +return QCT_QTIMER_VERSION_VALUE ; +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad offset 0x%x\n" , __func__, + (int )offset); +return 0 ; + } +} + +static void qct_qtimer_ac_write (void *opaque,hwaddr offset,uint64_t value, +unsigned size) +{ +QCTQtimerState *s = opaque; +uint32_t frame; + +switch (offset) { +case QCT_QTIMER_AC_CNTFRQ : + s->freq = value; +return ; +case QCT_QTIMER_AC_CNTSR : +if (value >0xff ) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad CNTSR value 0x%x\n" , + __func__, (int )value); +return ; + } + s->secure = value; +return ; + case QCT_QTIMER_AC_CNTACR_START ... QCT_QTIMER_AC_CNTACR_END: + frame = (offset -QCT_QTIMER_AC_CNTACR_START ) /4 ; +if (frame >= s->nr_frames) { +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad CNTACR offset 0x%x\n" , + __func__, (int )offset); +return ; + } + s->timer[frame].cnt_ctrl = value; +return ; +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad offset 0x%x\n" , __func__, + (int )offset); +return ; + } +} + +static const MemoryRegionOps qct_qtimer_ac_ops = { + .read = qct_qtimer_ac_read, + .write = qct_qtimer_ac_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =4 , + .max_access_size =4 , + .unaligned = false, + }, +}; + +/* +* View region: a flat array of (frame, view) slots, each frame_stride
hw/timer/qct-qtimer.c line 212
Quoted 10 lines
hw/timer/qct-qtimer.c new file +10
-0+* bytes wide, holding the per-frame CNTPCT/CNTP_CVAL/CNTP_TVAL/CNTP_CTL +* register set. +*/ +static QCTHextimerState *qct_qtimer_demux (QCTQtimerState *s,hwaddr offset, +uint32_t *reg_offset, +uint32_t *view) +{ +uint32_t stride = s->frame_stride; +uint32_t stride_shift =ctz32 (stride); +uint32_t slot_nr = (offset & (0xf * stride)) >> stride_shift;
Instead of hardcoded 0xf * stride, should we refer to QCT_QTIMER_TIMER_FRAME_ELTS instead?
Quoted 287 lines
hw/timer/qct-qtimer.c new file +287
-0+uint32_t frame = slot_nr / s->nr_views; + + *reg_offset = offset & (stride -1 ); + *view = slot_nr % s->nr_views; +if (frame >= s->nr_frames) { +return NULL ; + } +return &s->timer[frame]; +} + +/* Frames 8+ share cnttid_1; each frame's second view is gated by a bit. */ +static bool qct_qtimer_view_visible (QCTQtimerState *s,uint32_t frame, +uint32_t view) +{ +uint32_t cnttid = frame <8 ? s->cnttid_0 : s->cnttid_1; +uint32_t frame_idx = frame <8 ? frame : frame -8 ; + +return !view || (cnttid & (0x4 << (frame_idx *4 ))); +} + +static MemTxResult hex_timer_read (void *opaque,hwaddr offset,uint64_t *data, +unsigned size,MemTxAttrs attrs) +{ +QCTQtimerState *qs = opaque; +uint32_t reg_offset; +uint32_t view; +QCTHextimerState *s =qct_qtimer_demux (qs, offset, ®_offset, &view); +uint32_t frame; + +if (!s) { + *data =0 ; +return MEMTX_ACCESS_ERROR ; + } + frame = s - qs->timer; + +trace_qtimer_read (offset); + +if (!qct_qtimer_view_visible (qs, frame, view)) { + *data =0 ; +return MEMTX_OK ; + } + +switch (reg_offset) { +case QCT_QTIMER_CNT_FREQ : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RFRQ )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr & (QCT_QTIMER_CNTPL0ACR_PL0PCTEN | +QCT_QTIMER_CNTPL0ACR_PL0VCTEN ))) { +return MEMTX_ACCESS_ERROR ; + } + *data = s->freq; +return MEMTX_OK ; +case QCT_QTIMER_CNTP_CVAL_LO : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RWPT )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr &QCT_QTIMER_CNTPL0ACR_PL0CTEN )) { +return MEMTX_ACCESS_ERROR ; + } + *data =extract64 (s->cntval,0 ,32 ); +return MEMTX_OK ; +case QCT_QTIMER_CNTP_CVAL_HI : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RWPT )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr &QCT_QTIMER_CNTPL0ACR_PL0CTEN )) { +return MEMTX_ACCESS_ERROR ; + } +/* HI half is 24-bit per TRM; bits [31:24] are reserved. */ + *data =extract64 (s->cntval,32 ,QCT_QTIMER_CNT_HI_BITS ); +return MEMTX_OK ; +case QCT_QTIMER_CNTPCT_LO : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RPCT )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr &QCT_QTIMER_CNTPL0ACR_PL0PCTEN )) { +return MEMTX_ACCESS_ERROR ; + } + *data =extract64 (hex_timer_now (s),0 ,32 ); +return MEMTX_OK ; +case QCT_QTIMER_CNTPCT_HI : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RPCT )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr &QCT_QTIMER_CNTPL0ACR_PL0PCTEN )) { +return MEMTX_ACCESS_ERROR ; + } + *data =extract64 (hex_timer_now (s),32 ,QCT_QTIMER_CNT_HI_BITS ); +return MEMTX_OK ; +case QCT_QTIMER_CNTP_TVAL : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RWPT )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr &QCT_QTIMER_CNTPL0ACR_PL0CTEN )) { +return MEMTX_ACCESS_ERROR ; + } + *data = (uint32_t )(int32_t )(int64_t )(s->cntval -hex_timer_now (s)); +return MEMTX_OK ; +case QCT_QTIMER_CNTP_CTL : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RWPT )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr &QCT_QTIMER_CNTPL0ACR_PL0CTEN )) { +return MEMTX_ACCESS_ERROR ; + } +/* +* CNTP_CTL: bit 0 EN, bit 1 IMASK, bit 2 ISTAT (interrupt +* pending). ISTAT tracks int_level and is read-only. +*/ + *data = s->control | ((s->int_level &0x1 ) <<2 ); +return MEMTX_OK ; +case QCT_QTIMER_CNTPL0ACR : + *data = view ?0 : s->cntpl0acr; +return MEMTX_OK ; +case QCT_QTIMER_VERSION : + *data =QCT_QTIMER_VERSION_VALUE ; +return MEMTX_OK ; +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad offset 0x%x\n" , __func__, + (int )offset); + *data =0 ; +return MEMTX_ACCESS_ERROR ; + } +} + +static MemTxResult hex_timer_write (void *opaque,hwaddr offset, +uint64_t value,unsigned size, +MemTxAttrs attrs) +{ +QCTQtimerState *qs = opaque; +uint32_t reg_offset; +uint32_t view; +QCTHextimerState *s =qct_qtimer_demux (qs, offset, ®_offset, &view); +uint32_t frame; + +if (!s) { +return MEMTX_ACCESS_ERROR ; + } + frame = s - qs->timer; + +trace_qtimer_write (offset, value); + +if (!qct_qtimer_view_visible (qs, frame, view)) { +return MEMTX_OK ; + } + +switch (reg_offset) { +case QCT_QTIMER_CNTP_CVAL_LO : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RWPT )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr &QCT_QTIMER_CNTPL0ACR_PL0CTEN )) { +return MEMTX_ACCESS_ERROR ; + } + s->int_level =0 ; + s->cntval =deposit64 (s->cntval,0 ,32 , value); +hex_timer_rearm (s); +break ; +case QCT_QTIMER_CNTP_CVAL_HI : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RWPT )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr &QCT_QTIMER_CNTPL0ACR_PL0CTEN )) { +return MEMTX_ACCESS_ERROR ; + } + s->int_level =0 ; +/* HI half is 24-bit per TRM; bits [31:24] are reserved. */ + s->cntval =deposit64 (s->cntval,32 ,QCT_QTIMER_CNT_HI_BITS , value) & +QCT_QTIMER_CNT_MASK ; +hex_timer_rearm (s); +break ; +case QCT_QTIMER_CNTP_CTL : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RWPT )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr &QCT_QTIMER_CNTPL0ACR_PL0CTEN )) { +return MEMTX_ACCESS_ERROR ; + } +/* ISTAT (bit 2) is read-only; keep SW writes from polluting it. */ + s->control = value & ~QCT_QTIMER_CNTP_CTL_ISTAT ; +hex_timer_rearm (s); +break ; +case QCT_QTIMER_CNTP_TVAL : +if (!(s->cnt_ctrl &QCT_QTIMER_AC_CNTACR_RWPT )) { +return MEMTX_ACCESS_ERROR ; + } +if (view && !(s->cntpl0acr &QCT_QTIMER_CNTPL0ACR_PL0CTEN )) { +return MEMTX_ACCESS_ERROR ; + } +/* TVAL write: CVAL = CNTPCT + TVAL (TVAL is signed 32-bit). */ + s->int_level =0 ; + s->cntval = (hex_timer_now (s) + (int64_t )(int32_t )value) & +QCT_QTIMER_CNT_MASK ; +hex_timer_rearm (s); +break ; +case QCT_QTIMER_CNTPL0ACR : +if (!view) { + s->cntpl0acr = value; + } +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR ,"%s: bad offset 0x%x\n" , __func__, + (int )offset); +return MEMTX_ACCESS_ERROR ; + } +hex_timer_update (s); +return MEMTX_OK ; +} + +static void hex_timer_tick (void *opaque) +{ +QCTHextimerState *s = opaque; +uint64_t now =hex_timer_now (s); +uint64_t diff56 = (now - s->cntval) &QCT_QTIMER_CNT_MASK ; +int64_t signed_diff = (int64_t )(diff56 <<8 ) >>8 ; + +if (signed_diff >=0 ) { + s->int_level =1 ; +hex_timer_update (s); + }else { +hex_timer_rearm (s); + } +} + +static const MemoryRegionOps hex_timer_ops = { + .read_with_attrs = hex_timer_read, + .write_with_attrs = hex_timer_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =4 , + .max_access_size =8 , + .unaligned = false, + }, + .impl = { + .min_access_size =4 , + .max_access_size =4 , + }, +}; + +static const VMStateDescription vmstate_qct_hextimer = { + .name ="qct-hextimer" , + .version_id =1 , + .minimum_version_id =1 , + .fields = (const VMStateField []) { +VMSTATE_UINT32 (control, QCTHextimerState), +VMSTATE_UINT32 (cnt_ctrl, QCTHextimerState), +VMSTATE_INT64 (offset_ns, QCTHextimerState), +VMSTATE_UINT64 (cntval, QCTHextimerState), +VMSTATE_UINT32 (cntpl0acr, QCTHextimerState), +VMSTATE_UINT32 (int_level, QCTHextimerState), +VMSTATE_TIMER_PTR (timer, QCTHextimerState), +VMSTATE_END_OF_LIST () + } +}; + +static const VMStateDescription vmstate_qct_qtimer = { + .name ="qct-qtimer" , + .version_id =1 , + .minimum_version_id =1 , + .fields = (const VMStateField []) { +VMSTATE_STRUCT_ARRAY (timer, QCTQtimerState,QCT_QTIMER_TIMER_FRAME_ELTS , +1 , vmstate_qct_hextimer, QCTHextimerState), +VMSTATE_END_OF_LIST () + } +}; + +static void qct_qtimer_realize (DeviceState *dev,Error **errp) +{ +SysBusDevice *sbd =SYS_BUS_DEVICE (dev); +QCTQtimerState *s =QCT_QTIMER (dev); +unsigned int i; + +if (s->nr_frames >QCT_QTIMER_TIMER_FRAME_ELTS ) { +error_setg (errp,"nr_frames too high" ); +return ; + } +if (s->nr_views >QCT_QTIMER_TIMER_VIEW_ELTS ) { +error_setg (errp,"nr_views too high" ); +return ; + } + +memory_region_init_io (&s->iomem,OBJECT (s), &qct_qtimer_ac_ops, s, +"qct-qtimer-ac" ,QTIMER_MEM_SIZE_BYTES ); +sysbus_init_mmio (sbd, &s->iomem); + + memory_region_init_io(&s->view_iomem, OBJECT(s), &hex_timer_ops, s,
hw/timer/qct-qtimer.c line 509
Quoted 10 lines
hw/timer/qct-qtimer.c new file +10
-0+"qct-qtimer-view" , + (uint64_t )s->frame_stride * s->nr_frames * + s->nr_views); +sysbus_init_mmio (sbd, &s->view_iomem); + +for (i =0 ; i < s->nr_frames; i++) { +QCTHextimerState *t = &s->timer[i]; + + t->qtimer = s; + t->freq =QTIMER_DEFAULT_FREQ_HZ ;
It seems like this property has a default set to this value, so we should not need to set it explicitly. Also, it prevents overriding it.
Quoted 138 lines
hw/timer/qct-qtimer.c new file +104
-0+ s->secure |= (1 << i); + +sysbus_init_irq (sbd, &t->irq); + t->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , hex_timer_tick, t); + } +} + +static void qct_qtimer_reset_hold (Object *obj,ResetType type) +{ +QCTQtimerState *s =QCT_QTIMER (obj); +unsigned int i; + +for (i =0 ; i < s->nr_frames; i++) { +QCTHextimerState *t = &s->timer[i]; + +/* +* Per TRM: CTL = 0 (EN=0, IMASK=0, ISTAT=0), CVAL = 0 so that +* TVAL (= CVAL - CNTPCT) also reads 0 at reset. The QEMUTimer is +* only armed when SW sets CTL.EN=1, so cntval=0 does not cause a +* spurious fire before SW programs the compare value. +*/ + t->control =0 ; + t->cnt_ctrl =QCT_QTIMER_AC_CNTACR_RWPT |QCT_QTIMER_AC_CNTACR_RWVT | +QCT_QTIMER_AC_CNTACR_RVOFF |QCT_QTIMER_AC_CNTACR_RFRQ | +QCT_QTIMER_AC_CNTACR_RPVCT |QCT_QTIMER_AC_CNTACR_RPCT ; + t->cntval =0 ; + t->int_level =0 ; + t->offset_ns =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ); +timer_del (t->timer); + } +} + +static const Property qct_qtimer_properties[] = { +DEFINE_PROP_UINT32 ("freq" , QCTQtimerState, freq,QTIMER_DEFAULT_FREQ_HZ ), +DEFINE_PROP_UINT32 ("freq-scale" , QCTQtimerState, freq_scale,1 ), +DEFINE_PROP_UINT32 ("nr_frames" , QCTQtimerState, nr_frames,2 ), +DEFINE_PROP_UINT32 ("nr_views" , QCTQtimerState, nr_views,1 ), +DEFINE_PROP_UINT32 ("frame_stride" , QCTQtimerState, frame_stride,0x1000 ), +DEFINE_PROP_UINT32 ("cnttid_0" , QCTQtimerState, cnttid_0,0x11 ), +DEFINE_PROP_UINT32 ("cnttid_1" , QCTQtimerState, cnttid_1,0x0 ), +}; + +static void qct_qtimer_class_init (ObjectClass *klass,const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +ResettableClass *rc =RESETTABLE_CLASS (klass); + +device_class_set_props (dc, qct_qtimer_properties); + dc->realize = qct_qtimer_realize; + dc->vmsd = &vmstate_qct_qtimer; + rc->phases.hold = qct_qtimer_reset_hold; +} + +/* QTimer interface implementation, backing HEX_SREG_TIMERLO/TIMERHI */ +static uint32_t qct_qtimer_get_timer_lo_impl (QctQtimerInterface *obj) +{ +QCTQtimerState *s =QCT_QTIMER (obj); + +return s->nr_frames >0 ?extract64 (hex_timer_now (&s->timer[0 ]),0 ,32 ) + :0 ; +} + +static uint32_t qct_qtimer_get_timer_hi_impl (QctQtimerInterface *obj) +{ +QCTQtimerState *s =QCT_QTIMER (obj); + +return s->nr_frames >0 ?extract64 (hex_timer_now (&s->timer[0 ]),32 ,32 ) + :0 ; +} + +static void qct_qtimer_interface_class_init (ObjectClass *klass, +const void *data) +{ +QctQtimerInterfaceClass *k =QCT_QTIMER_INTERFACE_CLASS (klass); + + k->get_timer_lo = qct_qtimer_get_timer_lo_impl; + k->get_timer_hi = qct_qtimer_get_timer_hi_impl; +} + +static const TypeInfo qct_qtimer_interface_info = { + .name =TYPE_QCT_QTIMER_INTERFACE , + .parent =TYPE_INTERFACE , + .class_size =sizeof (QctQtimerInterfaceClass), + .class_init = qct_qtimer_interface_class_init, +}; + +static const TypeInfo qct_qtimer_info = { + .name =TYPE_QCT_QTIMER , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (QCTQtimerState), + .class_init = qct_qtimer_class_init, + .interfaces = (InterfaceInfo []) { + {TYPE_QCT_QTIMER_INTERFACE }, + { } + }, +}; + +static void qct_qtimer_register_types (void ) +{ +type_register_static (&qct_qtimer_interface_info); +type_register_static (&qct_qtimer_info); +} + +type_init (qct_qtimer_register_types)hw/timer/Kconfig +3
-0@@ -65,3 +65,6 @@ config STELLARIS_GPTM config AVR_TIMER16 bool + +config HEX_QTIMER + boolhw/timer/meson.build +2
-0@@ -34,3 +34,5 @@ specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_timer.c')) system_ss.add(when: 'CONFIG_SIFIVE_PWM', if_true: files('sifive_pwm.c')) system_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c')) + +specific_ss.add(when: 'CONFIG_HEX_QTIMER', if_true: files('qct-qtimer.c'))hw/timer/trace-events +5
-0@@ -128,3 +128,8 @@ imx_epit_get_freq(uint32_t freq) "ptimer frequency is %u" imx_epit_read(const char *name, uint32_t value) "(%s) = 0x%08x" imx_epit_write(const char *name, uint64_t value) "(%s, value = 0x%08" PRIx64 ")" imx_epit_cmp(uint32_t sr) "sr was %d" + +# qct-qtimer.c +qtimer_interrupt(void) "qtimer interrupt line updated" +qtimer_read(uint64_t offset) "offset 0x%" PRIx64 +qtimer_write(uint64_t offset, uint64_t value) "offset 0x%" PRIx64 " value 0x%" PRIx64
Re: [PATCH 1/3] hw/timer: Add QCT QTimer device model
In reply to Brian CainHi Brian,
Quoted 77 lines · Brian Cain
Implement the QCT QTimer generic timer device used by Hexagon DSP systems.
Co-authored-by Damien Hedde <[email protected]>Co-authored-by Tobias Röhmel <[email protected]>Co-authored-by Sid Manning <[email protected]>Co-authored-by Thomas Marceron <[email protected]>Co-authored-by Mahmoud Kamel <[email protected]>Signed-off-by Brian Cain <[email protected]>--- MAINTAINERS | 2 + include/hw/timer/qct-qtimer.h | 78 +++++ hw/timer/qct-qtimer.c | 613 ++++++++++++++++++++++++++++++++++ hw/timer/Kconfig | 3 + hw/timer/meson.build | 2 + hw/timer/trace-events | 5 + 6 files changed, 703 insertions(+)create mode 100644
include/hw/timer/qct-qtimer.hcreate mode 100644hw/timer/qct-qtimer.cMAINTAINERS +2
-0@@ -253,6 +253,8 @@ F: target/hexagon/ F: hw/intc/hex-l2vic.c F: include/hw/intc/hex-l2vic.h F: tests/qtest/l2vic-test.c +F: hw/timer/qct-qtimer.c +F: include/hw/timer/qct-qtimer.h X: target/hexagon/idef-parser/ X: target/hexagon/gen_idef_parser_funcs.py F: linux-user/hexagon/include/hw/timer/qct-qtimer.h new file +38
-0@@ -0,0 +1,78 @@ +/* +* Qualcomm QCT QTimer +* +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. +* SPDX-License-Identifier: GPL-2.0-or-later +*/ + +#ifndef HW_TIMER_QCT_QTIMER_H +#define HW_TIMER_QCT_QTIMER_H + +#include "qom/object.h" + +#define TYPE_QCT_QTIMER "qct-qtimer" + +#define QCT_QTIMER_TIMER_FRAME_ELTS (16) +#define QCT_QTIMER_TIMER_VIEW_ELTS (2) + +#define QCT_QTIMER_AC_CNTFRQ (0x000) +#define QCT_QTIMER_AC_CNTSR (0x004) +#define QCT_QTIMER_AC_CNTTID_0 (0x08) +#define QCT_QTIMER_AC_CNTACR_START (0x40) +#define QCT_QTIMER_AC_CNTACR_END (0x5c) +#define QCT_QTIMER_AC_CNTTID_1 (0x108) +#define QCT_QTIMER_AC_CNTACR_RWPT (1 << 5)/* R/W of CNTP_* regs */ +#define QCT_QTIMER_AC_CNTACR_RWVT (1 << 4)/* R/W of CNTV_* regs */ +#define QCT_QTIMER_AC_CNTACR_RVOFF (1 << 3)/* R/W of CNTVOFF register */ +#define QCT_QTIMER_AC_CNTACR_RFRQ (1 << 2)/* R/W of CNTFRQ register */ +#define QCT_QTIMER_AC_CNTACR_RPVCT (1 << 1)/* R/W of CNTVCT register */ +#define QCT_QTIMER_AC_CNTACR_RPCT (1 << 0)/* R/W of CNTPCT register */ +#define QCT_QTIMER_VERSION (0x0fd0) + +#define QCT_QTIMER_CNTPCT_LO (0x000) +#define QCT_QTIMER_CNTPCT_HI (0x004) +#define QCT_QTIMER_CNT_FREQ (0x010) +#define QCT_QTIMER_CNTPL0ACR (0x014) +#define QCT_QTIMER_CNTPL0ACR_PL0CTEN (1 << 9) +#define QCT_QTIMER_CNTPL0ACR_PL0TVEN (1 << 8) +#define QCT_QTIMER_CNTPL0ACR_PL0VCTEN (1 << 1)
include/hw/timer/qct-qtimer.h line 48
Quoted 10 lines
include/hw/timer/qct-qtimer.h new file +10
-0+#define QCT_QTIMER_CNTPL0ACR_PL0PCTEN (1 << 0) +#define QCT_QTIMER_CNTP_CVAL_LO (0x020) +#define QCT_QTIMER_CNTP_CVAL_HI (0x024) +#define QCT_QTIMER_CNT_MASK 0x00ffffffffffffffULL +#define QCT_QTIMER_CNT_HI_BITS 24 +#define QCT_QTIMER_CNTP_TVAL (0x028) +#define QCT_QTIMER_CNTP_CTL (0x02c) +#define QCT_QTIMER_CNTP_CTL_ENABLE (1 << 0) +#define QCT_QTIMER_CNTP_CTL_INTEN (1 << 1) +#define QCT_QTIMER_CNTP_CTL_ISTAT (1 << 2)
The register related definitions aren't consumed outside of the implementation, so no need to expose them, they could be moved to the single place using them, the source file.
include/hw/timer/qct-qtimer.h line 59
Quoted 11 lines
include/hw/timer/qct-qtimer.h new file +11
-0+ +/* QTimer interface for external access from hexagon_globalreg */ +#define TYPE_QCT_QTIMER_INTERFACE "qct-qtimer-if" + +typedef struct QctQtimerInterface QctQtimerInterface ; + +typedef struct QctQtimerInterfaceClass { + InterfaceClass parent_class; + + /* Read the live physical counter, backing HEX_SREG_TIMERLO/TIMERHI */ + uint32_t (*get_timer_lo)(QctQtimerInterface *qtimer);
const qtimer
include/hw/timer/qct-qtimer.h line 60
Quoted 1 line
include/hw/timer/qct-qtimer.h new file +1
-0+uint32_t (*get_timer_hi)(QctQtimerInterface *qtimer);
const qtimer
Quoted 10 lines
include/hw/timer/qct-qtimer.h new file +1
-0+} QctQtimerInterfaceClass;hw/timer/qct-qtimer.c new file +0
-0@@ -0,0 +1,613 @@
hw/timer/qct-qtimer.c line 198
Quoted 10 lines
hw/timer/qct-qtimer.c new file +9
-0+static const MemoryRegionOps qct_qtimer_ac_ops = { + .read = qct_qtimer_ac_read, + .write = qct_qtimer_ac_write, + .endianness =DEVICE_LITTLE_ENDIAN , + .valid = { + .min_access_size =4 , + .max_access_size =4 , + .unaligned = false, + },
Missing .impl = {4, 4}
hw/timer/qct-qtimer.c line 543
Quoted 5 lines
hw/timer/qct-qtimer.c new file +3
-0+}; +static const Property qct_qtimer_properties[] = { +DEFINE_PROP_UINT32 ("freq" , QCTQtimerState, freq,QTIMER_DEFAULT_FREQ_HZ ),
"freq-hz", freq_hz if possible.
Quoted 5 lines
hw/timer/qct-qtimer.c new file +5
-0+DEFINE_PROP_UINT32 ("freq-scale" , QCTQtimerState, freq_scale,1 ), +DEFINE_PROP_UINT32 ("nr_frames" , QCTQtimerState, nr_frames,2 ), +DEFINE_PROP_UINT32 ("nr_views" , QCTQtimerState, nr_views,1 ), +DEFINE_PROP_UINT32 ("frame_stride" , QCTQtimerState, frame_stride,0x1000 ), + DEFINE_PROP_UINT32("cnttid_0", QCTQtimerState, cnttid_0, 0x11),
hw/timer/qct-qtimer.c line 558
Quoted 10 lines
hw/timer/qct-qtimer.c new file +10
-0+ DEFINE_PROP_UINT32("cnttid_1", QCTQtimerState, cnttid_1, 0x0), +}; + +static void qct_qtimer_class_init (ObjectClass *klass,const void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); +ResettableClass *rc =RESETTABLE_CLASS (klass); + +device_class_set_props (dc, qct_qtimer_properties); + dc->realize = qct_qtimer_realize;
Missing unrealize.
hw/timer/qct-qtimer.c line 613
Quoted 12 lines
hw/timer/qct-qtimer.c new file +10
-0+ dc->vmsd = &vmstate_qct_qtimer; + rc->phases.hold = qct_qtimer_reset_hold; +} +static void qct_qtimer_register_types (void ) +{ +type_register_static (&qct_qtimer_interface_info); +type_register_static (&qct_qtimer_info); +} + +type_init (qct_qtimer_register_types)
Prefer DEFINE_TYPES.
Regards,
Phil.
Re: [PATCH 1/3] hw/timer: Add QCT QTimer device model
In reply to Brian Cainhw/timer/qct-qtimer.c line 543
Quoted 11 lines · On Fri, 17 Jul 2026 18:32:39 -0700 Brian Cain <[email protected]>…
hw/timer/qct-qtimer.c new file +3
-0@@ -0,0 +1,613 @@ + +static const Property qct_qtimer_properties[] = { +DEFINE_PROP_UINT32 ("freq" , QCTQtimerState, freq,QTIMER_DEFAULT_FREQ_HZ ),
This property sets QCTQtimerState.freq, but it never reaches QCTHextimerState.freq, right? So even though the user can set and read this prop value, the value used in the actual calculations doesn't use this?
Quoted 8 lines
hw/timer/qct-qtimer.c new file +8
-0+DEFINE_PROP_UINT32 ("freq-scale" , QCTQtimerState, freq_scale,1 ), +DEFINE_PROP_UINT32 ("nr_frames" , QCTQtimerState, nr_frames,2 ), +DEFINE_PROP_UINT32 ("nr_views" , QCTQtimerState, nr_views,1 ), +DEFINE_PROP_UINT32 ("frame_stride" , QCTQtimerState, frame_stride,0x1000 ), +DEFINE_PROP_UINT32 ("cnttid_0" , QCTQtimerState, cnttid_0,0x11 ), + DEFINE_PROP_UINT32("cnttid_1", QCTQtimerState, cnttid_1, 0x0), +}; +
PATCH 2/3 hw/hexagon: connect qtimer device
In reply to Brian CainInstantiate the QTimer device in both machine models, map its view region, connect its interrupt lines into l2vic, and link it to the globalreg device.
Store the QTimer DeviceState pointer in the shared HexagonCommonMachineState.
--- include/hw/hexagon/hexagon.h | 1 + include/hw/hexagon/hexagon_globalreg.h | 4 ++++ hw/hexagon/hexagon_dsp.c | 14 ++++++++++++++ hw/hexagon/hexagon_globalreg.c | 17 +++++++++++++++-- hw/hexagon/virt.c | 16 ++++++++++++++++ hw/hexagon/Kconfig | 1 + 6 files changed, 51 insertions(+), 2 deletions(-)
include/hw/hexagon/hexagon.h +1 -0
@@ -157,6 +157,7 @@ struct HexagonCommonMachineState {MemoryRegion ram;MemoryRegion cfgtable_rom;DeviceState *l2vic_dev; + DeviceState *qtimer_dev; };#endif
include/hw/hexagon/hexagon_globalreg.h +4 -0
@@ -11,6 +11,7 @@#include "hw/core/qdev.h" #include "hw/core/sysbus.h" #include "hw/intc/hex-l2vic.h" +#include "hw/timer/qct-qtimer.h" #include "qom/object.h" #include "target/hexagon/cpu.h"
@@ -26,6 +27,9 @@ struct HexagonGlobalRegState {/* L2VIC interface used to back the VID/VID1 registers */ HexL2VicInterface *l2vic; +/* QTimer interface used to back the TIMERLO/TIMERHI registers */ +QctQtimerInterface *qtimer; +/* Global performance cycle counter base */ uint64_t g_pcycle_base;
hw/hexagon/hexagon_dsp.c +14 -0
@@ -17,6 +17,7 @@#include "hw/hexagon/hexagon_globalreg.h" #include "hw/hexagon/hexagon_tlb.h" #include "hw/intc/hex-l2vic.h" +#include "hw/timer/qct-qtimer.h" #include "hw/core/loader.h" #include "qapi/error.h" #include "qemu/error-report.h"
@@ -141,6 +142,17 @@ static void hexagon_common_init(MachineState *machine, Rev_t rev,sysbus_mmio_map (SYS_BUS_DEVICE (hms->l2vic_dev),1 , m_cfg->cfgtable.fastl2vic_base <<16 ); + hms->qtimer_dev =qdev_new (TYPE_QCT_QTIMER ); +object_property_add_child (OBJECT (machine),"qtimer" , +OBJECT (hms->qtimer_dev)); +qdev_prop_set_uint32 (hms->qtimer_dev,"nr_frames" ,3 ); +sysbus_realize_and_unref (SYS_BUS_DEVICE (hms->qtimer_dev), &error_fatal); +sysbus_mmio_map (SYS_BUS_DEVICE (hms->qtimer_dev),1 , m_cfg->qtmr_region); +sysbus_connect_irq (SYS_BUS_DEVICE (hms->qtimer_dev),0 , +qdev_get_gpio_in (hms->l2vic_dev,3 )); +sysbus_connect_irq (SYS_BUS_DEVICE (hms->qtimer_dev),1 , +qdev_get_gpio_in (hms->l2vic_dev,4 )); + glob_regs_dev =qdev_new (TYPE_HEXAGON_GLOBALREG );object_property_add_child (OBJECT (machine),"global-regs" ,OBJECT (glob_regs_dev));
@@ -148,6 +160,8 @@ static void hexagon_common_init(MachineState *machine, Rev_t rev,qdev_prop_set_uint32 (glob_regs_dev,"dsp-rev" , rev);object_property_set_link (OBJECT (glob_regs_dev),"l2vic" ,OBJECT (hms->l2vic_dev), &error_fatal); +object_property_set_link (OBJECT (glob_regs_dev),"qtimer" , +OBJECT (hms->qtimer_dev), &error_fatal);sysbus_realize_and_unref (SYS_BUS_DEVICE (glob_regs_dev), &error_fatal); tlb_dev =qdev_new (TYPE_HEXAGON_TLB );
hw/hexagon/hexagon_globalreg.c +15 -2
@@ -141,15 +141,26 @@ static inline bool is_vid_reg(uint32_t reg)return reg ==HEX_SREG_VID || reg ==HEX_SREG_VID1 ; } +static inline bool is_timer_reg (uint32_t reg) +{ +return reg ==HEX_SREG_TIMERLO || reg ==HEX_SREG_TIMERHI ; +} +/* -* HEX_SREG_VID/VID1 are backed by the L2VIC's VID group registers -* rather than the plain regs[] array, when an L2VIC is wired up. +* HEX_SREG_VID/VID1 are backed by the L2VIC's VID group registers, and +* HEX_SREG_TIMERLO/TIMERHI are backed by the QTimer's live counter, +* rather than the plain regs[] array, when those devices are wired up. */ static uint32_t get_reg_value (HexagonGlobalRegState *s,uint32_t reg) {if (is_vid_reg (reg) && s->l2vic) {return l2vic_read_vid (s->l2vic, reg ==HEX_SREG_VID ?0 :1 ); } +if (is_timer_reg (reg) && s->qtimer) { +return reg ==HEX_SREG_TIMERLO ? +qct_qtimer_get_timer_lo (s->qtimer) : +qct_qtimer_get_timer_hi (s->qtimer); + }return s->regs[reg]; }
@@ -306,6 +317,8 @@ static const VMStateDescription vmstate_hexagon_globalreg = {static const Property hexagon_globalreg_properties[] = {DEFINE_PROP_LINK ("l2vic" , HexagonGlobalRegState, l2vic, TYPE_HEX_L2VIC_INTERFACE, HexL2VicInterface *), +DEFINE_PROP_LINK ("qtimer" , HexagonGlobalRegState, qtimer, + TYPE_QCT_QTIMER_INTERFACE, QctQtimerInterface *),DEFINE_PROP_UINT32 ("boot-evb" , HexagonGlobalRegState, boot_evb,0x0 ),DEFINE_PROP_UINT64 ("config-table-addr" , HexagonGlobalRegState, config_table_addr,0xffffffffULL ),
hw/hexagon/virt.c +16 -0
@@ -16,6 +16,7 @@#include "hw/hexagon/hexagon_globalreg.h" #include "hw/hexagon/hexagon_tlb.h" #include "hw/intc/hex-l2vic.h" +#include "hw/timer/qct-qtimer.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h"
@@ -279,12 +280,27 @@ static void virt_init(MachineState *ms)sysbus_mmio_map (SYS_BUS_DEVICE (vms->parent_obj.l2vic_dev),1 , m_cfg->cfgtable.fastl2vic_base <<16 ); + vms->parent_obj.qtimer_dev =qdev_new (TYPE_QCT_QTIMER ); +object_property_add_child (OBJECT (ms),"qtimer" , +OBJECT (vms->parent_obj.qtimer_dev)); +qdev_prop_set_uint32 (vms->parent_obj.qtimer_dev,"nr_frames" ,2 ); +sysbus_realize_and_unref (SYS_BUS_DEVICE (vms->parent_obj.qtimer_dev), + &error_fatal); +sysbus_mmio_map (SYS_BUS_DEVICE (vms->parent_obj.qtimer_dev),1 , + m_cfg->qtmr_region); +sysbus_connect_irq (SYS_BUS_DEVICE (vms->parent_obj.qtimer_dev),0 , +qdev_get_gpio_in (vms->parent_obj.l2vic_dev,3 )); +sysbus_connect_irq (SYS_BUS_DEVICE (vms->parent_obj.qtimer_dev),1 , +qdev_get_gpio_in (vms->parent_obj.l2vic_dev,4 )); + gsregs_dev =qdev_new (TYPE_HEXAGON_GLOBALREG );object_property_add_child (OBJECT (ms),"global-regs" ,OBJECT (gsregs_dev));qdev_prop_set_uint64 (gsregs_dev,"config-table-addr" , m_cfg->cfgbase);qdev_prop_set_uint32 (gsregs_dev,"dsp-rev" , v68_rev);object_property_set_link (OBJECT (gsregs_dev),"l2vic" ,OBJECT (vms->parent_obj.l2vic_dev), &error_fatal); +object_property_set_link (OBJECT (gsregs_dev),"qtimer" , +OBJECT (vms->parent_obj.qtimer_dev), &error_fatal);sysbus_realize_and_unref (SYS_BUS_DEVICE (gsregs_dev), &error_fatal); tlb_dev =qdev_new (TYPE_HEXAGON_TLB );
hw/hexagon/Kconfig +1 -0
@@ -3,6 +3,7 @@ config HEX_DSP default y depends on HEXAGON select HEX_L2VIC + select HEX_QTIMER config HEX_VIRT bool
Signature · 1 line
2.34.1
Re: [PATCH 2/3] hw/hexagon: connect qtimer device
Quoted 150 lines · Brian Cain
Instantiate the QTimer device in both machine models, map its view region, connect its interrupt lines into l2vic, and link it to the globalreg device.
Store the QTimer DeviceState pointer in the shared HexagonCommonMachineState.
Signed-off-by Brian Cain <[email protected]>--- include/hw/hexagon/hexagon.h | 1 + include/hw/hexagon/hexagon_globalreg.h | 4 ++++ hw/hexagon/hexagon_dsp.c | 14 ++++++++++++++ hw/hexagon/hexagon_globalreg.c | 17 +++++++++++++++-- hw/hexagon/virt.c | 16 ++++++++++++++++ hw/hexagon/Kconfig | 1 + 6 files changed, 51 insertions(+), 2 deletions(-)include/hw/hexagon/hexagon.h +1
-0@@ -157,6 +157,7 @@ struct HexagonCommonMachineState {MemoryRegion ram;MemoryRegion cfgtable_rom;DeviceState *l2vic_dev; + DeviceState *qtimer_dev; };#endif include/hw/hexagon/hexagon_globalreg.h +4
-0@@ -11,6 +11,7 @@#include "hw/core/qdev.h" #include "hw/core/sysbus.h" #include "hw/intc/hex-l2vic.h" +#include "hw/timer/qct-qtimer.h" #include "qom/object.h" #include "target/hexagon/cpu.h" @@ -26,6 +27,9 @@ struct HexagonGlobalRegState {/* L2VIC interface used to back the VID/VID1 registers */ HexL2VicInterface *l2vic; +/* QTimer interface used to back the TIMERLO/TIMERHI registers */ +QctQtimerInterface *qtimer; +/* Global performance cycle counter base */ uint64_t g_pcycle_base;hw/hexagon/hexagon_dsp.c +14
-0@@ -17,6 +17,7 @@#include "hw/hexagon/hexagon_globalreg.h" #include "hw/hexagon/hexagon_tlb.h" #include "hw/intc/hex-l2vic.h" +#include "hw/timer/qct-qtimer.h" #include "hw/core/loader.h" #include "qapi/error.h" #include "qemu/error-report.h" @@ -141,6 +142,17 @@ static void hexagon_common_init(MachineState *machine, Rev_t rev,sysbus_mmio_map (SYS_BUS_DEVICE (hms->l2vic_dev),1 , m_cfg->cfgtable.fastl2vic_base <<16 ); + hms->qtimer_dev =qdev_new (TYPE_QCT_QTIMER ); +object_property_add_child (OBJECT (machine),"qtimer" , +OBJECT (hms->qtimer_dev)); +qdev_prop_set_uint32 (hms->qtimer_dev,"nr_frames" ,3 ); +sysbus_realize_and_unref (SYS_BUS_DEVICE (hms->qtimer_dev), &error_fatal); +sysbus_mmio_map (SYS_BUS_DEVICE (hms->qtimer_dev),1 , m_cfg->qtmr_region); +sysbus_connect_irq (SYS_BUS_DEVICE (hms->qtimer_dev),0 , +qdev_get_gpio_in (hms->l2vic_dev,3 )); +sysbus_connect_irq (SYS_BUS_DEVICE (hms->qtimer_dev),1 , +qdev_get_gpio_in (hms->l2vic_dev,4 )); + glob_regs_dev =qdev_new (TYPE_HEXAGON_GLOBALREG );object_property_add_child (OBJECT (machine),"global-regs" ,OBJECT (glob_regs_dev));@@ -148,6 +160,8 @@ static void hexagon_common_init(MachineState *machine, Rev_t rev,qdev_prop_set_uint32 (glob_regs_dev,"dsp-rev" , rev);object_property_set_link (OBJECT (glob_regs_dev),"l2vic" ,OBJECT (hms->l2vic_dev), &error_fatal); +object_property_set_link (OBJECT (glob_regs_dev),"qtimer" , +OBJECT (hms->qtimer_dev), &error_fatal);sysbus_realize_and_unref (SYS_BUS_DEVICE (glob_regs_dev), &error_fatal); tlb_dev =qdev_new (TYPE_HEXAGON_TLB );hw/hexagon/hexagon_globalreg.c +15
-2@@ -141,15 +141,26 @@ static inline bool is_vid_reg(uint32_t reg)return reg ==HEX_SREG_VID || reg ==HEX_SREG_VID1 ; } +static inline bool is_timer_reg (uint32_t reg) +{ +return reg ==HEX_SREG_TIMERLO || reg ==HEX_SREG_TIMERHI ; +} +/* -* HEX_SREG_VID/VID1 are backed by the L2VIC's VID group registers -* rather than the plain regs[] array, when an L2VIC is wired up. +* HEX_SREG_VID/VID1 are backed by the L2VIC's VID group registers, and +* HEX_SREG_TIMERLO/TIMERHI are backed by the QTimer's live counter, +* rather than the plain regs[] array, when those devices are wired up. */ static uint32_t get_reg_value (HexagonGlobalRegState *s,uint32_t reg) {if (is_vid_reg (reg) && s->l2vic) {return l2vic_read_vid (s->l2vic, reg ==HEX_SREG_VID ?0 :1 ); } +if (is_timer_reg (reg) && s->qtimer) { +return reg ==HEX_SREG_TIMERLO ? +qct_qtimer_get_timer_lo (s->qtimer) : +qct_qtimer_get_timer_hi (s->qtimer); + }return s->regs[reg]; }@@ -306,6 +317,8 @@ static const VMStateDescription vmstate_hexagon_globalreg = {static const Property hexagon_globalreg_properties[] = {DEFINE_PROP_LINK ("l2vic" , HexagonGlobalRegState, l2vic, TYPE_HEX_L2VIC_INTERFACE, HexL2VicInterface *), +DEFINE_PROP_LINK ("qtimer" , HexagonGlobalRegState, qtimer, + TYPE_QCT_QTIMER_INTERFACE, QctQtimerInterface *),DEFINE_PROP_UINT32 ("boot-evb" , HexagonGlobalRegState, boot_evb,0x0 ),DEFINE_PROP_UINT64 ("config-table-addr" , HexagonGlobalRegState, config_table_addr,0xffffffffULL ),hw/hexagon/virt.c +3
-0@@ -16,6 +16,7 @@#include "hw/hexagon/hexagon_globalreg.h" #include "hw/hexagon/hexagon_tlb.h" #include "hw/intc/hex-l2vic.h" +#include "hw/timer/qct-qtimer.h" #include "hw/core/loader.h" #include "hw/core/qdev-properties.h" #include "hw/core/qdev-clock.h" @@ -279,12 +280,27 @@ static void virt_init(MachineState *ms)sysbus_mmio_map (SYS_BUS_DEVICE (vms->parent_obj.l2vic_dev),1 , m_cfg->cfgtable.fastl2vic_base <<16 ); + vms->parent_obj.qtimer_dev =qdev_new (TYPE_QCT_QTIMER ); + object_property_add_child(OBJECT(ms), "qtimer",
hw/hexagon/virt.c static void virt_init(MachineState *ms) · line 294
Quoted 10 lines
hw/hexagon/virt.c +10
-0+ OBJECT(vms->parent_obj.qtimer_dev)); +qdev_prop_set_uint32 (vms->parent_obj.qtimer_dev,"nr_frames" ,2 ); +sysbus_realize_and_unref (SYS_BUS_DEVICE (vms->parent_obj.qtimer_dev), + &error_fatal); +sysbus_mmio_map (SYS_BUS_DEVICE (vms->parent_obj.qtimer_dev),1 , + m_cfg->qtmr_region); +sysbus_connect_irq (SYS_BUS_DEVICE (vms->parent_obj.qtimer_dev),0 , +qdev_get_gpio_in (vms->parent_obj.l2vic_dev,3 )); +sysbus_connect_irq (SYS_BUS_DEVICE (vms->parent_obj.qtimer_dev),1 , +qdev_get_gpio_in (vms->parent_obj.l2vic_dev,4 ));
We should consider extract an init function for this, as it's mostly duplicated between virt and hexagon_dsp.
Also, is the difference in nr_frames expected?
Quoted 24 lines
hw/hexagon/virt.c +3
-0+ gsregs_dev =qdev_new (TYPE_HEXAGON_GLOBALREG );object_property_add_child (OBJECT (ms),"global-regs" ,OBJECT (gsregs_dev));qdev_prop_set_uint64 (gsregs_dev,"config-table-addr" , m_cfg->cfgbase);qdev_prop_set_uint32 (gsregs_dev,"dsp-rev" , v68_rev);object_property_set_link (OBJECT (gsregs_dev),"l2vic" ,OBJECT (vms->parent_obj.l2vic_dev), &error_fatal); +object_property_set_link (OBJECT (gsregs_dev),"qtimer" , +OBJECT (vms->parent_obj.qtimer_dev), &error_fatal);sysbus_realize_and_unref (SYS_BUS_DEVICE (gsregs_dev), &error_fatal); tlb_dev =qdev_new (TYPE_HEXAGON_TLB );hw/hexagon/Kconfig +1
-0@@ -3,6 +3,7 @@ config HEX_DSP default y depends on HEXAGON select HEX_L2VIC + select HEX_QTIMER config HEX_VIRT bool
PATCH 3/3 tests/qtest: add qct-qtimer qtest
In reply to Brian CainAdd a qtest exercising the QCT QTimer's register access, view-region frame addressing, and one-shot timer firing behavior.
--- MAINTAINERS | 1 + tests/qtest/qct-qtimer-test.c | 213 ++++++++++++++++++++++++++++++++++ tests/qtest/meson.build | 2 +- 3 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 tests/qtest/qct-qtimer-test.c
MAINTAINERS +1 -0
@@ -255,6 +255,7 @@ F: include/hw/intc/hex-l2vic.h F: tests/qtest/l2vic-test.c F: hw/timer/qct-qtimer.c F: include/hw/timer/qct-qtimer.h +F: tests/qtest/qct-qtimer-test.c X: target/hexagon/idef-parser/ X: target/hexagon/gen_idef_parser_funcs.py F: linux-user/hexagon/
tests/qtest/qct-qtimer-test.c new file +213 -0
213 lines not on this page · raw message
tests/qtest/meson.build +1 -1
@@ -299,7 +299,7 @@ qtests_riscv64 = ['riscv-csr-test'] + \ ['iommu-riscv-test'] : []) + \ (config_all_devices.has_key('CONFIG_K230') ? ['k230-wdt-test'] : []) -qtests_hexagon = ['boot-serial-test', 'l2vic-test'] +qtests_hexagon = ['boot-serial-test', 'l2vic-test', 'qct-qtimer-test'] qos_test_ss = ss.source_set() qos_test_ss.add(
Signature · 1 line
2.34.1
Re: [PATCH 3/3] tests/qtest: add qct-qtimer qtest
Quoted 33 lines · Brian Cain
Add a qtest exercising the QCT QTimer's register access, view-region frame addressing, and one-shot timer firing behavior.
Signed-off-by Brian Cain <[email protected]>--- MAINTAINERS | 1 + tests/qtest/qct-qtimer-test.c | 213 ++++++++++++++++++++++++++++++++++ tests/qtest/meson.build | 2 +- 3 files changed, 215 insertions(+), 1 deletion(-) create mode 100644 tests/qtest/qct-qtimer-test.cMAINTAINERS +1
-0@@ -255,6 +255,7 @@ F: include/hw/intc/hex-l2vic.h F: tests/qtest/l2vic-test.c F: hw/timer/qct-qtimer.c F: include/hw/timer/qct-qtimer.h +F: tests/qtest/qct-qtimer-test.c X: target/hexagon/idef-parser/ X: target/hexagon/gen_idef_parser_funcs.py F: linux-user/hexagon/tests/qtest/qct-qtimer-test.c new file +4
-0@@ -0,0 +1,213 @@ +/* +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. +* SPDX-License-Identifier: GPL-2.0-or-later +*
tests/qtest/qct-qtimer-test.c line 14
Quoted 10 lines
tests/qtest/qct-qtimer-test.c new file +10
-0+* QTest testcase for the QCT QTimer +*/ + +#include "qemu/osdep.h" +#include "libqtest-single.h" +#include "hw/timer/qct-qtimer.h" +#include "qemu/bitops.h" + +#define QTIMER_DEFAULT_FREQ_HZ 19200000ULL +#define QTIMER_VIEW_BASE 0xfc921000
Should this be properties, in case another sec maps this at a different address/has different freq?
Quoted 68 lines
tests/qtest/qct-qtimer-test.c new file +68
-0+ +#define TIMER_TEST_OFFSET 1000 +/* TIMER_TEST_OFFSET ticks expressed in nanoseconds of QEMU_CLOCK_VIRTUAL */ +#define TIMER_TEST_NS \ + ((TIMER_TEST_OFFSET * 1000000000ULL) / QTIMER_DEFAULT_FREQ_HZ) + +static uint32_t qtimer_read32 (uint64_t base,uint32_t offset) +{ +return readl (base + offset); +} + +static void qtimer_write32 (uint64_t base,uint32_t offset,uint32_t value) +{ +writel (base + offset, value); +} + +static uint64_t qtimer_read64 (uint64_t base,uint32_t offset) +{ +uint32_t lo =qtimer_read32 (base, offset); +uint32_t hi =qtimer_read32 (base, offset +4 ); + +return ((uint64_t )hi <<32 ) | lo; +} + +static void qtimer_write64 (uint64_t base,uint32_t offset,uint64_t value) +{ +qtimer_write32 (base, offset,extract64 (value,0 ,32 )); +qtimer_write32 (base, offset +4 ,extract64 (value,32 ,32 )); +} + +/* Test basic device presence and register access */ +static void test_qtimer_basic_access (void ) +{ +uint32_t val; + + val =qtimer_read32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNT_FREQ ); + g_assert_cmpuint(val, ==, QTIMER_DEFAULT_FREQ_HZ); +} + +/* Test multiple timer frames */ +static void test_qtimer_multiple_frames (void ) +{ +uint32_t val; +uint64_t frame0_base =QTIMER_VIEW_BASE ; +uint64_t frame1_base =QTIMER_VIEW_BASE +0x1000 ; + + val =qtimer_read32 (frame0_base,QCT_QTIMER_CNT_FREQ ); + g_assert_cmpuint(val, ==, QTIMER_DEFAULT_FREQ_HZ); + + val =qtimer_read32 (frame1_base,QCT_QTIMER_CNT_FREQ ); + g_assert_cmpuint(val, ==, QTIMER_DEFAULT_FREQ_HZ); +} + +/* Test that registers exist and can be accessed */ +static void test_qtimer_register_reads (void ) +{ +qtimer_read32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNT_FREQ ); +qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTPCT_LO ); +qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CVAL_LO ); +qtimer_read32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CTL ); +qtimer_read32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_TVAL ); +} + +/* Test timer control and value registers */ +static void test_qtimer_control_registers (void ) +{ +uint32_t ctl_val; +uint64_t cval_before, cval_after;
tests/qtest/qct-qtimer-test.c line 92
Quoted 10 lines
tests/qtest/qct-qtimer-test.c new file +10
-0+ + cval_before =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTPCT_LO ); + +qtimer_write32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_TVAL ,1000 ); + +qtimer_write32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CTL ,1 ); + ctl_val =qtimer_read32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CTL ); +if (ctl_val &1 ) { + g_assert_cmpuint(ctl_val & 1, ==, 1); + }
Seems like this if can be reduced to:g_assert(ctl_val)?
Quoted 134 lines
tests/qtest/qct-qtimer-test.c new file +121
-0+ +/* CVAL should be greater than before since we set TVAL */ + cval_after =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CVAL_LO ); + g_assert_cmpuint(cval_after, >, cval_before); + +qtimer_write32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CTL ,0 ); + ctl_val =qtimer_read32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CTL ); + g_assert_cmpuint(ctl_val & 1, ==, 0); +} + +/* Test CVAL register direct access */ +static void test_qtimer_cval_access (void ) +{ +uint64_t current_time, test_cval, read_cval; + + current_time =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTPCT_LO ); + test_cval = current_time +10000 ; + +qtimer_write64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CVAL_LO , test_cval); + read_cval =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CVAL_LO ); + g_assert_cmpuint(read_cval, ==, test_cval); +} + +/* Test counter progression */ +static void test_qtimer_counter_progression (void ) +{ +uint32_t freq; +uint64_t count1, count2; + +/* +* In qtest mode the virtual clock does not advance on its own, so +* reading the counter twice must give the same value. +*/ + count1 =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTPCT_LO ); + count2 =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTPCT_LO ); + g_assert_cmpuint(count2, ==, count1); + + freq =qtimer_read32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNT_FREQ ); + g_assert_cmpuint(freq, ==, QTIMER_DEFAULT_FREQ_HZ); +} + +/* Test timer behavior with clock control */ +static void test_qtimer_timer_behavior (void ) +{ +uint64_t current_count, target_count, read_cval, new_count; +uint64_t ctl_val, count_after_disable; + + current_count =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTPCT_LO ); + + target_count = current_count +TIMER_TEST_OFFSET ; +qtimer_write64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CVAL_LO , target_count); + + read_cval =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CVAL_LO ); + g_assert_cmpuint(read_cval, ==, target_count); + +qtimer_write32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CTL ,1 ); + + ctl_val =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CTL ); +/* EN set, IMASK clear, ISTAT not yet pending */ + g_assert_cmpuint(ctl_val, ==, 0x1); + +/* Step forward but not past the target */ +qtest_clock_step (global_qtest,TIMER_TEST_NS /2 ); + new_count =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTPCT_LO ); + g_assert_cmpuint(new_count, >=, current_count); + +/* Step past the target */ +qtest_clock_step (global_qtest,TIMER_TEST_NS ); + new_count =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTPCT_LO ); + g_assert_cmpuint(new_count, >=, target_count); + +qtimer_write32 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CTL ,0 ); + + ctl_val =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CTL ); +/* EN cleared, ISTAT set since new_count >= target_count */ + g_assert_cmpuint(ctl_val, ==, 0x4); + +/* +* CNTPCT runs independently of CNTP_CTL.EN: only the compare/IRQ +* logic is gated by EN, so the counter must keep advancing. +*/ +qtest_clock_step (global_qtest,TIMER_TEST_NS /2 ); + count_after_disable =qtimer_read64 (QTIMER_VIEW_BASE , +QCT_QTIMER_CNTPCT_LO ); + g_assert_cmpuint(count_after_disable, >, new_count); + +/* ISTAT remains set while CNTPCT >= CVAL, even with EN=0 */ + ctl_val =qtimer_read64 (QTIMER_VIEW_BASE ,QCT_QTIMER_CNTP_CTL ); + g_assert_cmpuint(ctl_val, ==, 0x4); +} + +static void test_qtimer_on_machine (gconstpointer data) +{ +const char *machine = (const char *)data; + g_autofree char *args = g_strdup_printf( +"-machine %s -global qct-qtimer.freq-scale=1" , machine); + +qtest_start (args); + +test_qtimer_basic_access (); +test_qtimer_multiple_frames (); +test_qtimer_register_reads (); +test_qtimer_control_registers (); +test_qtimer_cval_access (); +test_qtimer_counter_progression (); +test_qtimer_timer_behavior (); + +qtest_end (); +} + +int main (int argc,char **argv) +{ +g_test_init (&argc, &argv,NULL ); + +qtest_add_data_func ("/qct-qtimer/virt/all-tests" ,"virt" , + test_qtimer_on_machine); +qtest_add_data_func ("/qct-qtimer/V66G_1024/all-tests" ,"V66G_1024" , + test_qtimer_on_machine); + +return g_test_run (); +}tests/qtest/meson.build +1
-1@@ -299,7 +299,7 @@ qtests_riscv64 = ['riscv-csr-test'] + \ ['iommu-riscv-test'] : []) + \ (config_all_devices.has_key('CONFIG_K230') ? ['k230-wdt-test'] : []) -qtests_hexagon = ['boot-serial-test', 'l2vic-test'] +qtests_hexagon = ['boot-serial-test', 'l2vic-test', 'qct-qtimer-test'] qos_test_ss = ss.source_set() qos_test_ss.add(
Re: [PATCH 3/3] tests/qtest: add qct-qtimer qtest
Quoted 18 lines · On Tue, 21 Jul 2026 08:07:59 -0700 Pierrick Bouvier…
Quoted 16 lines · Brian Cain
tests/qtest/qct-qtimer-test.c new file +9
-0@@ -0,0 +1,213 @@ +/* +* Copyright (c) Qualcomm Technologies, Inc. and/or its subsidiaries. +* SPDX-License-Identifier: GPL-2.0-or-later +* +* QTest testcase for the QCT QTimer +*/ + +#include "qemu/osdep.h" +#include "libqtest-single.h"
Quoted 8 lines
tests/qtest/qct-qtimer-test.c line 14
Quoted 5 lines
tests/qtest/qct-qtimer-test.c new file +5
-0+#include "hw/timer/qct-qtimer.h" +#include "qemu/bitops.h" + +#define QTIMER_DEFAULT_FREQ_HZ 19200000ULL +#define QTIMER_VIEW_BASE 0xfc921000Should this be properties, in case another sec maps this at a different address/has different freq?
Yeah, makes sense, IMHO. The current QTIMER_VIEW_BASE value matches v66/v68 machines but not sa8775 (0x263a1000). (Though not sure if we want to add a qtimer device to that)