On Fri, Sep 3, 2021 at 7:25 AM Alistair Francis
<alistair.fran...@opensource.wdc.com> wrote:
>
> From: Alistair Francis <alistair.fran...@wdc.com>
>
> Connect the SiFive PWM device and expose it via the device tree.
>
> Signed-off-by: Alistair Francis <alistair.fran...@wdc.com>
> ---
> include/hw/riscv/sifive_u.h | 14 +++++++++-
> hw/riscv/sifive_u.c | 55 ++++++++++++++++++++++++++++++++++++-
> hw/timer/sifive_pwm.c | 1 +
> hw/riscv/Kconfig | 1 +
> 4 files changed, 69 insertions(+), 2 deletions(-)
Please also update docs/system/riscv/sifive_u.rst for the supported device list
>
> diff --git a/include/hw/riscv/sifive_u.h b/include/hw/riscv/sifive_u.h
> index 2656b39808..0d010c7309 100644
> --- a/include/hw/riscv/sifive_u.h
> +++ b/include/hw/riscv/sifive_u.h
> @@ -27,6 +27,7 @@
> #include "hw/misc/sifive_u_otp.h"
> #include "hw/misc/sifive_u_prci.h"
> #include "hw/ssi/sifive_spi.h"
> +#include "hw/timer/sifive_pwm.h"
>
> #define TYPE_RISCV_U_SOC "riscv.sifive.u.soc"
> #define RISCV_U_SOC(obj) \
> @@ -49,6 +50,7 @@ typedef struct SiFiveUSoCState {
> SiFiveSPIState spi0;
> SiFiveSPIState spi2;
> CadenceGEMState gem;
> + SiFiveUPwmState pwm[2];
>
> uint32_t serial;
> char *cpu_type;
> @@ -92,7 +94,9 @@ enum {
> SIFIVE_U_DEV_FLASH0,
> SIFIVE_U_DEV_DRAM,
> SIFIVE_U_DEV_GEM,
> - SIFIVE_U_DEV_GEM_MGMT
> + SIFIVE_U_DEV_GEM_MGMT,
> + SIFIVE_U_DEV_PWM0,
> + SIFIVE_U_DEV_PWM1
> };
>
> enum {
> @@ -126,6 +130,14 @@ enum {
> SIFIVE_U_PDMA_IRQ5 = 28,
> SIFIVE_U_PDMA_IRQ6 = 29,
> SIFIVE_U_PDMA_IRQ7 = 30,
> + SIFIVE_U_DEV_PWM0_0 = 42,
For consistency, these should be SIFIVE_U_PWM0_IRQ0/1/2/3
> + SIFIVE_U_DEV_PWM0_1 = 43,
> + SIFIVE_U_DEV_PWM0_2 = 44,
> + SIFIVE_U_DEV_PWM0_3 = 45,
> + SIFIVE_U_DEV_PWM1_0 = 46,
> + SIFIVE_U_DEV_PWM1_1 = 47,
> + SIFIVE_U_DEV_PWM1_2 = 48,
> + SIFIVE_U_DEV_PWM1_3 = 49,
> SIFIVE_U_QSPI0_IRQ = 51,
> SIFIVE_U_GEM_IRQ = 53
> };
> diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
> index 6cc1a62b0f..ed2e75df36 100644
> --- a/hw/riscv/sifive_u.c
> +++ b/hw/riscv/sifive_u.c
> @@ -17,6 +17,7 @@
> * 7) DMA (Direct Memory Access Controller)
> * 8) SPI0 connected to an SPI flash
> * 9) SPI2 connected to an SD card
> + * 10) PWM0 and PWM1
> *
> * This board currently generates devicetree dynamically that indicates at
> least
> * two harts and up to five harts.
> @@ -75,6 +76,8 @@ static const MemMapEntry sifive_u_memmap[] = {
> [SIFIVE_U_DEV_PRCI] = { 0x10000000, 0x1000 },
> [SIFIVE_U_DEV_UART0] = { 0x10010000, 0x1000 },
> [SIFIVE_U_DEV_UART1] = { 0x10011000, 0x1000 },
> + [SIFIVE_U_DEV_PWM0] = { 0x10020000, 0x1000 },
> + [SIFIVE_U_DEV_PWM1] = { 0x10021000, 0x1000 },
> [SIFIVE_U_DEV_QSPI0] = { 0x10040000, 0x1000 },
> [SIFIVE_U_DEV_QSPI2] = { 0x10050000, 0x1000 },
> [SIFIVE_U_DEV_GPIO] = { 0x10060000, 0x1000 },
> @@ -441,6 +444,38 @@ static void create_fdt(SiFiveUState *s, const
> MemMapEntry *memmap,
> qemu_fdt_setprop_cell(fdt, nodename, "reg", 0x0);
> g_free(nodename);
>
> + nodename = g_strdup_printf("/soc/pwm@%lx",
> + (long)memmap[SIFIVE_U_DEV_PWM0].base);
> + qemu_fdt_add_subnode(fdt, nodename);
> + qemu_fdt_setprop_string(fdt, nodename, "compatible", "sifive,pwm0");
> + qemu_fdt_setprop_cells(fdt, nodename, "reg",
> + 0x0, memmap[SIFIVE_U_DEV_PWM0].base,
> + 0x0, memmap[SIFIVE_U_DEV_PWM0].size);
> + qemu_fdt_setprop_cell(fdt, nodename, "interrupt-parent", plic_phandle);
> + qemu_fdt_setprop_cells(fdt, nodename, "interrupts",
> + SIFIVE_U_DEV_PWM0_0, SIFIVE_U_DEV_PWM0_1,
> + SIFIVE_U_DEV_PWM0_2, SIFIVE_U_DEV_PWM0_3);
> + qemu_fdt_setprop_cells(fdt, nodename, "clocks",
> + prci_phandle, PRCI_CLK_TLCLK);
> + qemu_fdt_setprop_cell(fdt, nodename, "#pwm-cells", 0);
> + g_free(nodename);
> +
> + nodename = g_strdup_printf("/soc/pwm@%lx",
> + (long)memmap[SIFIVE_U_DEV_PWM1].base);
> + qemu_fdt_add_subnode(fdt, nodename);
> + qemu_fdt_setprop_string(fdt, nodename, "compatible", "sifive,pwm0");
> + qemu_fdt_setprop_cells(fdt, nodename, "reg",
> + 0x0, memmap[SIFIVE_U_DEV_PWM1].base,
> + 0x0, memmap[SIFIVE_U_DEV_PWM1].size);
> + qemu_fdt_setprop_cell(fdt, nodename, "interrupt-parent", plic_phandle);
> + qemu_fdt_setprop_cells(fdt, nodename, "interrupts",
> + SIFIVE_U_DEV_PWM1_0, SIFIVE_U_DEV_PWM1_1,
> + SIFIVE_U_DEV_PWM1_2, SIFIVE_U_DEV_PWM1_3);
> + qemu_fdt_setprop_cells(fdt, nodename, "clocks",
> + prci_phandle, PRCI_CLK_TLCLK);
> + qemu_fdt_setprop_cell(fdt, nodename, "#pwm-cells", 0);
> + g_free(nodename);
> +
> nodename = g_strdup_printf("/soc/serial@%lx",
> (long)memmap[SIFIVE_U_DEV_UART1].base);
> qemu_fdt_add_subnode(fdt, nodename);
> @@ -765,6 +800,8 @@ static void sifive_u_soc_instance_init(Object *obj)
> object_initialize_child(obj, "pdma", &s->dma, TYPE_SIFIVE_PDMA);
> object_initialize_child(obj, "spi0", &s->spi0, TYPE_SIFIVE_SPI);
> object_initialize_child(obj, "spi2", &s->spi2, TYPE_SIFIVE_SPI);
> + object_initialize_child(obj, "pwm0", &s->pwm[0], TYPE_SIFIVE_PWM);
> + object_initialize_child(obj, "pwm1", &s->pwm[1], TYPE_SIFIVE_PWM);
> }
>
> static void sifive_u_soc_realize(DeviceState *dev, Error **errp)
> @@ -777,7 +814,7 @@ static void sifive_u_soc_realize(DeviceState *dev, Error
> **errp)
> MemoryRegion *l2lim_mem = g_new(MemoryRegion, 1);
> char *plic_hart_config;
> size_t plic_hart_config_len;
> - int i;
> + int i, j;
> NICInfo *nd = &nd_table[0];
>
> qdev_prop_set_uint32(DEVICE(&s->u_cpus), "num-harts", ms->smp.cpus - 1);
> @@ -904,6 +941,22 @@ static void sifive_u_soc_realize(DeviceState *dev, Error
> **errp)
> sysbus_connect_irq(SYS_BUS_DEVICE(&s->gem), 0,
> qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_U_GEM_IRQ));
>
> + /* PWM */
> + for (i = 0; i < 2; i++) {
> + if (!sysbus_realize(SYS_BUS_DEVICE(&s->pwm[i]), errp)) {
> + return;
> + }
> + sysbus_mmio_map(SYS_BUS_DEVICE(&s->pwm[i]), 0,
> + memmap[SIFIVE_U_DEV_PWM0].base + (0x1000 *
> i));
> +
> + /* Connect PWM interrupts to the PLIC */
> + for (j = 0; j < SIFIVE_PWM_IRQS; j++) {
> + sysbus_connect_irq(SYS_BUS_DEVICE(&s->pwm[i]), j,
> + qdev_get_gpio_in(DEVICE(s->plic),
> + SIFIVE_U_DEV_PWM0_0 + (i * 4) + j));
> + }
> + }
> +
> create_unimplemented_device("riscv.sifive.u.gem-mgmt",
> memmap[SIFIVE_U_DEV_GEM_MGMT].base,
> memmap[SIFIVE_U_DEV_GEM_MGMT].size);
>
> diff --git a/hw/timer/sifive_pwm.c b/hw/timer/sifive_pwm.c
> index 61a97f9b46..3b533d4484 100644
> --- a/hw/timer/sifive_pwm.c
> +++ b/hw/timer/sifive_pwm.c
> @@ -25,6 +25,7 @@
> */
>
> #include "qemu/osdep.h"
> +#include "trace.h"
> #include "hw/irq.h"
> #include "hw/timer/sifive_pwm.h"
> #include "hw/qdev-properties.h"
> diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
> index ff75add6f3..d56c339ef6 100644
> --- a/hw/riscv/Kconfig
> +++ b/hw/riscv/Kconfig
> @@ -69,6 +69,7 @@ config SIFIVE_U
> select SIFIVE_UART
> select SIFIVE_U_OTP
> select SIFIVE_U_PRCI
> + select SIFIVE_PWM
> select SSI_M25P80
> select SSI_SD
> select UNIMP
Regards,
Bin
