2015-05-15 04:23:24 +02:00
|
|
|
/*
|
2017-09-14 19:43:17 +02:00
|
|
|
* Xilinx ZynqMP ZCU102 board
|
2015-05-15 04:23:24 +02: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 17:23:45 +01: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 09:01:28 +01:00
|
|
|
#include "qapi/error.h"
|
2015-05-15 04:23:24 +02:00
|
|
|
#include "hw/arm/xlnx-zynqmp.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "qemu/error-report.h"
|
2015-12-15 13:16:16 +01:00
|
|
|
#include "qemu/log.h"
|
2020-04-23 14:11:14 +02:00
|
|
|
#include "sysemu/device_tree.h"
|
2020-09-03 22:43:22 +02:00
|
|
|
#include "qom/object.h"
|
2020-11-18 20:48:44 +01:00
|
|
|
#include "net/can_emu.h"
|
2015-05-15 04:23:24 +02:00
|
|
|
|
2020-09-03 22:43:22 +02:00
|
|
|
struct XlnxZCU102 {
|
2017-09-14 19:43:18 +02:00
|
|
|
MachineState parent_obj;
|
|
|
|
|
2015-05-15 04:23:24 +02:00
|
|
|
XlnxZynqMPState soc;
|
2017-09-14 19:43:18 +02:00
|
|
|
|
|
|
|
bool secure;
|
2017-09-14 19:43:18 +02:00
|
|
|
bool virt;
|
2020-04-23 14:11:13 +02:00
|
|
|
|
2020-11-18 20:48:44 +01:00
|
|
|
CanBusState *canbus[XLNX_ZYNQMP_NUM_CAN];
|
|
|
|
|
2020-04-23 14:11:13 +02:00
|
|
|
struct arm_boot_info binfo;
|
2020-09-03 22:43:22 +02:00
|
|
|
};
|
2015-05-15 04:23:24 +02:00
|
|
|
|
2017-09-14 19:43:18 +02:00
|
|
|
#define TYPE_ZCU102_MACHINE MACHINE_TYPE_NAME("xlnx-zcu102")
|
2020-09-16 20:25:19 +02:00
|
|
|
OBJECT_DECLARE_SIMPLE_TYPE(XlnxZCU102, ZCU102_MACHINE)
|
2017-09-14 19:43:18 +02:00
|
|
|
|
2015-05-15 04:23:30 +02:00
|
|
|
|
2017-09-14 19:43:18 +02: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 19:43:18 +02: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 14:11:14 +02: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 14:15:32 +02:00
|
|
|
static void xlnx_zcu102_init(MachineState *machine)
|
2015-05-15 04:23:24 +02:00
|
|
|
{
|
2018-06-08 14:15:32 +02:00
|
|
|
XlnxZCU102 *s = ZCU102_MACHINE(machine);
|
2016-01-21 15:15:04 +01:00
|
|
|
int i;
|
2016-01-12 23:39:18 +01: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 19:43:17 +02:00
|
|
|
qemu_log("WARNING: RAM size 0x%" PRIx64 " is small for ZCU102",
|
2016-01-12 23:39:18 +01:00
|
|
|
ram_size);
|
|
|
|
}
|
|
|
|
|
qom: Less verbose object_initialize_child()
All users of object_initialize_child() pass the obvious child size
argument. Almost all pass &error_abort and no properties. Tiresome.
Rename object_initialize_child() to
object_initialize_child_with_props() to free the name. New
convenience wrapper object_initialize_child() automates the size
argument, and passes &error_abort and no properties.
Rename object_initialize_childv() to
object_initialize_child_with_propsv() for consistency.
Convert callers with this Coccinelle script:
@@
expression parent, propname, type;
expression child, size;
symbol error_abort;
@@
- object_initialize_child(parent, propname, OBJECT(child), size, type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, size, type, &error_abort, NULL)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, child, sizeof(*child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, child, type)
@@
expression parent, propname, type;
expression child;
symbol error_abort;
@@
- object_initialize_child(parent, propname, &child, sizeof(child), type, &error_abort, NULL)
+ object_initialize_child(parent, propname, &child, type)
@@
expression parent, propname, type;
expression child, size, err;
expression list props;
@@
- object_initialize_child(parent, propname, child, size, type, err, props)
+ object_initialize_child_with_props(parent, propname, child, size, type, err, props)
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
[Rebased: machine opentitan is new (commit fe0fe4735e7)]
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-37-armbru@redhat.com>
2020-06-10 07:32:25 +02:00
|
|
|
object_initialize_child(OBJECT(machine), "soc", &s->soc, TYPE_XLNX_ZYNQMP);
|
2015-05-15 04:23:24 +02:00
|
|
|
|
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
2020-07-07 18:05:54 +02:00
|
|
|
object_property_set_link(OBJECT(&s->soc), "ddr-ram", OBJECT(machine->ram),
|
|
|
|
&error_abort);
|
|
|
|
object_property_set_bool(OBJECT(&s->soc), "secure", s->secure,
|
2017-09-14 19:43:18 +02:00
|
|
|
&error_fatal);
|
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
2020-07-07 18:05:54 +02:00
|
|
|
object_property_set_bool(OBJECT(&s->soc), "virtualization", s->virt,
|
2017-09-14 19:43:18 +02:00
|
|
|
&error_fatal);
|
2016-01-12 23:39:18 +01:00
|
|
|
|
2020-11-18 20:48:44 +01:00
|
|
|
for (i = 0; i < XLNX_ZYNQMP_NUM_CAN; i++) {
|
|
|
|
gchar *bus_name = g_strdup_printf("canbus%d", i);
|
|
|
|
|
|
|
|
object_property_set_link(OBJECT(&s->soc), bus_name,
|
|
|
|
OBJECT(s->canbus[i]), &error_fatal);
|
|
|
|
g_free(bus_name);
|
|
|
|
}
|
|
|
|
|
qdev: Convert bus-less devices to qdev_realize() with Coccinelle
All remaining conversions to qdev_realize() are for bus-less devices.
Coccinelle script:
// only correct for bus-less @dev!
@@
expression errp;
expression dev;
@@
- qdev_init_nofail(dev);
+ qdev_realize(dev, NULL, &error_fatal);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
@ depends on !(file in "hw/core/qdev.c") && !(file in "hw/core/bus.c")@
expression errp;
expression dev;
symbol true;
@@
- object_property_set_bool(dev, true, "realized", errp);
+ qdev_realize(DEVICE(dev), NULL, errp);
Note that Coccinelle chokes on ARMSSE typedef vs. macro in
hw/arm/armsse.c. Worked around by temporarily renaming the macro for
the spatch run.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-57-armbru@redhat.com>
2020-06-10 07:32:45 +02:00
|
|
|
qdev_realize(DEVICE(&s->soc), NULL, &error_fatal);
|
2015-05-15 04:23:27 +02:00
|
|
|
|
2016-02-18 15:16:18 +01: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);
|
|
|
|
}
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
carddev = qdev_new(TYPE_SD_CARD);
|
qdev: Make qdev_prop_set_drive() match the other helpers
qdev_prop_set_drive() can fail. None of the other qdev_prop_set_FOO()
can; they abort on error.
To clean up this inconsistency, rename qdev_prop_set_drive() to
qdev_prop_set_drive_err(), and create a qdev_prop_set_drive() that
aborts on error.
Coccinelle script to update callers:
@ depends on !(file in "hw/core/qdev-properties-system.c")@
expression dev, name, value;
symbol error_abort;
@@
- qdev_prop_set_drive(dev, name, value, &error_abort);
+ qdev_prop_set_drive(dev, name, value);
@@
expression dev, name, value, errp;
@@
- qdev_prop_set_drive(dev, name, value, errp);
+ qdev_prop_set_drive_err(dev, name, value, errp);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200622094227.1271650-14-armbru@redhat.com>
2020-06-22 11:42:24 +02:00
|
|
|
qdev_prop_set_drive_err(carddev, "drive", blk, &error_fatal);
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
qdev_realize_and_unref(carddev, bus, &error_fatal);
|
2016-02-18 15:16:18 +01:00
|
|
|
}
|
|
|
|
|
2016-01-21 15:15:04 +01:00
|
|
|
for (i = 0; i < XLNX_ZYNQMP_NUM_SPIS; i++) {
|
ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
Replace
dev = ssi_create_slave_no_init(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = qdev_new(type_name);
...
qdev_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
@@
type SSIBus;
identifier bus;
expression dev, qbus, expr;
expression list args;
@@
- bus = (SSIBus *)qbus;
+ bus = qbus; // TODO fix up decl
...
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, BUS(bus), &error_fatal);
Bus declarations fixed up manually.
Cc: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-24-armbru@redhat.com>
2020-06-10 07:32:12 +02:00
|
|
|
BusState *spi_bus;
|
2016-01-21 15:15:04 +01:00
|
|
|
DeviceState *flash_dev;
|
|
|
|
qemu_irq cs_line;
|
2016-07-04 14:06:37 +02:00
|
|
|
DriveInfo *dinfo = drive_get_next(IF_MTD);
|
2016-01-21 15:15:04 +01:00
|
|
|
gchar *bus_name = g_strdup_printf("spi%d", i);
|
|
|
|
|
ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
Replace
dev = ssi_create_slave_no_init(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = qdev_new(type_name);
...
qdev_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
@@
type SSIBus;
identifier bus;
expression dev, qbus, expr;
expression list args;
@@
- bus = (SSIBus *)qbus;
+ bus = qbus; // TODO fix up decl
...
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, BUS(bus), &error_fatal);
Bus declarations fixed up manually.
Cc: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-24-armbru@redhat.com>
2020-06-10 07:32:12 +02:00
|
|
|
spi_bus = qdev_get_child_bus(DEVICE(&s->soc), bus_name);
|
2016-01-21 15:15:04 +01:00
|
|
|
g_free(bus_name);
|
|
|
|
|
ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
Replace
dev = ssi_create_slave_no_init(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = qdev_new(type_name);
...
qdev_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
@@
type SSIBus;
identifier bus;
expression dev, qbus, expr;
expression list args;
@@
- bus = (SSIBus *)qbus;
+ bus = qbus; // TODO fix up decl
...
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, BUS(bus), &error_fatal);
Bus declarations fixed up manually.
Cc: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-24-armbru@redhat.com>
2020-06-10 07:32:12 +02:00
|
|
|
flash_dev = qdev_new("sst25wf080");
|
2016-07-04 14:06:37 +02:00
|
|
|
if (dinfo) {
|
qdev: Make qdev_prop_set_drive() match the other helpers
qdev_prop_set_drive() can fail. None of the other qdev_prop_set_FOO()
can; they abort on error.
To clean up this inconsistency, rename qdev_prop_set_drive() to
qdev_prop_set_drive_err(), and create a qdev_prop_set_drive() that
aborts on error.
Coccinelle script to update callers:
@ depends on !(file in "hw/core/qdev-properties-system.c")@
expression dev, name, value;
symbol error_abort;
@@
- qdev_prop_set_drive(dev, name, value, &error_abort);
+ qdev_prop_set_drive(dev, name, value);
@@
expression dev, name, value, errp;
@@
- qdev_prop_set_drive(dev, name, value, errp);
+ qdev_prop_set_drive_err(dev, name, value, errp);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200622094227.1271650-14-armbru@redhat.com>
2020-06-22 11:42:24 +02:00
|
|
|
qdev_prop_set_drive_err(flash_dev, "drive",
|
|
|
|
blk_by_legacy_dinfo(dinfo), &error_fatal);
|
2016-07-04 14:06:37 +02:00
|
|
|
}
|
ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
Replace
dev = ssi_create_slave_no_init(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = qdev_new(type_name);
...
qdev_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
@@
type SSIBus;
identifier bus;
expression dev, qbus, expr;
expression list args;
@@
- bus = (SSIBus *)qbus;
+ bus = qbus; // TODO fix up decl
...
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, BUS(bus), &error_fatal);
Bus declarations fixed up manually.
Cc: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-24-armbru@redhat.com>
2020-06-10 07:32:12 +02:00
|
|
|
qdev_realize_and_unref(flash_dev, spi_bus, &error_fatal);
|
2016-07-04 14:06:37 +02:00
|
|
|
|
2016-01-21 15:15:04 +01: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 18:59:22 +01:00
|
|
|
for (i = 0; i < XLNX_ZYNQMP_NUM_QSPI_FLASH; i++) {
|
ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
Replace
dev = ssi_create_slave_no_init(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = qdev_new(type_name);
...
qdev_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
@@
type SSIBus;
identifier bus;
expression dev, qbus, expr;
expression list args;
@@
- bus = (SSIBus *)qbus;
+ bus = qbus; // TODO fix up decl
...
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, BUS(bus), &error_fatal);
Bus declarations fixed up manually.
Cc: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-24-armbru@redhat.com>
2020-06-10 07:32:12 +02:00
|
|
|
BusState *spi_bus;
|
2017-12-13 18:59:22 +01:00
|
|
|
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);
|
|
|
|
|
ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
Replace
dev = ssi_create_slave_no_init(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = qdev_new(type_name);
...
qdev_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
@@
type SSIBus;
identifier bus;
expression dev, qbus, expr;
expression list args;
@@
- bus = (SSIBus *)qbus;
+ bus = qbus; // TODO fix up decl
...
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, BUS(bus), &error_fatal);
Bus declarations fixed up manually.
Cc: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-24-armbru@redhat.com>
2020-06-10 07:32:12 +02:00
|
|
|
spi_bus = qdev_get_child_bus(DEVICE(&s->soc), bus_name);
|
2017-12-13 18:59:22 +01:00
|
|
|
g_free(bus_name);
|
|
|
|
|
ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
Replace
dev = ssi_create_slave_no_init(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = qdev_new(type_name);
...
qdev_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
@@
type SSIBus;
identifier bus;
expression dev, qbus, expr;
expression list args;
@@
- bus = (SSIBus *)qbus;
+ bus = qbus; // TODO fix up decl
...
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, BUS(bus), &error_fatal);
Bus declarations fixed up manually.
Cc: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-24-armbru@redhat.com>
2020-06-10 07:32:12 +02:00
|
|
|
flash_dev = qdev_new("n25q512a11");
|
2017-12-13 18:59:22 +01:00
|
|
|
if (dinfo) {
|
qdev: Make qdev_prop_set_drive() match the other helpers
qdev_prop_set_drive() can fail. None of the other qdev_prop_set_FOO()
can; they abort on error.
To clean up this inconsistency, rename qdev_prop_set_drive() to
qdev_prop_set_drive_err(), and create a qdev_prop_set_drive() that
aborts on error.
Coccinelle script to update callers:
@ depends on !(file in "hw/core/qdev-properties-system.c")@
expression dev, name, value;
symbol error_abort;
@@
- qdev_prop_set_drive(dev, name, value, &error_abort);
+ qdev_prop_set_drive(dev, name, value);
@@
expression dev, name, value, errp;
@@
- qdev_prop_set_drive(dev, name, value, errp);
+ qdev_prop_set_drive_err(dev, name, value, errp);
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200622094227.1271650-14-armbru@redhat.com>
2020-06-22 11:42:24 +02:00
|
|
|
qdev_prop_set_drive_err(flash_dev, "drive",
|
|
|
|
blk_by_legacy_dinfo(dinfo), &error_fatal);
|
2017-12-13 18:59:22 +01:00
|
|
|
}
|
ssi: Convert uses of ssi_create_slave_no_init() with Coccinelle
Replace
dev = ssi_create_slave_no_init(bus, type_name);
...
qdev_init_nofail(dev);
by
dev = qdev_new(type_name);
...
qdev_realize_and_unref(dev, bus, &error_fatal);
Recent commit "qdev: New qdev_new(), qdev_realize(), etc." explains
why.
@@
type SSIBus;
identifier bus;
expression dev, qbus, expr;
expression list args;
@@
- bus = (SSIBus *)qbus;
+ bus = qbus; // TODO fix up decl
...
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression dev, bus, expr;
expression list args;
@@
- dev = ssi_create_slave_no_init(bus, args);
+ dev = qdev_new(args);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, BUS(bus), &error_fatal);
Bus declarations fixed up manually.
Cc: Alistair Francis <alistair@alistair23.me>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-24-armbru@redhat.com>
2020-06-10 07:32:12 +02:00
|
|
|
qdev_realize_and_unref(flash_dev, spi_bus, &error_fatal);
|
2017-12-13 18:59:22 +01:00
|
|
|
|
|
|
|
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 11:05:41 +01:00
|
|
|
/* TODO create and connect IDE devices for ide_drive_get() */
|
|
|
|
|
2020-04-23 14:11:13 +02:00
|
|
|
s->binfo.ram_size = ram_size;
|
|
|
|
s->binfo.loader_start = 0;
|
2020-04-23 14:11:14 +02:00
|
|
|
s->binfo.modify_dtb = zcu102_modify_dtb;
|
2020-04-23 14:11:13 +02:00
|
|
|
arm_load_kernel(s->soc.boot_cpu_ptr, machine, &s->binfo);
|
2015-05-15 04:23:24 +02:00
|
|
|
}
|
|
|
|
|
2017-09-14 19:43:18 +02:00
|
|
|
static void xlnx_zcu102_machine_instance_init(Object *obj)
|
|
|
|
{
|
2017-09-14 19:43:18 +02:00
|
|
|
XlnxZCU102 *s = ZCU102_MACHINE(obj);
|
|
|
|
|
|
|
|
/* Default to secure mode being disabled */
|
|
|
|
s->secure = false;
|
2017-09-14 19:43:18 +02:00
|
|
|
/* Default to virt (EL2) being disabled */
|
|
|
|
s->virt = false;
|
2021-01-28 13:00:10 +01:00
|
|
|
object_property_add_link(obj, "canbus0", TYPE_CAN_BUS,
|
2020-11-18 20:48:44 +01:00
|
|
|
(Object **)&s->canbus[0],
|
|
|
|
object_property_allow_set_link,
|
|
|
|
0);
|
|
|
|
|
2021-01-28 13:00:10 +01:00
|
|
|
object_property_add_link(obj, "canbus1", TYPE_CAN_BUS,
|
2020-11-18 20:48:44 +01:00
|
|
|
(Object **)&s->canbus[1],
|
|
|
|
object_property_allow_set_link,
|
|
|
|
0);
|
2017-09-14 19:43:18 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void xlnx_zcu102_machine_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
MachineClass *mc = MACHINE_CLASS(oc);
|
|
|
|
|
2018-06-22 14:28:38 +02:00
|
|
|
mc->desc = "Xilinx ZynqMP ZCU102 board with 4xA53s and 2xR5Fs based on " \
|
2017-11-13 14:55:26 +01:00
|
|
|
"the value of smp";
|
2017-09-14 19:43:17 +02: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 11:05:41 +01:00
|
|
|
mc->block_default_type = IF_IDE;
|
|
|
|
mc->units_per_default_bus = 1;
|
2017-09-07 14:54:54 +02:00
|
|
|
mc->ignore_memory_transaction_failures = true;
|
2017-10-31 12:50:51 +01:00
|
|
|
mc->max_cpus = XLNX_ZYNQMP_NUM_APU_CPUS + XLNX_ZYNQMP_NUM_RPU_CPUS;
|
2017-11-13 14:55:27 +01:00
|
|
|
mc->default_cpus = XLNX_ZYNQMP_NUM_APU_CPUS;
|
2020-02-19 17:09:11 +01:00
|
|
|
mc->default_ram_id = "ddr-ram";
|
2020-09-22 00:10:40 +02:00
|
|
|
|
|
|
|
object_class_property_add_bool(oc, "secure", zcu102_get_secure,
|
|
|
|
zcu102_set_secure);
|
|
|
|
object_class_property_set_description(oc, "secure",
|
|
|
|
"Set on/off to enable/disable the ARM "
|
|
|
|
"Security Extensions (TrustZone)");
|
|
|
|
|
|
|
|
object_class_property_add_bool(oc, "virtualization", zcu102_get_virt,
|
|
|
|
zcu102_set_virt);
|
|
|
|
object_class_property_set_description(oc, "virtualization",
|
|
|
|
"Set on/off to enable/disable emulating a "
|
|
|
|
"guest CPU which implements the ARM "
|
|
|
|
"Virtualization Extensions");
|
2016-06-06 17:59:32 +02:00
|
|
|
}
|
|
|
|
|
2017-09-14 19:43:18 +02:00
|
|
|
static const TypeInfo xlnx_zcu102_machine_init_typeinfo = {
|
2020-08-26 20:43:31 +02:00
|
|
|
.name = TYPE_ZCU102_MACHINE,
|
2017-09-14 19:43:18 +02:00
|
|
|
.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)
|