OpenTitan: Add support for the RISC-V timer
Subsystems (2)
v3 cover OpenTitan: Add support for the RISC-V timer
V3:
- Fix the value of the "infinite 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 v3 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 v3 2/3 hw/timer: Initial commit of Ibex Timer
In reply to Alistair FrancisAdd support for the Ibex timer. This is used with the RISC-V mtime/mtimecmp similar to the SiFive CLINT.
We currently don't support changing the prescale or the timervalue.
--- 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
@@ -1363,11 +1363,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
Re: [PATCH v3 2/3] hw/timer: Initial commit of Ibex Timer
Quoted 7 lines · Alistair Francis
Add support for the Ibex timer. This is used with the RISC-V mtime/mtimecmp similar to the SiFive CLINT.
We currently don't support changing the prescale or the timervalue.
Signed-off-by Alistair Francis <[email protected]>
Quoted 9 lines
--- 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
PATCH v3 3/3 hw/riscv: OpenTitan: Connect the mtime and mtimecmp timer
In reply to Alistair FrancisConnect the Ibex timer to the OpenTitan machine. The timer can trigger the RISC-V MIE interrupt as well as a custom device interrupt.
--- 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
Alistair Francis
AppliedQuoted 8 lines · Alistair Francis
V3:
- Fix the value of the "infinite 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
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 16 lines
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--
2.31.1