Re: [Qemu-devel] [PATCH v2 2/6] xlnx-zynqmp-pmu: Add the CPU and memory
On Mon, Sep 4, 2017 at 12:32 AM, Igor Mammedov wrote:
> On Fri, 1 Sep 2017 14:00:37 -0700
> Alistair Francis wrote:
>
>> Connect the MicroBlaze CPU and the ROM and RAM memory regions.
>>
>> Signed-off-by: Alistair Francis
>> ---
>>
>> hw/microblaze/xlnx-zynqmp-pmu.c | 65
>> +++--
>> 1 file changed, 63 insertions(+), 2 deletions(-)
>>
>> diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c
>> b/hw/microblaze/xlnx-zynqmp-pmu.c
>> index fc3c8b236f..33584cfa4d 100644
>> --- a/hw/microblaze/xlnx-zynqmp-pmu.c
>> +++ b/hw/microblaze/xlnx-zynqmp-pmu.c
>> @@ -18,8 +18,11 @@
>> #include "qemu/osdep.h"
>> #include "qapi/error.h"
>> #include "qemu-common.h"
>> +#include "exec/address-spaces.h"
>> #include "hw/boards.h"
>> +#include "hw/qdev-properties.h"
>> #include "cpu.h"
>> +#include "boot.h"
>>
>> /* Define the PMU device */
>>
>> @@ -27,21 +30,51 @@
>> #define XLNX_ZYNQMP_PMU(obj) OBJECT_CHECK(XlnxZynqMPPMUState, (obj), \
>>TYPE_XLNX_ZYNQMP_PMU)
>>
>> +#define XLNX_ZYNQMP_PMU_ROM_SIZE0x8000
>> +#define XLNX_ZYNQMP_PMU_ROM_ADDR0xFFD0
>> +#define XLNX_ZYNQMP_PMU_RAM_ADDR0xFFDC
>> +
>> typedef struct XlnxZynqMPPMUState {
>> /*< private >*/
>> DeviceState parent_obj;
>>
>> /*< public >*/
>> +MicroBlazeCPU cpu;
>> } XlnxZynqMPPMUState;
>>
>> static void xlnx_zynqmp_pmu_init(Object *obj)
>> {
>> +XlnxZynqMPPMUState *s = XLNX_ZYNQMP_PMU(obj);
>>
>> +object_initialize(&s->cpu, sizeof(s->cpu),
>> + TYPE_MICROBLAZE_CPU);
>> +object_property_add_child(obj, "pmu-cpu[*]", OBJECT(&s->cpu),
> ^^^ why do you use this syntax
> here?
>
Woops, that was a left over from the ARM ZynqMP. I'll remove the '[*]'
>> + &error_abort);
>> }
>>
>> static void xlnx_zynqmp_pmu_realize(DeviceState *dev, Error **errp)
>> {
>> -
>> +XlnxZynqMPPMUState *s = XLNX_ZYNQMP_PMU(dev);
>> +
>> +object_property_set_uint(OBJECT(&s->cpu), XLNX_ZYNQMP_PMU_ROM_ADDR,
>> + "base-vectors", &error_abort);
>> +object_property_set_bool(OBJECT(&s->cpu), true, "use-stack-protection",
>> + &error_abort);
>> +object_property_set_uint(OBJECT(&s->cpu), 0, "use-fpu", &error_abort);
>> +object_property_set_uint(OBJECT(&s->cpu), 0, "use-hw-mul",
>> &error_abort);
>> +object_property_set_bool(OBJECT(&s->cpu), true, "use-barrel",
>> + &error_abort);
>> +object_property_set_bool(OBJECT(&s->cpu), true, "use-msr-instr",
>> + &error_abort);
>> +object_property_set_bool(OBJECT(&s->cpu), true, "use-pcmp-instr",
>> + &error_abort);
>> +object_property_set_bool(OBJECT(&s->cpu), false, "use-mmu",
>> &error_abort);
>> +object_property_set_bool(OBJECT(&s->cpu), true, "endianness",
>> + &error_abort);
>> +object_property_set_str(OBJECT(&s->cpu), "8.40.b", "version",
>> +&error_abort);
>> +object_property_set_uint(OBJECT(&s->cpu), 0, "pvr", &error_abort);
>> +object_property_set_bool(OBJECT(&s->cpu), true, "realized",
>> &error_fatal);
> I'd replace error_fatal here with errp
Will do.
Thanks,
Alistair
>
>> }
>>
>> static void xlnx_zynqmp_pmu_class_init(ObjectClass *oc, void *data)
>> @@ -70,7 +103,35 @@ type_init(xlnx_zynqmp_pmu_register_types)
>>
>> static void xlnx_zcu102_pmu_init(MachineState *machine)
>> {
>> -
>> +XlnxZynqMPPMUState *pmu = g_new0(XlnxZynqMPPMUState, 1);
>> +MemoryRegion *address_space_mem = get_system_memory();
>> +MemoryRegion *pmu_rom = g_new(MemoryRegion, 1);
>> +MemoryRegion *pmu_ram = g_new(MemoryRegion, 1);
>> +
>> +/* Create the ROM */
>> +memory_region_init_rom(pmu_rom, NULL, "xlnx-zcu102-pmu.rom",
>> + XLNX_ZYNQMP_PMU_ROM_SIZE, &error_fatal);
>> +memory_region_add_subregion(address_space_mem, XLNX_ZYNQMP_PMU_ROM_ADDR,
>> +pmu_rom);
>> +
>> +/* Create the RAM */
>> +memory_region_init_ram(pmu_ram, NULL, "xlnx-zcu102-pmu.ram",
>> + machine->ram_size, &error_fatal);
>> +memory_region_add_subregion(address_space_mem, XLNX_ZYNQMP_PMU_RAM_ADDR,
>> +pmu_ram);
>> +
>> +/* Create the PMU device */
>> +object_initialize(pmu, sizeof(XlnxZynqMPPMUState),
>> TYPE_XLNX_ZYNQMP_PMU);
>> +object_property_add_child(OBJECT(machine), "pmu", OBJECT(pmu),
>> + &error_abort);
>> +object_property_set_bool(OBJECT(pmu), true, "realized", &error_fatal);
>> +
>> +/* Load the kernel */
>> +microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR,
>> + machine->ram_size,
>> + machine->kernel_filename,
>> + machi
Re: [Qemu-devel] [PATCH v2 2/6] xlnx-zynqmp-pmu: Add the CPU and memory
On Fri, 1 Sep 2017 14:00:37 -0700
Alistair Francis wrote:
> Connect the MicroBlaze CPU and the ROM and RAM memory regions.
>
> Signed-off-by: Alistair Francis
> ---
>
> hw/microblaze/xlnx-zynqmp-pmu.c | 65
> +++--
> 1 file changed, 63 insertions(+), 2 deletions(-)
>
> diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c
> index fc3c8b236f..33584cfa4d 100644
> --- a/hw/microblaze/xlnx-zynqmp-pmu.c
> +++ b/hw/microblaze/xlnx-zynqmp-pmu.c
> @@ -18,8 +18,11 @@
> #include "qemu/osdep.h"
> #include "qapi/error.h"
> #include "qemu-common.h"
> +#include "exec/address-spaces.h"
> #include "hw/boards.h"
> +#include "hw/qdev-properties.h"
> #include "cpu.h"
> +#include "boot.h"
>
> /* Define the PMU device */
>
> @@ -27,21 +30,51 @@
> #define XLNX_ZYNQMP_PMU(obj) OBJECT_CHECK(XlnxZynqMPPMUState, (obj), \
>TYPE_XLNX_ZYNQMP_PMU)
>
> +#define XLNX_ZYNQMP_PMU_ROM_SIZE0x8000
> +#define XLNX_ZYNQMP_PMU_ROM_ADDR0xFFD0
> +#define XLNX_ZYNQMP_PMU_RAM_ADDR0xFFDC
> +
> typedef struct XlnxZynqMPPMUState {
> /*< private >*/
> DeviceState parent_obj;
>
> /*< public >*/
> +MicroBlazeCPU cpu;
> } XlnxZynqMPPMUState;
>
> static void xlnx_zynqmp_pmu_init(Object *obj)
> {
> +XlnxZynqMPPMUState *s = XLNX_ZYNQMP_PMU(obj);
>
> +object_initialize(&s->cpu, sizeof(s->cpu),
> + TYPE_MICROBLAZE_CPU);
> +object_property_add_child(obj, "pmu-cpu[*]", OBJECT(&s->cpu),
^^^ why do you use this syntax
here?
> + &error_abort);
> }
>
> static void xlnx_zynqmp_pmu_realize(DeviceState *dev, Error **errp)
> {
> -
> +XlnxZynqMPPMUState *s = XLNX_ZYNQMP_PMU(dev);
> +
> +object_property_set_uint(OBJECT(&s->cpu), XLNX_ZYNQMP_PMU_ROM_ADDR,
> + "base-vectors", &error_abort);
> +object_property_set_bool(OBJECT(&s->cpu), true, "use-stack-protection",
> + &error_abort);
> +object_property_set_uint(OBJECT(&s->cpu), 0, "use-fpu", &error_abort);
> +object_property_set_uint(OBJECT(&s->cpu), 0, "use-hw-mul", &error_abort);
> +object_property_set_bool(OBJECT(&s->cpu), true, "use-barrel",
> + &error_abort);
> +object_property_set_bool(OBJECT(&s->cpu), true, "use-msr-instr",
> + &error_abort);
> +object_property_set_bool(OBJECT(&s->cpu), true, "use-pcmp-instr",
> + &error_abort);
> +object_property_set_bool(OBJECT(&s->cpu), false, "use-mmu",
> &error_abort);
> +object_property_set_bool(OBJECT(&s->cpu), true, "endianness",
> + &error_abort);
> +object_property_set_str(OBJECT(&s->cpu), "8.40.b", "version",
> +&error_abort);
> +object_property_set_uint(OBJECT(&s->cpu), 0, "pvr", &error_abort);
> +object_property_set_bool(OBJECT(&s->cpu), true, "realized",
> &error_fatal);
I'd replace error_fatal here with errp
> }
>
> static void xlnx_zynqmp_pmu_class_init(ObjectClass *oc, void *data)
> @@ -70,7 +103,35 @@ type_init(xlnx_zynqmp_pmu_register_types)
>
> static void xlnx_zcu102_pmu_init(MachineState *machine)
> {
> -
> +XlnxZynqMPPMUState *pmu = g_new0(XlnxZynqMPPMUState, 1);
> +MemoryRegion *address_space_mem = get_system_memory();
> +MemoryRegion *pmu_rom = g_new(MemoryRegion, 1);
> +MemoryRegion *pmu_ram = g_new(MemoryRegion, 1);
> +
> +/* Create the ROM */
> +memory_region_init_rom(pmu_rom, NULL, "xlnx-zcu102-pmu.rom",
> + XLNX_ZYNQMP_PMU_ROM_SIZE, &error_fatal);
> +memory_region_add_subregion(address_space_mem, XLNX_ZYNQMP_PMU_ROM_ADDR,
> +pmu_rom);
> +
> +/* Create the RAM */
> +memory_region_init_ram(pmu_ram, NULL, "xlnx-zcu102-pmu.ram",
> + machine->ram_size, &error_fatal);
> +memory_region_add_subregion(address_space_mem, XLNX_ZYNQMP_PMU_RAM_ADDR,
> +pmu_ram);
> +
> +/* Create the PMU device */
> +object_initialize(pmu, sizeof(XlnxZynqMPPMUState), TYPE_XLNX_ZYNQMP_PMU);
> +object_property_add_child(OBJECT(machine), "pmu", OBJECT(pmu),
> + &error_abort);
> +object_property_set_bool(OBJECT(pmu), true, "realized", &error_fatal);
> +
> +/* Load the kernel */
> +microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR,
> + machine->ram_size,
> + machine->kernel_filename,
> + machine->dtb,
> + NULL);
> }
>
> static void xlnx_zcu102_pmu_machine_init(MachineClass *mc)
[Qemu-devel] [PATCH v2 2/6] xlnx-zynqmp-pmu: Add the CPU and memory
Connect the MicroBlaze CPU and the ROM and RAM memory regions.
Signed-off-by: Alistair Francis
---
hw/microblaze/xlnx-zynqmp-pmu.c | 65 +++--
1 file changed, 63 insertions(+), 2 deletions(-)
diff --git a/hw/microblaze/xlnx-zynqmp-pmu.c b/hw/microblaze/xlnx-zynqmp-pmu.c
index fc3c8b236f..33584cfa4d 100644
--- a/hw/microblaze/xlnx-zynqmp-pmu.c
+++ b/hw/microblaze/xlnx-zynqmp-pmu.c
@@ -18,8 +18,11 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qemu-common.h"
+#include "exec/address-spaces.h"
#include "hw/boards.h"
+#include "hw/qdev-properties.h"
#include "cpu.h"
+#include "boot.h"
/* Define the PMU device */
@@ -27,21 +30,51 @@
#define XLNX_ZYNQMP_PMU(obj) OBJECT_CHECK(XlnxZynqMPPMUState, (obj), \
TYPE_XLNX_ZYNQMP_PMU)
+#define XLNX_ZYNQMP_PMU_ROM_SIZE0x8000
+#define XLNX_ZYNQMP_PMU_ROM_ADDR0xFFD0
+#define XLNX_ZYNQMP_PMU_RAM_ADDR0xFFDC
+
typedef struct XlnxZynqMPPMUState {
/*< private >*/
DeviceState parent_obj;
/*< public >*/
+MicroBlazeCPU cpu;
} XlnxZynqMPPMUState;
static void xlnx_zynqmp_pmu_init(Object *obj)
{
+XlnxZynqMPPMUState *s = XLNX_ZYNQMP_PMU(obj);
+object_initialize(&s->cpu, sizeof(s->cpu),
+ TYPE_MICROBLAZE_CPU);
+object_property_add_child(obj, "pmu-cpu[*]", OBJECT(&s->cpu),
+ &error_abort);
}
static void xlnx_zynqmp_pmu_realize(DeviceState *dev, Error **errp)
{
-
+XlnxZynqMPPMUState *s = XLNX_ZYNQMP_PMU(dev);
+
+object_property_set_uint(OBJECT(&s->cpu), XLNX_ZYNQMP_PMU_ROM_ADDR,
+ "base-vectors", &error_abort);
+object_property_set_bool(OBJECT(&s->cpu), true, "use-stack-protection",
+ &error_abort);
+object_property_set_uint(OBJECT(&s->cpu), 0, "use-fpu", &error_abort);
+object_property_set_uint(OBJECT(&s->cpu), 0, "use-hw-mul", &error_abort);
+object_property_set_bool(OBJECT(&s->cpu), true, "use-barrel",
+ &error_abort);
+object_property_set_bool(OBJECT(&s->cpu), true, "use-msr-instr",
+ &error_abort);
+object_property_set_bool(OBJECT(&s->cpu), true, "use-pcmp-instr",
+ &error_abort);
+object_property_set_bool(OBJECT(&s->cpu), false, "use-mmu", &error_abort);
+object_property_set_bool(OBJECT(&s->cpu), true, "endianness",
+ &error_abort);
+object_property_set_str(OBJECT(&s->cpu), "8.40.b", "version",
+&error_abort);
+object_property_set_uint(OBJECT(&s->cpu), 0, "pvr", &error_abort);
+object_property_set_bool(OBJECT(&s->cpu), true, "realized", &error_fatal);
}
static void xlnx_zynqmp_pmu_class_init(ObjectClass *oc, void *data)
@@ -70,7 +103,35 @@ type_init(xlnx_zynqmp_pmu_register_types)
static void xlnx_zcu102_pmu_init(MachineState *machine)
{
-
+XlnxZynqMPPMUState *pmu = g_new0(XlnxZynqMPPMUState, 1);
+MemoryRegion *address_space_mem = get_system_memory();
+MemoryRegion *pmu_rom = g_new(MemoryRegion, 1);
+MemoryRegion *pmu_ram = g_new(MemoryRegion, 1);
+
+/* Create the ROM */
+memory_region_init_rom(pmu_rom, NULL, "xlnx-zcu102-pmu.rom",
+ XLNX_ZYNQMP_PMU_ROM_SIZE, &error_fatal);
+memory_region_add_subregion(address_space_mem, XLNX_ZYNQMP_PMU_ROM_ADDR,
+pmu_rom);
+
+/* Create the RAM */
+memory_region_init_ram(pmu_ram, NULL, "xlnx-zcu102-pmu.ram",
+ machine->ram_size, &error_fatal);
+memory_region_add_subregion(address_space_mem, XLNX_ZYNQMP_PMU_RAM_ADDR,
+pmu_ram);
+
+/* Create the PMU device */
+object_initialize(pmu, sizeof(XlnxZynqMPPMUState), TYPE_XLNX_ZYNQMP_PMU);
+object_property_add_child(OBJECT(machine), "pmu", OBJECT(pmu),
+ &error_abort);
+object_property_set_bool(OBJECT(pmu), true, "realized", &error_fatal);
+
+/* Load the kernel */
+microblaze_load_kernel(&pmu->cpu, XLNX_ZYNQMP_PMU_RAM_ADDR,
+ machine->ram_size,
+ machine->kernel_filename,
+ machine->dtb,
+ NULL);
}
static void xlnx_zcu102_pmu_machine_init(MachineClass *mc)
--
2.11.0
