On Thu, Mar 3, 2022 at 2:55 PM Alistair Francis
<alistair.fran...@opensource.wdc.com> wrote:
>
> From: Wilfred Mallawa <wilfred.mall...@wdc.com>
>
> Connect spi host[1/0] to opentitan.
>
> Signed-off-by: Wilfred Mallawa <wilfred.mall...@wdc.com>
> Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Thanks!
Applied to riscv-to-apply.next
Alistair
> ---
> V2 -> V3 Changes:
> 1. Fixup commit message typo.
> In `opentitan.h`:
> 1. Revert copyright year change from 2022 to 2020
> 2. Moved `OPENTITAN_SPI_X` #defines into an enum
> 3. Sorted IBEX_X_IRQ enum in ascending order.
>
> hw/riscv/opentitan.c | 36 ++++++++++++++++++++++++++++++++----
> include/hw/riscv/opentitan.h | 30 +++++++++++++++++++++---------
> 2 files changed, 53 insertions(+), 13 deletions(-)
>
> diff --git a/hw/riscv/opentitan.c b/hw/riscv/opentitan.c
> index 833624d66c..2d401dcb23 100644
> --- a/hw/riscv/opentitan.c
> +++ b/hw/riscv/opentitan.c
> @@ -120,11 +120,18 @@ static void lowrisc_ibex_soc_init(Object *obj)
> object_initialize_child(obj, "uart", &s->uart, TYPE_IBEX_UART);
>
> object_initialize_child(obj, "timer", &s->timer, TYPE_IBEX_TIMER);
> +
> + for (int i = 0; i < OPENTITAN_NUM_SPI_HOSTS; i++) {
> + object_initialize_child(obj, "spi_host[*]", &s->spi_host[i],
> + TYPE_IBEX_SPI_HOST);
> + }
> }
>
> static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp)
> {
> const MemMapEntry *memmap = ibex_memmap;
> + DeviceState *dev;
> + SysBusDevice *busdev;
> MachineState *ms = MACHINE(qdev_get_machine());
> LowRISCIbexSoCState *s = RISCV_IBEX_SOC(dev_soc);
> MemoryRegion *sys_mem = get_system_memory();
> @@ -209,14 +216,35 @@ static void lowrisc_ibex_soc_realize(DeviceState
> *dev_soc, Error **errp)
> qdev_get_gpio_in(DEVICE(qemu_get_cpu(0)),
> IRQ_M_TIMER));
>
> + /* SPI-Hosts */
> + for (int i = 0; i < OPENTITAN_NUM_SPI_HOSTS; ++i) {
> + dev = DEVICE(&(s->spi_host[i]));
> + if (!sysbus_realize(SYS_BUS_DEVICE(&s->spi_host[i]), errp)) {
> + return;
> + }
> + busdev = SYS_BUS_DEVICE(dev);
> + sysbus_mmio_map(busdev, 0, memmap[IBEX_DEV_SPI_HOST0 + i].base);
> +
> + switch (i) {
> + case OPENTITAN_SPI_HOST0:
> + sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(DEVICE(&s->plic),
> + IBEX_SPI_HOST0_ERR_IRQ));
> + sysbus_connect_irq(busdev, 1, qdev_get_gpio_in(DEVICE(&s->plic),
> + IBEX_SPI_HOST0_SPI_EVENT_IRQ));
> + break;
> + case OPENTITAN_SPI_HOST1:
> + sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(DEVICE(&s->plic),
> + IBEX_SPI_HOST1_ERR_IRQ));
> + sysbus_connect_irq(busdev, 1, qdev_get_gpio_in(DEVICE(&s->plic),
> + IBEX_SPI_HOST1_SPI_EVENT_IRQ));
> + break;
> + }
> + }
> +
> create_unimplemented_device("riscv.lowrisc.ibex.gpio",
> memmap[IBEX_DEV_GPIO].base, memmap[IBEX_DEV_GPIO].size);
> create_unimplemented_device("riscv.lowrisc.ibex.spi_device",
> memmap[IBEX_DEV_SPI_DEVICE].base, memmap[IBEX_DEV_SPI_DEVICE].size);
> - create_unimplemented_device("riscv.lowrisc.ibex.spi_host0",
> - memmap[IBEX_DEV_SPI_HOST0].base, memmap[IBEX_DEV_SPI_HOST0].size);
> - create_unimplemented_device("riscv.lowrisc.ibex.spi_host1",
> - memmap[IBEX_DEV_SPI_HOST1].base, memmap[IBEX_DEV_SPI_HOST1].size);
> create_unimplemented_device("riscv.lowrisc.ibex.i2c",
> memmap[IBEX_DEV_I2C].base, memmap[IBEX_DEV_I2C].size);
> create_unimplemented_device("riscv.lowrisc.ibex.pattgen",
> diff --git a/include/hw/riscv/opentitan.h b/include/hw/riscv/opentitan.h
> index 00da9ded43..68892cd8e5 100644
> --- a/include/hw/riscv/opentitan.h
> +++ b/include/hw/riscv/opentitan.h
> @@ -23,11 +23,18 @@
> #include "hw/intc/sifive_plic.h"
> #include "hw/char/ibex_uart.h"
> #include "hw/timer/ibex_timer.h"
> +#include "hw/ssi/ibex_spi_host.h"
> #include "qom/object.h"
>
> #define TYPE_RISCV_IBEX_SOC "riscv.lowrisc.ibex.soc"
> OBJECT_DECLARE_SIMPLE_TYPE(LowRISCIbexSoCState, RISCV_IBEX_SOC)
>
> +enum {
> + OPENTITAN_SPI_HOST0,
> + OPENTITAN_SPI_HOST1,
> + OPENTITAN_NUM_SPI_HOSTS,
> +};
> +
> struct LowRISCIbexSoCState {
> /*< private >*/
> SysBusDevice parent_obj;
> @@ -37,6 +44,7 @@ struct LowRISCIbexSoCState {
> SiFivePLICState plic;
> IbexUartState uart;
> IbexTimerState timer;
> + IbexSPIHostState spi_host[OPENTITAN_NUM_SPI_HOSTS];
>
> MemoryRegion flash_mem;
> MemoryRegion rom;
> @@ -89,15 +97,19 @@ enum {
> };
>
> enum {
> - IBEX_TIMER_TIMEREXPIRED0_0 = 126,
> - IBEX_UART0_RX_PARITY_ERR_IRQ = 8,
> - IBEX_UART0_RX_TIMEOUT_IRQ = 7,
> - IBEX_UART0_RX_BREAK_ERR_IRQ = 6,
> - IBEX_UART0_RX_FRAME_ERR_IRQ = 5,
> - IBEX_UART0_RX_OVERFLOW_IRQ = 4,
> - IBEX_UART0_TX_EMPTY_IRQ = 3,
> - IBEX_UART0_RX_WATERMARK_IRQ = 2,
> - IBEX_UART0_TX_WATERMARK_IRQ = 1,
> + IBEX_UART0_TX_WATERMARK_IRQ = 1,
> + IBEX_UART0_RX_WATERMARK_IRQ = 2,
> + IBEX_UART0_TX_EMPTY_IRQ = 3,
> + IBEX_UART0_RX_OVERFLOW_IRQ = 4,
> + IBEX_UART0_RX_FRAME_ERR_IRQ = 5,
> + IBEX_UART0_RX_BREAK_ERR_IRQ = 6,
> + IBEX_UART0_RX_TIMEOUT_IRQ = 7,
> + IBEX_UART0_RX_PARITY_ERR_IRQ = 8,
> + IBEX_TIMER_TIMEREXPIRED0_0 = 126,
> + IBEX_SPI_HOST0_ERR_IRQ = 150,
> + IBEX_SPI_HOST0_SPI_EVENT_IRQ = 151,
> + IBEX_SPI_HOST1_ERR_IRQ = 152,
> + IBEX_SPI_HOST1_SPI_EVENT_IRQ = 153,
> };
>
> #endif
> --
> 2.35.1
>
