Commit 647a70a1 authored by Alistair Francis's avatar Alistair Francis
Browse files

hw/riscv/sifive_plic: Use gpios instead of irqs 



Instead of creating the interrupt in lines with qemu_allocate_irq() use
qdev_init_gpio_in() as this gives us the ability to use the qdev*gpio*()
helpers later on.

Signed-off-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Suggested-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: default avatarMichael Clark <mjc@sifive.com>
parent 651cd8b7

hw/riscv/sifive_e.c

+3 −2
Original line number Diff line number Diff line
@@ -187,13 +187,14 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp) 
    sifive_mmio_emulate(sys_mem, "riscv.sifive.e.gpio0",

        memmap[SIFIVE_E_GPIO0].base, memmap[SIFIVE_E_GPIO0].size);

    sifive_uart_create(sys_mem, memmap[SIFIVE_E_UART0].base,

        serial_hd(0), SIFIVE_PLIC(s->plic)->irqs[SIFIVE_E_UART0_IRQ]);

        serial_hd(0), qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_E_UART0_IRQ));

    sifive_mmio_emulate(sys_mem, "riscv.sifive.e.qspi0",

        memmap[SIFIVE_E_QSPI0].base, memmap[SIFIVE_E_QSPI0].size);

    sifive_mmio_emulate(sys_mem, "riscv.sifive.e.pwm0",

        memmap[SIFIVE_E_PWM0].base, memmap[SIFIVE_E_PWM0].size);

    /* sifive_uart_create(sys_mem, memmap[SIFIVE_E_UART1].base,

        serial_hd(1), SIFIVE_PLIC(s->plic)->irqs[SIFIVE_E_UART1_IRQ]); */

        serial_hd(1), qdev_get_gpio_in(DEVICE(s->plic),

                                       SIFIVE_E_UART1_IRQ)); */

    sifive_mmio_emulate(sys_mem, "riscv.sifive.e.qspi1",

        memmap[SIFIVE_E_QSPI1].base, memmap[SIFIVE_E_QSPI1].size);

    sifive_mmio_emulate(sys_mem, "riscv.sifive.e.pwm1",

hw/riscv/sifive_plic.c

+1 −5
Original line number Diff line number Diff line
@@ -435,7 +435,6 @@ static void sifive_plic_irq_request(void *opaque, int irq, int level) 
static void sifive_plic_realize(DeviceState *dev, Error **errp)

{

    SiFivePLICState *plic = SIFIVE_PLIC(dev);

    int i;



    memory_region_init_io(&plic->mmio, OBJECT(dev), &sifive_plic_ops, plic,

                          TYPE_SIFIVE_PLIC, plic->aperture_size);
@@ -448,10 +447,7 @@ static void sifive_plic_realize(DeviceState *dev, Error **errp) 
    plic->claimed = g_new0(uint32_t, plic->bitfield_words);

    plic->enable = g_new0(uint32_t, plic->bitfield_words * plic->num_addrs);

    sysbus_init_mmio(SYS_BUS_DEVICE(dev), &plic->mmio);

    plic->irqs = g_new0(qemu_irq, plic->num_sources + 1);

    for (i = 0; i <= plic->num_sources; i++) {

        plic->irqs[i] = qemu_allocate_irq(sifive_plic_irq_request, plic, i);

    }

    qdev_init_gpio_in(dev, sifive_plic_irq_request, plic->num_sources);

}



static void sifive_plic_class_init(ObjectClass *klass, void *data)

hw/riscv/sifive_u.c

+3 −2
Original line number Diff line number Diff line
@@ -317,9 +317,10 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) 
        SIFIVE_U_PLIC_CONTEXT_STRIDE,

        memmap[SIFIVE_U_PLIC].size);

    sifive_uart_create(system_memory, memmap[SIFIVE_U_UART0].base,

        serial_hd(0), SIFIVE_PLIC(s->plic)->irqs[SIFIVE_U_UART0_IRQ]);

        serial_hd(0), qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_U_UART0_IRQ));

    /* sifive_uart_create(system_memory, memmap[SIFIVE_U_UART1].base,

        serial_hd(1), SIFIVE_PLIC(s->plic)->irqs[SIFIVE_U_UART1_IRQ]); */

        serial_hd(1), qdev_get_gpio_in(DEVICE(s->plic),

                                       SIFIVE_U_UART1_IRQ)); */

    sifive_clint_create(memmap[SIFIVE_U_CLINT].base,

        memmap[SIFIVE_U_CLINT].size, smp_cpus,

        SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE);

hw/riscv/virt.c

+2 −2
Original line number Diff line number Diff line
@@ -380,11 +380,11 @@ static void riscv_virt_board_init(MachineState *machine) 
    for (i = 0; i < VIRTIO_COUNT; i++) {

        sysbus_create_simple("virtio-mmio",

            memmap[VIRT_VIRTIO].base + i * memmap[VIRT_VIRTIO].size,

            SIFIVE_PLIC(s->plic)->irqs[VIRTIO_IRQ + i]);

            qdev_get_gpio_in(DEVICE(s->plic), VIRTIO_IRQ + i));

    }



    serial_mm_init(system_memory, memmap[VIRT_UART0].base,

        0, SIFIVE_PLIC(s->plic)->irqs[UART0_IRQ], 399193,

        0, qdev_get_gpio_in(DEVICE(s->plic), UART0_IRQ), 399193,

        serial_hd(0), DEVICE_LITTLE_ENDIAN);

}

include/hw/riscv/sifive_plic.h

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ typedef struct SiFivePLICState { 
    uint32_t *claimed;

    uint32_t *enable;

    QemuMutex lock;

    qemu_irq *irqs;



    /* config */

    char *hart_config;