2015-09-07 11:39:31 +02:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2013 Jean-Christophe Dubois <jcd@tribudubois.net>
|
|
|
|
*
|
|
|
|
* PDK Board System emulation.
|
|
|
|
*
|
|
|
|
* Based on hw/arm/kzm.c
|
|
|
|
*
|
|
|
|
* Copyright (c) 2008 OKL and 2011 NICTA
|
|
|
|
* Written by Hans at OK-Labs
|
|
|
|
* Updated by Peter Chubb.
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
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"
|
2016-01-19 21:51:44 +01:00
|
|
|
#include "cpu.h"
|
2020-03-10 22:51:45 +01:00
|
|
|
#include "hw/qdev-properties.h"
|
2015-09-07 11:39:31 +02:00
|
|
|
#include "hw/arm/fsl-imx25.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "qemu/error-report.h"
|
|
|
|
#include "exec/address-spaces.h"
|
|
|
|
#include "sysemu/qtest.h"
|
|
|
|
#include "hw/i2c/i2c.h"
|
2020-02-19 17:08:49 +01:00
|
|
|
#include "qemu/cutils.h"
|
2015-09-07 11:39:31 +02:00
|
|
|
|
|
|
|
/* Memory map for PDK Emulation Baseboard:
|
|
|
|
* 0x00000000-0x7fffffff See i.MX25 SOC fr support
|
|
|
|
* 0x80000000-0x87ffffff RAM + Alias EMULATED
|
|
|
|
* 0x90000000-0x9fffffff RAM + Alias EMULATED
|
|
|
|
* 0xa0000000-0xa7ffffff Flash IGNORED
|
|
|
|
* 0xa8000000-0xafffffff Flash IGNORED
|
|
|
|
* 0xb0000000-0xb1ffffff SRAM IGNORED
|
|
|
|
* 0xb2000000-0xb3ffffff SRAM IGNORED
|
|
|
|
* 0xb4000000-0xb5ffffff CS4 IGNORED
|
|
|
|
* 0xb6000000-0xb8000fff Reserved IGNORED
|
|
|
|
* 0xb8001000-0xb8001fff SDRAM CTRL reg IGNORED
|
|
|
|
* 0xb8002000-0xb8002fff WEIM CTRL reg IGNORED
|
|
|
|
* 0xb8003000-0xb8003fff M3IF CTRL reg IGNORED
|
|
|
|
* 0xb8004000-0xb8004fff EMI CTRL reg IGNORED
|
|
|
|
* 0xb8005000-0xbaffffff Reserved IGNORED
|
|
|
|
* 0xbb000000-0xbb000fff NAND flash area buf IGNORED
|
|
|
|
* 0xbb001000-0xbb0011ff NAND flash reserved IGNORED
|
|
|
|
* 0xbb001200-0xbb001dff Reserved IGNORED
|
|
|
|
* 0xbb001e00-0xbb001fff NAN flash CTRL reg IGNORED
|
|
|
|
* 0xbb012000-0xbfffffff Reserved IGNORED
|
|
|
|
* 0xc0000000-0xffffffff Reserved IGNORED
|
|
|
|
*/
|
|
|
|
|
|
|
|
typedef struct IMX25PDK {
|
|
|
|
FslIMX25State soc;
|
|
|
|
MemoryRegion ram_alias;
|
|
|
|
} IMX25PDK;
|
|
|
|
|
|
|
|
static struct arm_boot_info imx25_pdk_binfo;
|
|
|
|
|
|
|
|
static void imx25_pdk_init(MachineState *machine)
|
|
|
|
{
|
2020-02-19 17:08:49 +01:00
|
|
|
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
2015-09-07 11:39:31 +02:00
|
|
|
IMX25PDK *s = g_new0(IMX25PDK, 1);
|
|
|
|
unsigned int ram_size;
|
|
|
|
unsigned int alias_offset;
|
|
|
|
int i;
|
|
|
|
|
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 18:34:08 +02:00
|
|
|
object_initialize_child(OBJECT(machine), "soc", &s->soc, sizeof(s->soc),
|
|
|
|
TYPE_FSL_IMX25, &error_abort, NULL);
|
2015-09-07 11:39:31 +02:00
|
|
|
|
2016-01-14 16:02:12 +01:00
|
|
|
object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal);
|
2015-09-07 11:39:31 +02:00
|
|
|
|
|
|
|
/* We need to initialize our memory */
|
|
|
|
if (machine->ram_size > (FSL_IMX25_SDRAM0_SIZE + FSL_IMX25_SDRAM1_SIZE)) {
|
2020-02-19 17:08:49 +01:00
|
|
|
char *sz = size_to_str(mc->default_ram_size);
|
|
|
|
error_report("Invalid RAM size, should be %s", sz);
|
|
|
|
g_free(sz);
|
|
|
|
exit(EXIT_FAILURE);
|
2015-09-07 11:39:31 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
memory_region_add_subregion(get_system_memory(), FSL_IMX25_SDRAM0_ADDR,
|
2020-02-19 17:08:50 +01:00
|
|
|
machine->ram);
|
2015-09-07 11:39:31 +02:00
|
|
|
|
|
|
|
/* initialize the alias memory if any */
|
|
|
|
for (i = 0, ram_size = machine->ram_size, alias_offset = 0;
|
|
|
|
(i < 2) && ram_size; i++) {
|
|
|
|
unsigned int size;
|
|
|
|
static const struct {
|
|
|
|
hwaddr addr;
|
|
|
|
unsigned int size;
|
|
|
|
} ram[2] = {
|
|
|
|
{ FSL_IMX25_SDRAM0_ADDR, FSL_IMX25_SDRAM0_SIZE },
|
|
|
|
{ FSL_IMX25_SDRAM1_ADDR, FSL_IMX25_SDRAM1_SIZE },
|
|
|
|
};
|
|
|
|
|
|
|
|
size = MIN(ram_size, ram[i].size);
|
|
|
|
|
|
|
|
ram_size -= size;
|
|
|
|
|
|
|
|
if (size < ram[i].size) {
|
|
|
|
memory_region_init_alias(&s->ram_alias, NULL, "ram.alias",
|
2020-02-19 17:08:50 +01:00
|
|
|
machine->ram,
|
|
|
|
alias_offset, ram[i].size - size);
|
2015-09-07 11:39:31 +02:00
|
|
|
memory_region_add_subregion(get_system_memory(),
|
|
|
|
ram[i].addr + size, &s->ram_alias);
|
|
|
|
}
|
|
|
|
|
|
|
|
alias_offset += ram[i].size;
|
|
|
|
}
|
|
|
|
|
|
|
|
imx25_pdk_binfo.ram_size = machine->ram_size;
|
|
|
|
imx25_pdk_binfo.loader_start = FSL_IMX25_SDRAM0_ADDR;
|
|
|
|
imx25_pdk_binfo.board_id = 1771,
|
|
|
|
imx25_pdk_binfo.nb_cpus = 1;
|
|
|
|
|
2020-03-10 22:51:45 +01:00
|
|
|
for (i = 0; i < FSL_IMX25_NUM_ESDHCS; i++) {
|
|
|
|
BusState *bus;
|
|
|
|
DeviceState *carddev;
|
|
|
|
DriveInfo *di;
|
|
|
|
BlockBackend *blk;
|
|
|
|
|
|
|
|
di = drive_get_next(IF_SD);
|
|
|
|
blk = di ? blk_by_legacy_dinfo(di) : NULL;
|
|
|
|
bus = qdev_get_child_bus(DEVICE(&s->soc.esdhc[i]), "sd-bus");
|
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);
|
2020-03-10 22:51:45 +01:00
|
|
|
qdev_prop_set_drive(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);
|
2020-03-10 22:51:45 +01:00
|
|
|
}
|
|
|
|
|
2015-09-07 11:39:31 +02:00
|
|
|
/*
|
|
|
|
* We test explicitly for qtest here as it is not done (yet?) in
|
|
|
|
* arm_load_kernel(). Without this the "make check" command would
|
|
|
|
* fail.
|
|
|
|
*/
|
|
|
|
if (!qtest_enabled()) {
|
2019-08-09 08:57:21 +02:00
|
|
|
arm_load_kernel(&s->soc.cpu, machine, &imx25_pdk_binfo);
|
2015-09-07 11:39:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
static void imx25_pdk_machine_init(MachineClass *mc)
|
2015-09-07 11:39:31 +02:00
|
|
|
{
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->desc = "ARM i.MX25 PDK board (ARM926)";
|
|
|
|
mc->init = imx25_pdk_init;
|
2017-09-07 14:54:54 +02:00
|
|
|
mc->ignore_memory_transaction_failures = true;
|
2020-02-19 17:08:50 +01:00
|
|
|
mc->default_ram_id = "imx25.ram";
|
2015-09-07 11:39:31 +02:00
|
|
|
}
|
|
|
|
|
2015-10-16 12:14:53 +02:00
|
|
|
DEFINE_MACHINE("imx25-pdk", imx25_pdk_machine_init)
|