mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sparc: sun4u/sun4v/niagara: use generic cpu_model parsing

Browse Source 
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <1507211474-188400-33-git-send-email-imammedo@redhat.com>
Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
Igor Mammedov 2017-10-05 15:51:06 +02:00 committed by Eduardo Habkost
parent 1d4bfc5496
commit 5853046101
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/sparc64/niagara.c
View File

@ -106,8 +106,7 @@ static void niagara_init(MachineState *machine)
MemoryRegion *sysmem = get_system_memory(); MemoryRegion *sysmem = get_system_memory();
/* init CPUs */ /* init CPUs */
sparc64_cpu_devinit(machine->cpu_model, "Sun UltraSparc T1", sparc64_cpu_devinit(machine->cpu_type, NIAGARA_PROM_BASE);
NIAGARA_PROM_BASE);
/* set up devices */ /* set up devices */
memory_region_allocate_system_memory(&s->hv_ram, NULL, "sun4v-hv.ram", memory_region_allocate_system_memory(&s->hv_ram, NULL, "sun4v-hv.ram",
NIAGARA_HV_RAM_SIZE); NIAGARA_HV_RAM_SIZE);
@ -174,6 +173,7 @@ static void niagara_class_init(ObjectClass *oc, void *data)
mc->init = niagara_init; mc->init = niagara_init;
mc->max_cpus = 1; /* XXX for now */ mc->max_cpus = 1; /* XXX for now */
mc->default_boot_order = "c"; mc->default_boot_order = "c";
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Sun-UltraSparc-T1");
} }
static const TypeInfo niagara_type = { static const TypeInfo niagara_type = {

8
hw/sparc64/sparc64.c
View File

@ -339,8 +339,7 @@ void cpu_tick_set_limit(CPUTimer *timer, uint64_t limit)
} }
} }
SPARCCPU *sparc64_cpu_devinit(const char *cpu_model, SPARCCPU *sparc64_cpu_devinit(const char *cpu_type, uint64_t prom_addr)
const char *default_cpu_model, uint64_t prom_addr)
{ {
SPARCCPU *cpu; SPARCCPU *cpu;
CPUSPARCState *env; CPUSPARCState *env;
@ -350,10 +349,7 @@ SPARCCPU *sparc64_cpu_devinit(const char *cpu_model,
uint32_t stick_frequency = 100 * 1000000; uint32_t stick_frequency = 100 * 1000000;
uint32_t hstick_frequency = 100 * 1000000; uint32_t hstick_frequency = 100 * 1000000;
if (cpu_model == NULL) { cpu = SPARC_CPU(cpu_create(cpu_type));
cpu_model = default_cpu_model;
}
cpu = SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model));
env = &cpu->env; env = &cpu->env;
env->tick = cpu_timer_create("tick", cpu, tick_irq, env->tick = cpu_timer_create("tick", cpu, tick_irq,

8
hw/sparc64/sun4u.c
View File

@ -75,7 +75,6 @@
#define IVEC_MAX 0x40 #define IVEC_MAX 0x40
struct hwdef { struct hwdef {
const char * const default_cpu_model;
uint16_t machine_id; uint16_t machine_id;
uint64_t prom_addr; uint64_t prom_addr;
uint64_t console_serial_base; uint64_t console_serial_base;
@ -446,8 +445,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
bool onboard_nic; bool onboard_nic;
/* init CPUs */ /* init CPUs */
cpu = sparc64_cpu_devinit(machine->cpu_model, hwdef->default_cpu_model, cpu = sparc64_cpu_devinit(machine->cpu_type, hwdef->prom_addr);
hwdef->prom_addr);
/* set up devices */ /* set up devices */
ram_init(0, machine->ram_size); ram_init(0, machine->ram_size);
@ -599,14 +597,12 @@ enum {
static const struct hwdef hwdefs[] = { static const struct hwdef hwdefs[] = {
/* Sun4u generic PC-like machine */ /* Sun4u generic PC-like machine */
{ {
.default_cpu_model = "TI UltraSparc IIi",
.machine_id = sun4u_id, .machine_id = sun4u_id,
.prom_addr = 0x1fff0000000ULL, .prom_addr = 0x1fff0000000ULL,
.console_serial_base = 0, .console_serial_base = 0,
}, },
/* Sun4v generic PC-like machine */ /* Sun4v generic PC-like machine */
{ {
.default_cpu_model = "Sun UltraSparc T1",
.machine_id = sun4v_id, .machine_id = sun4v_id,
.prom_addr = 0x1fff0000000ULL, .prom_addr = 0x1fff0000000ULL,
.console_serial_base = 0, .console_serial_base = 0,
@ -635,6 +631,7 @@ static void sun4u_class_init(ObjectClass *oc, void *data)
mc->max_cpus = 1; /* XXX for now */ mc->max_cpus = 1; /* XXX for now */
mc->is_default = 1; mc->is_default = 1;
mc->default_boot_order = "c"; mc->default_boot_order = "c";
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("TI-UltraSparc-IIi");
} }
static const TypeInfo sun4u_type = { static const TypeInfo sun4u_type = {
@ -652,6 +649,7 @@ static void sun4v_class_init(ObjectClass *oc, void *data)
mc->block_default_type = IF_IDE; mc->block_default_type = IF_IDE;
mc->max_cpus = 1; /* XXX for now */ mc->max_cpus = 1; /* XXX for now */
mc->default_boot_order = "c"; mc->default_boot_order = "c";
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("Sun-UltraSparc-T1");
} }
static const TypeInfo sun4v_type = { static const TypeInfo sun4v_type = {

3
include/hw/sparc/sparc64.h
View File

@ -1,5 +1,4 @@
SPARCCPU *sparc64_cpu_devinit(const char *cpu_model, SPARCCPU *sparc64_cpu_devinit(const char *cpu_type, uint64_t prom_addr);
const char *dflt_cpu_model, uint64_t prom_addr);
void sparc64_cpu_set_ivec_irq(void *opaque, int irq, int level); void sparc64_cpu_set_ivec_irq(void *opaque, int irq, int level);