On 5/19/20 11:31 PM, Alistair Francis wrote:
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
> Reviewed-by: Bin Meng <bin.meng@windriver.com>
> ---
> include/hw/riscv/opentitan.h | 13 +++++++++++++
> hw/riscv/opentitan.c | 24 ++++++++++++++++++++++--
> 2 files changed, 35 insertions(+), 2 deletions(-)
>
> diff --git a/include/hw/riscv/opentitan.h b/include/hw/riscv/opentitan.h
> index 8d6a09b696..825a3610bc 100644
> --- a/include/hw/riscv/opentitan.h
> +++ b/include/hw/riscv/opentitan.h
> @@ -21,6 +21,7 @@
>
> #include "hw/riscv/riscv_hart.h"
> #include "hw/intc/ibex_plic.h"
> +#include "hw/char/ibex_uart.h"
>
> #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc"
> #define RISCV_IBEX_SOC(obj) \
> @@ -33,6 +34,7 @@ typedef struct LowRISCIbexSoCState {
> /*< public >*/
> RISCVHartArrayState cpus;
> IbexPlicState plic;
> + IbexUartState uart;
>
> MemoryRegion flash_mem;
> MemoryRegion rom;
> @@ -63,4 +65,15 @@ enum {
> IBEX_USBDEV,
> };
>
> +enum {
> + IBEX_UART_RX_PARITY_ERR_IRQ = 0x28,
> + IBEX_UART_RX_TIMEOUT_IRQ = 0x27,
> + IBEX_UART_RX_BREAK_ERR_IRQ = 0x26,
> + IBEX_UART_RX_FRAME_ERR_IRQ = 0x25,
> + IBEX_UART_RX_OVERFLOW_IRQ = 0x24,
> + IBEX_UART_TX_EMPTY_IRQ = 0x23,
> + IBEX_UART_RX_WATERMARK_IRQ = 0x22,
> + IBEX_UART_TX_WATERMARK_IRQ = 0x21
> +};
> +
> #endif
> diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
> index 3926321d8c..a6c0b949ca 100644
> --- a/hw/riscv/opentitan.c
> +++ b/hw/riscv/opentitan.c
> @@ -96,6 +96,9 @@ static void riscv_lowrisc_ibex_soc_init(Object *obj)
>
> sysbus_init_child_obj(obj, "plic", &s->plic,
> sizeof(s->plic), TYPE_IBEX_PLIC);
> +
> + sysbus_init_child_obj(obj, "uart", &s->uart,
> + sizeof(s->uart), TYPE_IBEX_UART);
> }
>
> static void riscv_lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp)
> @@ -137,8 +140,25 @@ static void riscv_lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp)
> busdev = SYS_BUS_DEVICE(dev);
> sysbus_mmio_map(busdev, 0, memmap[IBEX_PLIC].base);
>
> - create_unimplemented_device("riscv.lowrisc.ibex.uart",
> - memmap[IBEX_UART].base, memmap[IBEX_UART].size);
> + /* UART */
> + dev = DEVICE(&(s->uart));
> + qdev_prop_set_chr(dev, "chardev", serial_hd(0));
> + object_property_set_bool(OBJECT(&s->uart), true, "realized", &err);
> + if (err != NULL) {
> + error_propagate(errp, err);
> + return;
> + }
> + busdev = SYS_BUS_DEVICE(dev);
> + sysbus_mmio_map(busdev, 0, memmap[IBEX_UART].base);
> + sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(DEVICE(&s->plic),
> + IBEX_UART_TX_WATERMARK_IRQ));
> + sysbus_connect_irq(busdev, 1, qdev_get_gpio_in(DEVICE(&s->plic),
> + IBEX_UART_RX_WATERMARK_IRQ));
> + sysbus_connect_irq(busdev, 2, qdev_get_gpio_in(DEVICE(&s->plic),
> + IBEX_UART_TX_EMPTY_IRQ));
> + sysbus_connect_irq(busdev, 3, qdev_get_gpio_in(DEVICE(&s->plic),
> + IBEX_UART_RX_OVERFLOW_IRQ));
> +
> create_unimplemented_device("riscv.lowrisc.ibex.gpio",
> memmap[IBEX_GPIO].base, memmap[IBEX_GPIO].size);
> create_unimplemented_device("riscv.lowrisc.ibex.spi",
>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>