From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55564) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z523A-0001NN-26 for qemu-devel@nongnu.org; Tue, 16 Jun 2015 21:21:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z5236-0000FL-0I for qemu-devel@nongnu.org; Tue, 16 Jun 2015 21:21:55 -0400 Received: from mail-bl2on0069.outbound.protection.outlook.com ([65.55.169.69]:37216 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z5235-0000F9-GZ for qemu-devel@nongnu.org; Tue, 16 Jun 2015 21:21:51 -0400 Date: Wed, 17 Jun 2015 11:17:02 +1000 From: "Edgar E. Iglesias" Message-ID: <20150617011702.GE30423@toto> References: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: Subject: Re: [Qemu-devel] [PATCH target-arm v3 5/7] arm: xlnx-zynqmp: Preface CPU variables with "apu" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Crosthwaite Cc: peter.maydell@linaro.org, alistair.francis@xilinx.com, qemu-devel@nongnu.org, zach.pfeffer@xilinx.com, jues@xilinx.com On Tue, Jun 16, 2015 at 05:36:14PM -0700, Peter Crosthwaite wrote: > The CPUs currently supported by zynqmp are the APU (application > processing unit) CPUs. There are other CPUs in Zynqmp so unqualified > "cpus" in ambiguous. Preface the variables with "APU" accordingly, to > prepare support adding the RPU (realtime processing unit) processors. > Reviewed-by: Edgar E. Iglesias > Signed-off-by: Peter Crosthwaite > --- > changed since v1: > s/acpu/apu-cpu/ > > hw/arm/xlnx-ep108.c | 2 +- > hw/arm/xlnx-zynqmp.c | 26 ++++++++++++++------------ > include/hw/arm/xlnx-zynqmp.h | 4 ++-- > 3 files changed, 17 insertions(+), 15 deletions(-) > > diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c > index b924f5e..7a98dd6 100644 > --- a/hw/arm/xlnx-ep108.c > +++ b/hw/arm/xlnx-ep108.c > @@ -65,7 +65,7 @@ static void xlnx_ep108_init(MachineState *machine) > xlnx_ep108_binfo.kernel_cmdline = machine->kernel_cmdline; > xlnx_ep108_binfo.initrd_filename = machine->initrd_filename; > xlnx_ep108_binfo.loader_start = 0; > - arm_load_kernel(&s->soc.cpu[0], &xlnx_ep108_binfo); > + arm_load_kernel(&s->soc.apu_cpu[0], &xlnx_ep108_binfo); > } > > static QEMUMachine xlnx_ep108_machine = { > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index 6b01965..353ecad 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -64,10 +64,10 @@ static void xlnx_zynqmp_init(Object *obj) > XlnxZynqMPState *s = XLNX_ZYNQMP(obj); > int i; > > - for (i = 0; i < XLNX_ZYNQMP_NUM_CPUS; i++) { > - object_initialize(&s->cpu[i], sizeof(s->cpu[i]), > + for (i = 0; i < XLNX_ZYNQMP_NUM_APU_CPUS; i++) { > + object_initialize(&s->apu_cpu[i], sizeof(s->apu_cpu[i]), > "cortex-a53-" TYPE_ARM_CPU); > - object_property_add_child(obj, "cpu[*]", OBJECT(&s->cpu[i]), > + object_property_add_child(obj, "apu-cpu[*]", OBJECT(&s->apu_cpu[i]), > &error_abort); > } > > @@ -95,7 +95,7 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) > > qdev_prop_set_uint32(DEVICE(&s->gic), "num-irq", GIC_NUM_SPI_INTR + 32); > qdev_prop_set_uint32(DEVICE(&s->gic), "revision", 2); > - qdev_prop_set_uint32(DEVICE(&s->gic), "num-cpu", XLNX_ZYNQMP_NUM_CPUS); > + qdev_prop_set_uint32(DEVICE(&s->gic), "num-cpu", XLNX_ZYNQMP_NUM_APU_CPUS); > object_property_set_bool(OBJECT(&s->gic), true, "realized", &err); > if (err) { > error_propagate((errp), (err)); > @@ -121,38 +121,40 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) > } > } > > - for (i = 0; i < XLNX_ZYNQMP_NUM_CPUS; i++) { > + for (i = 0; i < XLNX_ZYNQMP_NUM_APU_CPUS; i++) { > qemu_irq irq; > > - object_property_set_int(OBJECT(&s->cpu[i]), QEMU_PSCI_CONDUIT_SMC, > + object_property_set_int(OBJECT(&s->apu_cpu[i]), QEMU_PSCI_CONDUIT_SMC, > "psci-conduit", &error_abort); > if (i > 0) { > /* Secondary CPUs start in PSCI powered-down state */ > - object_property_set_bool(OBJECT(&s->cpu[i]), true, > + object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, > "start-powered-off", &error_abort); > } > > - object_property_set_int(OBJECT(&s->cpu[i]), GIC_BASE_ADDR, > + object_property_set_int(OBJECT(&s->apu_cpu[i]), GIC_BASE_ADDR, > "reset-cbar", &err); > if (err) { > error_propagate((errp), (err)); > return; > } > > - object_property_set_bool(OBJECT(&s->cpu[i]), true, "realized", &err); > + object_property_set_bool(OBJECT(&s->apu_cpu[i]), true, "realized", > + &err); > if (err) { > error_propagate((errp), (err)); > return; > } > > sysbus_connect_irq(SYS_BUS_DEVICE(&s->gic), i, > - qdev_get_gpio_in(DEVICE(&s->cpu[i]), ARM_CPU_IRQ)); > + qdev_get_gpio_in(DEVICE(&s->apu_cpu[i]), > + ARM_CPU_IRQ)); > irq = qdev_get_gpio_in(DEVICE(&s->gic), > arm_gic_ppi_index(i, ARM_PHYS_TIMER_PPI)); > - qdev_connect_gpio_out(DEVICE(&s->cpu[i]), 0, irq); > + qdev_connect_gpio_out(DEVICE(&s->apu_cpu[i]), 0, irq); > irq = qdev_get_gpio_in(DEVICE(&s->gic), > arm_gic_ppi_index(i, ARM_VIRT_TIMER_PPI)); > - qdev_connect_gpio_out(DEVICE(&s->cpu[i]), 1, irq); > + qdev_connect_gpio_out(DEVICE(&s->apu_cpu[i]), 1, irq); > } > > for (i = 0; i < GIC_NUM_SPI_INTR; i++) { > diff --git a/include/hw/arm/xlnx-zynqmp.h b/include/hw/arm/xlnx-zynqmp.h > index 79c2b0b..d042df1 100644 > --- a/include/hw/arm/xlnx-zynqmp.h > +++ b/include/hw/arm/xlnx-zynqmp.h > @@ -27,7 +27,7 @@ > #define XLNX_ZYNQMP(obj) OBJECT_CHECK(XlnxZynqMPState, (obj), \ > TYPE_XLNX_ZYNQMP) > > -#define XLNX_ZYNQMP_NUM_CPUS 4 > +#define XLNX_ZYNQMP_NUM_APU_CPUS 4 > #define XLNX_ZYNQMP_NUM_GEMS 4 > #define XLNX_ZYNQMP_NUM_UARTS 2 > > @@ -47,7 +47,7 @@ typedef struct XlnxZynqMPState { > DeviceState parent_obj; > > /*< public >*/ > - ARMCPU cpu[XLNX_ZYNQMP_NUM_CPUS]; > + ARMCPU apu_cpu[XLNX_ZYNQMP_NUM_APU_CPUS]; > GICState gic; > MemoryRegion gic_mr[XLNX_ZYNQMP_GIC_REGIONS][XLNX_ZYNQMP_GIC_ALIASES]; > CadenceGEMState gem[XLNX_ZYNQMP_NUM_GEMS]; > -- > 2.4.3.3.g905f831 >