| Message ID | 20180503115620.10596-3-edgar.iglesias@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | xlnx-zynqmp: Change the Cortex-R5 for Cortex-R5F | expand |
On 05/03/2018 01:56 PM, Edgar E. Iglesias wrote: > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > The ZynqMP has Cortex-R5Fs with the optional FPU enabled. > Seems ok to me according to the documentation. Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com> > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > --- > hw/arm/xlnx-zynqmp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index 505253e0d2..efeb53c732 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -116,7 +116,7 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, > char *name; > > object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]), > - "cortex-r5-" TYPE_ARM_CPU); > + "cortex-r5f-" TYPE_ARM_CPU); > object_property_add_child(OBJECT(s), "rpu-cpu[*]", > OBJECT(&s->rpu_cpu[i]), &error_abort); > >
On Thu, May 3, 2018 at 4:56 AM Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote: > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > The ZynqMP has Cortex-R5Fs with the optional FPU enabled. > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/arm/xlnx-zynqmp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index 505253e0d2..efeb53c732 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -116,7 +116,7 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, > char *name; > object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]), > - "cortex-r5-" TYPE_ARM_CPU); > + "cortex-r5f-" TYPE_ARM_CPU); > object_property_add_child(OBJECT(s), "rpu-cpu[*]", > OBJECT(&s->rpu_cpu[i]), &error_abort); > -- > 2.14.1
Hi Edgar, On 05/03/2018 08:56 AM, Edgar E. Iglesias wrote: > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > The ZynqMP has Cortex-R5Fs with the optional FPU enabled. What about updating the xlnx-zcu102 machine description too? mc->desc = "Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs ..." > > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> I just noticed we can not get information for the R profile cores via the monitor: (qemu) info cpus * CPU #0: thread_id=19283 CPU #1: thread_id=19284 CPU #2: thread_id=19285 CPU #3: thread_id=19286 same with "info registers -a" > --- > hw/arm/xlnx-zynqmp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index 505253e0d2..efeb53c732 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -116,7 +116,7 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, > char *name; > > object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]), > - "cortex-r5-" TYPE_ARM_CPU); > + "cortex-r5f-" TYPE_ARM_CPU); > object_property_add_child(OBJECT(s), "rpu-cpu[*]", > OBJECT(&s->rpu_cpu[i]), &error_abort); > >
On Thu, May 10, 2018 at 03:09:46PM -0300, Philippe Mathieu-Daudé wrote: > Hi Edgar, > > On 05/03/2018 08:56 AM, Edgar E. Iglesias wrote: > > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > > > The ZynqMP has Cortex-R5Fs with the optional FPU enabled. > > What about updating the xlnx-zcu102 machine description too? > > mc->desc = "Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs ..." Yes, I've added the 'F' in v2 (I've kept the Rb and Tb lines). Will send v2 in a moment. Cheers, Edgar > > > > > Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com> > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > I just noticed we can not get information for the R profile cores via > the monitor: > > (qemu) info cpus > * CPU #0: thread_id=19283 > CPU #1: thread_id=19284 > CPU #2: thread_id=19285 > CPU #3: thread_id=19286 > > same with "info registers -a" > > > --- > > hw/arm/xlnx-zynqmp.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > > index 505253e0d2..efeb53c732 100644 > > --- a/hw/arm/xlnx-zynqmp.c > > +++ b/hw/arm/xlnx-zynqmp.c > > @@ -116,7 +116,7 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, > > char *name; > > > > object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]), > > - "cortex-r5-" TYPE_ARM_CPU); > > + "cortex-r5f-" TYPE_ARM_CPU); > > object_property_add_child(OBJECT(s), "rpu-cpu[*]", > > OBJECT(&s->rpu_cpu[i]), &error_abort); > > > >
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 505253e0d2..efeb53c732 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -116,7 +116,7 @@ static void xlnx_zynqmp_create_rpu(XlnxZynqMPState *s, const char *boot_cpu, char *name; object_initialize(&s->rpu_cpu[i], sizeof(s->rpu_cpu[i]), - "cortex-r5-" TYPE_ARM_CPU); + "cortex-r5f-" TYPE_ARM_CPU); object_property_add_child(OBJECT(s), "rpu-cpu[*]", OBJECT(&s->rpu_cpu[i]), &error_abort);