2016-03-16 18:06:00 +01:00
|
|
|
/*
|
2016-09-22 19:13:05 +02:00
|
|
|
* ASPEED SoC family
|
2016-03-16 18:06:00 +01:00
|
|
|
*
|
|
|
|
* Andrew Jeffery <andrew@aj.id.au>
|
|
|
|
* Jeremy Kerr <jk@ozlabs.org>
|
|
|
|
*
|
|
|
|
* Copyright 2016 IBM Corp.
|
|
|
|
*
|
|
|
|
* This code is licensed under the GPL version 2 or later. See
|
|
|
|
* the COPYING file in the top-level directory.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#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"
|
2016-03-16 18:06:00 +01:00
|
|
|
#include "exec/address-spaces.h"
|
2018-02-15 19:29:36 +01:00
|
|
|
#include "hw/misc/unimp.h"
|
2016-09-22 19:13:05 +02:00
|
|
|
#include "hw/arm/aspeed_soc.h"
|
2016-03-16 18:06:00 +01:00
|
|
|
#include "hw/char/serial.h"
|
2015-12-15 13:16:16 +01:00
|
|
|
#include "qemu/log.h"
|
2019-05-23 16:35:07 +02:00
|
|
|
#include "qemu/module.h"
|
2019-07-01 18:26:16 +02:00
|
|
|
#include "qemu/error-report.h"
|
2016-06-06 17:59:29 +02:00
|
|
|
#include "hw/i2c/aspeed_i2c.h"
|
2017-04-14 10:35:02 +02:00
|
|
|
#include "net/net.h"
|
2019-08-12 07:23:57 +02:00
|
|
|
#include "sysemu/sysemu.h"
|
2016-03-16 18:06:00 +01:00
|
|
|
|
2016-09-22 19:13:05 +02:00
|
|
|
#define ASPEED_SOC_IOMEM_SIZE 0x00200000
|
2019-07-01 18:26:15 +02:00
|
|
|
|
|
|
|
static const hwaddr aspeed_soc_ast2400_memmap[] = {
|
|
|
|
[ASPEED_IOMEM] = 0x1E600000,
|
|
|
|
[ASPEED_FMC] = 0x1E620000,
|
|
|
|
[ASPEED_SPI1] = 0x1E630000,
|
2020-02-06 19:34:37 +01:00
|
|
|
[ASPEED_EHCI1] = 0x1E6A1000,
|
2019-07-01 18:26:15 +02:00
|
|
|
[ASPEED_VIC] = 0x1E6C0000,
|
|
|
|
[ASPEED_SDMC] = 0x1E6E0000,
|
|
|
|
[ASPEED_SCU] = 0x1E6E2000,
|
2019-07-01 18:26:18 +02:00
|
|
|
[ASPEED_XDMA] = 0x1E6E7000,
|
2019-09-25 16:32:48 +02:00
|
|
|
[ASPEED_VIDEO] = 0x1E700000,
|
2019-07-01 18:26:15 +02:00
|
|
|
[ASPEED_ADC] = 0x1E6E9000,
|
|
|
|
[ASPEED_SRAM] = 0x1E720000,
|
2019-09-25 16:32:27 +02:00
|
|
|
[ASPEED_SDHCI] = 0x1E740000,
|
2019-07-01 18:26:15 +02:00
|
|
|
[ASPEED_GPIO] = 0x1E780000,
|
|
|
|
[ASPEED_RTC] = 0x1E781000,
|
|
|
|
[ASPEED_TIMER1] = 0x1E782000,
|
|
|
|
[ASPEED_WDT] = 0x1E785000,
|
|
|
|
[ASPEED_PWM] = 0x1E786000,
|
|
|
|
[ASPEED_LPC] = 0x1E789000,
|
|
|
|
[ASPEED_IBT] = 0x1E789140,
|
|
|
|
[ASPEED_I2C] = 0x1E78A000,
|
|
|
|
[ASPEED_ETH1] = 0x1E660000,
|
|
|
|
[ASPEED_ETH2] = 0x1E680000,
|
|
|
|
[ASPEED_UART1] = 0x1E783000,
|
|
|
|
[ASPEED_UART5] = 0x1E784000,
|
|
|
|
[ASPEED_VUART] = 0x1E787000,
|
|
|
|
[ASPEED_SDRAM] = 0x40000000,
|
|
|
|
};
|
|
|
|
|
|
|
|
static const hwaddr aspeed_soc_ast2500_memmap[] = {
|
|
|
|
[ASPEED_IOMEM] = 0x1E600000,
|
|
|
|
[ASPEED_FMC] = 0x1E620000,
|
|
|
|
[ASPEED_SPI1] = 0x1E630000,
|
|
|
|
[ASPEED_SPI2] = 0x1E631000,
|
2020-02-06 19:34:37 +01:00
|
|
|
[ASPEED_EHCI1] = 0x1E6A1000,
|
|
|
|
[ASPEED_EHCI2] = 0x1E6A3000,
|
2019-07-01 18:26:15 +02:00
|
|
|
[ASPEED_VIC] = 0x1E6C0000,
|
|
|
|
[ASPEED_SDMC] = 0x1E6E0000,
|
|
|
|
[ASPEED_SCU] = 0x1E6E2000,
|
2019-07-01 18:26:18 +02:00
|
|
|
[ASPEED_XDMA] = 0x1E6E7000,
|
2019-07-01 18:26:15 +02:00
|
|
|
[ASPEED_ADC] = 0x1E6E9000,
|
2019-09-25 16:32:48 +02:00
|
|
|
[ASPEED_VIDEO] = 0x1E700000,
|
2019-07-01 18:26:15 +02:00
|
|
|
[ASPEED_SRAM] = 0x1E720000,
|
2019-09-25 16:32:27 +02:00
|
|
|
[ASPEED_SDHCI] = 0x1E740000,
|
2019-07-01 18:26:15 +02:00
|
|
|
[ASPEED_GPIO] = 0x1E780000,
|
|
|
|
[ASPEED_RTC] = 0x1E781000,
|
|
|
|
[ASPEED_TIMER1] = 0x1E782000,
|
|
|
|
[ASPEED_WDT] = 0x1E785000,
|
|
|
|
[ASPEED_PWM] = 0x1E786000,
|
|
|
|
[ASPEED_LPC] = 0x1E789000,
|
|
|
|
[ASPEED_IBT] = 0x1E789140,
|
|
|
|
[ASPEED_I2C] = 0x1E78A000,
|
|
|
|
[ASPEED_ETH1] = 0x1E660000,
|
|
|
|
[ASPEED_ETH2] = 0x1E680000,
|
|
|
|
[ASPEED_UART1] = 0x1E783000,
|
|
|
|
[ASPEED_UART5] = 0x1E784000,
|
|
|
|
[ASPEED_VUART] = 0x1E787000,
|
|
|
|
[ASPEED_SDRAM] = 0x80000000,
|
|
|
|
};
|
2016-09-22 19:13:05 +02:00
|
|
|
|
2019-07-01 18:26:15 +02:00
|
|
|
static const int aspeed_soc_ast2400_irqmap[] = {
|
|
|
|
[ASPEED_UART1] = 9,
|
|
|
|
[ASPEED_UART2] = 32,
|
|
|
|
[ASPEED_UART3] = 33,
|
|
|
|
[ASPEED_UART4] = 34,
|
|
|
|
[ASPEED_UART5] = 10,
|
|
|
|
[ASPEED_VUART] = 8,
|
|
|
|
[ASPEED_FMC] = 19,
|
2020-02-06 19:34:37 +01:00
|
|
|
[ASPEED_EHCI1] = 5,
|
|
|
|
[ASPEED_EHCI2] = 13,
|
2019-07-01 18:26:15 +02:00
|
|
|
[ASPEED_SDMC] = 0,
|
|
|
|
[ASPEED_SCU] = 21,
|
|
|
|
[ASPEED_ADC] = 31,
|
|
|
|
[ASPEED_GPIO] = 20,
|
|
|
|
[ASPEED_RTC] = 22,
|
|
|
|
[ASPEED_TIMER1] = 16,
|
|
|
|
[ASPEED_TIMER2] = 17,
|
|
|
|
[ASPEED_TIMER3] = 18,
|
|
|
|
[ASPEED_TIMER4] = 35,
|
|
|
|
[ASPEED_TIMER5] = 36,
|
|
|
|
[ASPEED_TIMER6] = 37,
|
|
|
|
[ASPEED_TIMER7] = 38,
|
|
|
|
[ASPEED_TIMER8] = 39,
|
|
|
|
[ASPEED_WDT] = 27,
|
|
|
|
[ASPEED_PWM] = 28,
|
|
|
|
[ASPEED_LPC] = 8,
|
|
|
|
[ASPEED_IBT] = 8, /* LPC */
|
|
|
|
[ASPEED_I2C] = 12,
|
|
|
|
[ASPEED_ETH1] = 2,
|
|
|
|
[ASPEED_ETH2] = 3,
|
2019-07-01 18:26:18 +02:00
|
|
|
[ASPEED_XDMA] = 6,
|
2019-09-25 16:32:27 +02:00
|
|
|
[ASPEED_SDHCI] = 26,
|
2019-07-01 18:26:15 +02:00
|
|
|
};
|
2016-03-16 18:06:00 +01:00
|
|
|
|
2019-07-01 18:26:15 +02:00
|
|
|
#define aspeed_soc_ast2500_irqmap aspeed_soc_ast2400_irqmap
|
|
|
|
|
|
|
|
static qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int ctrl)
|
|
|
|
{
|
|
|
|
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
|
|
|
|
|
2019-09-25 16:32:42 +02:00
|
|
|
return qdev_get_gpio_in(DEVICE(&s->vic), sc->irqmap[ctrl]);
|
2019-07-01 18:26:15 +02:00
|
|
|
}
|
|
|
|
|
2016-09-22 19:13:05 +02:00
|
|
|
static void aspeed_soc_init(Object *obj)
|
2016-03-16 18:06:00 +01:00
|
|
|
{
|
2016-09-22 19:13:05 +02:00
|
|
|
AspeedSoCState *s = ASPEED_SOC(obj);
|
2016-09-22 19:13:05 +02:00
|
|
|
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
|
2016-10-17 20:22:16 +02:00
|
|
|
int i;
|
2019-09-04 09:05:00 +02:00
|
|
|
char socname[8];
|
|
|
|
char typename[64];
|
|
|
|
|
2019-09-25 16:32:42 +02:00
|
|
|
if (sscanf(sc->name, "%7s", socname) != 1) {
|
2019-09-04 09:05:00 +02:00
|
|
|
g_assert_not_reached();
|
|
|
|
}
|
2016-03-16 18:06:00 +01:00
|
|
|
|
2019-09-25 16:32:42 +02:00
|
|
|
for (i = 0; i < sc->num_cpus; i++) {
|
2019-07-01 18:26:16 +02:00
|
|
|
object_initialize_child(obj, "cpu[*]", OBJECT(&s->cpu[i]),
|
2019-09-25 16:32:42 +02:00
|
|
|
sizeof(s->cpu[i]), sc->cpu_type,
|
2019-07-01 18:26:16 +02:00
|
|
|
&error_abort, NULL);
|
|
|
|
}
|
2016-03-16 18:06:00 +01:00
|
|
|
|
2019-09-04 09:05:05 +02:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.scu-%s", socname);
|
hw/arm/aspeed: Use object_initialize_child for correct ref. 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>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Message-Id: <20190507163416.24647-8-philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2019-05-07 18:34:07 +02:00
|
|
|
sysbus_init_child_obj(obj, "scu", OBJECT(&s->scu), sizeof(s->scu),
|
2019-09-04 09:05:05 +02:00
|
|
|
typename);
|
2016-06-27 16:37:33 +02:00
|
|
|
qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev",
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->silicon_rev);
|
2016-06-27 16:37:33 +02:00
|
|
|
object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu),
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 17:29:22 +02:00
|
|
|
"hw-strap1");
|
2016-06-27 16:37:33 +02:00
|
|
|
object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu),
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 17:29:22 +02:00
|
|
|
"hw-strap2");
|
2017-11-14 13:20:18 +01:00
|
|
|
object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu),
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 17:29:22 +02:00
|
|
|
"hw-prot-key");
|
2016-07-04 14:06:37 +02:00
|
|
|
|
hw/arm/aspeed: Use object_initialize_child for correct ref. 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>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Message-Id: <20190507163416.24647-8-philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2019-05-07 18:34:07 +02:00
|
|
|
sysbus_init_child_obj(obj, "vic", OBJECT(&s->vic), sizeof(s->vic),
|
|
|
|
TYPE_ASPEED_VIC);
|
2018-06-26 18:50:42 +02:00
|
|
|
|
2019-07-01 18:26:16 +02:00
|
|
|
sysbus_init_child_obj(obj, "rtc", OBJECT(&s->rtc), sizeof(s->rtc),
|
|
|
|
TYPE_ASPEED_RTC);
|
|
|
|
|
2019-09-25 16:32:29 +02:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.timer-%s", socname);
|
hw/arm/aspeed: Use object_initialize_child for correct ref. 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>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Message-Id: <20190507163416.24647-8-philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2019-05-07 18:34:07 +02:00
|
|
|
sysbus_init_child_obj(obj, "timerctrl", OBJECT(&s->timerctrl),
|
2019-09-25 16:32:29 +02:00
|
|
|
sizeof(s->timerctrl), typename);
|
2018-06-26 18:50:42 +02:00
|
|
|
|
2019-09-25 16:32:40 +02:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.i2c-%s", socname);
|
hw/arm/aspeed: Use object_initialize_child for correct ref. 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>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Message-Id: <20190507163416.24647-8-philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2019-05-07 18:34:07 +02:00
|
|
|
sysbus_init_child_obj(obj, "i2c", OBJECT(&s->i2c), sizeof(s->i2c),
|
2019-09-25 16:32:40 +02:00
|
|
|
typename);
|
2018-06-26 18:50:42 +02:00
|
|
|
|
2019-09-04 09:05:00 +02:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname);
|
hw/arm/aspeed: Use object_initialize_child for correct ref. 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>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Message-Id: <20190507163416.24647-8-philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2019-05-07 18:34:07 +02:00
|
|
|
sysbus_init_child_obj(obj, "fmc", OBJECT(&s->fmc), sizeof(s->fmc),
|
2019-09-04 09:05:00 +02:00
|
|
|
typename);
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 17:29:22 +02:00
|
|
|
object_property_add_alias(obj, "num-cs", OBJECT(&s->fmc), "num-cs");
|
2016-07-04 14:06:37 +02:00
|
|
|
|
2019-09-25 16:32:42 +02:00
|
|
|
for (i = 0; i < sc->spis_num; i++) {
|
2019-09-04 09:05:00 +02:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i + 1, socname);
|
hw/arm/aspeed: Use object_initialize_child for correct ref. 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>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Message-Id: <20190507163416.24647-8-philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2019-05-07 18:34:07 +02:00
|
|
|
sysbus_init_child_obj(obj, "spi[*]", OBJECT(&s->spi[i]),
|
2019-09-04 09:05:00 +02:00
|
|
|
sizeof(s->spi[i]), typename);
|
2016-10-17 20:22:16 +02:00
|
|
|
}
|
2016-09-06 20:52:17 +02:00
|
|
|
|
2020-02-06 19:34:37 +01:00
|
|
|
for (i = 0; i < sc->ehcis_num; i++) {
|
|
|
|
sysbus_init_child_obj(obj, "ehci[*]", OBJECT(&s->ehci[i]),
|
|
|
|
sizeof(s->ehci[i]), TYPE_PLATFORM_EHCI);
|
|
|
|
}
|
|
|
|
|
2019-09-25 16:32:33 +02:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.sdmc-%s", socname);
|
hw/arm/aspeed: Use object_initialize_child for correct ref. 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>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Message-Id: <20190507163416.24647-8-philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2019-05-07 18:34:07 +02:00
|
|
|
sysbus_init_child_obj(obj, "sdmc", OBJECT(&s->sdmc), sizeof(s->sdmc),
|
2019-09-25 16:32:33 +02:00
|
|
|
typename);
|
2016-09-22 19:13:06 +02:00
|
|
|
object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc),
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 17:29:22 +02:00
|
|
|
"ram-size");
|
2018-08-16 15:05:29 +02:00
|
|
|
object_property_add_alias(obj, "max-ram-size", OBJECT(&s->sdmc),
|
qom: Drop parameter @errp of object_property_add() & friends
The only way object_property_add() can fail is when a property with
the same name already exists. Since our property names are all
hardcoded, failure is a programming error, and the appropriate way to
handle it is passing &error_abort.
Same for its variants, except for object_property_add_child(), which
additionally fails when the child already has a parent. Parentage is
also under program control, so this is a programming error, too.
We have a bit over 500 callers. Almost half of them pass
&error_abort, slightly fewer ignore errors, one test case handles
errors, and the remaining few callers pass them to their own callers.
The previous few commits demonstrated once again that ignoring
programming errors is a bad idea.
Of the few ones that pass on errors, several violate the Error API.
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call. ich9_pm_add_properties(), sparc32_ledma_realize(),
sparc32_dma_realize(), xilinx_axidma_realize(), xilinx_enet_realize()
are wrong that way.
When the one appropriate choice of argument is &error_abort, letting
users pick the argument is a bad idea.
Drop parameter @errp and assert the preconditions instead.
There's one exception to "duplicate property name is a programming
error": the way object_property_add() implements the magic (and
undocumented) "automatic arrayification". Don't drop @errp there.
Instead, rename object_property_add() to object_property_try_add(),
and add the obvious wrapper object_property_add().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200505152926.18877-15-armbru@redhat.com>
[Two semantic rebase conflicts resolved]
2020-05-05 17:29:22 +02:00
|
|
|
"max-ram-size");
|
2017-02-07 19:29:59 +01:00
|
|
|
|
2019-09-25 16:32:42 +02:00
|
|
|
for (i = 0; i < sc->wdts_num; i++) {
|
2019-09-25 16:32:35 +02:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname);
|
hw/arm/aspeed: Use object_initialize_child for correct ref. 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>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Message-Id: <20190507163416.24647-8-philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
2019-05-07 18:34:07 +02:00
|
|
|
sysbus_init_child_obj(obj, "wdt[*]", OBJECT(&s->wdt[i]),
|
2019-09-25 16:32:35 +02:00
|
|
|
sizeof(s->wdt[i]), typename);
|
2017-07-11 12:21:26 +02:00
|
|
|
}
|
2017-04-14 10:35:02 +02:00
|
|
|
|
2019-09-25 16:32:46 +02:00
|
|
|
for (i = 0; i < sc->macs_num; i++) {
|
2019-07-01 18:26:16 +02:00
|
|
|
sysbus_init_child_obj(obj, "ftgmac100[*]", OBJECT(&s->ftgmac100[i]),
|
|
|
|
sizeof(s->ftgmac100[i]), TYPE_FTGMAC100);
|
|
|
|
}
|
2019-07-01 18:26:18 +02:00
|
|
|
|
|
|
|
sysbus_init_child_obj(obj, "xdma", OBJECT(&s->xdma), sizeof(s->xdma),
|
|
|
|
TYPE_ASPEED_XDMA);
|
2019-09-04 09:04:58 +02:00
|
|
|
|
2019-09-04 09:05:00 +02:00
|
|
|
snprintf(typename, sizeof(typename), "aspeed.gpio-%s", socname);
|
2019-09-04 09:04:58 +02:00
|
|
|
sysbus_init_child_obj(obj, "gpio", OBJECT(&s->gpio), sizeof(s->gpio),
|
2019-09-04 09:05:00 +02:00
|
|
|
typename);
|
2019-09-25 16:32:27 +02:00
|
|
|
|
|
|
|
sysbus_init_child_obj(obj, "sdc", OBJECT(&s->sdhci), sizeof(s->sdhci),
|
|
|
|
TYPE_ASPEED_SDHCI);
|
|
|
|
|
2020-01-30 17:02:02 +01:00
|
|
|
object_property_set_int(OBJECT(&s->sdhci), 2, "num-slots", &error_abort);
|
|
|
|
|
2019-09-25 16:32:27 +02:00
|
|
|
/* Init sd card slot class here so that they're under the correct parent */
|
|
|
|
for (i = 0; i < ASPEED_SDHCI_NUM_SLOTS; ++i) {
|
|
|
|
sysbus_init_child_obj(obj, "sdhci[*]", OBJECT(&s->sdhci.slots[i]),
|
|
|
|
sizeof(s->sdhci.slots[i]), TYPE_SYSBUS_SDHCI);
|
|
|
|
}
|
2016-03-16 18:06:00 +01:00
|
|
|
}
|
|
|
|
|
2016-09-22 19:13:05 +02:00
|
|
|
static void aspeed_soc_realize(DeviceState *dev, Error **errp)
|
2016-03-16 18:06:00 +01:00
|
|
|
{
|
|
|
|
int i;
|
2016-09-22 19:13:05 +02:00
|
|
|
AspeedSoCState *s = ASPEED_SOC(dev);
|
2016-10-17 20:22:16 +02:00
|
|
|
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
|
2016-07-04 14:06:37 +02:00
|
|
|
Error *err = NULL, *local_err = NULL;
|
2016-03-16 18:06:00 +01:00
|
|
|
|
|
|
|
/* IO space */
|
2019-09-25 16:32:42 +02:00
|
|
|
create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_IOMEM],
|
2019-07-01 18:26:15 +02:00
|
|
|
ASPEED_SOC_IOMEM_SIZE);
|
2016-03-16 18:06:00 +01:00
|
|
|
|
2019-09-25 16:32:48 +02:00
|
|
|
/* Video engine stub */
|
|
|
|
create_unimplemented_device("aspeed.video", sc->memmap[ASPEED_VIDEO],
|
|
|
|
0x1000);
|
|
|
|
|
2016-12-27 15:59:26 +01:00
|
|
|
/* CPU */
|
arm/aspeed: Compute the number of CPUs from the SoC definition
Commit ece09beec457 ("aspeed: introduce a configurable number of CPU
per machine") was a convient change during bringup but the Aspeed SoCs
have a fixed number of CPUs : one for the AST2400 and AST2500, and two
for the AST2600.
When the number of CPUs configured with -smp is less than the SoC's
fixed number, the "unconfigured" CPUs are left unrealized. This can
happen for machines ast2600-evb and tacoma-bmc, where the SoC's fixed
number is 2. To get virtual hardware that matches the physical
hardware, you have to pass -smp cpus=2 (or its sugared form -smp 2).
We normally reject -smp cpus=N when N exceeds the machine's limit.
Except we ignore cpus=2 (and only cpus=2) with a warning for machines
ast2500-evb, palmetto-bmc, romulus-bmc, sonorapass-bmc, swift-bmc, and
witherspoon-bmc.
Remove the "num-cpu" property from the SoC state and use the fixed
number of CPUs defined in the SoC class instead. Compute the default,
min, max number of CPUs of the machine directly from the SoC class
definition.
Machines ast2600-evb and tacoma-bmc now always get their second CPU as
they should. Visible in "info qom-tree"; here's the change for
ast2600-evb:
/machine (ast2600-evb-machine)
/peripheral (container)
/peripheral-anon (container)
/soc (ast2600-a1)
/a7mpcore (a15mpcore_priv)
/a15mp-priv-container[0] (qemu:memory-region)
/gic (arm_gic)
/gic_cpu[0] (qemu:memory-region)
/gic_cpu[1] (qemu:memory-region)
+ /gic_cpu[2] (qemu:memory-region)
/gic_dist[0] (qemu:memory-region)
/gic_vcpu[0] (qemu:memory-region)
/gic_viface[0] (qemu:memory-region)
/gic_viface[1] (qemu:memory-region)
+ /gic_viface[2] (qemu:memory-region)
/unnamed-gpio-in[0] (irq)
[...]
+ /unnamed-gpio-in[160] (irq)
[same for 161 to 190...]
+ /unnamed-gpio-in[191] (irq)
Also visible in "info qtree"; here's the change for ast2600-evb:
bus: main-system-bus
type System
dev: a15mpcore_priv, id ""
gpio-in "" 128
- gpio-out "sysbus-irq" 5
- num-cpu = 1 (0x1)
+ gpio-out "sysbus-irq" 10
+ num-cpu = 2 (0x2)
num-irq = 160 (0xa0)
mmio 0000000040460000/0000000000008000
dev: arm_gic, id ""
- gpio-in "" 160
- num-cpu = 1 (0x1)
+ gpio-in "" 192
+ num-cpu = 2 (0x2)
num-irq = 160 (0xa0)
revision = 2 (0x2)
has-security-extensions = true
has-virtualization-extensions = true
num-priority-bits = 8 (0x8)
mmio ffffffffffffffff/0000000000001000
mmio ffffffffffffffff/0000000000002000
mmio ffffffffffffffff/0000000000001000
mmio ffffffffffffffff/0000000000002000
mmio ffffffffffffffff/0000000000000100
+ mmio ffffffffffffffff/0000000000000100
+ mmio ffffffffffffffff/0000000000000200
mmio ffffffffffffffff/0000000000000200
The other machines now reject -smp cpus=2 just like -smp cpus=3 and up.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
[Commit message expanded]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200609122339.937862-5-armbru@redhat.com>
2020-06-09 14:23:19 +02:00
|
|
|
for (i = 0; i < sc->num_cpus; i++) {
|
2019-07-01 18:26:16 +02:00
|
|
|
object_property_set_bool(OBJECT(&s->cpu[i]), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2016-12-27 15:59:26 +01:00
|
|
|
}
|
|
|
|
|
2016-12-27 15:59:27 +01:00
|
|
|
/* SRAM */
|
2018-04-26 12:04:39 +02:00
|
|
|
memory_region_init_ram(&s->sram, OBJECT(dev), "aspeed.sram",
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->sram_size, &err);
|
2016-12-27 15:59:27 +01:00
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-07-01 18:26:15 +02:00
|
|
|
memory_region_add_subregion(get_system_memory(),
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->memmap[ASPEED_SRAM], &s->sram);
|
2016-12-27 15:59:27 +01:00
|
|
|
|
2018-06-26 18:50:42 +02:00
|
|
|
/* SCU */
|
|
|
|
object_property_set_bool(OBJECT(&s->scu), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-09-25 16:32:42 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_SCU]);
|
2018-06-26 18:50:42 +02:00
|
|
|
|
2016-03-16 18:06:00 +01:00
|
|
|
/* VIC */
|
|
|
|
object_property_set_bool(OBJECT(&s->vic), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-09-25 16:32:42 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->vic), 0, sc->memmap[ASPEED_VIC]);
|
2016-03-16 18:06:00 +01:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->vic), 0,
|
2016-12-27 15:59:26 +01:00
|
|
|
qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ));
|
2016-03-16 18:06:00 +01:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->vic), 1,
|
2016-12-27 15:59:26 +01:00
|
|
|
qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));
|
2016-03-16 18:06:00 +01:00
|
|
|
|
2019-07-01 18:26:16 +02:00
|
|
|
/* RTC */
|
|
|
|
object_property_set_bool(OBJECT(&s->rtc), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-09-25 16:32:42 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->rtc), 0, sc->memmap[ASPEED_RTC]);
|
2019-07-01 18:26:16 +02:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->rtc), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_RTC));
|
|
|
|
|
2016-03-16 18:06:00 +01:00
|
|
|
/* Timer */
|
2019-11-19 15:12:10 +01:00
|
|
|
object_property_set_link(OBJECT(&s->timerctrl),
|
|
|
|
OBJECT(&s->scu), "scu", &error_abort);
|
2016-03-16 18:06:00 +01:00
|
|
|
object_property_set_bool(OBJECT(&s->timerctrl), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-07-01 18:26:15 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->timerctrl), 0,
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->memmap[ASPEED_TIMER1]);
|
2019-07-01 18:26:15 +02:00
|
|
|
for (i = 0; i < ASPEED_TIMER_NR_TIMERS; i++) {
|
|
|
|
qemu_irq irq = aspeed_soc_get_irq(s, ASPEED_TIMER1 + i);
|
2016-03-16 18:06:00 +01:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->timerctrl), i, irq);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* UART - attach an 8250 to the IO space as our UART5 */
|
2018-04-20 16:52:43 +02:00
|
|
|
if (serial_hd(0)) {
|
2019-07-01 18:26:15 +02:00
|
|
|
qemu_irq uart5 = aspeed_soc_get_irq(s, ASPEED_UART5);
|
2019-09-25 16:32:42 +02:00
|
|
|
serial_mm_init(get_system_memory(), sc->memmap[ASPEED_UART5], 2,
|
2018-04-20 16:52:43 +02:00
|
|
|
uart5, 38400, serial_hd(0), DEVICE_LITTLE_ENDIAN);
|
2016-03-16 18:06:00 +01:00
|
|
|
}
|
2016-06-06 17:59:29 +02:00
|
|
|
|
|
|
|
/* I2C */
|
2019-11-19 15:11:58 +01:00
|
|
|
object_property_set_link(OBJECT(&s->i2c), OBJECT(s->dram_mr), "dram", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2016-06-06 17:59:29 +02:00
|
|
|
object_property_set_bool(OBJECT(&s->i2c), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-09-25 16:32:42 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c), 0, sc->memmap[ASPEED_I2C]);
|
2016-06-06 17:59:29 +02:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c), 0,
|
2019-07-01 18:26:15 +02:00
|
|
|
aspeed_soc_get_irq(s, ASPEED_I2C));
|
2016-07-04 14:06:37 +02:00
|
|
|
|
2016-12-27 15:59:29 +01:00
|
|
|
/* FMC, The number of CS is set at the board level */
|
2019-11-19 15:11:57 +01:00
|
|
|
object_property_set_link(OBJECT(&s->fmc), OBJECT(s->dram_mr), "dram", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-09-25 16:32:42 +02:00
|
|
|
object_property_set_int(OBJECT(&s->fmc), sc->memmap[ASPEED_SDRAM],
|
2019-07-01 18:26:17 +02:00
|
|
|
"sdram-base", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2016-12-27 15:59:29 +01:00
|
|
|
object_property_set_bool(OBJECT(&s->fmc), true, "realized", &err);
|
2016-07-04 14:06:37 +02:00
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-09-25 16:32:42 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->fmc), 0, sc->memmap[ASPEED_FMC]);
|
2016-10-17 20:22:16 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->fmc), 1,
|
|
|
|
s->fmc.ctrl->flash_window_base);
|
2016-10-17 20:22:16 +02:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->fmc), 0,
|
2019-07-01 18:26:15 +02:00
|
|
|
aspeed_soc_get_irq(s, ASPEED_FMC));
|
2016-07-04 14:06:37 +02:00
|
|
|
|
|
|
|
/* SPI */
|
2019-09-25 16:32:42 +02:00
|
|
|
for (i = 0; i < sc->spis_num; i++) {
|
2016-10-17 20:22:16 +02:00
|
|
|
object_property_set_int(OBJECT(&s->spi[i]), 1, "num-cs", &err);
|
|
|
|
object_property_set_bool(OBJECT(&s->spi[i]), true, "realized",
|
|
|
|
&local_err);
|
|
|
|
error_propagate(&err, local_err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-07-01 18:26:15 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 0,
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->memmap[ASPEED_SPI1 + i]);
|
2016-10-17 20:22:16 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->spi[i]), 1,
|
|
|
|
s->spi[i].ctrl->flash_window_base);
|
2016-07-04 14:06:37 +02:00
|
|
|
}
|
2016-09-06 20:52:17 +02:00
|
|
|
|
2020-02-06 19:34:37 +01:00
|
|
|
/* EHCI */
|
|
|
|
for (i = 0; i < sc->ehcis_num; i++) {
|
|
|
|
object_property_set_bool(OBJECT(&s->ehci[i]), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->ehci[i]), 0,
|
|
|
|
sc->memmap[ASPEED_EHCI1 + i]);
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->ehci[i]), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_EHCI1 + i));
|
|
|
|
}
|
|
|
|
|
2016-09-06 20:52:17 +02:00
|
|
|
/* SDMC - SDRAM Memory Controller */
|
|
|
|
object_property_set_bool(OBJECT(&s->sdmc), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-09-25 16:32:42 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdmc), 0, sc->memmap[ASPEED_SDMC]);
|
2017-02-07 19:29:59 +01:00
|
|
|
|
|
|
|
/* Watch dog */
|
2019-09-25 16:32:42 +02:00
|
|
|
for (i = 0; i < sc->wdts_num; i++) {
|
2019-09-25 16:32:35 +02:00
|
|
|
AspeedWDTClass *awc = ASPEED_WDT_GET_CLASS(&s->wdt[i]);
|
|
|
|
|
2019-11-19 15:12:10 +01:00
|
|
|
object_property_set_link(OBJECT(&s->wdt[i]),
|
|
|
|
OBJECT(&s->scu), "scu", &error_abort);
|
2017-07-11 12:21:26 +02:00
|
|
|
object_property_set_bool(OBJECT(&s->wdt[i]), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt[i]), 0,
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->memmap[ASPEED_WDT] + i * awc->offset);
|
2017-02-07 19:29:59 +01:00
|
|
|
}
|
2017-04-14 10:35:02 +02:00
|
|
|
|
|
|
|
/* Net */
|
arm/aspeed: Rework NIC attachment
The number of MACs supported by an Aspeed SoC is defined by "macs_num"
under the SoC model, that is two for the AST2400 and AST2500 and four
for the AST2600. The model initializes the maximum number of supported
MACs but the number of realized devices is capped by the number of
network device back-ends defined on the command line. This can leave
unrealized devices hanging around in the QOM composition tree.
To get virtual hardware that matches the physical hardware, you have
to pass exactly as many -nic options as there are MACs, and some of
them must be -nic none:
* Machines ast2500-evb, palmetto-bmc, romulus-bmc, sonorapass-bmc,
swift-bmc, and witherspoon-bmc: two -nic, and the second one must be
-nic none.
* Machine ast2600-evb: four -nic, the first one must be -nic none.
* Machine tacoma-bmc: four nic, the first two and the last one must be
-nic none.
Modify the machine initialization to define which MACs are attached to
a network device back-end using a bit-field property "macs-mask" and
let the SoC realize all network devices.
The default setting of "macs-mask" is "use MAC0" only, which works for
all our AST2400 and AST2500 machines. The AST2600 machines have
different configurations. The AST2600 EVB machine activates MAC1, MAC2
and MAC3 and the Tacoma BMC machine activates MAC2.
Incompatible CLI change: -nic options now apply to *active* MACs:
MAC1, MAC2, MAC3 for ast2600-evb, MAC2 for tacoma-bmc, and MAC0 for
all the others.
The machines now always get all MACs as they should. Visible in "info
qom-tree", here's the change for tacoma-bmc:
/machine (tacoma-bmc-machine)
/peripheral (container)
/peripheral-anon (container)
/soc (ast2600-a1)
[...]
/ftgmac100[0] (ftgmac100)
/ftgmac100[0] (qemu:memory-region)
/ftgmac100[1] (ftgmac100)
+ /ftgmac100[0] (qemu:memory-region)
/ftgmac100[2] (ftgmac100)
+ /ftgmac100[0] (qemu:memory-region)
/ftgmac100[3] (ftgmac100)
+ /ftgmac100[0] (qemu:memory-region)
[...]
/mii[0] (aspeed-mmi)
/aspeed-mmi[0] (qemu:memory-region)
/mii[1] (aspeed-mmi)
+ /aspeed-mmi[0] (qemu:memory-region)
/mii[2] (aspeed-mmi)
+ /aspeed-mmi[0] (qemu:memory-region)
/mii[3] (aspeed-mmi)
+ /aspeed-mmi[0] (qemu:memory-region)
Also visible in "info qtree"; here's the change for tacoma-bmc:
dev: ftgmac100, id ""
gpio-out "sysbus-irq" 1
aspeed = true
- mac = "52:54:00:12:34:56"
- netdev = "hub0port0"
+ mac = "52:54:00:12:34:57"
+ netdev = ""
mmio 000000001e660000/0000000000002000
dev: ftgmac100, id ""
- aspeed = false
- mac = "00:00:00:00:00:00"
+ gpio-out "sysbus-irq" 1
+ aspeed = true
+ mac = "52:54:00:12:34:58"
netdev = ""
+ mmio 000000001e680000/0000000000002000
dev: ftgmac100, id ""
- aspeed = false
- mac = "00:00:00:00:00:00"
- netdev = ""
+ gpio-out "sysbus-irq" 1
+ aspeed = true
+ mac = "52:54:00:12:34:56"
+ netdev = "hub0port0"
+ mmio 000000001e670000/0000000000002000
dev: ftgmac100, id ""
- aspeed = false
- mac = "00:00:00:00:00:00"
+ gpio-out "sysbus-irq" 1
+ aspeed = true
+ mac = "52:54:00:12:34:59"
netdev = ""
+ mmio 000000001e690000/0000000000002000
[...]
dev: aspeed-mmi, id ""
mmio 000000001e650000/0000000000000008
dev: aspeed-mmi, id ""
+ mmio 000000001e650008/0000000000000008
dev: aspeed-mmi, id ""
+ mmio 000000001e650010/0000000000000008
dev: aspeed-mmi, id ""
+ mmio 000000001e650018/0000000000000008
Inactive MACs will have no peer and QEMU may warn the user with :
qemu-system-arm: warning: nic ftgmac100.0 has no peer
qemu-system-arm: warning: nic ftgmac100.1 has no peer
qemu-system-arm: warning: nic ftgmac100.3 has no peer
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
[Commit message expanded]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200609122339.937862-6-armbru@redhat.com>
2020-06-09 14:23:20 +02:00
|
|
|
for (i = 0; i < sc->macs_num; i++) {
|
2019-07-01 18:26:16 +02:00
|
|
|
object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "aspeed",
|
|
|
|
&err);
|
|
|
|
object_property_set_bool(OBJECT(&s->ftgmac100[i]), true, "realized",
|
|
|
|
&local_err);
|
|
|
|
error_propagate(&err, local_err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0,
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->memmap[ASPEED_ETH1 + i]);
|
2019-07-01 18:26:16 +02:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_ETH1 + i));
|
2017-04-14 10:35:02 +02:00
|
|
|
}
|
2019-07-01 18:26:18 +02:00
|
|
|
|
|
|
|
/* XDMA */
|
|
|
|
object_property_set_bool(OBJECT(&s->xdma), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->xdma), 0,
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->memmap[ASPEED_XDMA]);
|
2019-07-01 18:26:18 +02:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->xdma), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_XDMA));
|
2019-09-04 09:04:58 +02:00
|
|
|
|
|
|
|
/* GPIO */
|
|
|
|
object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2019-09-25 16:32:42 +02:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio), 0, sc->memmap[ASPEED_GPIO]);
|
2019-09-04 09:04:58 +02:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_GPIO));
|
2019-09-25 16:32:27 +02:00
|
|
|
|
|
|
|
/* SDHCI */
|
|
|
|
object_property_set_bool(OBJECT(&s->sdhci), true, "realized", &err);
|
|
|
|
if (err) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci), 0,
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->memmap[ASPEED_SDHCI]);
|
2019-09-25 16:32:27 +02:00
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci), 0,
|
|
|
|
aspeed_soc_get_irq(s, ASPEED_SDHCI));
|
2016-03-16 18:06:00 +01:00
|
|
|
}
|
2019-07-01 18:26:16 +02:00
|
|
|
static Property aspeed_soc_properties[] = {
|
2019-11-19 15:11:57 +01:00
|
|
|
DEFINE_PROP_LINK("dram", AspeedSoCState, dram_mr, TYPE_MEMORY_REGION,
|
|
|
|
MemoryRegion *),
|
2019-07-01 18:26:16 +02:00
|
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
|
|
};
|
2016-03-16 18:06:00 +01:00
|
|
|
|
2016-09-22 19:13:05 +02:00
|
|
|
static void aspeed_soc_class_init(ObjectClass *oc, void *data)
|
2016-03-16 18:06:00 +01:00
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
|
2016-09-22 19:13:05 +02:00
|
|
|
dc->realize = aspeed_soc_realize;
|
2017-09-04 16:21:55 +02:00
|
|
|
/* Reason: Uses serial_hds and nd_table in realize() directly */
|
|
|
|
dc->user_creatable = false;
|
2020-01-10 16:30:32 +01:00
|
|
|
device_class_set_props(dc, aspeed_soc_properties);
|
2016-03-16 18:06:00 +01:00
|
|
|
}
|
|
|
|
|
2016-09-22 19:13:05 +02:00
|
|
|
static const TypeInfo aspeed_soc_type_info = {
|
2016-09-22 19:13:05 +02:00
|
|
|
.name = TYPE_ASPEED_SOC,
|
|
|
|
.parent = TYPE_DEVICE,
|
|
|
|
.instance_size = sizeof(AspeedSoCState),
|
|
|
|
.class_size = sizeof(AspeedSoCClass),
|
2019-09-25 16:32:42 +02:00
|
|
|
.class_init = aspeed_soc_class_init,
|
2016-09-22 19:13:05 +02:00
|
|
|
.abstract = true,
|
2016-03-16 18:06:00 +01:00
|
|
|
};
|
|
|
|
|
2019-09-25 16:32:42 +02:00
|
|
|
static void aspeed_soc_ast2400_class_init(ObjectClass *oc, void *data)
|
2016-03-16 18:06:00 +01:00
|
|
|
{
|
2019-09-25 16:32:42 +02:00
|
|
|
AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc);
|
2016-09-22 19:13:05 +02:00
|
|
|
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->name = "ast2400-a1";
|
|
|
|
sc->cpu_type = ARM_CPU_TYPE_NAME("arm926");
|
|
|
|
sc->silicon_rev = AST2400_A1_SILICON_REV;
|
|
|
|
sc->sram_size = 0x8000;
|
|
|
|
sc->spis_num = 1;
|
2020-02-06 19:34:37 +01:00
|
|
|
sc->ehcis_num = 1;
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->wdts_num = 2;
|
2019-09-25 16:32:46 +02:00
|
|
|
sc->macs_num = 2;
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->irqmap = aspeed_soc_ast2400_irqmap;
|
|
|
|
sc->memmap = aspeed_soc_ast2400_memmap;
|
|
|
|
sc->num_cpus = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo aspeed_soc_ast2400_type_info = {
|
|
|
|
.name = "ast2400-a1",
|
|
|
|
.parent = TYPE_ASPEED_SOC,
|
|
|
|
.instance_init = aspeed_soc_init,
|
|
|
|
.instance_size = sizeof(AspeedSoCState),
|
|
|
|
.class_init = aspeed_soc_ast2400_class_init,
|
|
|
|
};
|
|
|
|
|
|
|
|
static void aspeed_soc_ast2500_class_init(ObjectClass *oc, void *data)
|
|
|
|
{
|
|
|
|
AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc);
|
|
|
|
|
|
|
|
sc->name = "ast2500-a1";
|
|
|
|
sc->cpu_type = ARM_CPU_TYPE_NAME("arm1176");
|
|
|
|
sc->silicon_rev = AST2500_A1_SILICON_REV;
|
|
|
|
sc->sram_size = 0x9000;
|
|
|
|
sc->spis_num = 2;
|
2020-02-06 19:34:37 +01:00
|
|
|
sc->ehcis_num = 2;
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->wdts_num = 3;
|
2019-09-25 16:32:46 +02:00
|
|
|
sc->macs_num = 2;
|
2019-09-25 16:32:42 +02:00
|
|
|
sc->irqmap = aspeed_soc_ast2500_irqmap;
|
|
|
|
sc->memmap = aspeed_soc_ast2500_memmap;
|
|
|
|
sc->num_cpus = 1;
|
2016-03-16 18:06:00 +01:00
|
|
|
}
|
|
|
|
|
2019-09-25 16:32:42 +02:00
|
|
|
static const TypeInfo aspeed_soc_ast2500_type_info = {
|
|
|
|
.name = "ast2500-a1",
|
|
|
|
.parent = TYPE_ASPEED_SOC,
|
|
|
|
.instance_init = aspeed_soc_init,
|
|
|
|
.instance_size = sizeof(AspeedSoCState),
|
|
|
|
.class_init = aspeed_soc_ast2500_class_init,
|
|
|
|
};
|
|
|
|
static void aspeed_soc_register_types(void)
|
|
|
|
{
|
|
|
|
type_register_static(&aspeed_soc_type_info);
|
|
|
|
type_register_static(&aspeed_soc_ast2400_type_info);
|
|
|
|
type_register_static(&aspeed_soc_ast2500_type_info);
|
|
|
|
};
|
|
|
|
|
2016-09-22 19:13:05 +02:00
|
|
|
type_init(aspeed_soc_register_types)
|