2015-05-15 05:23:24 +03:00
|
|
|
/*
|
2017-09-14 20:43:17 +03:00
|
|
|
* Xilinx ZynqMP ZCU102 board
|
2015-05-15 05:23:24 +03:00
|
|
|
*
|
|
|
|
* Copyright (C) 2015 Xilinx Inc
|
|
|
|
* Written by Peter Crosthwaite <peter.crosthwaite@xilinx.com>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License as published by the
|
|
|
|
* Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
* for more details.
|
|
|
|
*/
|
|
|
|
|
2015-12-07 19:23:45 +03:00
|
|
|
#include "qemu/osdep.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2016-01-19 23:51:44 +03:00
|
|
|
#include "cpu.h"
|
2015-05-15 05:23:24 +03:00
|
|
|
#include "hw/arm/xlnx-zynqmp.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "qemu/error-report.h"
|
2015-12-15 15:16:16 +03:00
|
|
|
#include "qemu/log.h"
|
2017-11-16 18:29:43 +03:00
|
|
|
#include "sysemu/qtest.h"
|
2020-04-23 15:11:14 +03:00
|
|
|
#include "sysemu/device_tree.h"
|
2015-05-15 05:23:24 +03:00
|
|
|
|
2017-09-14 20:43:17 +03:00
|
|
|
typedef struct XlnxZCU102 {
|
2017-09-14 20:43:18 +03:00
|
|
|
MachineState parent_obj;
|
|
|
|
|
2015-05-15 05:23:24 +03:00
|
|
|
XlnxZynqMPState soc;
|
2017-09-14 20:43:18 +03:00
|
|
|
|
|
|
|
bool secure;
|
2017-09-14 20:43:18 +03:00
|
|
|
bool virt;
|
2020-04-23 15:11:13 +03:00
|
|
|
|
|
|
|
struct arm_boot_info binfo;
|
2017-09-14 20:43:17 +03:00
|
|
|
} XlnxZCU102;
|
2015-05-15 05:23:24 +03:00
|
|
|
|
2017-09-14 20:43:18 +03:00
|
|
|
#define TYPE_ZCU102_MACHINE MACHINE_TYPE_NAME("xlnx-zcu102")
|
|
|
|
#define ZCU102_MACHINE(obj) \
|
|
|
|
OBJECT_CHECK(XlnxZCU102, (obj), TYPE_ZCU102_MACHINE)
|
|
|
|
|
2015-05-15 05:23:30 +03:00
|
|
|
|
2017-09-14 20:43:18 +03:00
|
|
|
static bool zcu102_get_secure(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
XlnxZCU102 *s = ZCU102_MACHINE(obj);
|
|
|
|
|
|
|
|
return s->secure;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void zcu102_set_secure(Object *obj, bool value, Error **errp)
|
|
|
|
{
|
|
|
|
XlnxZCU102 *s = ZCU102_MACHINE(obj);
|
|
|
|
|
|
|
|
s->secure = value;
|
|
|
|
}
|
|
|
|
|
2017-09-14 20:43:18 +03:00
|
|
|
static bool zcu102_get_virt(Object *obj, Error **errp)
|
|
|
|
{
|
|
|
|
XlnxZCU102 *s = ZCU102_MACHINE(obj);
|
|
|
|
|
|
|
|
return s->virt;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void zcu102_set_virt(Object *obj, bool value, Error **errp)
|
|
|
|
{
|
|
|
|
XlnxZCU102 *s = ZCU102_MACHINE(obj);
|
|
|
|
|
|
|
|
s->virt = value;
|
|
|
|
}
|
|
|
|
|
2020-04-23 15:11:14 +03:00
|
|
|
static void zcu102_modify_dtb(const struct arm_boot_info *binfo, void *fdt)
|
|
|
|
{
|
|
|
|
XlnxZCU102 *s = container_of(binfo, XlnxZCU102, binfo);
|
|
|
|
bool method_is_hvc;
|
|
|
|
char **node_path;
|
|
|
|
const char *r;
|
|
|
|
int prop_len;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* If EL3 is enabled, we keep all firmware nodes active. */
|
|
|
|
if (!s->secure) {
|
|
|
|
node_path = qemu_fdt_node_path(fdt, NULL, "xlnx,zynqmp-firmware",
|
|
|
|
&error_fatal);
|
|
|
|
|
|
|
|
for (i = 0; node_path && node_path[i]; i++) {
|
|
|
|
r = qemu_fdt_getprop(fdt, node_path[i], "method", &prop_len, NULL);
|
|
|
|
method_is_hvc = r && !strcmp("hvc", r);
|
|
|
|
|
|
|
|
/* Allow HVC based firmware if EL2 is enabled. */
|
|
|
|
if (method_is_hvc && s->virt) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
qemu_fdt_setprop_string(fdt, node_path[i], "status", "disabled");
|
|
|
|
}
|
|
|
|
g_strfreev(node_path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-06-08 15:15:32 +03:00
|
|
|
static void xlnx_zcu102_init(MachineState *machine)
|
2015-05-15 05:23:24 +03:00
|
|
|
{
|
2018-06-08 15:15:32 +03:00
|
|
|
XlnxZCU102 *s = ZCU102_MACHINE(machine);
|
2016-01-21 17:15:04 +03:00
|
|
|
int i;
|
2016-01-13 01:39:18 +03:00
|
|
|
uint64_t ram_size = machine->ram_size;
|
|
|
|
|
|
|
|
/* Create the memory region to pass to the SoC */
|
|
|
|
if (ram_size > XLNX_ZYNQMP_MAX_RAM_SIZE) {
|
|
|
|
error_report("ERROR: RAM size 0x%" PRIx64 " above max supported of "
|
|
|
|
"0x%llx", ram_size,
|
|
|
|
XLNX_ZYNQMP_MAX_RAM_SIZE);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ram_size < 0x08000000) {
|
2017-09-14 20:43:17 +03:00
|
|
|
qemu_log("WARNING: RAM size 0x%" PRIx64 " is small for ZCU102",
|
2016-01-13 01:39:18 +03:00
|
|
|
ram_size);
|
|
|
|
}
|
|
|
|
|
hw/arm: Use object_initialize_child for correct reference counting
As explained in commit aff39be0ed97:
Both functions, object_initialize() and object_property_add_child()
increase the reference counter of the new object, so one of the
references has to be dropped afterwards to get the reference
counting right. Otherwise the child object will not be properly
cleaned up when the parent gets destroyed.
Thus let's use now object_initialize_child() instead to get the
reference counting here right.
This patch was generated using the following Coccinelle script
(with a bit of manual fix-up for overly long lines):
@use_object_initialize_child@
expression parent_obj;
expression child_ptr;
expression child_name;
expression child_type;
expression child_size;
expression errp;
@@
(
- object_initialize(child_ptr, child_size, child_type);
+ object_initialize_child(parent_obj, child_name, child_ptr, child_size,
+ child_type, &error_abort, NULL);
... when != parent_obj
- object_property_add_child(parent_obj, child_name, OBJECT(child_ptr), NULL);
...
?- object_unref(OBJECT(child_ptr));
|
- object_initialize(child_ptr, child_size, child_type);
+ object_initialize_child(parent_obj, child_name, child_ptr, child_size,
+ child_type, errp, NULL);
... when != parent_obj
- object_property_add_child(parent_obj, child_name, OBJECT(child_ptr), errp);
...
?- object_unref(OBJECT(child_ptr));
)
@use_sysbus_init_child_obj@
expression parent_obj;
expression dev;
expression child_ptr;
expression child_name;
expression child_type;
expression child_size;
expression errp;
@@
(
- object_initialize_child(parent_obj, child_name, child_ptr, child_size,
- child_type, errp, NULL);
+ sysbus_init_child_obj(parent_obj, child_name, child_ptr, child_size,
+ child_type);
...
- qdev_set_parent_bus(DEVICE(child_ptr), sysbus_get_default());
|
- object_initialize_child(parent_obj, child_name, child_ptr, child_size,
- child_type, errp, NULL);
+ sysbus_init_child_obj(parent_obj, child_name, child_ptr, child_size,
+ child_type);
- dev = DEVICE(child_ptr);
- qdev_set_parent_bus(dev, sysbus_get_default());
)
While the object_initialize() function doesn't take an
'Error *errp' argument, the object_initialize_child() does.
Since this code is used when a machine is created (and is not
yet running), we deliberately choose to use the &error_abort
argument instead of ignoring errors if an object creation failed.
This choice also matches when using sysbus_init_child_obj(),
since its code is:
void sysbus_init_child_obj(Object *parent,
const char *childname, void *child,
size_t childsize, const char *childtype)
{
object_initialize_child(parent, childname, child, childsize,
childtype, &error_abort, NULL);
qdev_set_parent_bus(DEVICE(child), sysbus_get_default());
}
Suggested-by: Eduardo Habkost <ehabkost@redhat.com>
Inspired-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20190507163416.24647-9-philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2019-05-07 19:34:08 +03:00
|
|
|
object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
|
|
|
|
TYPE_XLNX_ZYNQMP, &error_abort, NULL);
|
2015-05-15 05:23:24 +03:00
|
|
|
|
2020-02-19 19:09:11 +03:00
|
|
|
object_property_set_link(OBJECT(&s->soc), OBJECT(machine->ram),
|
2016-01-13 01:39:18 +03:00
|
|
|
"ddr-ram", &error_abort);
|
2017-09-14 20:43:18 +03:00
|
|
|
object_property_set_bool(OBJECT(&s->soc), s->secure, "secure",
|
|
|
|
&error_fatal);
|
2017-09-14 20:43:18 +03:00
|
|
|
object_property_set_bool(OBJECT(&s->soc), s->virt, "virtualization",
|
|
|
|
&error_fatal);
|
2016-01-13 01:39:18 +03:00
|
|
|
|
2016-01-14 18:02:12 +03:00
|
|
|
object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal);
|
2015-05-15 05:23:27 +03:00
|
|
|
|
2016-02-18 17:16:18 +03:00
|
|
|
/* Create and plug in the SD cards */
|
|
|
|
for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) {
|
|
|
|
BusState *bus;
|
|
|
|
DriveInfo *di = drive_get_next(IF_SD);
|
|
|
|
BlockBackend *blk = di ? blk_by_legacy_dinfo(di) : NULL;
|
|
|
|
DeviceState *carddev;
|
|
|
|
char *bus_name;
|
|
|
|
|
|
|
|
bus_name = g_strdup_printf("sd-bus%d", i);
|
|
|
|
bus = qdev_get_child_bus(DEVICE(&s->soc), bus_name);
|
|
|
|
g_free(bus_name);
|
|
|
|
if (!bus) {
|
|
|
|
error_report("No SD bus found for SD card %d", i);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
carddev = qdev_create(bus, TYPE_SD_CARD);
|
|
|
|
qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);
|
|
|
|
object_property_set_bool(OBJECT(carddev), true, "realized",
|
|
|
|
&error_fatal);
|
|
|
|
}
|
|
|
|
|
2016-01-21 17:15:04 +03:00
|
|
|
for (i = 0; i < XLNX_ZYNQMP_NUM_SPIS; i++) {
|
|
|
|
SSIBus *spi_bus;
|
|
|
|
DeviceState *flash_dev;
|
|
|
|
qemu_irq cs_line;
|
2016-07-04 15:06:37 +03:00
|
|
|
DriveInfo *dinfo = drive_get_next(IF_MTD);
|
2016-01-21 17:15:04 +03:00
|
|
|
gchar *bus_name = g_strdup_printf("spi%d", i);
|
|
|
|
|
|
|
|
spi_bus = (SSIBus *)qdev_get_child_bus(DEVICE(&s->soc), bus_name);
|
|
|
|
g_free(bus_name);
|
|
|
|
|
2016-07-04 15:06:37 +03:00
|
|
|
flash_dev = ssi_create_slave_no_init(spi_bus, "sst25wf080");
|
|
|
|
if (dinfo) {
|
|
|
|
qdev_prop_set_drive(flash_dev, "drive", blk_by_legacy_dinfo(dinfo),
|
|
|
|
&error_fatal);
|
|
|
|
}
|
|
|
|
qdev_init_nofail(flash_dev);
|
|
|
|
|
2016-01-21 17:15:04 +03:00
|
|
|
cs_line = qdev_get_gpio_in_named(flash_dev, SSI_GPIO_CS, 0);
|
|
|
|
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->soc.spi[i]), 1, cs_line);
|
|
|
|
}
|
|
|
|
|
2017-12-13 20:59:22 +03:00
|
|
|
for (i = 0; i < XLNX_ZYNQMP_NUM_QSPI_FLASH; i++) {
|
|
|
|
SSIBus *spi_bus;
|
|
|
|
DeviceState *flash_dev;
|
|
|
|
qemu_irq cs_line;
|
|
|
|
DriveInfo *dinfo = drive_get_next(IF_MTD);
|
|
|
|
int bus = i / XLNX_ZYNQMP_NUM_QSPI_BUS_CS;
|
|
|
|
gchar *bus_name = g_strdup_printf("qspi%d", bus);
|
|
|
|
|
|
|
|
spi_bus = (SSIBus *)qdev_get_child_bus(DEVICE(&s->soc), bus_name);
|
|
|
|
g_free(bus_name);
|
|
|
|
|
|
|
|
flash_dev = ssi_create_slave_no_init(spi_bus, "n25q512a11");
|
|
|
|
if (dinfo) {
|
|
|
|
qdev_prop_set_drive(flash_dev, "drive", blk_by_legacy_dinfo(dinfo),
|
|
|
|
&error_fatal);
|
|
|
|
}
|
|
|
|
qdev_init_nofail(flash_dev);
|
|
|
|
|
|
|
|
cs_line = qdev_get_gpio_in_named(flash_dev, SSI_GPIO_CS, 0);
|
|
|
|
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->soc.qspi), i + 1, cs_line);
|
|
|
|
}
|
|
|
|
|
hw/arm/cubieboard hw/arm/xlnx-ep108: Fix units_per_default_bus
Machine types cubieboard, xlnx-ep108, xlnx-zcu102 have an onboard AHCI
controller, but neglect to set their MachineClass member
units_per_default_bus = 1. This permits -drive if=ide,unit=1, which
makes no sense for AHCI. It also screws up index=N for odd N, because
it gets desugared to unit=1,bus=N/2
Doesn't really matter, because these machine types fail to honor
-drive if=ide. Add the missing units_per_default_bus = 1 anyway,
along with a TODO comment on what needs to be done for -drive if=ide.
Also set block_default_type = IF_IDE explicitly. It's currently the
default, but the next commit will change it to something more
sensible, and we want to keep the IF_IDE default for these three
machines. See also the previous commit.
Cc: Beniamino Galvani <b.galvani@gmail.com>
Cc: Alistair Francis <alistair.francis@xilinx.com>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Message-Id: <1487153147-11530-3-git-send-email-armbru@redhat.com>
2017-02-15 13:05:41 +03:00
|
|
|
/* TODO create and connect IDE devices for ide_drive_get() */
|
|
|
|
|
2020-04-23 15:11:13 +03:00
|
|
|
s->binfo.ram_size = ram_size;
|
|
|
|
s->binfo.loader_start = 0;
|
2020-04-23 15:11:14 +03:00
|
|
|
s->binfo.modify_dtb = zcu102_modify_dtb;
|
2020-04-23 15:11:13 +03:00
|
|
|
arm_load_kernel(s->soc.boot_cpu_ptr, machine, &s->binfo);
|
2015-05-15 05:23:24 +03:00
|
|
|
}
|
|
|
|
|
2017-09-14 20:43:18 +03:00
|
|
|
static void xlnx_zcu102_machine_instance_init(Object *obj)
|
|
|
|
{
|
2017-09-14 20:43:18 +03:00
|
|
|
XlnxZCU102 *s = ZCU102_MACHINE(obj);
|
|
|
|
|
|
|
|
/* Default to secure mode being disabled */
|
|
|
|
s->secure = false;
|
|
|
|
object_property_add_bool(obj, "secure", zcu102_get_secure,
|
|
|
|
zcu102_set_secure, NULL);
|
|
|
|
object_property_set_description(obj, "secure",
|
|
|
|
"Set on/off to enable/disable the ARM "
|
|
|
|
"Security Extensions (TrustZone)",
|
|
|
|
NULL);
|
2017-09-14 20:43:18 +03:00
|
|
|
|
|
|
|
/* Default to virt (EL2) being disabled */
|
|
|
|
s->virt = false;
|
|
|
|
object_property_add_bool(obj, "virtualization", zcu102_get_virt,
|
|
|
|
zcu102_set_virt, NULL);
|
|
|
|
object_property_set_description(obj, "virtualization",
|
|
|
|
"Set on/off to enable/disable emulating a "
|
|
|
|
"guest CPU which implements the ARM "
|
|
|
|
"Virtualization Extensions",
|
|
|
|
NULL);
|
2017-09-14 20:43:18 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
|
2018-06-22 15:28:38 +03:00
|
|
|
mc->desc = "Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs based on " \
|
2017-11-13 16:55:26 +03:00
|
|
|
"the value of smp";
|
2017-09-14 20:43:17 +03:00
|
|
|
mc->init = xlnx_zcu102_init;
|
hw/arm/cubieboard hw/arm/xlnx-ep108: Fix units_per_default_bus
Machine types cubieboard, xlnx-ep108, xlnx-zcu102 have an onboard AHCI
controller, but neglect to set their MachineClass member
units_per_default_bus = 1. This permits -drive if=ide,unit=1, which
makes no sense for AHCI. It also screws up index=N for odd N, because
it gets desugared to unit=1,bus=N/2
Doesn't really matter, because these machine types fail to honor
-drive if=ide. Add the missing units_per_default_bus = 1 anyway,
along with a TODO comment on what needs to be done for -drive if=ide.
Also set block_default_type = IF_IDE explicitly. It's currently the
default, but the next commit will change it to something more
sensible, and we want to keep the IF_IDE default for these three
machines. See also the previous commit.
Cc: Beniamino Galvani <b.galvani@gmail.com>
Cc: Alistair Francis <alistair.francis@xilinx.com>
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Message-Id: <1487153147-11530-3-git-send-email-armbru@redhat.com>
2017-02-15 13:05:41 +03:00
|
|
|
mc->block_default_type = IF_IDE;
|
|
|
|
mc->units_per_default_bus = 1;
|
2017-09-07 15:54:54 +03:00
|
|
|
mc->ignore_memory_transaction_failures = true;
|
2017-10-31 14:50:51 +03:00
|
|
|
mc->max_cpus = XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS;
|
2017-11-13 16:55:27 +03:00
|
|
|
mc->default_cpus = XLNX_ZYNQMP_NUM_APU_CPUS;
|
2020-02-19 19:09:11 +03:00
|
|
|
mc->default_ram_id = "ddr-ram";
|
2016-06-06 18:59:32 +03:00
|
|
|
}
|
|
|
|
|
2017-09-14 20:43:18 +03:00
|
|
|
static const TypeInfo xlnx_zcu102_machine_init_typeinfo = {
|
|
|
|
.name = MACHINE_TYPE_NAME("xlnx-zcu102"),
|
|
|
|
.parent = TYPE_MACHINE,
|
|
|
|
.class_init = xlnx_zcu102_machine_class_init,
|
|
|
|
.instance_init = xlnx_zcu102_machine_instance_init,
|
|
|
|
.instance_size = sizeof(XlnxZCU102),
|
|
|
|
};
|
|
|
|
|
|
|
|
static void xlnx_zcu102_machine_init_register_types(void)
|
|
|
|
{
|
|
|
|
type_register_static(&xlnx_zcu102_machine_init_typeinfo);
|
|
|
|
}
|
|
|
|
|
|
|
|
type_init(xlnx_zcu102_machine_init_register_types)
|