d031379803
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>
128 lines
4.1 KiB
C
128 lines
4.1 KiB
C
/*
|
|
* SABRELITE Board System emulation.
|
|
*
|
|
* Copyright (c) 2015 Jean-Christophe Dubois <jcd@tribudubois.net>
|
|
*
|
|
* This code is licensed under the GPL, version 2 or later.
|
|
* See the file `COPYING' in the top level directory.
|
|
*
|
|
* It (partially) emulates a sabrelite board, with a Freescale
|
|
* i.MX6 SoC
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu-common.h"
|
|
#include "hw/arm/fsl-imx6.h"
|
|
#include "hw/boards.h"
|
|
#include "sysemu/sysemu.h"
|
|
#include "qemu/error-report.h"
|
|
#include "sysemu/qtest.h"
|
|
|
|
typedef struct IMX6Sabrelite {
|
|
FslIMX6State soc;
|
|
MemoryRegion ram;
|
|
} IMX6Sabrelite;
|
|
|
|
static struct arm_boot_info sabrelite_binfo = {
|
|
/* DDR memory start */
|
|
.loader_start = FSL_IMX6_MMDC_ADDR,
|
|
/* No board ID, we boot from DT tree */
|
|
.board_id = -1,
|
|
};
|
|
|
|
/* No need to do any particular setup for secondary boot */
|
|
static void sabrelite_write_secondary(ARMCPU *cpu,
|
|
const struct arm_boot_info *info)
|
|
{
|
|
}
|
|
|
|
/* Secondary cores are reset through SRC device */
|
|
static void sabrelite_reset_secondary(ARMCPU *cpu,
|
|
const struct arm_boot_info *info)
|
|
{
|
|
}
|
|
|
|
static void sabrelite_init(MachineState *machine)
|
|
{
|
|
IMX6Sabrelite *s = g_new0(IMX6Sabrelite, 1);
|
|
Error *err = NULL;
|
|
|
|
/* Check the amount of memory is compatible with the SOC */
|
|
if (machine->ram_size > FSL_IMX6_MMDC_SIZE) {
|
|
error_report("RAM size " RAM_ADDR_FMT " above max supported (%08x)",
|
|
machine->ram_size, FSL_IMX6_MMDC_SIZE);
|
|
exit(1);
|
|
}
|
|
|
|
object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
|
|
TYPE_FSL_IMX6, &error_abort, NULL);
|
|
|
|
object_property_set_bool(OBJECT(&s->soc), true, "realized", &err);
|
|
if (err != NULL) {
|
|
error_report("%s", error_get_pretty(err));
|
|
exit(1);
|
|
}
|
|
|
|
memory_region_allocate_system_memory(&s->ram, NULL, "sabrelite.ram",
|
|
machine->ram_size);
|
|
memory_region_add_subregion(get_system_memory(), FSL_IMX6_MMDC_ADDR,
|
|
&s->ram);
|
|
|
|
{
|
|
/*
|
|
* TODO: Ideally we would expose the chip select and spi bus on the
|
|
* SoC object using alias properties; then we would not need to
|
|
* directly access the underlying spi device object.
|
|
*/
|
|
/* Add the sst25vf016b NOR FLASH memory to first SPI */
|
|
Object *spi_dev;
|
|
|
|
spi_dev = object_resolve_path_component(OBJECT(&s->soc), "spi1");
|
|
if (spi_dev) {
|
|
SSIBus *spi_bus;
|
|
|
|
spi_bus = (SSIBus *)qdev_get_child_bus(DEVICE(spi_dev), "spi");
|
|
if (spi_bus) {
|
|
DeviceState *flash_dev;
|
|
qemu_irq cs_line;
|
|
DriveInfo *dinfo = drive_get_next(IF_MTD);
|
|
|
|
flash_dev = ssi_create_slave_no_init(spi_bus, "sst25vf016b");
|
|
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(spi_dev), 1, cs_line);
|
|
}
|
|
}
|
|
}
|
|
|
|
sabrelite_binfo.ram_size = machine->ram_size;
|
|
sabrelite_binfo.kernel_filename = machine->kernel_filename;
|
|
sabrelite_binfo.kernel_cmdline = machine->kernel_cmdline;
|
|
sabrelite_binfo.initrd_filename = machine->initrd_filename;
|
|
sabrelite_binfo.nb_cpus = smp_cpus;
|
|
sabrelite_binfo.secure_boot = true;
|
|
sabrelite_binfo.write_secondary_boot = sabrelite_write_secondary;
|
|
sabrelite_binfo.secondary_cpu_reset_hook = sabrelite_reset_secondary;
|
|
|
|
if (!qtest_enabled()) {
|
|
arm_load_kernel(&s->soc.cpu[0], &sabrelite_binfo);
|
|
}
|
|
}
|
|
|
|
static void sabrelite_machine_init(MachineClass *mc)
|
|
{
|
|
mc->desc = "Freescale i.MX6 Quad SABRE Lite Board (Cortex A9)";
|
|
mc->init = sabrelite_init;
|
|
mc->max_cpus = FSL_IMX6_NUM_CPUS;
|
|
mc->ignore_memory_transaction_failures = true;
|
|
}
|
|
|
|
DEFINE_MACHINE("sabrelite", sabrelite_machine_init)
|