Commit 87c8047f authored by Igor Mammedov's avatar Igor Mammedov Committed by Patchew Importer
Browse files

arm/xlnx-zcu102: use memdev for RAM 



memory_region_allocate_system_memory() API is going away, so
replace it with memdev allocated MemoryRegion. The later is
initialized by generic code, so board only needs to opt in
to memdev scheme by providing
  MachineClass::default_ram_id
and using MachineState::ram instead of manually initializing
RAM memory region.

Signed-off-by: default avatarIgor Mammedov <imammedo@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: default avatarAlistair Francis <alistair.francis@wdc.com>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-Id: <20200219160953.13771-38-imammedo@redhat.com>
parent e9201598

hw/arm/xlnx-zcu102.c

+2 −5
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ typedef struct XlnxZCU102 { 
    MachineState parent_obj;



    XlnxZynqMPState soc;

    MemoryRegion ddr_ram;



    bool secure;

    bool virt;
@@ -87,13 +86,10 @@ static void xlnx_zcu102_init(MachineState *machine) 
                 ram_size);

    }



    memory_region_allocate_system_memory(&s->ddr_ram, NULL, "ddr-ram",

                                         ram_size);



    object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),

                            TYPE_XLNX_ZYNQMP, &error_abort, NULL);



    object_property_set_link(OBJECT(&s->soc), OBJECT(&s->ddr_ram),

    object_property_set_link(OBJECT(&s->soc), OBJECT(machine->ram),

                         "ddr-ram", &error_abort);

    object_property_set_bool(OBJECT(&s->soc), s->secure, "secure",

                             &error_fatal);
@@ -211,6 +207,7 @@ static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data) 
    mc->ignore_memory_transaction_failures = true;

    mc->max_cpus = XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS;

    mc->default_cpus = XLNX_ZYNQMP_NUM_APU_CPUS;

    mc->default_ram_id = "ddr-ram";

}



static const TypeInfo xlnx_zcu102_machine_init_typeinfo = {