ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/openrisc/openrisc_sim: Increase max_cpus to 4 

Now that we no longer have a limit of 2 CPUs due to fixing the
IRQ routing issues we can increase the max.  Here we increase
the limit to 4, we could go higher, but currently OMPIC has a
limit of 4, so we align with that.

Signed-off-by: Stafford Horne <shorne@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Stafford Horne 2022-02-19 14:57:07 +09:00
parent 22991cfbdf
commit f42e09e6a6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/openrisc/openrisc_sim.c
View File

@ -37,6 +37,8 @@
#define KERNEL_LOAD_ADDR 0x100 #define KERNEL_LOAD_ADDR 0x100
#define OR1KSIM_CPUS_MAX 4
#define TYPE_OR1KSIM_MACHINE MACHINE_TYPE_NAME("or1k-sim") #define TYPE_OR1KSIM_MACHINE MACHINE_TYPE_NAME("or1k-sim")
#define OR1KSIM_MACHINE(obj) \ #define OR1KSIM_MACHINE(obj) \
OBJECT_CHECK(Or1ksimState, (obj), TYPE_OR1KSIM_MACHINE) OBJECT_CHECK(Or1ksimState, (obj), TYPE_OR1KSIM_MACHINE)
@ -197,12 +199,12 @@ static void openrisc_sim_init(MachineState *machine)
{ {
ram_addr_t ram_size = machine->ram_size; ram_addr_t ram_size = machine->ram_size;
const char *kernel_filename = machine->kernel_filename; const char *kernel_filename = machine->kernel_filename;
OpenRISCCPU *cpus[2] = {}; OpenRISCCPU *cpus[OR1KSIM_CPUS_MAX] = {};
MemoryRegion *ram; MemoryRegion *ram;
int n; int n;
unsigned int smp_cpus = machine->smp.cpus; unsigned int smp_cpus = machine->smp.cpus;
assert(smp_cpus >= 1 && smp_cpus <= 2); assert(smp_cpus >= 1 && smp_cpus <= OR1KSIM_CPUS_MAX);
for (n = 0; n < smp_cpus; n++) { for (n = 0; n < smp_cpus; n++) {
cpus[n] = OPENRISC_CPU(cpu_create(machine->cpu_type)); cpus[n] = OPENRISC_CPU(cpu_create(machine->cpu_type));
if (cpus[n] == NULL) { if (cpus[n] == NULL) {
@ -243,7 +245,7 @@ static void openrisc_sim_machine_init(ObjectClass *oc, void *data)
mc->desc = "or1k simulation"; mc->desc = "or1k simulation";
mc->init = openrisc_sim_init; mc->init = openrisc_sim_init;
mc->max_cpus = 2; mc->max_cpus = OR1KSIM_CPUS_MAX;
mc->is_default = true; mc->is_default = true;
mc->default_cpu_type = OPENRISC_CPU_TYPE_NAME("or1200"); mc->default_cpu_type = OPENRISC_CPU_TYPE_NAME("or1200");
} }