Commit ba1ba5cc authored by Igor Mammedov's avatar Igor Mammedov Committed by Eduardo Habkost
Browse files

arm: drop intermediate cpu_model -> cpu type parsing and use cpu type directly 



there are 2 use cases to deal with:
  1: fixed CPU models per board/soc
  2: boards with user configurable cpu_model and fallback to
     default cpu_model if user hasn't specified one explicitly

For the 1st
  drop intermediate cpu_model parsing and use const cpu type
  directly, which replaces:
     typename = object_class_get_name(
           cpu_class_by_name(TYPE_ARM_CPU, cpu_model))
     object_new(typename)
  with
     object_new(FOO_CPU_TYPE_NAME)
  or
     cpu_generic_init(BASE_CPU_TYPE, "my cpu model")
  with
     cpu_create(FOO_CPU_TYPE_NAME)

as result 1st use case doesn't have to invoke not necessary
translation and not needed code is removed.

For the 2nd
 1: set default cpu type with MachineClass::default_cpu_type and
 2: use generic cpu_model parsing that done before machine_init()
    is run and:
    2.1: drop custom cpu_model parsing where pattern is:
       typename = object_class_get_name(
           cpu_class_by_name(TYPE_ARM_CPU, cpu_model))
       [parse_features(typename, cpu_model, &err) ]

    2.2: or replace cpu_generic_init() which does what
         2.1 does + create_cpu(typename) with just
         create_cpu(machine->cpu_type)
as result cpu_name -> cpu_type translation is done using
generic machine code one including parsing optional features
if supported/present (removes a bunch of duplicated cpu_model
parsing code) and default cpu type is defined in an uniform way
within machine_class_init callbacks instead of adhoc places
in boadr's machine_init code.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Message-Id: <1505318697-77161-6-git-send-email-imammedo@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 311ca98d

hw/arm/armv7m.c

+5 −35
Original line number Diff line number Diff line
@@ -151,10 +151,6 @@ static void armv7m_realize(DeviceState *dev, Error **errp) 
    SysBusDevice *sbd;

    Error *err = NULL;

    int i;

    char **cpustr;

    ObjectClass *oc;

    const char *typename;

    CPUClass *cc;



    if (!s->board_memory) {

        error_setg(errp, "memory property was not set");
@@ -163,29 +159,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp) 


    memory_region_add_subregion_overlap(&s->container, 0, s->board_memory, -1);



    cpustr = g_strsplit(s->cpu_model, ",", 2);



    oc = cpu_class_by_name(TYPE_ARM_CPU, cpustr[0]);

    if (!oc) {

        error_setg(errp, "Unknown CPU model %s", cpustr[0]);

        g_strfreev(cpustr);

        return;

    }



    cc = CPU_CLASS(oc);

    typename = object_class_get_name(oc);

    cc->parse_features(typename, cpustr[1], &err);

    g_strfreev(cpustr);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    s->cpu = ARM_CPU(object_new(typename));

    if (!s->cpu) {

        error_setg(errp, "Unknown CPU model %s", s->cpu_model);

        return;

    }

    s->cpu = ARM_CPU(object_new(s->cpu_type));



    object_property_set_link(OBJECT(s->cpu), OBJECT(&s->container), "memory",

                             &error_abort);
@@ -241,7 +215,7 @@ static void armv7m_realize(DeviceState *dev, Error **errp) 
}



static Property armv7m_properties[] = {

    DEFINE_PROP_STRING("cpu-model", ARMv7MState, cpu_model),

    DEFINE_PROP_STRING("cpu-type", ARMv7MState, cpu_type),

    DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION,

                     MemoryRegion *),

    DEFINE_PROP_END_OF_LIST(),
@@ -275,20 +249,16 @@ static void armv7m_reset(void *opaque) 
   Returns the ARMv7M device.  */



DeviceState *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,

                      const char *kernel_filename, const char *cpu_model)

                         const char *kernel_filename, const char *cpu_type)

{

    DeviceState *armv7m;



    if (cpu_model == NULL) {

        cpu_model = "cortex-m3";

    }



    armv7m = qdev_create(NULL, TYPE_ARMV7M);

    qdev_prop_set_uint32(armv7m, "num-irq", num_irq);

    qdev_prop_set_string(armv7m, "cpu-model", cpu_model);

    qdev_prop_set_string(armv7m, "cpu-type", cpu_type);

    object_property_set_link(OBJECT(armv7m), OBJECT(get_system_memory()),

                                     "memory", &error_abort);

    /* This will exit with an error if the user passed us a bad cpu_model */

    /* This will exit with an error if the user passed us a bad cpu_type */

    qdev_init_nofail(armv7m);



    armv7m_load_kernel(ARM_CPU(first_cpu), kernel_filename, mem_size);

hw/arm/aspeed_soc.c

+5 −8
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static const char *aspeed_soc_ast2500_typenames[] = { 
static const AspeedSoCInfo aspeed_socs[] = {

    {

        .name         = "ast2400-a0",

        .cpu_model    = "arm926",

        .cpu_type     = ARM_CPU_TYPE_NAME("arm926"),

        .silicon_rev  = AST2400_A0_SILICON_REV,

        .sdram_base   = AST2400_SDRAM_BASE,

        .sram_size    = 0x8000,
@@ -65,7 +65,7 @@ static const AspeedSoCInfo aspeed_socs[] = { 
        .wdts_num     = 2,

    }, {

        .name         = "ast2400-a1",

        .cpu_model    = "arm926",

        .cpu_type     = ARM_CPU_TYPE_NAME("arm926"),

        .silicon_rev  = AST2400_A1_SILICON_REV,

        .sdram_base   = AST2400_SDRAM_BASE,

        .sram_size    = 0x8000,
@@ -76,7 +76,7 @@ static const AspeedSoCInfo aspeed_socs[] = { 
        .wdts_num     = 2,

    }, {

        .name         = "ast2400",

        .cpu_model    = "arm926",

        .cpu_type     = ARM_CPU_TYPE_NAME("arm926"),

        .silicon_rev  = AST2400_A0_SILICON_REV,

        .sdram_base   = AST2400_SDRAM_BASE,

        .sram_size    = 0x8000,
@@ -87,7 +87,7 @@ static const AspeedSoCInfo aspeed_socs[] = { 
        .wdts_num     = 2,

    }, {

        .name         = "ast2500-a1",

        .cpu_model    = "arm1176",

        .cpu_type     = ARM_CPU_TYPE_NAME("arm1176"),

        .silicon_rev  = AST2500_A1_SILICON_REV,

        .sdram_base   = AST2500_SDRAM_BASE,

        .sram_size    = 0x9000,
@@ -128,13 +128,10 @@ static void aspeed_soc_init(Object *obj) 
{

    AspeedSoCState *s = ASPEED_SOC(obj);

    AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);

    char *cpu_typename;

    int i;



    cpu_typename = g_strdup_printf("%s-" TYPE_ARM_CPU, sc->info->cpu_model);

    object_initialize(&s->cpu, sizeof(s->cpu), cpu_typename);

    object_initialize(&s->cpu, sizeof(s->cpu), sc->info->cpu_type);

    object_property_add_child(obj, "cpu", OBJECT(&s->cpu), NULL);

    g_free(cpu_typename);



    object_initialize(&s->vic, sizeof(s->vic), TYPE_ASPEED_VIC);

    object_property_add_child(obj, "vic", OBJECT(&s->vic), NULL);

hw/arm/collie.c

+3 −7
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include "hw/block/flash.h"

#include "sysemu/block-backend.h"

#include "exec/address-spaces.h"

#include "qom/cpu.h"

#include "cpu.h"



static struct arm_boot_info collie_binfo = {

    .loader_start = SA_SDCS0,
@@ -27,7 +27,6 @@ static struct arm_boot_info collie_binfo = { 


static void collie_init(MachineState *machine)

{

    const char *cpu_model = machine->cpu_model;

    const char *kernel_filename = machine->kernel_filename;

    const char *kernel_cmdline = machine->kernel_cmdline;

    const char *initrd_filename = machine->initrd_filename;
@@ -35,11 +34,7 @@ static void collie_init(MachineState *machine) 
    DriveInfo *dinfo;

    MemoryRegion *sysmem = get_system_memory();



    if (!cpu_model) {

        cpu_model = "sa1110";

    }



    s = sa1110_init(sysmem, collie_binfo.ram_size, cpu_model);

    s = sa1110_init(sysmem, collie_binfo.ram_size, machine->cpu_type);



    dinfo = drive_get(IF_PFLASH, 0, 0);

    pflash_cfi01_register(SA_CS0, NULL, "collie.fl1", 0x02000000,
@@ -65,6 +60,7 @@ static void collie_machine_init(MachineClass *mc) 
    mc->desc = "Sharp SL-5500 (Collie) PDA (SA-1110)";

    mc->init = collie_init;

    mc->ignore_memory_transaction_failures = true;

    mc->default_cpu_type = ARM_CPU_TYPE_NAME("sa1110");

}



DEFINE_MACHINE("collie", collie_machine_init)

hw/arm/exynos4210.c

+1 −5
Original line number Diff line number Diff line
@@ -169,15 +169,11 @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem) 
    Exynos4210State *s = g_new(Exynos4210State, 1);

    qemu_irq gate_irq[EXYNOS4210_NCPUS][EXYNOS4210_IRQ_GATE_NINPUTS];

    SysBusDevice *busdev;

    ObjectClass *cpu_oc;

    DeviceState *dev;

    int i, n;



    cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, "cortex-a9");

    assert(cpu_oc);



    for (n = 0; n < EXYNOS4210_NCPUS; n++) {

        Object *cpuobj = object_new(object_class_get_name(cpu_oc));

        Object *cpuobj = object_new(ARM_CPU_TYPE_NAME("cortex-a9"));



        /* By default A9 CPUs have EL3 enabled.  This board does not currently

         * support EL3 so the CPU EL3 property is disabled before realization.

hw/arm/gumstix.c

+3 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include "sysemu/block-backend.h"

#include "exec/address-spaces.h"

#include "sysemu/qtest.h"

#include "cpu.h"



static const int sector_len = 128 * 1024;
@@ -86,7 +87,6 @@ static void connex_init(MachineState *machine) 


static void verdex_init(MachineState *machine)

{

    const char *cpu_model = machine->cpu_model;

    PXA2xxState *cpu;

    DriveInfo *dinfo;

    int be;
@@ -95,7 +95,7 @@ static void verdex_init(MachineState *machine) 
    uint32_t verdex_rom = 0x02000000;

    uint32_t verdex_ram = 0x10000000;



    cpu = pxa270_init(address_space_mem, verdex_ram, cpu_model ?: "pxa270-c0");

    cpu = pxa270_init(address_space_mem, verdex_ram, machine->cpu_type);



    dinfo = drive_get(IF_PFLASH, 0, 0);

    if (!dinfo && !qtest_enabled()) {
@@ -144,6 +144,7 @@ static void verdex_class_init(ObjectClass *oc, void *data) 
    mc->desc = "Gumstix Verdex (PXA270)";

    mc->init = verdex_init;

    mc->ignore_memory_transaction_failures = true;

    mc->default_cpu_type = ARM_CPU_TYPE_NAME("pxa270-c0");

}



static const TypeInfo verdex_type = {