Commit c4473127 authored by Like Xu's avatar Like Xu Committed by Eduardo Habkost
Browse files

hw/riscv: Replace global smp variables with machine smp properties 



The global smp variables in riscv are replaced with smp machine properties.

A local variable of the same name would be introduced in the declaration
phase if it's used widely in the context OR replace it on the spot if it's
only used once. No semantic changes.

Signed-off-by: default avatarLike Xu <like.xu@linux.intel.com>
Message-Id: <20190518205428.90532-6-like.xu@linux.intel.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
[ehabkost: fix spike_board_init()]
[ehabkost: fix riscv_sifive_e_soc_init()]
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent fe6b6346

hw/riscv/sifive_e.c

+4 −2
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static void riscv_sifive_e_init(MachineState *machine) 


static void riscv_sifive_e_soc_init(Object *obj)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    SiFiveESoCState *s = RISCV_E_SOC(obj);



    object_initialize_child(obj, "cpus", &s->cpus,
@@ -131,7 +132,7 @@ static void riscv_sifive_e_soc_init(Object *obj) 
                            &error_abort, NULL);

    object_property_set_str(OBJECT(&s->cpus), SIFIVE_E_CPU, "cpu-type",

                            &error_abort);

    object_property_set_int(OBJECT(&s->cpus), smp_cpus, "num-harts",

    object_property_set_int(OBJECT(&s->cpus), ms->smp.cpus, "num-harts",

                            &error_abort);

    sysbus_init_child_obj(obj, "riscv.sifive.e.gpio0",

                          &s->gpio, sizeof(s->gpio),
@@ -140,6 +141,7 @@ static void riscv_sifive_e_soc_init(Object *obj) 


static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    const struct MemmapEntry *memmap = sifive_e_memmap;

    Error *err = NULL;
@@ -168,7 +170,7 @@ static void riscv_sifive_e_soc_realize(DeviceState *dev, Error **errp) 
        SIFIVE_E_PLIC_CONTEXT_STRIDE,

        memmap[SIFIVE_E_PLIC].size);

    sifive_clint_create(memmap[SIFIVE_E_CLINT].base,

        memmap[SIFIVE_E_CLINT].size, smp_cpus,

        memmap[SIFIVE_E_CLINT].size, ms->smp.cpus,

        SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE);

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

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

hw/riscv/sifive_plic.c

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "qemu/error-report.h"

#include "hw/sysbus.h"

#include "hw/pci/msi.h"

#include "hw/boards.h"

#include "target/riscv/cpu.h"

#include "sysemu/sysemu.h"

#include "hw/riscv/sifive_plic.h"
@@ -439,6 +440,8 @@ static void sifive_plic_irq_request(void *opaque, int irq, int level) 


static void sifive_plic_realize(DeviceState *dev, Error **errp)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    unsigned int smp_cpus = ms->smp.cpus;

    SiFivePLICState *plic = SIFIVE_PLIC(dev);

    int i;

hw/riscv/sifive_u.c

+7 −4
Original line number Diff line number Diff line
@@ -315,13 +315,14 @@ static void riscv_sifive_u_init(MachineState *machine) 


static void riscv_sifive_u_soc_init(Object *obj)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    SiFiveUSoCState *s = RISCV_U_SOC(obj);



    object_initialize_child(obj, "cpus", &s->cpus, sizeof(s->cpus),

                            TYPE_RISCV_HART_ARRAY, &error_abort, NULL);

    object_property_set_str(OBJECT(&s->cpus), SIFIVE_U_CPU, "cpu-type",

                            &error_abort);

    object_property_set_int(OBJECT(&s->cpus), smp_cpus, "num-harts",

    object_property_set_int(OBJECT(&s->cpus), ms->smp.cpus, "num-harts",

                            &error_abort);



    sysbus_init_child_obj(obj, "gem", &s->gem, sizeof(s->gem),
@@ -330,6 +331,7 @@ static void riscv_sifive_u_soc_init(Object *obj) 


static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp)

{

    MachineState *ms = MACHINE(qdev_get_machine());

    SiFiveUSoCState *s = RISCV_U_SOC(dev);

    const struct MemmapEntry *memmap = sifive_u_memmap;

    MemoryRegion *system_memory = get_system_memory();
@@ -351,9 +353,10 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) 
                                mask_rom);



    /* create PLIC hart topology configuration string */

    plic_hart_config_len = (strlen(SIFIVE_U_PLIC_HART_CONFIG) + 1) * smp_cpus;

    plic_hart_config_len = (strlen(SIFIVE_U_PLIC_HART_CONFIG) + 1) *

                           ms->smp.cpus;

    plic_hart_config = g_malloc0(plic_hart_config_len);

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

    for (i = 0; i < ms->smp.cpus; i++) {

        if (i != 0) {

            strncat(plic_hart_config, ",", plic_hart_config_len);

        }
@@ -379,7 +382,7 @@ static void riscv_sifive_u_soc_realize(DeviceState *dev, Error **errp) 
    sifive_uart_create(system_memory, memmap[SIFIVE_U_UART1].base,

        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,

        memmap[SIFIVE_U_CLINT].size, ms->smp.cpus,

        SIFIVE_SIP_BASE, SIFIVE_TIMECMP_BASE, SIFIVE_TIME_BASE);



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

hw/riscv/spike.c

+3 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ static void spike_board_init(MachineState *machine) 
    MemoryRegion *main_mem = g_new(MemoryRegion, 1);

    MemoryRegion *mask_rom = g_new(MemoryRegion, 1);

    int i;

    unsigned int smp_cpus = machine->smp.cpus;



    /* Initialize SOC */

    object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
@@ -241,6 +242,7 @@ static void spike_v1_10_0_board_init(MachineState *machine) 
    MemoryRegion *main_mem = g_new(MemoryRegion, 1);

    MemoryRegion *mask_rom = g_new(MemoryRegion, 1);

    int i;

    unsigned int smp_cpus = machine->smp.cpus;



    if (!qtest_enabled()) {

        info_report("The Spike v1.10.0 machine has been deprecated. "
@@ -329,6 +331,7 @@ static void spike_v1_09_1_board_init(MachineState *machine) 
    MemoryRegion *main_mem = g_new(MemoryRegion, 1);

    MemoryRegion *mask_rom = g_new(MemoryRegion, 1);

    int i;

    unsigned int smp_cpus = machine->smp.cpus;



    if (!qtest_enabled()) {

        info_report("The Spike v1.09.1 machine has been deprecated. "

hw/riscv/virt.c

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ static void riscv_virt_board_init(MachineState *machine) 
    char *plic_hart_config;

    size_t plic_hart_config_len;

    int i;

    unsigned int smp_cpus = machine->smp.cpus;

    void *fdt;



    /* Initialize SOC */