A few RISC-V fixes
v2 cover A few RISC-V fixes
This series has a few fixes for RISC-V OpenTitan
v2:
- Convert Ibex UART to the register field API
Alistair Francis (2):
hw/char: Convert the Ibex UART to use the qdev Clock model hw/char: Convert the Ibex UART to use the registerfields API
include/hw/char/ibex_uart.h | 79 +++++++++--------- hw/char/ibex_uart.c | 158 +++++++++++++++++++++--------------- 2 files changed, 129 insertions(+), 108 deletions(-)
Signature · 1 line
2.27.0
PATCH v2 1/2 hw/char: Convert the Ibex UART to use the qdev Clock model
Conver the Ibex UART to use the recently added qdev-clock functions.
Signed-off-by Alistair Francis <[email protected]>
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
--- include/hw/char/ibex_uart.h | 3 +++ hw/char/ibex_uart.c | 30 +++++++++++++++++++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-)
include/hw/char/ibex_uart.h +3 -0
@@ -72,6 +72,7 @@#define IBEX_UART_TIMEOUT_CTRL 0x2c#define IBEX_UART_TX_FIFO_SIZE 16 +#define IBEX_UART_CLOCK 50000000/* 50MHz clock */ #define TYPE_IBEX_UART "ibex-uart"#define IBEX_UART (obj) \
@@ -101,6 +102,8 @@ typedef struct {uint32_t uart_val;uint32_t uart_timeout_ctrl; +Clock *f_clk; +CharBackend chr;qemu_irq tx_watermark;qemu_irq rx_watermark;
hw/char/ibex_uart.c +27 -3
@@ -28,6 +28,7 @@#include "qemu/osdep.h" #include "hw/char/ibex_uart.h" #include "hw/irq.h" +#include "hw/qdev-clock.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qemu/log.h"
@@ -203,6 +204,17 @@ static void ibex_uart_reset(DeviceState *dev)ibex_uart_update_irqs (s); } +static uint64_t ibex_uart_get_baud (IbexUartState *s) +{ +uint64_t baud; + + baud = ((s->uart_ctrl &UART_CTRL_NCO ) >>16 ); + baud *=clock_get_hz (s->f_clk); + baud >>=20 ; + +return baud; +} +static uint64_t ibex_uart_read (void *opaque,hwaddr addr,unsigned int size) {
@@ -329,9 +341,7 @@ static void ibex_uart_write(void *opaque, hwaddr addr, "%s: UART_CTRL_RXBLVL is not supported\n", __func__); }if (value &UART_CTRL_NCO ) { -uint64_t baud = ((value &UART_CTRL_NCO ) >>16 ); - baud *=1000 ; - baud >>=20 ; +uint64_t baud =ibex_uart_get_baud (s); s->char_tx_time = (NANOSECONDS_PER_SECOND / baud) *10 ; }
@@ -385,6 +395,16 @@ static void ibex_uart_write(void *opaque, hwaddr addr, } } +static void ibex_uart_clk_update (void *opaque) +{ +IbexUartState *s = opaque; + +/* recompute uart's speed on clock change */ +uint64_t baud =ibex_uart_get_baud (s); + + s->char_tx_time = (NANOSECONDS_PER_SECOND / baud) *10 ; +} +static void fifo_trigger_update (void *opaque) {IbexUartState *s = opaque;
@@ -444,6 +464,10 @@ static void ibex_uart_init(Object *obj) {IbexUartState *s =IBEX_UART (obj); + s->f_clk =qdev_init_clock_in (DEVICE (obj),"f_clock" , + ibex_uart_clk_update, s); +clock_set_hz (s->f_clk,IBEX_UART_CLOCK ); +sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->tx_watermark);sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->rx_watermark);sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->tx_empty);
Signature · 1 line
2.27.0
PATCH v2 2/2 hw/char: Convert the Ibex UART to use the registerfields API
In reply to Alistair FrancisSigned-off-by Alistair Francis <[email protected]>
--- include/hw/char/ibex_uart.h | 76 ++++++++++----------- hw/char/ibex_uart.c | 130 ++++++++++++++++++------------------ 2 files changed, 100 insertions(+), 106 deletions(-)
include/hw/char/ibex_uart.h +35 -41
@@ -26,50 +26,44 @@#define HW_IBEX_UART_H #include "hw/sysbus.h" +#include "hw/registerfields.h" #include "chardev/char-fe.h" #include "qemu/timer.h" -#define IBEX_UART_INTR_STATE 0x00 -#define INTR_STATE_TX_WATERMARK (1 << 0) -#define INTR_STATE_RX_WATERMARK (1 << 1) -#define INTR_STATE_TX_EMPTY (1 << 2) -#define INTR_STATE_RX_OVERFLOW (1 << 3) -#define IBEX_UART_INTR_ENABLE 0x04 -#define IBEX_UART_INTR_TEST 0x08 - -#define IBEX_UART_CTRL 0x0c -#define UART_CTRL_TX_ENABLE (1 << 0) -#define UART_CTRL_RX_ENABLE (1 << 1) -#define UART_CTRL_NF (1 << 2) -#define UART_CTRL_SLPBK (1 << 4) -#define UART_CTRL_LLPBK (1 << 5) -#define UART_CTRL_PARITY_EN (1 << 6) -#define UART_CTRL_PARITY_ODD (1 << 7) -#define UART_CTRL_RXBLVL (3 << 8) -#define UART_CTRL_NCO (0xFFFF << 16) - -#define IBEX_UART_STATUS 0x10 -#define UART_STATUS_TXFULL (1 << 0) -#define UART_STATUS_RXFULL (1 << 1) -#define UART_STATUS_TXEMPTY (1 << 2) -#define UART_STATUS_RXIDLE (1 << 4) -#define UART_STATUS_RXEMPTY (1 << 5) - -#define IBEX_UART_RDATA 0x14 -#define IBEX_UART_WDATA 0x18 - -#define IBEX_UART_FIFO_CTRL 0x1c -#define FIFO_CTRL_RXRST (1 << 0) -#define FIFO_CTRL_TXRST (1 << 1) -#define FIFO_CTRL_RXILVL (7 << 2) -#define FIFO_CTRL_RXILVL_SHIFT (2) -#define FIFO_CTRL_TXILVL (3 << 5) -#define FIFO_CTRL_TXILVL_SHIFT (5) - -#define IBEX_UART_FIFO_STATUS 0x20 -#define IBEX_UART_OVRD 0x24 -#define IBEX_UART_VAL 0x28 -#define IBEX_UART_TIMEOUT_CTRL 0x2c +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) +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 +65 -65
342 lines not on this page · raw message
Signature · 1 line
2.27.0