From: Alistair Francis <alistair.francis@xilinx.com>
To: qemu-devel@nongnu.org
Cc: alistair.francis@xilinx.com, alistair23@gmail.com,
ehabkost@redhat.com, marcel@redhat.com, imammedo@redhat.com,
f4bug@amsat.org, peter.maydell@linaro.org
Subject: [Qemu-devel] [PATCH v5 5/6] xlnx-zcu102: Specify the valid CPUs
Date: Thu, 1 Feb 2018 16:42:15 -0800 [thread overview]
Message-ID: <2b1f2a135fcc38848a3cbd8746b87b526fe43351.1517532021.git.alistair.francis@xilinx.com> (raw)
In-Reply-To: <cover.1517532021.git.alistair.francis@xilinx.com>
List all possible valid CPU options.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
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;
}
V5:
- Use cpu_model names
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..994b19a36f 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[] = {
+ "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
next prev parent reply other threads:[~2018-02-02 0:54 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-02 0:42 [Qemu-devel] [PATCH v5 0/6] Add a valid_cpu_types property Alistair Francis
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 1/6] machine: Convert the valid cpu types to use cpu_model Alistair Francis
2018-02-02 18:23 ` Eduardo Habkost
2018-02-05 11:22 ` Igor Mammedov
2018-02-05 13:54 ` Eduardo Habkost
2018-02-05 14:42 ` Igor Mammedov
2018-02-05 22:42 ` Eduardo Habkost
2018-02-06 14:43 ` Igor Mammedov
2019-06-17 5:09 ` Philippe Mathieu-Daudé
2019-06-17 14:43 ` Eduardo Habkost
2019-06-17 15:01 ` Igor Mammedov
2019-06-17 15:15 ` Philippe Mathieu-Daudé
2019-06-17 15:33 ` Igor Mammedov
2019-06-17 16:27 ` Eduardo Habkost
2019-06-18 11:34 ` Igor Mammedov
2019-06-18 13:55 ` Eduardo Habkost
2019-06-20 9:02 ` Igor Mammedov
2019-06-20 14:43 ` Eduardo Habkost
2020-01-23 18:48 ` Philippe Mathieu-Daudé
2020-02-06 20:59 ` Eduardo Habkost
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 2/6] netduino2: Specify the valid CPUs Alistair Francis
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 3/6] bcm2836: Use the Cortex-A7 instead of Cortex-A15 Alistair Francis
2018-02-15 13:23 ` Philippe Mathieu-Daudé
2018-02-15 22:41 ` Alistair Francis
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 4/6] raspi: Specify the valid CPUs Alistair Francis
2018-02-15 11:29 ` Peter Maydell
2018-02-15 13:04 ` Philippe Mathieu-Daudé
2018-02-15 13:17 ` Peter Maydell
2018-02-15 17:08 ` Igor Mammedov
2018-02-02 0:42 ` Alistair Francis [this message]
2018-02-02 0:42 ` [Qemu-devel] [PATCH v5 6/6] xilinx_zynq: " Alistair Francis
2018-03-13 23:13 ` [Qemu-devel] [PATCH v5 0/6] Add a valid_cpu_types property Philippe Mathieu-Daudé
2018-03-21 14:33 ` Igor Mammedov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2b1f2a135fcc38848a3cbd8746b87b526fe43351.1517532021.git.alistair.francis@xilinx.com \
--to=alistair.francis@xilinx.com \
--cc=alistair23@gmail.com \
--cc=ehabkost@redhat.com \
--cc=f4bug@amsat.org \
--cc=imammedo@redhat.com \
--cc=marcel@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).