hw/riscv: OpenTitan: Add support for the RISC-V timer
Subsystems (2)
cover hw/riscv: OpenTitan: Add support for the RISC-V timer
Alistair Francis (3):
hw/char/ibex_uart: Make the register layout private hw/timer: Initial commit of Ibex Timer
hw/riscv: OpenTitan: Connect the mtime and mtimecmp timer
include/hw/char/ibex_uart.h | 37 ----- include/hw/riscv/opentitan.h | 5 +- include/hw/timer/ibex_timer.h | 52 ++++++ hw/char/ibex_uart.c | 37 +++++ hw/riscv/opentitan.c | 14 +- hw/timer/ibex_timer.c | 305 ++++++++++++++++++++++++++++++++++ MAINTAINERS | 6 +- hw/timer/meson.build | 1 + 8 files changed, 412 insertions(+), 45 deletions(-) create mode 100644 include/hw/timer/ibex_timer.h create mode 100644 hw/timer/ibex_timer.c
Signature · 1 line
2.31.1
PATCH 1/3 hw/char/ibex_uart: Make the register layout private
We don't need to expose the register layout in the public header, so don't.
--- include/hw/char/ibex_uart.h | 37 ------------------------------------- hw/char/ibex_uart.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 37 deletions(-)
include/hw/char/ibex_uart.h +0 -37
@@ -31,43 +31,6 @@#include "qemu/timer.h" #include "qom/object.h" -REG32(INTR_STATE, 0x00) - FIELD(INTR_STATE, TX_WATERMARK, 0, 1) - FIELD(INTR_STATE, RX_WATERMARK, 1, 1) - FIELD(INTR_STATE, TX_EMPTY, 2, 1) - FIELD(INTR_STATE, RX_OVERFLOW, 3, 1) -REG32(INTR_ENABLE, 0x04) -REG32(INTR_TEST, 0x08) -REG32(CTRL, 0x0C) - FIELD(CTRL, TX_ENABLE, 0, 1) - FIELD(CTRL, RX_ENABLE, 1, 1) - FIELD(CTRL, NF, 2, 1) - FIELD(CTRL, SLPBK, 4, 1) - FIELD(CTRL, LLPBK, 5, 1) - FIELD(CTRL, PARITY_EN, 6, 1) - FIELD(CTRL, PARITY_ODD, 7, 1) - FIELD(CTRL, RXBLVL, 8, 2) - FIELD(CTRL, NCO, 16, 16) -REG32(STATUS, 0x10) - FIELD(STATUS, TXFULL, 0, 1) - FIELD(STATUS, RXFULL, 1, 1) - FIELD(STATUS, TXEMPTY, 2, 1) - FIELD(STATUS, RXIDLE, 4, 1) - FIELD(STATUS, RXEMPTY, 5, 1) -REG32(RDATA, 0x14) -REG32(WDATA, 0x18) -REG32(FIFO_CTRL, 0x1c) - FIELD(FIFO_CTRL, RXRST, 0, 1) - FIELD(FIFO_CTRL, TXRST, 1, 1) - FIELD(FIFO_CTRL, RXILVL, 2, 3) - FIELD(FIFO_CTRL, TXILVL, 5, 2) -REG32(FIFO_STATUS, 0x20) - FIELD(FIFO_STATUS, TXLVL, 0, 5) - FIELD(FIFO_STATUS, RXLVL, 16, 5) -REG32(OVRD, 0x24) -REG32(VAL, 0x28) -REG32(TIMEOUT_CTRL, 0x2c) -#define IBEX_UART_TX_FIFO_SIZE 16#define IBEX_UART_CLOCK 50000000/* 50MHz clock */
hw/char/ibex_uart.c +37 -0
@@ -35,6 +35,43 @@#include "qemu/log.h" #include "qemu/module.h" +REG32(INTR_STATE, 0x00) + FIELD(INTR_STATE, TX_WATERMARK, 0, 1) + FIELD(INTR_STATE, RX_WATERMARK, 1, 1) + FIELD(INTR_STATE, TX_EMPTY, 2, 1) + FIELD(INTR_STATE, RX_OVERFLOW, 3, 1) +REG32(INTR_ENABLE, 0x04) +REG32(INTR_TEST, 0x08) +REG32(CTRL, 0x0C) + FIELD(CTRL, TX_ENABLE, 0, 1) + FIELD(CTRL, RX_ENABLE, 1, 1) + FIELD(CTRL, NF, 2, 1) + FIELD(CTRL, SLPBK, 4, 1) + FIELD(CTRL, LLPBK, 5, 1) + FIELD(CTRL, PARITY_EN, 6, 1) + FIELD(CTRL, PARITY_ODD, 7, 1) + FIELD(CTRL, RXBLVL, 8, 2) + FIELD(CTRL, NCO, 16, 16) +REG32(STATUS, 0x10) + FIELD(STATUS, TXFULL, 0, 1) + FIELD(STATUS, RXFULL, 1, 1) + FIELD(STATUS, TXEMPTY, 2, 1) + FIELD(STATUS, RXIDLE, 4, 1) + FIELD(STATUS, RXEMPTY, 5, 1) +REG32(RDATA, 0x14) +REG32(WDATA, 0x18) +REG32(FIFO_CTRL, 0x1c) + FIELD(FIFO_CTRL, RXRST, 0, 1) + FIELD(FIFO_CTRL, TXRST, 1, 1) + FIELD(FIFO_CTRL, RXILVL, 2, 3) + FIELD(FIFO_CTRL, TXILVL, 5, 2) +REG32(FIFO_STATUS, 0x20) + FIELD(FIFO_STATUS, TXLVL, 0, 5) + FIELD(FIFO_STATUS, RXLVL, 16, 5) +REG32(OVRD, 0x24) +REG32(VAL, 0x28) +REG32(TIMEOUT_CTRL, 0x2c) +static void ibex_uart_update_irqs (IbexUartState *s) {if (s->uart_intr_state & s->uart_intr_enable &R_INTR_STATE_TX_WATERMARK_MASK ) {
Signature · 1 line
2.31.1
PATCH 2/3 hw/timer: Initial commit of Ibex Timer
In reply to Alistair Francis--- include/hw/timer/ibex_timer.h | 52 ++++++ hw/timer/ibex_timer.c | 305 ++++++++++++++++++++++++++++++++++ MAINTAINERS | 6 +- hw/timer/meson.build | 1 + 4 files changed, 360 insertions(+), 4 deletions(-) create mode 100644 include/hw/timer/ibex_timer.h create mode 100644 hw/timer/ibex_timer.c
include/hw/timer/ibex_timer.h new file +52 -0
@@ -0,0 +1,52 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_IBEX_TIMER_H +#define HW_IBEX_TIMER_H + +#include "hw/sysbus.h" + +#define TYPE_IBEX_TIMER "ibex-timer" +OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) + +struct IbexTimerState { +/* <private> */ +SysBusDevice parent_obj; + +/* <public> */ +MemoryRegion mmio; + +uint32_t timer_ctrl; +uint32_t timer_cfg0; +uint32_t timer_compare_lower0; +uint32_t timer_compare_upper0; +uint32_t timer_intr_enable; +uint32_t timer_intr_state; +uint32_t timer_intr_test; + +uint32_t timebase_freq; + +qemu_irq irq; +}; +#endif /* HW_IBEX_TIMER_H */
hw/timer/ibex_timer.c new file +305 -0
305 lines not on this page · raw message
MAINTAINERS +2 -4
@@ -1355,11 +1355,9 @@ M: Alistair Francis <[email protected]> L: [email protected] S: Supported F: hw/riscv/opentitan.c -F: hw/char/ibex_uart.c -F: hw/intc/ibex_plic.c +F: hw/*/ibex_*.c F: include/hw/riscv/opentitan.h -F: include/hw/char/ibex_uart.h -F: include/hw/intc/ibex_plic.h +F: include/hw/*/ibex_*.h Microchip PolarFire SoC Icicle Kit M: Bin Meng <[email protected]>
hw/timer/meson.build +1 -0
@@ -33,5 +33,6 @@ softmmu_ss.add(when: 'CONFIG_SSE_COUNTER', if_true: files('sse-counter.c')) softmmu_ss.add(when: 'CONFIG_SSE_TIMER', if_true: files('sse-timer.c')) softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_timer.c')) softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c')) +specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_timer.c')) specific_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c'))
Signature · 1 line
2.31.1
PATCH 3/3 hw/riscv: OpenTitan: Connect the mtime and mtimecmp timer
In reply to Alistair Francis--- include/hw/riscv/opentitan.h | 5 ++++- hw/riscv/opentitan.c | 14 +++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-)
include/hw/riscv/opentitan.h +4 -1
@@ -22,6 +22,7 @@#include "hw/riscv/riscv_hart.h" #include "hw/intc/ibex_plic.h" #include "hw/char/ibex_uart.h" +#include "hw/timer/ibex_timer.h" #include "qom/object.h" #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc"
@@ -35,6 +36,7 @@ struct LowRISCIbexSoCState {RISCVHartArrayState cpus;IbexPlicState plic;IbexUartState uart; +IbexTimerState timer;MemoryRegion flash_mem;MemoryRegion rom;
@@ -57,7 +59,7 @@ enum {IBEX_DEV_SPI ,IBEX_DEV_I2C ,IBEX_DEV_PATTGEN , -IBEX_DEV_RV_TIMER , +IBEX_DEV_TIMER ,IBEX_DEV_SENSOR_CTRL ,IBEX_DEV_OTP_CTRL , IBEX_DEV_PWRMGR,
@@ -82,6 +84,7 @@ enum { };enum { +IBEX_TIMER_TIMEREXPIRED0_0 =125 ,IBEX_UART0_RX_PARITY_ERR_IRQ =8 ,IBEX_UART0_RX_TIMEOUT_IRQ =7 ,IBEX_UART0_RX_BREAK_ERR_IRQ =6 ,
hw/riscv/opentitan.c +11 -3
@@ -36,7 +36,7 @@ static const MemMapEntry ibex_memmap[] = { [IBEX_DEV_SPI] = { 0x40050000, 0x1000 }, [IBEX_DEV_I2C] = { 0x40080000, 0x1000 }, [IBEX_DEV_PATTGEN] = { 0x400e0000, 0x1000 }, - [IBEX_DEV_RV_TIMER] = { 0x40100000, 0x1000 }, + [IBEX_DEV_TIMER] = { 0x40100000, 0x1000 }, [IBEX_DEV_SENSOR_CTRL] = { 0x40110000, 0x1000 }, [IBEX_DEV_OTP_CTRL] = { 0x40130000, 0x4000 }, [IBEX_DEV_PWRMGR] = { 0x40400000, 0x1000 },
@@ -106,6 +106,8 @@ static void lowrisc_ibex_soc_init(Object *obj)object_initialize_child (obj,"plic" , &s->plic,TYPE_IBEX_PLIC );object_initialize_child (obj,"uart" , &s->uart,TYPE_IBEX_UART ); + +object_initialize_child (obj,"timer" , &s->timer,TYPE_IBEX_TIMER ); }static void lowrisc_ibex_soc_realize (DeviceState *dev_soc,Error **errp)
@@ -159,6 +161,14 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp)3 ,qdev_get_gpio_in (DEVICE (&s->plic), IBEX_UART0_RX_OVERFLOW_IRQ)); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->timer), errp)) { +return ; + } +sysbus_mmio_map (SYS_BUS_DEVICE (&s->timer),0 , memmap[IBEX_DEV_TIMER ].base); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->timer), +0 ,qdev_get_gpio_in (DEVICE (&s->plic), +IBEX_TIMER_TIMEREXPIRED0_0 )); +create_unimplemented_device ("riscv.lowrisc.ibex.gpio" , memmap[IBEX_DEV_GPIO ].base, memmap[IBEX_DEV_GPIO ].size); create_unimplemented_device("riscv.lowrisc.ibex.spi",
@@ -167,8 +177,6 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) memmap[IBEX_DEV_I2C].base, memmap[IBEX_DEV_I2C].size);create_unimplemented_device ("riscv.lowrisc.ibex.pattgen" , memmap[IBEX_DEV_PATTGEN ].base, memmap[IBEX_DEV_PATTGEN ].size); -create_unimplemented_device ("riscv.lowrisc.ibex.rv_timer" , - memmap[IBEX_DEV_RV_TIMER ].base, memmap[IBEX_DEV_RV_TIMER ].size);create_unimplemented_device ("riscv.lowrisc.ibex.sensor_ctrl" , memmap[IBEX_DEV_SENSOR_CTRL ].base, memmap[IBEX_DEV_SENSOR_CTRL ].size); create_unimplemented_device("riscv.lowrisc.ibex.otp_ctrl",
Signature · 1 line
2.31.1
Re: [PATCH v1 1/3] hw/char/ibex_uart: Make the register layout private
In reply to Alistair FrancisQuoted 10 lines · Alistair Francis
We don't need to expose the register layout in the public header, so don't.
Signed-off-by Alistair Francis <[email protected]>--- include/hw/char/ibex_uart.h | 37 ------------------------------------- hw/char/ibex_uart.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 37 deletions(-)
Re: [PATCH v1 2/3] hw/timer: Initial commit of Ibex Timer
In reply to Alistair FrancisOn Mon, May 31, 2021 at 12:33 PM Alistair Francis
<[email protected]> wrote:
Please write some commit message, for example, what is supported in this initial version, and what is not.
Quoted 136 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/timer/ibex_timer.h | 52 ++++++ hw/timer/ibex_timer.c | 305 ++++++++++++++++++++++++++++++++++ MAINTAINERS | 6 +- hw/timer/meson.build | 1 + 4 files changed, 360 insertions(+), 4 deletions(-) create mode 100644 include/hw/timer/ibex_timer.h create mode 100644 hw/timer/ibex_timer.cinclude/hw/timer/ibex_timer.h new file +52
-0@@ -0,0 +1,52 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_IBEX_TIMER_H +#define HW_IBEX_TIMER_H + +#include "hw/sysbus.h" + +#define TYPE_IBEX_TIMER "ibex-timer" +OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) + +struct IbexTimerState { +/* <private> */ +SysBusDevice parent_obj; + +/* <public> */ +MemoryRegion mmio; + +uint32_t timer_ctrl; +uint32_t timer_cfg0; +uint32_t timer_compare_lower0; +uint32_t timer_compare_upper0; +uint32_t timer_intr_enable; +uint32_t timer_intr_state; +uint32_t timer_intr_test; + +uint32_t timebase_freq; + +qemu_irq irq; +}; +#endif /* HW_IBEX_TIMER_H */ hw/timer/ibex_timer.c new file +61
-0@@ -0,0 +1,305 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* For details check the documentation here: +* https://docs.opentitan.org/hw/ip/rv_timer/doc/ +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/timer.h" +#include "hw/timer/ibex_timer.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "target/riscv/cpu.h" +#include "migration/vmstate.h" + +REG32(CTRL, 0x00) + FIELD(CTRL, ACTIVE, 0, 1) +REG32(CFG0, 0x100) + FIELD(CFG0, PRESCALE, 0, 12) + FIELD(CFG0, STEP, 16, 8) +REG32(LOWER0, 0x104) +REG32(UPPER0, 0x108) +REG32(COMPARE_LOWER0, 0x10C) +REG32(COMPARE_UPPER0, 0x110) +REG32(INTR_ENABLE, 0x114) + FIELD(INTR_ENABLE, IE_0, 0, 1) +REG32(INTR_STATE, 0x118) + FIELD(INTR_STATE, IS_0, 0, 1) +REG32(INTR_TEST, 0x11C) + FIELD(INTR_TEST, T_0, 0, 1) + +static uint64_t cpu_riscv_read_rtc (uint32_t timebase_freq) +{ +return muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ), + timebase_freq,NANOSECONDS_PER_SECOND ); +} + +static void ibex_timer_update_irqs (IbexTimerState *s) +{ +CPUState *cs =qemu_get_cpu (0 );
hw/timer/ibex_timer.c line 71
Quoted 10 lines
hw/timer/ibex_timer.c new file +10
-0+RISCVCPU *cpu =RISCV_CPU (cs); +uint64_t value = s->timer_compare_lower0 | + ((uint64_t )s->timer_compare_upper0 <<32 ); +uint64_t next, diff; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq); + +if (!(s->timer_ctrl &R_CTRL_ACTIVE_MASK )) { +/* Timer isn't active */ +return ; + }
I am not sure if compiler can optimize such, but this if block can be put at the beginning of this function.
hw/timer/ibex_timer.c line 74
Quoted 3 lines
hw/timer/ibex_timer.c new file +3
-0+ +/* Update the CPUs mtimecmp */ + cpu->env.timecmp = value;
The existing env.timecmp seems to be only valid for CLINT. Should we move it out of env?
Quoted 16 lines
hw/timer/ibex_timer.c new file +16
-0+ +if (cpu->env.timecmp <= now) { +/* +* If the mtimecmp was in the past raise the interrupt now. +*/ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +return ; + } + +/* Setup a timer to trigger the interrupt in the future */ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (0 )); +qemu_set_irq (s->irq, false);
hw/timer/ibex_timer.c line 100
Quoted 10 lines
hw/timer/ibex_timer.c new file +10
-0+ + diff = cpu->env.timecmp - now; + next =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + +muldiv64 (diff, +NANOSECONDS_PER_SECOND , + s->timebase_freq); + +if (next <qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL )) { +/* We overflowed the timer, just set it as large as we can */ +timer_mod (cpu->env.timer,0x0FFFFFFFFFFFFFFF );
Should it be 0x7FFFFFFFFFFFFFFF?
Quoted 22 lines
hw/timer/ibex_timer.c new file +22
-0+ }else { +timer_mod (cpu->env.timer, next); + } +} + +static void ibex_timer_cb (void *opaque) +{ +IbexTimerState *s = opaque; +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); + +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +} + +static void ibex_timer_reset (DeviceState *dev) +{ +IbexTimerState *s =IBEX_TIMER (dev); +
hw/timer/ibex_timer.c line 132
Quoted 10 lines
hw/timer/ibex_timer.c new file +10
-0+CPUState *cpu =qemu_get_cpu (0 ); +CPURISCVState *env = cpu->env_ptr; + env->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + &ibex_timer_cb, s); + env->timecmp =0 ; + + s->timer_ctrl =0x00000000 ; + s->timer_cfg0 =0x00000000 ; + s->timer_compare_lower0 =0x0000003c ; + s->timer_compare_upper0 =0x00000000 ;
The reset values seem not to conform with the spec?
Quoted 71 lines
hw/timer/ibex_timer.c new file +71
-0+ s->timer_intr_enable =0x00000000 ; + s->timer_intr_state =0x00000000 ; + s->timer_intr_test =0x00000000 ; + +ibex_timer_update_irqs (s); +} + +static uint64_t ibex_timer_read (void *opaque,hwaddr addr, +unsigned int size) +{ +IbexTimerState *s = opaque; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq); +uint64_t retvalue =0 ; + +switch (addr >>2 ) { +case R_CTRL : + retvalue = s->timer_ctrl; +break ; +case R_CFG0 : + retvalue = s->timer_cfg0; +break ; +case R_LOWER0 : + retvalue = now; +break ; +case R_UPPER0 : + retvalue = now >>32 ; +break ; +case R_COMPARE_LOWER0 : + retvalue = s->timer_compare_lower0; +break ; +case R_COMPARE_UPPER0 : + retvalue = s->timer_compare_upper0; +break ; +case R_INTR_ENABLE : + retvalue = s->timer_intr_enable; +break ; +case R_INTR_STATE : + retvalue = s->timer_intr_state; +break ; +case R_INTR_TEST : + retvalue = s->timer_intr_test; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bad offset 0x%" HWADDR_PRIx"\n" , __func__, addr); +return 0 ; + } + +return retvalue; +} + +static void ibex_timer_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +IbexTimerState *s = opaque; +uint32_t val = val64; + +switch (addr >>2 ) { +case R_CTRL : + s->timer_ctrl = val; +break ; +case R_CFG0 : +qemu_log_mask (LOG_UNIMP ,"Changing prescale or step not supported" ); + s->timer_cfg0 = val; +break ; +case R_LOWER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_UPPER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ;
hw/timer/ibex_timer.c line 213
Quoted 10 lines
hw/timer/ibex_timer.c new file +10
-0+case R_COMPARE_LOWER0 : + s->timer_compare_lower0 = val; +ibex_timer_update_irqs (s); +break ; +case R_COMPARE_UPPER0 : + s->timer_compare_upper0 = val; +ibex_timer_update_irqs (s); +break ; +case R_INTR_ENABLE : + s->timer_intr_enable = val;
Does this register connect to MIE?
Quoted 115 lines
hw/timer/ibex_timer.c new file +92
-0+break ; +case R_INTR_STATE : +/* Write 1 to clear */ + s->timer_intr_state &= ~val; +break ; +case R_INTR_TEST : + s->timer_intr_test = val; +if (s->timer_intr_enable & + s->timer_intr_test & +R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bad offset 0x%" HWADDR_PRIx"\n" , __func__, addr); + } +} + +static const MemoryRegionOps ibex_timer_ops = { + .read = ibex_timer_read, + .write = ibex_timer_write, + .endianness =DEVICE_NATIVE_ENDIAN , + .impl.min_access_size =4 , + .impl.max_access_size =4 , +}; + +static int ibex_timer_post_load (void *opaque,int version_id) +{ +IbexTimerState *s = opaque; + +ibex_timer_update_irqs (s); +return 0 ; +} + +static const VMStateDescription vmstate_ibex_timer = { + .name =TYPE_IBEX_TIMER , + .version_id =1 , + .minimum_version_id =1 , + .post_load = ibex_timer_post_load, + .fields = (VMStateField []) { +VMSTATE_UINT32 (timer_ctrl, IbexTimerState), +VMSTATE_UINT32 (timer_cfg0, IbexTimerState), +VMSTATE_UINT32 (timer_compare_lower0, IbexTimerState), +VMSTATE_UINT32 (timer_compare_upper0, IbexTimerState), +VMSTATE_UINT32 (timer_intr_enable, IbexTimerState), +VMSTATE_UINT32 (timer_intr_state, IbexTimerState), +VMSTATE_UINT32 (timer_intr_test, IbexTimerState), +VMSTATE_END_OF_LIST () + } +}; + +static Property ibex_timer_properties[] = { +DEFINE_PROP_UINT32 ("timebase-freq" , IbexTimerState, timebase_freq,10000 ), +DEFINE_PROP_END_OF_LIST (), +}; + +static void ibex_timer_init (Object *obj) +{ +IbexTimerState *s =IBEX_TIMER (obj); + +sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irq); + +memory_region_init_io (&s->mmio, obj, &ibex_timer_ops, s, +TYPE_IBEX_TIMER ,0x400 ); +sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->mmio); +} + +static void ibex_timer_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = ibex_timer_reset; + dc->vmsd = &vmstate_ibex_timer; +device_class_set_props (dc, ibex_timer_properties); +} + +static const TypeInfo ibex_timer_info = { + .name =TYPE_IBEX_TIMER , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (IbexTimerState), + .instance_init = ibex_timer_init, + .class_init = ibex_timer_class_init, +}; + +static void ibex_timer_register_types (void ) +{ +type_register_static (&ibex_timer_info); +} + +type_init (ibex_timer_register_types)MAINTAINERS +2
-4@@ -1355,11 +1355,9 @@ M: Alistair Francis <[email protected]> L: [email protected] S: Supported F: hw/riscv/opentitan.c -F: hw/char/ibex_uart.c -F: hw/intc/ibex_plic.c +F: hw/*/ibex_*.c F: include/hw/riscv/opentitan.h -F: include/hw/char/ibex_uart.h -F: include/hw/intc/ibex_plic.h +F: include/hw/*/ibex_*.h Microchip PolarFire SoC Icicle Kit M: Bin Meng <[email protected]>hw/timer/meson.build +0
-0
hw/timer/meson.build softmmu_ss.add(when: 'CONFIG_SSE_COUNTER', if_true: files('sse-counter.c'))
Quoted 7 lines
hw/timer/meson.build +1
-1@@ -33,5 +33,6 @@ softmmu_ss.add(when: 'CONFIG_SSE_COUNTER', if_true: files('sse-counter.c')) softmmu_ss.add(when: 'CONFIG_SSE_TIMER', if_true: files('sse-timer.c')) softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_timer.c')) softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c')) +specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_timer.c')) specific_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c')) --
Regards,
Bin
Re: [PATCH v1 3/3] hw/riscv: OpenTitan: Connect the mtime and mtimecmp timer
In reply to Alistair FrancisQuoted 1 line · Alistair Francis
Please write some commit message here
Quoted 36 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/opentitan.h | 5 ++++- hw/riscv/opentitan.c | 14 +++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-)include/hw/riscv/opentitan.h +3
-1@@ -22,6 +22,7 @@#include "hw/riscv/riscv_hart.h" #include "hw/intc/ibex_plic.h" #include "hw/char/ibex_uart.h" +#include "hw/timer/ibex_timer.h" #include "qom/object.h" #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc"@@ -35,6 +36,7 @@ struct LowRISCIbexSoCState {RISCVHartArrayState cpus;IbexPlicState plic;IbexUartState uart; +IbexTimerState timer;MemoryRegion flash_mem;MemoryRegion rom;@@ -57,7 +59,7 @@ enum {IBEX_DEV_SPI ,IBEX_DEV_I2C ,IBEX_DEV_PATTGEN , -IBEX_DEV_RV_TIMER , +IBEX_DEV_TIMER ,IBEX_DEV_SENSOR_CTRL ,IBEX_DEV_OTP_CTRL , IBEX_DEV_PWRMGR,
include/hw/riscv/opentitan.h enum { · line 87
Quoted 4 lines
include/hw/riscv/opentitan.h +1
-0@@ -82,6 +84,7 @@ enum { };enum { +IBEX_TIMER_TIMEREXPIRED0_0 =125 ,
So this timer is connected to PLIC, instead of a dedicated exception code in the *cause CSR?
Quoted 41 lines
include/hw/riscv/opentitan.h +0
-0IBEX_UART0_RX_PARITY_ERR_IRQ =8 ,IBEX_UART0_RX_TIMEOUT_IRQ =7 , IBEX_UART0_RX_BREAK_ERR_IRQ = 6,hw/riscv/opentitan.c +11
-1@@ -36,7 +36,7 @@ static const MemMapEntry ibex_memmap[] = { [IBEX_DEV_SPI] = { 0x40050000, 0x1000 }, [IBEX_DEV_I2C] = { 0x40080000, 0x1000 }, [IBEX_DEV_PATTGEN] = { 0x400e0000, 0x1000 }, - [IBEX_DEV_RV_TIMER] = { 0x40100000, 0x1000 }, + [IBEX_DEV_TIMER] = { 0x40100000, 0x1000 }, [IBEX_DEV_SENSOR_CTRL] = { 0x40110000, 0x1000 }, [IBEX_DEV_OTP_CTRL] = { 0x40130000, 0x4000 }, [IBEX_DEV_PWRMGR] = { 0x40400000, 0x1000 },@@ -106,6 +106,8 @@ static void lowrisc_ibex_soc_init(Object *obj)object_initialize_child (obj,"plic" , &s->plic,TYPE_IBEX_PLIC );object_initialize_child (obj,"uart" , &s->uart,TYPE_IBEX_UART ); + +object_initialize_child (obj,"timer" , &s->timer,TYPE_IBEX_TIMER ); }static void lowrisc_ibex_soc_realize (DeviceState *dev_soc,Error **errp)@@ -159,6 +161,14 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp)3 ,qdev_get_gpio_in (DEVICE (&s->plic), IBEX_UART0_RX_OVERFLOW_IRQ)); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->timer), errp)) { +return ; + } +sysbus_mmio_map (SYS_BUS_DEVICE (&s->timer),0 , memmap[IBEX_DEV_TIMER ].base); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->timer), +0 ,qdev_get_gpio_in (DEVICE (&s->plic), +IBEX_TIMER_TIMEREXPIRED0_0 )); +create_unimplemented_device ("riscv.lowrisc.ibex.gpio" , memmap[IBEX_DEV_GPIO ].base, memmap[IBEX_DEV_GPIO ].size); create_unimplemented_device("riscv.lowrisc.ibex.spi",
hw/riscv/opentitan.c static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) · line 182
Quoted 8 lines
hw/riscv/opentitan.c +0
-2@@ -167,8 +177,6 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) memmap[IBEX_DEV_I2C].base, memmap[IBEX_DEV_I2C].size);create_unimplemented_device ("riscv.lowrisc.ibex.pattgen" , memmap[IBEX_DEV_PATTGEN ].base, memmap[IBEX_DEV_PATTGEN ].size); -create_unimplemented_device ("riscv.lowrisc.ibex.rv_timer" , - memmap[IBEX_DEV_RV_TIMER ].base, memmap[IBEX_DEV_RV_TIMER ].size);create_unimplemented_device ("riscv.lowrisc.ibex.sensor_ctrl" , memmap[IBEX_DEV_SENSOR_CTRL ].base, memmap[IBEX_DEV_SENSOR_CTRL ].size); create_unimplemented_device("riscv.lowrisc.ibex.otp_ctrl",
Regards,
Bin
Re: [PATCH v1 2/3] hw/timer: Initial commit of Ibex Timer
In reply to Bin MengQuoted 6 lines · Bin Meng
On Mon, May 31, 2021 at 12:33 PM Alistair Francis
<[email protected]> wrote:Please write some commit message, for example, what is supported in this initial version, and what is not.
I'll add something.
Quoted 142 lines
Quoted 142 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/timer/ibex_timer.h | 52 ++++++ hw/timer/ibex_timer.c | 305 ++++++++++++++++++++++++++++++++++ MAINTAINERS | 6 +- hw/timer/meson.build | 1 + 4 files changed, 360 insertions(+), 4 deletions(-) create mode 100644 include/hw/timer/ibex_timer.h create mode 100644 hw/timer/ibex_timer.cinclude/hw/timer/ibex_timer.h new file +52
-0@@ -0,0 +1,52 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_IBEX_TIMER_H +#define HW_IBEX_TIMER_H + +#include "hw/sysbus.h" + +#define TYPE_IBEX_TIMER "ibex-timer" +OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) + +struct IbexTimerState { +/* <private> */ +SysBusDevice parent_obj; + +/* <public> */ +MemoryRegion mmio; + +uint32_t timer_ctrl; +uint32_t timer_cfg0; +uint32_t timer_compare_lower0; +uint32_t timer_compare_upper0; +uint32_t timer_intr_enable; +uint32_t timer_intr_state; +uint32_t timer_intr_test; + +uint32_t timebase_freq; + +qemu_irq irq; +}; +#endif /* HW_IBEX_TIMER_H */ hw/timer/ibex_timer.c new file +66
-0@@ -0,0 +1,305 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* For details check the documentation here: +* https://docs.opentitan.org/hw/ip/rv_timer/doc/ +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/timer.h" +#include "hw/timer/ibex_timer.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "target/riscv/cpu.h" +#include "migration/vmstate.h" + +REG32(CTRL, 0x00) + FIELD(CTRL, ACTIVE, 0, 1) +REG32(CFG0, 0x100) + FIELD(CFG0, PRESCALE, 0, 12) + FIELD(CFG0, STEP, 16, 8) +REG32(LOWER0, 0x104) +REG32(UPPER0, 0x108) +REG32(COMPARE_LOWER0, 0x10C) +REG32(COMPARE_UPPER0, 0x110) +REG32(INTR_ENABLE, 0x114) + FIELD(INTR_ENABLE, IE_0, 0, 1) +REG32(INTR_STATE, 0x118) + FIELD(INTR_STATE, IS_0, 0, 1) +REG32(INTR_TEST, 0x11C) + FIELD(INTR_TEST, T_0, 0, 1) + +static uint64_t cpu_riscv_read_rtc (uint32_t timebase_freq) +{ +return muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ), + timebase_freq,NANOSECONDS_PER_SECOND ); +} + +static void ibex_timer_update_irqs (IbexTimerState *s) +{ +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); +uint64_t value = s->timer_compare_lower0 | + ((uint64_t )s->timer_compare_upper0 <<32 ); +uint64_t next, diff; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq);
Quoted 8 lines
hw/timer/ibex_timer.c line 71
Quoted 5 lines
hw/timer/ibex_timer.c new file +5
-0+ +if (!(s->timer_ctrl &R_CTRL_ACTIVE_MASK )) { +/* Timer isn't active */ +return ; + }I am not sure if compiler can optimize such, but this if block can be put at the beginning of this function.
QEMU's style guide prefers declarations at the start of blocks, so I think we should leave this as is.
https://github.com/qemu/qemu/blob/master/docs/devel/style.rst#declarations
Quoted 7 lines
hw/timer/ibex_timer.c line 74
Quoted 4 lines
hw/timer/ibex_timer.c new file +3
-0+ +/* Update the CPUs mtimecmp */ + cpu->env.timecmp = value;The existing env.timecmp seems to be only valid for CLINT. Should we move it out of env?
This is the CLINT equivalent for OpenTitan, so in this case it's the correct use.
In saying that as a future improvement it's probably good to move this stuff out of env if we can.
Quoted 21 lines
Quoted 21 lines
hw/timer/ibex_timer.c new file +20
-0+ +if (cpu->env.timecmp <= now) { +/* +* If the mtimecmp was in the past raise the interrupt now. +*/ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +return ; + } + +/* Setup a timer to trigger the interrupt in the future */ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (0 )); +qemu_set_irq (s->irq, false); + + diff = cpu->env.timecmp - now; + next =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + + muldiv64(diff,
Quoted 8 lines
hw/timer/ibex_timer.c line 100
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+NANOSECONDS_PER_SECOND , + s->timebase_freq); + +if (next <qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL )) { +/* We overflowed the timer, just set it as large as we can */ +timer_mod (cpu->env.timer,0x0FFFFFFFFFFFFFFF );Should it be
0x7FFFFFFFFFFFFFFF?
Yeah, you are right.
Quoted 27 lines
Quoted 27 lines
hw/timer/ibex_timer.c new file +26
-0+ }else { +timer_mod (cpu->env.timer, next); + } +} + +static void ibex_timer_cb (void *opaque) +{ +IbexTimerState *s = opaque; +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); + +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +} + +static void ibex_timer_reset (DeviceState *dev) +{ +IbexTimerState *s =IBEX_TIMER (dev); + +CPUState *cpu =qemu_get_cpu (0 ); +CPURISCVState *env = cpu->env_ptr; + env->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + &ibex_timer_cb, s);
Quoted 8 lines
hw/timer/ibex_timer.c line 132
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+ env->timecmp =0 ; + + s->timer_ctrl =0x00000000 ; + s->timer_cfg0 =0x00000000 ; + s->timer_compare_lower0 =0x0000003c ; + s->timer_compare_upper0 =0x00000000 ;The reset values seem not to conform with the spec?
You are right! Fixed
Quoted 76 lines
Quoted 76 lines
hw/timer/ibex_timer.c new file +75
-0+ s->timer_intr_enable =0x00000000 ; + s->timer_intr_state =0x00000000 ; + s->timer_intr_test =0x00000000 ; + +ibex_timer_update_irqs (s); +} + +static uint64_t ibex_timer_read (void *opaque,hwaddr addr, +unsigned int size) +{ +IbexTimerState *s = opaque; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq); +uint64_t retvalue =0 ; + +switch (addr >>2 ) { +case R_CTRL : + retvalue = s->timer_ctrl; +break ; +case R_CFG0 : + retvalue = s->timer_cfg0; +break ; +case R_LOWER0 : + retvalue = now; +break ; +case R_UPPER0 : + retvalue = now >>32 ; +break ; +case R_COMPARE_LOWER0 : + retvalue = s->timer_compare_lower0; +break ; +case R_COMPARE_UPPER0 : + retvalue = s->timer_compare_upper0; +break ; +case R_INTR_ENABLE : + retvalue = s->timer_intr_enable; +break ; +case R_INTR_STATE : + retvalue = s->timer_intr_state; +break ; +case R_INTR_TEST : + retvalue = s->timer_intr_test; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bad offset 0x%" HWADDR_PRIx"\n" , __func__, addr); +return 0 ; + } + +return retvalue; +} + +static void ibex_timer_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +IbexTimerState *s = opaque; +uint32_t val = val64; + +switch (addr >>2 ) { +case R_CTRL : + s->timer_ctrl = val; +break ; +case R_CFG0 : +qemu_log_mask (LOG_UNIMP ,"Changing prescale or step not supported" ); + s->timer_cfg0 = val; +break ; +case R_LOWER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_UPPER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_COMPARE_LOWER0 : + s->timer_compare_lower0 = val; +ibex_timer_update_irqs (s); +break ;
Quoted 8 lines
hw/timer/ibex_timer.c line 213
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+case R_COMPARE_UPPER0 : + s->timer_compare_upper0 = val; +ibex_timer_update_irqs (s); +break ; +case R_INTR_ENABLE : + s->timer_intr_enable = val;Does this register connect to MIE?
No, it's a little confusing.
The timer is connected to MIE AND it also has its own interrupt. This controls it's custom interrupt.
Alistair
Quoted 126 lines
Quoted 116 lines
hw/timer/ibex_timer.c new file +92
-0+break ; +case R_INTR_STATE : +/* Write 1 to clear */ + s->timer_intr_state &= ~val; +break ; +case R_INTR_TEST : + s->timer_intr_test = val; +if (s->timer_intr_enable & + s->timer_intr_test & +R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bad offset 0x%" HWADDR_PRIx"\n" , __func__, addr); + } +} + +static const MemoryRegionOps ibex_timer_ops = { + .read = ibex_timer_read, + .write = ibex_timer_write, + .endianness =DEVICE_NATIVE_ENDIAN , + .impl.min_access_size =4 , + .impl.max_access_size =4 , +}; + +static int ibex_timer_post_load (void *opaque,int version_id) +{ +IbexTimerState *s = opaque; + +ibex_timer_update_irqs (s); +return 0 ; +} + +static const VMStateDescription vmstate_ibex_timer = { + .name =TYPE_IBEX_TIMER , + .version_id =1 , + .minimum_version_id =1 , + .post_load = ibex_timer_post_load, + .fields = (VMStateField []) { +VMSTATE_UINT32 (timer_ctrl, IbexTimerState), +VMSTATE_UINT32 (timer_cfg0, IbexTimerState), +VMSTATE_UINT32 (timer_compare_lower0, IbexTimerState), +VMSTATE_UINT32 (timer_compare_upper0, IbexTimerState), +VMSTATE_UINT32 (timer_intr_enable, IbexTimerState), +VMSTATE_UINT32 (timer_intr_state, IbexTimerState), +VMSTATE_UINT32 (timer_intr_test, IbexTimerState), +VMSTATE_END_OF_LIST () + } +}; + +static Property ibex_timer_properties[] = { +DEFINE_PROP_UINT32 ("timebase-freq" , IbexTimerState, timebase_freq,10000 ), +DEFINE_PROP_END_OF_LIST (), +}; + +static void ibex_timer_init (Object *obj) +{ +IbexTimerState *s =IBEX_TIMER (obj); + +sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irq); + +memory_region_init_io (&s->mmio, obj, &ibex_timer_ops, s, +TYPE_IBEX_TIMER ,0x400 ); +sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->mmio); +} + +static void ibex_timer_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = ibex_timer_reset; + dc->vmsd = &vmstate_ibex_timer; +device_class_set_props (dc, ibex_timer_properties); +} + +static const TypeInfo ibex_timer_info = { + .name =TYPE_IBEX_TIMER , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (IbexTimerState), + .instance_init = ibex_timer_init, + .class_init = ibex_timer_class_init, +}; + +static void ibex_timer_register_types (void ) +{ +type_register_static (&ibex_timer_info); +} + +type_init (ibex_timer_register_types)MAINTAINERS +2
-4@@ -1355,11 +1355,9 @@ M: Alistair Francis <[email protected]> L: [email protected] S: Supported F: hw/riscv/opentitan.c -F: hw/char/ibex_uart.c -F: hw/intc/ibex_plic.c +F: hw/*/ibex_*.c F: include/hw/riscv/opentitan.h -F: include/hw/char/ibex_uart.h -F: include/hw/intc/ibex_plic.h +F: include/hw/*/ibex_*.h Microchip PolarFire SoC Icicle Kit M: Bin Meng <[email protected]>hw/timer/meson.build +0
-0hw/timer/meson.build softmmu_ss.add(when: 'CONFIG_SSE_COUNTER', if_true: files('sse-counter.c'))
Quoted 7 lines
hw/timer/meson.build +1
-1@@ -33,5 +33,6 @@ softmmu_ss.add(when: 'CONFIG_SSE_COUNTER', if_true: files('sse-counter.c')) softmmu_ss.add(when: 'CONFIG_SSE_TIMER', if_true: files('sse-timer.c')) softmmu_ss.add(when: 'CONFIG_STM32F2XX_TIMER', if_true: files('stm32f2xx_timer.c')) softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_timer.c')) +specific_ss.add(when: 'CONFIG_IBEX', if_true: files('ibex_timer.c')) specific_ss.add(when: 'CONFIG_AVR_TIMER16', if_true: files('avr_timer16.c')) --Regards,
Bin
Re: [PATCH v1 3/3] hw/riscv: OpenTitan: Connect the mtime and mtimecmp timer
In reply to Bin MengQuoted 6 lines · Bin Meng
Quoted 1 line · Alistair Francis
Please write some commit message here
Done.
Quoted 39 lines
Quoted 39 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/riscv/opentitan.h | 5 ++++- hw/riscv/opentitan.c | 14 +++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-)include/hw/riscv/opentitan.h +3
-1@@ -22,6 +22,7 @@#include "hw/riscv/riscv_hart.h" #include "hw/intc/ibex_plic.h" #include "hw/char/ibex_uart.h" +#include "hw/timer/ibex_timer.h" #include "qom/object.h" #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc"@@ -35,6 +36,7 @@ struct LowRISCIbexSoCState {RISCVHartArrayState cpus;IbexPlicState plic;IbexUartState uart; +IbexTimerState timer;MemoryRegion flash_mem;MemoryRegion rom;@@ -57,7 +59,7 @@ enum {IBEX_DEV_SPI ,IBEX_DEV_I2C ,IBEX_DEV_PATTGEN , -IBEX_DEV_RV_TIMER , +IBEX_DEV_TIMER ,IBEX_DEV_SENSOR_CTRL ,IBEX_DEV_OTP_CTRL , IBEX_DEV_PWRMGR,@@ -82,6 +84,7 @@ enum { };
Quoted 5 lines
include/hw/riscv/opentitan.h enum { · line 87
Quoted 2 lines
include/hw/riscv/opentitan.h +1
-0enum { +IBEX_TIMER_TIMEREXPIRED0_0 =125 ,So this timer is connected to PLIC, instead of a dedicated exception code in the *cause CSR?
It is connected to both. It triggers the bit in MIE and can also trigger an interrupt via the PLIC.
Alistair
Quoted 53 lines
Quoted 42 lines
include/hw/riscv/opentitan.h +0
-0IBEX_UART0_RX_PARITY_ERR_IRQ =8 ,IBEX_UART0_RX_TIMEOUT_IRQ =7 , IBEX_UART0_RX_BREAK_ERR_IRQ = 6,hw/riscv/opentitan.c +11
-1@@ -36,7 +36,7 @@ static const MemMapEntry ibex_memmap[] = { [IBEX_DEV_SPI] = { 0x40050000, 0x1000 }, [IBEX_DEV_I2C] = { 0x40080000, 0x1000 }, [IBEX_DEV_PATTGEN] = { 0x400e0000, 0x1000 }, - [IBEX_DEV_RV_TIMER] = { 0x40100000, 0x1000 }, + [IBEX_DEV_TIMER] = { 0x40100000, 0x1000 }, [IBEX_DEV_SENSOR_CTRL] = { 0x40110000, 0x1000 }, [IBEX_DEV_OTP_CTRL] = { 0x40130000, 0x4000 }, [IBEX_DEV_PWRMGR] = { 0x40400000, 0x1000 },@@ -106,6 +106,8 @@ static void lowrisc_ibex_soc_init(Object *obj)object_initialize_child (obj,"plic" , &s->plic,TYPE_IBEX_PLIC );object_initialize_child (obj,"uart" , &s->uart,TYPE_IBEX_UART ); + +object_initialize_child (obj,"timer" , &s->timer,TYPE_IBEX_TIMER ); }static void lowrisc_ibex_soc_realize (DeviceState *dev_soc,Error **errp)@@ -159,6 +161,14 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp)3 ,qdev_get_gpio_in (DEVICE (&s->plic), IBEX_UART0_RX_OVERFLOW_IRQ)); +if (!sysbus_realize (SYS_BUS_DEVICE (&s->timer), errp)) { +return ; + } +sysbus_mmio_map (SYS_BUS_DEVICE (&s->timer),0 , memmap[IBEX_DEV_TIMER ].base); +sysbus_connect_irq (SYS_BUS_DEVICE (&s->timer), +0 ,qdev_get_gpio_in (DEVICE (&s->plic), +IBEX_TIMER_TIMEREXPIRED0_0 )); +create_unimplemented_device ("riscv.lowrisc.ibex.gpio" , memmap[IBEX_DEV_GPIO ].base, memmap[IBEX_DEV_GPIO ].size); create_unimplemented_device("riscv.lowrisc.ibex.spi",hw/riscv/opentitan.c static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) · line 182
Quoted 8 lines
hw/riscv/opentitan.c +0
-2@@ -167,8 +177,6 @@ static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp) memmap[IBEX_DEV_I2C].base, memmap[IBEX_DEV_I2C].size);create_unimplemented_device ("riscv.lowrisc.ibex.pattgen" , memmap[IBEX_DEV_PATTGEN ].base, memmap[IBEX_DEV_PATTGEN ].size); -create_unimplemented_device ("riscv.lowrisc.ibex.rv_timer" , - memmap[IBEX_DEV_RV_TIMER ].base, memmap[IBEX_DEV_RV_TIMER ].size);create_unimplemented_device ("riscv.lowrisc.ibex.sensor_ctrl" , memmap[IBEX_DEV_SENSOR_CTRL ].base, memmap[IBEX_DEV_SENSOR_CTRL ].size); create_unimplemented_device("riscv.lowrisc.ibex.otp_ctrl",Regards,
Bin
Re: [PATCH v1 2/3] hw/timer: Initial commit of Ibex Timer
In reply to Alistair FrancisQuoted 336 lines · Alistair Francis
Quoted 6 lines · Bin Meng
On Mon, May 31, 2021 at 12:33 PM Alistair Francis
<[email protected]> wrote:Please write some commit message, for example, what is supported in this initial version, and what is not.
I'll add something.
Quoted 142 lines
Quoted 142 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/timer/ibex_timer.h | 52 ++++++ hw/timer/ibex_timer.c | 305 ++++++++++++++++++++++++++++++++++ MAINTAINERS | 6 +- hw/timer/meson.build | 1 + 4 files changed, 360 insertions(+), 4 deletions(-) create mode 100644 include/hw/timer/ibex_timer.h create mode 100644 hw/timer/ibex_timer.cinclude/hw/timer/ibex_timer.h new file +52
-0@@ -0,0 +1,52 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_IBEX_TIMER_H +#define HW_IBEX_TIMER_H + +#include "hw/sysbus.h" + +#define TYPE_IBEX_TIMER "ibex-timer" +OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) + +struct IbexTimerState { +/* <private> */ +SysBusDevice parent_obj; + +/* <public> */ +MemoryRegion mmio; + +uint32_t timer_ctrl; +uint32_t timer_cfg0; +uint32_t timer_compare_lower0; +uint32_t timer_compare_upper0; +uint32_t timer_intr_enable; +uint32_t timer_intr_state; +uint32_t timer_intr_test; + +uint32_t timebase_freq; + +qemu_irq irq; +}; +#endif /* HW_IBEX_TIMER_H */ hw/timer/ibex_timer.c new file +66
-0@@ -0,0 +1,305 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* For details check the documentation here: +* https://docs.opentitan.org/hw/ip/rv_timer/doc/ +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/timer.h" +#include "hw/timer/ibex_timer.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "target/riscv/cpu.h" +#include "migration/vmstate.h" + +REG32(CTRL, 0x00) + FIELD(CTRL, ACTIVE, 0, 1) +REG32(CFG0, 0x100) + FIELD(CFG0, PRESCALE, 0, 12) + FIELD(CFG0, STEP, 16, 8) +REG32(LOWER0, 0x104) +REG32(UPPER0, 0x108) +REG32(COMPARE_LOWER0, 0x10C) +REG32(COMPARE_UPPER0, 0x110) +REG32(INTR_ENABLE, 0x114) + FIELD(INTR_ENABLE, IE_0, 0, 1) +REG32(INTR_STATE, 0x118) + FIELD(INTR_STATE, IS_0, 0, 1) +REG32(INTR_TEST, 0x11C) + FIELD(INTR_TEST, T_0, 0, 1) + +static uint64_t cpu_riscv_read_rtc (uint32_t timebase_freq) +{ +return muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ), + timebase_freq,NANOSECONDS_PER_SECOND ); +} + +static void ibex_timer_update_irqs (IbexTimerState *s) +{ +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); +uint64_t value = s->timer_compare_lower0 | + ((uint64_t )s->timer_compare_upper0 <<32 ); +uint64_t next, diff; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq);Quoted 8 lines
hw/timer/ibex_timer.c line 71
Quoted 5 lines
hw/timer/ibex_timer.c new file +5
-0+ +if (!(s->timer_ctrl &R_CTRL_ACTIVE_MASK )) { +/* Timer isn't active */ +return ; + }I am not sure if compiler can optimize such, but this if block can be put at the beginning of this function.
QEMU's style guide prefers declarations at the start of blocks, so I think we should leave this as is.
https://github.com/qemu/qemu/blob/master/docs/devel/style.rst#declarations
Quoted 7 lines
hw/timer/ibex_timer.c line 74
Quoted 4 lines
hw/timer/ibex_timer.c new file +3
-0+ +/* Update the CPUs mtimecmp */ + cpu->env.timecmp = value;The existing env.timecmp seems to be only valid for CLINT. Should we move it out of env?
This is the CLINT equivalent for OpenTitan, so in this case it's the correct use.
In saying that as a future improvement it's probably good to move this stuff out of env if we can.
Quoted 21 lines
Quoted 21 lines
hw/timer/ibex_timer.c new file +20
-0+ +if (cpu->env.timecmp <= now) { +/* +* If the mtimecmp was in the past raise the interrupt now. +*/ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +return ; + } + +/* Setup a timer to trigger the interrupt in the future */ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (0 )); +qemu_set_irq (s->irq, false); + + diff = cpu->env.timecmp - now; + next =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + + muldiv64(diff,Quoted 8 lines
hw/timer/ibex_timer.c line 100
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+NANOSECONDS_PER_SECOND , + s->timebase_freq); + +if (next <qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL )) { +/* We overflowed the timer, just set it as large as we can */ +timer_mod (cpu->env.timer,0x0FFFFFFFFFFFFFFF );Should it be
0x7FFFFFFFFFFFFFFF?Yeah, you are right.
Quoted 27 lines
Quoted 27 lines
hw/timer/ibex_timer.c new file +26
-0+ }else { +timer_mod (cpu->env.timer, next); + } +} + +static void ibex_timer_cb (void *opaque) +{ +IbexTimerState *s = opaque; +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); + +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +} + +static void ibex_timer_reset (DeviceState *dev) +{ +IbexTimerState *s =IBEX_TIMER (dev); + +CPUState *cpu =qemu_get_cpu (0 ); +CPURISCVState *env = cpu->env_ptr; + env->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + &ibex_timer_cb, s);Quoted 8 lines
hw/timer/ibex_timer.c line 132
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+ env->timecmp =0 ; + + s->timer_ctrl =0x00000000 ; + s->timer_cfg0 =0x00000000 ; + s->timer_compare_lower0 =0x0000003c ; + s->timer_compare_upper0 =0x00000000 ;The reset values seem not to conform with the spec?
You are right! Fixed
Quoted 76 lines
Quoted 76 lines
hw/timer/ibex_timer.c new file +75
-0+ s->timer_intr_enable =0x00000000 ; + s->timer_intr_state =0x00000000 ; + s->timer_intr_test =0x00000000 ; + +ibex_timer_update_irqs (s); +} + +static uint64_t ibex_timer_read (void *opaque,hwaddr addr, +unsigned int size) +{ +IbexTimerState *s = opaque; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq); +uint64_t retvalue =0 ; + +switch (addr >>2 ) { +case R_CTRL : + retvalue = s->timer_ctrl; +break ; +case R_CFG0 : + retvalue = s->timer_cfg0; +break ; +case R_LOWER0 : + retvalue = now; +break ; +case R_UPPER0 : + retvalue = now >>32 ; +break ; +case R_COMPARE_LOWER0 : + retvalue = s->timer_compare_lower0; +break ; +case R_COMPARE_UPPER0 : + retvalue = s->timer_compare_upper0; +break ; +case R_INTR_ENABLE : + retvalue = s->timer_intr_enable; +break ; +case R_INTR_STATE : + retvalue = s->timer_intr_state; +break ; +case R_INTR_TEST : + retvalue = s->timer_intr_test; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bad offset 0x%" HWADDR_PRIx"\n" , __func__, addr); +return 0 ; + } + +return retvalue; +} + +static void ibex_timer_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +IbexTimerState *s = opaque; +uint32_t val = val64; + +switch (addr >>2 ) { +case R_CTRL : + s->timer_ctrl = val; +break ; +case R_CFG0 : +qemu_log_mask (LOG_UNIMP ,"Changing prescale or step not supported" ); + s->timer_cfg0 = val; +break ; +case R_LOWER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_UPPER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_COMPARE_LOWER0 : + s->timer_compare_lower0 = val; +ibex_timer_update_irqs (s); +break ;Quoted 8 lines
hw/timer/ibex_timer.c line 213
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+case R_COMPARE_UPPER0 : + s->timer_compare_upper0 = val; +ibex_timer_update_irqs (s); +break ; +case R_INTR_ENABLE : + s->timer_intr_enable = val;Does this register connect to MIE?
Quoted 5 lines
No, it's a little confusing.
The timer is connected to MIE AND it also has its own interrupt. This controls it's custom interrupt.
I don't see codes to connect this to MIE, so in this version we only support connecting interrupt to PLIC?
Regards,
Bin
Re: [PATCH v1 2/3] hw/timer: Initial commit of Ibex Timer
Quoted 338 lines · Bin Meng
Quoted 336 lines · Alistair Francis
Quoted 6 lines · Bin Meng
On Mon, May 31, 2021 at 12:33 PM Alistair Francis
<[email protected]> wrote:Please write some commit message, for example, what is supported in this initial version, and what is not.
I'll add something.
Quoted 142 lines
Quoted 142 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/timer/ibex_timer.h | 52 ++++++ hw/timer/ibex_timer.c | 305 ++++++++++++++++++++++++++++++++++ MAINTAINERS | 6 +- hw/timer/meson.build | 1 + 4 files changed, 360 insertions(+), 4 deletions(-) create mode 100644 include/hw/timer/ibex_timer.h create mode 100644 hw/timer/ibex_timer.cinclude/hw/timer/ibex_timer.h new file +52
-0@@ -0,0 +1,52 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_IBEX_TIMER_H +#define HW_IBEX_TIMER_H + +#include "hw/sysbus.h" + +#define TYPE_IBEX_TIMER "ibex-timer" +OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) + +struct IbexTimerState { +/* <private> */ +SysBusDevice parent_obj; + +/* <public> */ +MemoryRegion mmio; + +uint32_t timer_ctrl; +uint32_t timer_cfg0; +uint32_t timer_compare_lower0; +uint32_t timer_compare_upper0; +uint32_t timer_intr_enable; +uint32_t timer_intr_state; +uint32_t timer_intr_test; + +uint32_t timebase_freq; + +qemu_irq irq; +}; +#endif /* HW_IBEX_TIMER_H */ hw/timer/ibex_timer.c new file +66
-0@@ -0,0 +1,305 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* For details check the documentation here: +* https://docs.opentitan.org/hw/ip/rv_timer/doc/ +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/timer.h" +#include "hw/timer/ibex_timer.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "target/riscv/cpu.h" +#include "migration/vmstate.h" + +REG32(CTRL, 0x00) + FIELD(CTRL, ACTIVE, 0, 1) +REG32(CFG0, 0x100) + FIELD(CFG0, PRESCALE, 0, 12) + FIELD(CFG0, STEP, 16, 8) +REG32(LOWER0, 0x104) +REG32(UPPER0, 0x108) +REG32(COMPARE_LOWER0, 0x10C) +REG32(COMPARE_UPPER0, 0x110) +REG32(INTR_ENABLE, 0x114) + FIELD(INTR_ENABLE, IE_0, 0, 1) +REG32(INTR_STATE, 0x118) + FIELD(INTR_STATE, IS_0, 0, 1) +REG32(INTR_TEST, 0x11C) + FIELD(INTR_TEST, T_0, 0, 1) + +static uint64_t cpu_riscv_read_rtc (uint32_t timebase_freq) +{ +return muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ), + timebase_freq,NANOSECONDS_PER_SECOND ); +} + +static void ibex_timer_update_irqs (IbexTimerState *s) +{ +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); +uint64_t value = s->timer_compare_lower0 | + ((uint64_t )s->timer_compare_upper0 <<32 ); +uint64_t next, diff; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq);Quoted 8 lines
hw/timer/ibex_timer.c line 71
Quoted 5 lines
hw/timer/ibex_timer.c new file +5
-0+ +if (!(s->timer_ctrl &R_CTRL_ACTIVE_MASK )) { +/* Timer isn't active */ +return ; + }I am not sure if compiler can optimize such, but this if block can be put at the beginning of this function.
QEMU's style guide prefers declarations at the start of blocks, so I think we should leave this as is.
https://github.com/qemu/qemu/blob/master/docs/devel/style.rst#declarations
Quoted 7 lines
hw/timer/ibex_timer.c line 74
Quoted 4 lines
hw/timer/ibex_timer.c new file +3
-0+ +/* Update the CPUs mtimecmp */ + cpu->env.timecmp = value;The existing env.timecmp seems to be only valid for CLINT. Should we move it out of env?
This is the CLINT equivalent for OpenTitan, so in this case it's the correct use.
In saying that as a future improvement it's probably good to move this stuff out of env if we can.
Quoted 21 lines
Quoted 21 lines
hw/timer/ibex_timer.c new file +20
-0+ +if (cpu->env.timecmp <= now) { +/* +* If the mtimecmp was in the past raise the interrupt now. +*/ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +return ; + } + +/* Setup a timer to trigger the interrupt in the future */ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (0 )); +qemu_set_irq (s->irq, false); + + diff = cpu->env.timecmp - now; + next =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + + muldiv64(diff,Quoted 8 lines
hw/timer/ibex_timer.c line 100
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+NANOSECONDS_PER_SECOND , + s->timebase_freq); + +if (next <qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL )) { +/* We overflowed the timer, just set it as large as we can */ +timer_mod (cpu->env.timer,0x0FFFFFFFFFFFFFFF );Should it be
0x7FFFFFFFFFFFFFFF?Yeah, you are right.
Quoted 27 lines
Quoted 27 lines
hw/timer/ibex_timer.c new file +26
-0+ }else { +timer_mod (cpu->env.timer, next); + } +} + +static void ibex_timer_cb (void *opaque) +{ +IbexTimerState *s = opaque; +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); + +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +} + +static void ibex_timer_reset (DeviceState *dev) +{ +IbexTimerState *s =IBEX_TIMER (dev); + +CPUState *cpu =qemu_get_cpu (0 ); +CPURISCVState *env = cpu->env_ptr; + env->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + &ibex_timer_cb, s);Quoted 8 lines
hw/timer/ibex_timer.c line 132
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+ env->timecmp =0 ; + + s->timer_ctrl =0x00000000 ; + s->timer_cfg0 =0x00000000 ; + s->timer_compare_lower0 =0x0000003c ; + s->timer_compare_upper0 =0x00000000 ;The reset values seem not to conform with the spec?
You are right! Fixed
Quoted 84 lines
Quoted 72 lines
hw/timer/ibex_timer.c new file +71
-0+ s->timer_intr_enable =0x00000000 ; + s->timer_intr_state =0x00000000 ; + s->timer_intr_test =0x00000000 ; + +ibex_timer_update_irqs (s); +} + +static uint64_t ibex_timer_read (void *opaque,hwaddr addr, +unsigned int size) +{ +IbexTimerState *s = opaque; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq); +uint64_t retvalue =0 ; + +switch (addr >>2 ) { +case R_CTRL : + retvalue = s->timer_ctrl; +break ; +case R_CFG0 : + retvalue = s->timer_cfg0; +break ; +case R_LOWER0 : + retvalue = now; +break ; +case R_UPPER0 : + retvalue = now >>32 ; +break ; +case R_COMPARE_LOWER0 : + retvalue = s->timer_compare_lower0; +break ; +case R_COMPARE_UPPER0 : + retvalue = s->timer_compare_upper0; +break ; +case R_INTR_ENABLE : + retvalue = s->timer_intr_enable; +break ; +case R_INTR_STATE : + retvalue = s->timer_intr_state; +break ; +case R_INTR_TEST : + retvalue = s->timer_intr_test; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bad offset 0x%" HWADDR_PRIx"\n" , __func__, addr); +return 0 ; + } + +return retvalue; +} + +static void ibex_timer_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +IbexTimerState *s = opaque; +uint32_t val = val64; + +switch (addr >>2 ) { +case R_CTRL : + s->timer_ctrl = val; +break ; +case R_CFG0 : +qemu_log_mask (LOG_UNIMP ,"Changing prescale or step not supported" ); + s->timer_cfg0 = val; +break ; +case R_LOWER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_UPPER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ;hw/timer/ibex_timer.c line 213
Quoted 10 lines
hw/timer/ibex_timer.c new file +10
-0+case R_COMPARE_LOWER0 : + s->timer_compare_lower0 = val; +ibex_timer_update_irqs (s); +break ; +case R_COMPARE_UPPER0 : + s->timer_compare_upper0 = val; +ibex_timer_update_irqs (s); +break ; +case R_INTR_ENABLE : + s->timer_intr_enable = val;Does this register connect to MIE?
Quoted 8 lines
Quoted 5 lines
No, it's a little confusing.
The timer is connected to MIE AND it also has its own interrupt. This controls it's custom interrupt.
I don't see codes to connect this to MIE, so in this version we only support connecting interrupt to PLIC?
We call riscv_cpu_update_mip() which updates the bits in MIP.
Alistair
Quoted 3 lines
Regards,
Bin
Re: [PATCH v1 2/3] hw/timer: Initial commit of Ibex Timer
Quoted 342 lines · Alistair Francis
Quoted 340 lines · Bin Meng
Quoted 338 lines · Alistair Francis
Quoted 6 lines · Bin Meng
On Mon, May 31, 2021 at 12:33 PM Alistair Francis
<[email protected]> wrote:Please write some commit message, for example, what is supported in this initial version, and what is not.
I'll add something.
Quoted 142 lines
Quoted 142 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/timer/ibex_timer.h | 52 ++++++ hw/timer/ibex_timer.c | 305 ++++++++++++++++++++++++++++++++++ MAINTAINERS | 6 +- hw/timer/meson.build | 1 + 4 files changed, 360 insertions(+), 4 deletions(-) create mode 100644 include/hw/timer/ibex_timer.h create mode 100644 hw/timer/ibex_timer.cinclude/hw/timer/ibex_timer.h new file +52
-0@@ -0,0 +1,52 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_IBEX_TIMER_H +#define HW_IBEX_TIMER_H + +#include "hw/sysbus.h" + +#define TYPE_IBEX_TIMER "ibex-timer" +OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) + +struct IbexTimerState { +/* <private> */ +SysBusDevice parent_obj; + +/* <public> */ +MemoryRegion mmio; + +uint32_t timer_ctrl; +uint32_t timer_cfg0; +uint32_t timer_compare_lower0; +uint32_t timer_compare_upper0; +uint32_t timer_intr_enable; +uint32_t timer_intr_state; +uint32_t timer_intr_test; + +uint32_t timebase_freq; + +qemu_irq irq; +}; +#endif /* HW_IBEX_TIMER_H */ hw/timer/ibex_timer.c new file +66
-0@@ -0,0 +1,305 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* For details check the documentation here: +* https://docs.opentitan.org/hw/ip/rv_timer/doc/ +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/timer.h" +#include "hw/timer/ibex_timer.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "target/riscv/cpu.h" +#include "migration/vmstate.h" + +REG32(CTRL, 0x00) + FIELD(CTRL, ACTIVE, 0, 1) +REG32(CFG0, 0x100) + FIELD(CFG0, PRESCALE, 0, 12) + FIELD(CFG0, STEP, 16, 8) +REG32(LOWER0, 0x104) +REG32(UPPER0, 0x108) +REG32(COMPARE_LOWER0, 0x10C) +REG32(COMPARE_UPPER0, 0x110) +REG32(INTR_ENABLE, 0x114) + FIELD(INTR_ENABLE, IE_0, 0, 1) +REG32(INTR_STATE, 0x118) + FIELD(INTR_STATE, IS_0, 0, 1) +REG32(INTR_TEST, 0x11C) + FIELD(INTR_TEST, T_0, 0, 1) + +static uint64_t cpu_riscv_read_rtc (uint32_t timebase_freq) +{ +return muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ), + timebase_freq,NANOSECONDS_PER_SECOND ); +} + +static void ibex_timer_update_irqs (IbexTimerState *s) +{ +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); +uint64_t value = s->timer_compare_lower0 | + ((uint64_t )s->timer_compare_upper0 <<32 ); +uint64_t next, diff; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq);Quoted 8 lines
hw/timer/ibex_timer.c line 71
Quoted 5 lines
hw/timer/ibex_timer.c new file +5
-0+ +if (!(s->timer_ctrl &R_CTRL_ACTIVE_MASK )) { +/* Timer isn't active */ +return ; + }I am not sure if compiler can optimize such, but this if block can be put at the beginning of this function.
QEMU's style guide prefers declarations at the start of blocks, so I think we should leave this as is.
https://github.com/qemu/qemu/blob/master/docs/devel/style.rst#declarations
Quoted 7 lines
hw/timer/ibex_timer.c line 74
Quoted 4 lines
hw/timer/ibex_timer.c new file +3
-0+ +/* Update the CPUs mtimecmp */ + cpu->env.timecmp = value;The existing env.timecmp seems to be only valid for CLINT. Should we move it out of env?
This is the CLINT equivalent for OpenTitan, so in this case it's the correct use.
In saying that as a future improvement it's probably good to move this stuff out of env if we can.
Quoted 21 lines
Quoted 21 lines
hw/timer/ibex_timer.c new file +20
-0+ +if (cpu->env.timecmp <= now) { +/* +* If the mtimecmp was in the past raise the interrupt now. +*/ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +return ; + } + +/* Setup a timer to trigger the interrupt in the future */ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (0 )); +qemu_set_irq (s->irq, false); + + diff = cpu->env.timecmp - now; + next =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + + muldiv64(diff,Quoted 8 lines
hw/timer/ibex_timer.c line 100
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+NANOSECONDS_PER_SECOND , + s->timebase_freq); + +if (next <qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL )) { +/* We overflowed the timer, just set it as large as we can */ +timer_mod (cpu->env.timer,0x0FFFFFFFFFFFFFFF );Should it be
0x7FFFFFFFFFFFFFFF?Yeah, you are right.
Quoted 27 lines
Quoted 27 lines
hw/timer/ibex_timer.c new file +26
-0+ }else { +timer_mod (cpu->env.timer, next); + } +} + +static void ibex_timer_cb (void *opaque) +{ +IbexTimerState *s = opaque; +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); + +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +} + +static void ibex_timer_reset (DeviceState *dev) +{ +IbexTimerState *s =IBEX_TIMER (dev); + +CPUState *cpu =qemu_get_cpu (0 ); +CPURISCVState *env = cpu->env_ptr; + env->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + &ibex_timer_cb, s);Quoted 8 lines
hw/timer/ibex_timer.c line 132
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+ env->timecmp =0 ; + + s->timer_ctrl =0x00000000 ; + s->timer_cfg0 =0x00000000 ; + s->timer_compare_lower0 =0x0000003c ; + s->timer_compare_upper0 =0x00000000 ;The reset values seem not to conform with the spec?
You are right! Fixed
Quoted 76 lines
Quoted 76 lines
hw/timer/ibex_timer.c new file +75
-0+ s->timer_intr_enable =0x00000000 ; + s->timer_intr_state =0x00000000 ; + s->timer_intr_test =0x00000000 ; + +ibex_timer_update_irqs (s); +} + +static uint64_t ibex_timer_read (void *opaque,hwaddr addr, +unsigned int size) +{ +IbexTimerState *s = opaque; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq); +uint64_t retvalue =0 ; + +switch (addr >>2 ) { +case R_CTRL : + retvalue = s->timer_ctrl; +break ; +case R_CFG0 : + retvalue = s->timer_cfg0; +break ; +case R_LOWER0 : + retvalue = now; +break ; +case R_UPPER0 : + retvalue = now >>32 ; +break ; +case R_COMPARE_LOWER0 : + retvalue = s->timer_compare_lower0; +break ; +case R_COMPARE_UPPER0 : + retvalue = s->timer_compare_upper0; +break ; +case R_INTR_ENABLE : + retvalue = s->timer_intr_enable; +break ; +case R_INTR_STATE : + retvalue = s->timer_intr_state; +break ; +case R_INTR_TEST : + retvalue = s->timer_intr_test; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bad offset 0x%" HWADDR_PRIx"\n" , __func__, addr); +return 0 ; + } + +return retvalue; +} + +static void ibex_timer_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +IbexTimerState *s = opaque; +uint32_t val = val64; + +switch (addr >>2 ) { +case R_CTRL : + s->timer_ctrl = val; +break ; +case R_CFG0 : +qemu_log_mask (LOG_UNIMP ,"Changing prescale or step not supported" ); + s->timer_cfg0 = val; +break ; +case R_LOWER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_UPPER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_COMPARE_LOWER0 : + s->timer_compare_lower0 = val; +ibex_timer_update_irqs (s); +break ;Quoted 8 lines
hw/timer/ibex_timer.c line 213
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+case R_COMPARE_UPPER0 : + s->timer_compare_upper0 = val; +ibex_timer_update_irqs (s); +break ; +case R_INTR_ENABLE : + s->timer_intr_enable = val;Does this register connect to MIE?
No, it's a little confusing.
Quoted 9 lines
Quoted 6 lines
Quoted 3 lines
The timer is connected to MIE AND it also has its own interrupt. This controls it's custom interrupt.
I don't see codes to connect this to MIE, so in this version we only support connecting interrupt to PLIC?
We call
riscv_cpu_update_mip()which updates the bits in MIP.
I think that's for MIP, not MIE?
Regards,
Bin
Re: [PATCH v1 2/3] hw/timer: Initial commit of Ibex Timer
Quoted 348 lines · Bin Meng
Quoted 346 lines · Alistair Francis
Quoted 344 lines · Bin Meng
Quoted 341 lines · Alistair Francis
Quoted 6 lines · Bin Meng
On Mon, May 31, 2021 at 12:33 PM Alistair Francis
<[email protected]> wrote:Please write some commit message, for example, what is supported in this initial version, and what is not.
I'll add something.
Quoted 142 lines
Quoted 142 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/timer/ibex_timer.h | 52 ++++++ hw/timer/ibex_timer.c | 305 ++++++++++++++++++++++++++++++++++ MAINTAINERS | 6 +- hw/timer/meson.build | 1 + 4 files changed, 360 insertions(+), 4 deletions(-) create mode 100644 include/hw/timer/ibex_timer.h create mode 100644 hw/timer/ibex_timer.cinclude/hw/timer/ibex_timer.h new file +52
-0@@ -0,0 +1,52 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_IBEX_TIMER_H +#define HW_IBEX_TIMER_H + +#include "hw/sysbus.h" + +#define TYPE_IBEX_TIMER "ibex-timer" +OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) + +struct IbexTimerState { +/* <private> */ +SysBusDevice parent_obj; + +/* <public> */ +MemoryRegion mmio; + +uint32_t timer_ctrl; +uint32_t timer_cfg0; +uint32_t timer_compare_lower0; +uint32_t timer_compare_upper0; +uint32_t timer_intr_enable; +uint32_t timer_intr_state; +uint32_t timer_intr_test; + +uint32_t timebase_freq; + +qemu_irq irq; +}; +#endif /* HW_IBEX_TIMER_H */ hw/timer/ibex_timer.c new file +66
-0@@ -0,0 +1,305 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* For details check the documentation here: +* https://docs.opentitan.org/hw/ip/rv_timer/doc/ +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/timer.h" +#include "hw/timer/ibex_timer.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "target/riscv/cpu.h" +#include "migration/vmstate.h" + +REG32(CTRL, 0x00) + FIELD(CTRL, ACTIVE, 0, 1) +REG32(CFG0, 0x100) + FIELD(CFG0, PRESCALE, 0, 12) + FIELD(CFG0, STEP, 16, 8) +REG32(LOWER0, 0x104) +REG32(UPPER0, 0x108) +REG32(COMPARE_LOWER0, 0x10C) +REG32(COMPARE_UPPER0, 0x110) +REG32(INTR_ENABLE, 0x114) + FIELD(INTR_ENABLE, IE_0, 0, 1) +REG32(INTR_STATE, 0x118) + FIELD(INTR_STATE, IS_0, 0, 1) +REG32(INTR_TEST, 0x11C) + FIELD(INTR_TEST, T_0, 0, 1) + +static uint64_t cpu_riscv_read_rtc (uint32_t timebase_freq) +{ +return muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ), + timebase_freq,NANOSECONDS_PER_SECOND ); +} + +static void ibex_timer_update_irqs (IbexTimerState *s) +{ +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); +uint64_t value = s->timer_compare_lower0 | + ((uint64_t )s->timer_compare_upper0 <<32 ); +uint64_t next, diff; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq);Quoted 8 lines
hw/timer/ibex_timer.c line 71
Quoted 5 lines
hw/timer/ibex_timer.c new file +5
-0+ +if (!(s->timer_ctrl &R_CTRL_ACTIVE_MASK )) { +/* Timer isn't active */ +return ; + }I am not sure if compiler can optimize such, but this if block can be put at the beginning of this function.
QEMU's style guide prefers declarations at the start of blocks, so I think we should leave this as is.
https://github.com/qemu/qemu/blob/master/docs/devel/style.rst#declarations
Quoted 7 lines
hw/timer/ibex_timer.c line 74
Quoted 4 lines
hw/timer/ibex_timer.c new file +3
-0+ +/* Update the CPUs mtimecmp */ + cpu->env.timecmp = value;The existing env.timecmp seems to be only valid for CLINT. Should we move it out of env?
This is the CLINT equivalent for OpenTitan, so in this case it's the correct use.
In saying that as a future improvement it's probably good to move this stuff out of env if we can.
Quoted 21 lines
Quoted 21 lines
hw/timer/ibex_timer.c new file +20
-0+ +if (cpu->env.timecmp <= now) { +/* +* If the mtimecmp was in the past raise the interrupt now. +*/ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +return ; + } + +/* Setup a timer to trigger the interrupt in the future */ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (0 )); +qemu_set_irq (s->irq, false); + + diff = cpu->env.timecmp - now; + next =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + + muldiv64(diff,Quoted 8 lines
hw/timer/ibex_timer.c line 100
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+NANOSECONDS_PER_SECOND , + s->timebase_freq); + +if (next <qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL )) { +/* We overflowed the timer, just set it as large as we can */ +timer_mod (cpu->env.timer,0x0FFFFFFFFFFFFFFF );Should it be
0x7FFFFFFFFFFFFFFF?Yeah, you are right.
Quoted 27 lines
Quoted 27 lines
hw/timer/ibex_timer.c new file +26
-0+ }else { +timer_mod (cpu->env.timer, next); + } +} + +static void ibex_timer_cb (void *opaque) +{ +IbexTimerState *s = opaque; +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); + +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +} + +static void ibex_timer_reset (DeviceState *dev) +{ +IbexTimerState *s =IBEX_TIMER (dev); + +CPUState *cpu =qemu_get_cpu (0 ); +CPURISCVState *env = cpu->env_ptr; + env->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + &ibex_timer_cb, s);Quoted 8 lines
hw/timer/ibex_timer.c line 132
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+ env->timecmp =0 ; + + s->timer_ctrl =0x00000000 ; + s->timer_cfg0 =0x00000000 ; + s->timer_compare_lower0 =0x0000003c ; + s->timer_compare_upper0 =0x00000000 ;The reset values seem not to conform with the spec?
You are right! Fixed
Quoted 76 lines
Quoted 76 lines
hw/timer/ibex_timer.c new file +75
-0+ s->timer_intr_enable =0x00000000 ; + s->timer_intr_state =0x00000000 ; + s->timer_intr_test =0x00000000 ; + +ibex_timer_update_irqs (s); +} + +static uint64_t ibex_timer_read (void *opaque,hwaddr addr, +unsigned int size) +{ +IbexTimerState *s = opaque; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq); +uint64_t retvalue =0 ; + +switch (addr >>2 ) { +case R_CTRL : + retvalue = s->timer_ctrl; +break ; +case R_CFG0 : + retvalue = s->timer_cfg0; +break ; +case R_LOWER0 : + retvalue = now; +break ; +case R_UPPER0 : + retvalue = now >>32 ; +break ; +case R_COMPARE_LOWER0 : + retvalue = s->timer_compare_lower0; +break ; +case R_COMPARE_UPPER0 : + retvalue = s->timer_compare_upper0; +break ; +case R_INTR_ENABLE : + retvalue = s->timer_intr_enable; +break ; +case R_INTR_STATE : + retvalue = s->timer_intr_state; +break ; +case R_INTR_TEST : + retvalue = s->timer_intr_test; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bad offset 0x%" HWADDR_PRIx"\n" , __func__, addr); +return 0 ; + } + +return retvalue; +} + +static void ibex_timer_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +IbexTimerState *s = opaque; +uint32_t val = val64; + +switch (addr >>2 ) { +case R_CTRL : + s->timer_ctrl = val; +break ; +case R_CFG0 : +qemu_log_mask (LOG_UNIMP ,"Changing prescale or step not supported" ); + s->timer_cfg0 = val; +break ; +case R_LOWER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_UPPER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_COMPARE_LOWER0 : + s->timer_compare_lower0 = val; +ibex_timer_update_irqs (s); +break ;Quoted 8 lines
hw/timer/ibex_timer.c line 213
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+case R_COMPARE_UPPER0 : + s->timer_compare_upper0 = val; +ibex_timer_update_irqs (s); +break ; +case R_INTR_ENABLE : + s->timer_intr_enable = val;Does this register connect to MIE?
No, it's a little confusing.
The timer is connected to MIE AND it also has its own interrupt. This controls it's custom interrupt.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
I don't see codes to connect this to MIE, so in this version we only support connecting interrupt to PLIC?
We call
riscv_cpu_update_mip()which updates the bits in MIP.I think that's for MIP, not MIE?
Yep. Sorry I misinterpreted what your first email meant.
R_INTR_ENABLE does not connect to MIE.
R_INTR_ENABLE is to enable or disable the PLIC interrupt line. The timer will also trigger MIP (MIE is then controlled via teh CSR access).
Alistair
Quoted 3 lines
Regards,
Bin
Re: [PATCH v1 2/3] hw/timer: Initial commit of Ibex Timer
Quoted 358 lines · Alistair Francis
Quoted 348 lines · Bin Meng
Quoted 346 lines · Alistair Francis
Quoted 344 lines · Bin Meng
Quoted 341 lines · Alistair Francis
Quoted 6 lines · Bin Meng
On Mon, May 31, 2021 at 12:33 PM Alistair Francis
<[email protected]> wrote:Please write some commit message, for example, what is supported in this initial version, and what is not.
I'll add something.
Quoted 142 lines
Quoted 142 lines
Signed-off-by Alistair Francis <[email protected]>--- include/hw/timer/ibex_timer.h | 52 ++++++ hw/timer/ibex_timer.c | 305 ++++++++++++++++++++++++++++++++++ MAINTAINERS | 6 +- hw/timer/meson.build | 1 + 4 files changed, 360 insertions(+), 4 deletions(-) create mode 100644 include/hw/timer/ibex_timer.h create mode 100644 hw/timer/ibex_timer.cinclude/hw/timer/ibex_timer.h new file +52
-0@@ -0,0 +1,52 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#ifndef HW_IBEX_TIMER_H +#define HW_IBEX_TIMER_H + +#include "hw/sysbus.h" + +#define TYPE_IBEX_TIMER "ibex-timer" +OBJECT_DECLARE_SIMPLE_TYPE(IbexTimerState, IBEX_TIMER) + +struct IbexTimerState { +/* <private> */ +SysBusDevice parent_obj; + +/* <public> */ +MemoryRegion mmio; + +uint32_t timer_ctrl; +uint32_t timer_cfg0; +uint32_t timer_compare_lower0; +uint32_t timer_compare_upper0; +uint32_t timer_intr_enable; +uint32_t timer_intr_state; +uint32_t timer_intr_test; + +uint32_t timebase_freq; + +qemu_irq irq; +}; +#endif /* HW_IBEX_TIMER_H */ hw/timer/ibex_timer.c new file +66
-0@@ -0,0 +1,305 @@ +/* +* QEMU lowRISC Ibex Timer device +* +* Copyright (c) 2021 Western Digital +* +* For details check the documentation here: +* https://docs.opentitan.org/hw/ip/rv_timer/doc/ +* +* Permission is hereby granted, free of charge, to any person obtaining a copy +* of this software and associated documentation files (the "Software"), to deal +* in the Software without restriction, including without limitation the rights +* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +* copies of the Software, and to permit persons to whom the Software is +* furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice shall be included in +* all copies or substantial portions of the Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +* THE SOFTWARE. +*/ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "qemu/timer.h" +#include "hw/timer/ibex_timer.h" +#include "hw/irq.h" +#include "hw/qdev-properties.h" +#include "target/riscv/cpu.h" +#include "migration/vmstate.h" + +REG32(CTRL, 0x00) + FIELD(CTRL, ACTIVE, 0, 1) +REG32(CFG0, 0x100) + FIELD(CFG0, PRESCALE, 0, 12) + FIELD(CFG0, STEP, 16, 8) +REG32(LOWER0, 0x104) +REG32(UPPER0, 0x108) +REG32(COMPARE_LOWER0, 0x10C) +REG32(COMPARE_UPPER0, 0x110) +REG32(INTR_ENABLE, 0x114) + FIELD(INTR_ENABLE, IE_0, 0, 1) +REG32(INTR_STATE, 0x118) + FIELD(INTR_STATE, IS_0, 0, 1) +REG32(INTR_TEST, 0x11C) + FIELD(INTR_TEST, T_0, 0, 1) + +static uint64_t cpu_riscv_read_rtc (uint32_t timebase_freq) +{ +return muldiv64 (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ), + timebase_freq,NANOSECONDS_PER_SECOND ); +} + +static void ibex_timer_update_irqs (IbexTimerState *s) +{ +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); +uint64_t value = s->timer_compare_lower0 | + ((uint64_t )s->timer_compare_upper0 <<32 ); +uint64_t next, diff; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq);Quoted 8 lines
hw/timer/ibex_timer.c line 71
Quoted 5 lines
hw/timer/ibex_timer.c new file +5
-0+ +if (!(s->timer_ctrl &R_CTRL_ACTIVE_MASK )) { +/* Timer isn't active */ +return ; + }I am not sure if compiler can optimize such, but this if block can be put at the beginning of this function.
QEMU's style guide prefers declarations at the start of blocks, so I think we should leave this as is.
https://github.com/qemu/qemu/blob/master/docs/devel/style.rst#declarations
Quoted 7 lines
hw/timer/ibex_timer.c line 74
Quoted 4 lines
hw/timer/ibex_timer.c new file +3
-0+ +/* Update the CPUs mtimecmp */ + cpu->env.timecmp = value;The existing env.timecmp seems to be only valid for CLINT. Should we move it out of env?
This is the CLINT equivalent for OpenTitan, so in this case it's the correct use.
In saying that as a future improvement it's probably good to move this stuff out of env if we can.
Quoted 21 lines
Quoted 21 lines
hw/timer/ibex_timer.c new file +20
-0+ +if (cpu->env.timecmp <= now) { +/* +* If the mtimecmp was in the past raise the interrupt now. +*/ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +return ; + } + +/* Setup a timer to trigger the interrupt in the future */ +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (0 )); +qemu_set_irq (s->irq, false); + + diff = cpu->env.timecmp - now; + next =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) + + muldiv64(diff,Quoted 8 lines
hw/timer/ibex_timer.c line 100
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+NANOSECONDS_PER_SECOND , + s->timebase_freq); + +if (next <qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL )) { +/* We overflowed the timer, just set it as large as we can */ +timer_mod (cpu->env.timer,0x0FFFFFFFFFFFFFFF );Should it be
0x7FFFFFFFFFFFFFFF?Yeah, you are right.
Quoted 27 lines
Quoted 27 lines
hw/timer/ibex_timer.c new file +26
-0+ }else { +timer_mod (cpu->env.timer, next); + } +} + +static void ibex_timer_cb (void *opaque) +{ +IbexTimerState *s = opaque; +CPUState *cs =qemu_get_cpu (0 ); +RISCVCPU *cpu =RISCV_CPU (cs); + +riscv_cpu_update_mip (cpu,MIP_MTIP ,BOOL_TO_MASK (1 )); +if (s->timer_intr_enable &R_INTR_ENABLE_IE_0_MASK ) { + s->timer_intr_state |=R_INTR_STATE_IS_0_MASK ; +qemu_set_irq (s->irq, true); + } +} + +static void ibex_timer_reset (DeviceState *dev) +{ +IbexTimerState *s =IBEX_TIMER (dev); + +CPUState *cpu =qemu_get_cpu (0 ); +CPURISCVState *env = cpu->env_ptr; + env->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , + &ibex_timer_cb, s);Quoted 8 lines
hw/timer/ibex_timer.c line 132
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+ env->timecmp =0 ; + + s->timer_ctrl =0x00000000 ; + s->timer_cfg0 =0x00000000 ; + s->timer_compare_lower0 =0x0000003c ; + s->timer_compare_upper0 =0x00000000 ;The reset values seem not to conform with the spec?
You are right! Fixed
Quoted 76 lines
Quoted 76 lines
hw/timer/ibex_timer.c new file +75
-0+ s->timer_intr_enable =0x00000000 ; + s->timer_intr_state =0x00000000 ; + s->timer_intr_test =0x00000000 ; + +ibex_timer_update_irqs (s); +} + +static uint64_t ibex_timer_read (void *opaque,hwaddr addr, +unsigned int size) +{ +IbexTimerState *s = opaque; +uint64_t now =cpu_riscv_read_rtc (s->timebase_freq); +uint64_t retvalue =0 ; + +switch (addr >>2 ) { +case R_CTRL : + retvalue = s->timer_ctrl; +break ; +case R_CFG0 : + retvalue = s->timer_cfg0; +break ; +case R_LOWER0 : + retvalue = now; +break ; +case R_UPPER0 : + retvalue = now >>32 ; +break ; +case R_COMPARE_LOWER0 : + retvalue = s->timer_compare_lower0; +break ; +case R_COMPARE_UPPER0 : + retvalue = s->timer_compare_upper0; +break ; +case R_INTR_ENABLE : + retvalue = s->timer_intr_enable; +break ; +case R_INTR_STATE : + retvalue = s->timer_intr_state; +break ; +case R_INTR_TEST : + retvalue = s->timer_intr_test; +break ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"%s: Bad offset 0x%" HWADDR_PRIx"\n" , __func__, addr); +return 0 ; + } + +return retvalue; +} + +static void ibex_timer_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +IbexTimerState *s = opaque; +uint32_t val = val64; + +switch (addr >>2 ) { +case R_CTRL : + s->timer_ctrl = val; +break ; +case R_CFG0 : +qemu_log_mask (LOG_UNIMP ,"Changing prescale or step not supported" ); + s->timer_cfg0 = val; +break ; +case R_LOWER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_UPPER0 : +qemu_log_mask (LOG_UNIMP ,"Changing timer value is not supported" ); +break ; +case R_COMPARE_LOWER0 : + s->timer_compare_lower0 = val; +ibex_timer_update_irqs (s); +break ;Quoted 8 lines
hw/timer/ibex_timer.c line 213
Quoted 6 lines
hw/timer/ibex_timer.c new file +6
-0+case R_COMPARE_UPPER0 : + s->timer_compare_upper0 = val; +ibex_timer_update_irqs (s); +break ; +case R_INTR_ENABLE : + s->timer_intr_enable = val;Does this register connect to MIE?
No, it's a little confusing.
The timer is connected to MIE AND it also has its own interrupt. This controls it's custom interrupt.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
I don't see codes to connect this to MIE, so in this version we only support connecting interrupt to PLIC?
We call
riscv_cpu_update_mip()which updates the bits in MIP.I think that's for MIP, not MIE?
Quoted 7 lines
Yep. Sorry I misinterpreted what your first email meant.
R_INTR_ENABLEdoes not connect to MIE.
R_INTR_ENABLEis to enable or disable the PLIC interrupt line. The timer will also trigger MIP (MIE is then controlled via teh CSR access).
Yeah, this is now clear :). Thanks!
Regards,
Bin