Commit 5874f0a7 authored by Bin Meng's avatar Bin Meng Committed by Alistair Francis
Browse files

hw/riscv: sifive_u: Simplify the GEM IRQ connect code a little bit 



There is no need to retrieve all PLIC IRQ information in order to
just connect the GEM IRQ. Use qdev_get_gpio_in() directly like
what is done for other peripherals.

Signed-off-by: default avatarBin Meng <bin.meng@windriver.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Message-id: 1591625864-31494-4-git-send-email-bmeng.cn@gmail.com
Message-Id: <1591625864-31494-4-git-send-email-bmeng.cn@gmail.com>
Signed-off-by: default avatarAlistair Francis <alistair.francis@wdc.com>
parent 89494462

hw/riscv/sifive_u.c

+1 −6
Original line number Diff line number Diff line
@@ -514,7 +514,6 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp) 
    MemoryRegion *system_memory = get_system_memory();

    MemoryRegion *mask_rom = g_new(MemoryRegion, 1);

    MemoryRegion *l2lim_mem = g_new(MemoryRegion, 1);

    qemu_irq plic_gpios[SIFIVE_U_PLIC_NUM_SOURCES];

    char *plic_hart_config;

    size_t plic_hart_config_len;

    int i;
@@ -594,10 +593,6 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp) 
    sysbus_realize(SYS_BUS_DEVICE(&s->otp), &err);

    sysbus_mmio_map(SYS_BUS_DEVICE(&s->otp), 0, memmap[SIFIVE_U_OTP].base);



    for (i = 0; i < SIFIVE_U_PLIC_NUM_SOURCES; i++) {

        plic_gpios[i] = qdev_get_gpio_in(DEVICE(s->plic), i);

    }



    if (nd->used) {

        qemu_check_nic_model(nd, TYPE_CADENCE_GEM);

        qdev_set_nic_properties(DEVICE(&s->gem), nd);
@@ -611,7 +606,7 @@ static void sifive_u_soc_realize(DeviceState *dev, Error **errp) 
    }

    sysbus_mmio_map(SYS_BUS_DEVICE(&s->gem), 0, memmap[SIFIVE_U_GEM].base);

    sysbus_connect_irq(SYS_BUS_DEVICE(&s->gem), 0,

                       plic_gpios[SIFIVE_U_GEM_IRQ]);

                       qdev_get_gpio_in(DEVICE(s->plic), SIFIVE_U_GEM_IRQ));



    create_unimplemented_device("riscv.sifive.u.gem-mgmt",

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