[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 4/5] xlnx-zcu102: Specify the valid CPUs
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PATCH v4 4/5] xlnx-zcu102: Specify the valid CPUs |
Date: |
Tue, 19 Dec 2017 16:27:59 -0800 |
List all possible valid CPU options.
Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
---
An implementation for single CPU machines is still being discussed. A
solution proposed by Eduardo is this:
1) Change the default on TYPE_MACHINE to:
mc->valid_cpu_types = { TYPE_CPU, NULL };
This will keep the existing behavior for all boards.
2) mc->valid_cpu_types=NULL be interpreted as "no CPU model
except the default is accepted" or "-cpu is not accepted" in
machine_run_board_init() (I prefer the former, but both
options would be correct)
3) Boards like xlnx_zynqmp could then just do this:
static void xxx_class_init(...) {
mc->default_cpu_type = MY_CPU_TYPE;
/* Reason: XXX_init() is hardcoded to MY_CPU_TYPE */
mc->valid_cpu_types = NULL;
}
V4:
- Remove spaces
V3:
- Make variable static
V2:
- Don't use the users -cpu
- Fixup allignment
hw/arm/xlnx-zcu102.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/hw/arm/xlnx-zcu102.c b/hw/arm/xlnx-zcu102.c
index b126cf148b..08b5c28a3a 100644
--- a/hw/arm/xlnx-zcu102.c
+++ b/hw/arm/xlnx-zcu102.c
@@ -184,6 +184,11 @@ static void xlnx_zynqmp_init(XlnxZCU102 *s, MachineState
*machine)
arm_load_kernel(s->soc.boot_cpu_ptr, &xlnx_zcu102_binfo);
}
+static const char *xlnx_zynqmp_valid_cpus[] = {
+ ARM_CPU_TYPE_NAME("cortex-a53"),
+ NULL
+};
+
static void xlnx_ep108_init(MachineState *machine)
{
XlnxZCU102 *s = EP108_MACHINE(machine);
@@ -216,6 +221,12 @@ static void xlnx_ep108_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_cpu_type = ARM_CPU_TYPE_NAME("cortex-a53");
+ /* The ZynqMP SoC is always a Cortex-A53. We add this here to give
+ * users a sane error if they specify a different CPU, but we never
+ * use their CPU choice.
+ */
+ mc->valid_cpu_types = xlnx_zynqmp_valid_cpus;
}
static const TypeInfo xlnx_ep108_machine_init_typeinfo = {
@@ -274,6 +285,12 @@ 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_cpu_type = ARM_CPU_TYPE_NAME("cortex-a53");
+ /* The ZynqMP SoC is always a Cortex-A53. We add this here to give
+ * users a sane error if they specify a different CPU, but we never
+ * use their CPU choice.
+ */
+ mc->valid_cpu_types = xlnx_zynqmp_valid_cpus;
}
static const TypeInfo xlnx_zcu102_machine_init_typeinfo = {
--
2.14.1
- [Qemu-devel] [PATCH v4 0/5] Add a valid_cpu_types property, Alistair Francis, 2017/12/19
- [Qemu-devel] [PATCH v4 2/5] bcm2836: Use the Cortex-A7 instead of Cortex-A15, Alistair Francis, 2017/12/19
- [Qemu-devel] [PATCH v4 1/5] netduino2: Specify the valid CPUs, Alistair Francis, 2017/12/19
- [Qemu-devel] [PATCH v4 3/5] raspi: Specify the valid CPUs, Alistair Francis, 2017/12/19
- [Qemu-devel] [PATCH v4 4/5] xlnx-zcu102: Specify the valid CPUs,
Alistair Francis <=
- [Qemu-devel] [PATCH v4 5/5] xilinx_zynq: Specify the valid CPUs, Alistair Francis, 2017/12/19
- Re: [Qemu-devel] [PATCH v4 0/5] Add a valid_cpu_types property, Peter Maydell, 2017/12/19
- Re: [Qemu-devel] [PATCH v4 0/5] Add a valid_cpu_types property, Alistair Francis, 2017/12/19
- Re: [Qemu-devel] [PATCH v4 0/5] Add a valid_cpu_types property, Alistair Francis, 2017/12/19
- Re: [Qemu-devel] [PATCH v4 0/5] Add a valid_cpu_types property, Eduardo Habkost, 2017/12/20
- Re: [Qemu-devel] [PATCH v4 0/5] Add a valid_cpu_types property, Alistair Francis, 2017/12/22
- Re: [Qemu-devel] [PATCH v4 0/5] Add a valid_cpu_types property, Alistair Francis, 2017/12/22
- Re: [Qemu-devel] [PATCH v4 0/5] Add a valid_cpu_types property, Eduardo Habkost, 2017/12/22
- Re: [Qemu-devel] [PATCH v4 0/5] Add a valid_cpu_types property, Igor Mammedov, 2017/12/28
- Re: [Qemu-devel] [PATCH v4 0/5] Add a valid_cpu_types property, Eduardo Habkost, 2017/12/28