2007-11-11 03:04:49 +03:00
|
|
|
/*
|
|
|
|
* ARMV7M System emulation.
|
|
|
|
*
|
|
|
|
* Copyright (c) 2006-2007 CodeSourcery.
|
|
|
|
* Written by Paul Brook
|
|
|
|
*
|
2011-06-23 04:59:26 +04:00
|
|
|
* This code is licensed under the GPL.
|
2007-11-11 03:04:49 +03:00
|
|
|
*/
|
|
|
|
|
2015-12-07 19:23:45 +03:00
|
|
|
#include "qemu/osdep.h"
|
2017-02-20 18:35:57 +03:00
|
|
|
#include "hw/arm/armv7m.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2016-01-19 23:51:44 +03:00
|
|
|
#include "cpu.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/sysbus.h"
|
2019-05-23 16:47:43 +03:00
|
|
|
#include "hw/arm/boot.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/loader.h"
|
2019-08-12 08:23:51 +03:00
|
|
|
#include "hw/qdev-properties.h"
|
2009-09-20 18:58:02 +04:00
|
|
|
#include "elf.h"
|
2013-07-29 20:36:59 +04:00
|
|
|
#include "sysemu/qtest.h"
|
2019-08-12 08:23:38 +03:00
|
|
|
#include "sysemu/reset.h"
|
2013-07-29 20:36:59 +04:00
|
|
|
#include "qemu/error-report.h"
|
2019-05-23 17:35:07 +03:00
|
|
|
#include "qemu/module.h"
|
2017-02-20 18:35:59 +03:00
|
|
|
#include "exec/address-spaces.h"
|
2018-03-02 13:45:36 +03:00
|
|
|
#include "target/arm/idau.h"
|
2007-11-11 03:04:49 +03:00
|
|
|
|
|
|
|
/* Bitbanded IO. Each word corresponds to a single bit. */
|
|
|
|
|
2011-06-23 04:59:26 +04:00
|
|
|
/* Get the byte address of the real memory for a bitband access. */
|
2017-02-20 18:36:01 +03:00
|
|
|
static inline hwaddr bitband_addr(BitBandState *s, hwaddr offset)
|
2007-11-11 03:04:49 +03:00
|
|
|
{
|
2017-02-20 18:36:01 +03:00
|
|
|
return s->base | (offset & 0x1ffffff) >> 5;
|
2007-11-11 03:04:49 +03:00
|
|
|
}
|
|
|
|
|
2017-02-20 18:36:01 +03:00
|
|
|
static MemTxResult bitband_read(void *opaque, hwaddr offset,
|
|
|
|
uint64_t *data, unsigned size, MemTxAttrs attrs)
|
2007-11-11 03:04:49 +03:00
|
|
|
{
|
2017-02-20 18:36:01 +03:00
|
|
|
BitBandState *s = opaque;
|
|
|
|
uint8_t buf[4];
|
|
|
|
MemTxResult res;
|
|
|
|
int bitpos, bit;
|
|
|
|
hwaddr addr;
|
|
|
|
|
|
|
|
assert(size <= 4);
|
|
|
|
|
|
|
|
/* Find address in underlying memory and round down to multiple of size */
|
|
|
|
addr = bitband_addr(s, offset) & (-size);
|
2017-09-21 11:51:08 +03:00
|
|
|
res = address_space_read(&s->source_as, addr, attrs, buf, size);
|
2017-02-20 18:36:01 +03:00
|
|
|
if (res) {
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
/* Bit position in the N bytes read... */
|
|
|
|
bitpos = (offset >> 2) & ((size * 8) - 1);
|
|
|
|
/* ...converted to byte in buffer and bit in byte */
|
|
|
|
bit = (buf[bitpos >> 3] >> (bitpos & 7)) & 1;
|
|
|
|
*data = bit;
|
|
|
|
return MEMTX_OK;
|
2007-11-11 03:04:49 +03:00
|
|
|
}
|
|
|
|
|
2017-02-20 18:36:01 +03:00
|
|
|
static MemTxResult bitband_write(void *opaque, hwaddr offset, uint64_t value,
|
|
|
|
unsigned size, MemTxAttrs attrs)
|
2007-11-11 03:04:49 +03:00
|
|
|
{
|
2017-02-20 18:36:01 +03:00
|
|
|
BitBandState *s = opaque;
|
|
|
|
uint8_t buf[4];
|
|
|
|
MemTxResult res;
|
|
|
|
int bitpos, bit;
|
|
|
|
hwaddr addr;
|
|
|
|
|
|
|
|
assert(size <= 4);
|
|
|
|
|
|
|
|
/* Find address in underlying memory and round down to multiple of size */
|
|
|
|
addr = bitband_addr(s, offset) & (-size);
|
2017-09-21 11:51:08 +03:00
|
|
|
res = address_space_read(&s->source_as, addr, attrs, buf, size);
|
2017-02-20 18:36:01 +03:00
|
|
|
if (res) {
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
/* Bit position in the N bytes read... */
|
|
|
|
bitpos = (offset >> 2) & ((size * 8) - 1);
|
|
|
|
/* ...converted to byte in buffer and bit in byte */
|
|
|
|
bit = 1 << (bitpos & 7);
|
|
|
|
if (value & 1) {
|
|
|
|
buf[bitpos >> 3] |= bit;
|
|
|
|
} else {
|
|
|
|
buf[bitpos >> 3] &= ~bit;
|
|
|
|
}
|
2017-09-21 11:51:08 +03:00
|
|
|
return address_space_write(&s->source_as, addr, attrs, buf, size);
|
2007-11-11 03:04:49 +03:00
|
|
|
}
|
|
|
|
|
2011-08-15 18:17:20 +04:00
|
|
|
static const MemoryRegionOps bitband_ops = {
|
2017-02-20 18:36:01 +03:00
|
|
|
.read_with_attrs = bitband_read,
|
|
|
|
.write_with_attrs = bitband_write,
|
2011-08-15 18:17:20 +04:00
|
|
|
.endianness = DEVICE_NATIVE_ENDIAN,
|
2017-02-20 18:36:01 +03:00
|
|
|
.impl.min_access_size = 1,
|
|
|
|
.impl.max_access_size = 4,
|
|
|
|
.valid.min_access_size = 1,
|
|
|
|
.valid.max_access_size = 4,
|
2007-11-11 03:04:49 +03:00
|
|
|
};
|
|
|
|
|
2016-03-07 10:05:42 +03:00
|
|
|
static void bitband_init(Object *obj)
|
2007-11-11 03:04:49 +03:00
|
|
|
{
|
2016-03-07 10:05:42 +03:00
|
|
|
BitBandState *s = BITBAND(obj);
|
|
|
|
SysBusDevice *dev = SYS_BUS_DEVICE(obj);
|
2007-11-11 03:04:49 +03:00
|
|
|
|
2017-02-20 18:36:01 +03:00
|
|
|
memory_region_init_io(&s->iomem, obj, &bitband_ops, s,
|
2013-06-07 05:25:08 +04:00
|
|
|
"bitband", 0x02000000);
|
2011-11-27 13:38:10 +04:00
|
|
|
sysbus_init_mmio(dev, &s->iomem);
|
2009-06-03 18:16:49 +04:00
|
|
|
}
|
|
|
|
|
2017-02-20 18:36:01 +03:00
|
|
|
static void bitband_realize(DeviceState *dev, Error **errp)
|
|
|
|
{
|
|
|
|
BitBandState *s = BITBAND(dev);
|
|
|
|
|
|
|
|
if (!s->source_memory) {
|
|
|
|
error_setg(errp, "source-memory property not set");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-09-21 11:51:08 +03:00
|
|
|
address_space_init(&s->source_as, s->source_memory, "bitband-source");
|
2017-02-20 18:36:01 +03:00
|
|
|
}
|
|
|
|
|
2007-11-11 03:04:49 +03:00
|
|
|
/* Board init. */
|
2010-04-05 22:34:51 +04:00
|
|
|
|
2017-02-20 18:35:57 +03:00
|
|
|
static const hwaddr bitband_input_addr[ARMV7M_NUM_BITBANDS] = {
|
|
|
|
0x20000000, 0x40000000
|
|
|
|
};
|
|
|
|
|
|
|
|
static const hwaddr bitband_output_addr[ARMV7M_NUM_BITBANDS] = {
|
|
|
|
0x22000000, 0x42000000
|
|
|
|
};
|
|
|
|
|
|
|
|
static void armv7m_instance_init(Object *obj)
|
|
|
|
{
|
|
|
|
ARMv7MState *s = ARMV7M(obj);
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* Can't init the cpu here, we don't yet know which model to use */
|
|
|
|
|
2017-02-20 18:35:59 +03:00
|
|
|
memory_region_init(&s->container, obj, "armv7m-container", UINT64_MAX);
|
|
|
|
|
2020-11-20 00:56:16 +03:00
|
|
|
object_initialize_child(obj, "nvic", &s->nvic, TYPE_NVIC);
|
2017-02-20 18:35:57 +03:00
|
|
|
object_property_add_alias(obj, "num-irq",
|
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 18:29:22 +03:00
|
|
|
OBJECT(&s->nvic), "num-irq");
|
2017-02-20 18:35:57 +03:00
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(s->bitband); i++) {
|
2020-06-10 08:32:38 +03:00
|
|
|
object_initialize_child(obj, "bitband[*]", &s->bitband[i],
|
|
|
|
TYPE_BITBAND);
|
2017-02-20 18:35:57 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void armv7m_realize(DeviceState *dev, Error **errp)
|
|
|
|
{
|
|
|
|
ARMv7MState *s = ARMV7M(dev);
|
2017-02-20 18:36:00 +03:00
|
|
|
SysBusDevice *sbd;
|
2017-02-20 18:35:57 +03:00
|
|
|
Error *err = NULL;
|
|
|
|
int i;
|
|
|
|
|
2017-02-20 18:35:59 +03:00
|
|
|
if (!s->board_memory) {
|
|
|
|
error_setg(errp, "memory property was not set");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
memory_region_add_subregion_overlap(&s->container, 0, s->board_memory, -1);
|
|
|
|
|
2019-02-01 17:55:41 +03:00
|
|
|
s->cpu = ARM_CPU(object_new_with_props(s->cpu_type, OBJECT(s), "cpu",
|
|
|
|
&err, NULL));
|
|
|
|
if (err != NULL) {
|
|
|
|
error_propagate(errp, err);
|
|
|
|
return;
|
|
|
|
}
|
2017-02-20 18:35:57 +03:00
|
|
|
|
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
2020-07-07 19:05:54 +03:00
|
|
|
object_property_set_link(OBJECT(s->cpu), "memory", OBJECT(&s->container),
|
2017-02-20 18:35:59 +03:00
|
|
|
&error_abort);
|
2020-09-14 16:56:17 +03:00
|
|
|
if (object_property_find(OBJECT(s->cpu), "idau")) {
|
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
2020-07-07 19:05:54 +03:00
|
|
|
object_property_set_link(OBJECT(s->cpu), "idau", s->idau,
|
2020-06-30 12:03:41 +03:00
|
|
|
&error_abort);
|
2018-03-02 13:45:36 +03:00
|
|
|
}
|
2020-09-14 16:56:17 +03:00
|
|
|
if (object_property_find(OBJECT(s->cpu), "init-svtor")) {
|
qom: Use returned bool to check for failure, Coccinelle part
The previous commit enables conversion of
foo(..., &err);
if (err) {
...
}
to
if (!foo(..., errp)) {
...
}
for QOM functions that now return true / false on success / error.
Coccinelle script:
@@
identifier fun = {
object_apply_global_props, object_initialize_child_with_props,
object_initialize_child_with_propsv, object_property_get,
object_property_get_bool, object_property_parse, object_property_set,
object_property_set_bool, object_property_set_int,
object_property_set_link, object_property_set_qobject,
object_property_set_str, object_property_set_uint, object_set_props,
object_set_propv, user_creatable_add_dict,
user_creatable_complete, user_creatable_del
};
expression list args, args2;
typedef Error;
Error *err;
@@
- fun(args, &err, args2);
- if (err)
+ if (!fun(args, &err, args2))
{
...
}
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Line breaks tidied up manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-29-armbru@redhat.com>
2020-07-07 19:05:56 +03:00
|
|
|
if (!object_property_set_uint(OBJECT(s->cpu), "init-svtor",
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
s->init_svtor, errp)) {
|
2018-03-02 13:45:37 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2020-09-14 16:56:17 +03:00
|
|
|
if (object_property_find(OBJECT(s->cpu), "start-powered-off")) {
|
qom: Use returned bool to check for failure, Coccinelle part
The previous commit enables conversion of
foo(..., &err);
if (err) {
...
}
to
if (!foo(..., errp)) {
...
}
for QOM functions that now return true / false on success / error.
Coccinelle script:
@@
identifier fun = {
object_apply_global_props, object_initialize_child_with_props,
object_initialize_child_with_propsv, object_property_get,
object_property_get_bool, object_property_parse, object_property_set,
object_property_set_bool, object_property_set_int,
object_property_set_link, object_property_set_qobject,
object_property_set_str, object_property_set_uint, object_set_props,
object_set_propv, user_creatable_add_dict,
user_creatable_complete, user_creatable_del
};
expression list args, args2;
typedef Error;
Error *err;
@@
- fun(args, &err, args2);
- if (err)
+ if (!fun(args, &err, args2))
{
...
}
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Line breaks tidied up manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-29-armbru@redhat.com>
2020-07-07 19:05:56 +03:00
|
|
|
if (!object_property_set_bool(OBJECT(s->cpu), "start-powered-off",
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
s->start_powered_off, errp)) {
|
2019-02-01 17:55:41 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2020-09-14 16:56:17 +03:00
|
|
|
if (object_property_find(OBJECT(s->cpu), "vfp")) {
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
if (!object_property_set_bool(OBJECT(s->cpu), "vfp", s->vfp, errp)) {
|
2019-05-17 20:40:45 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2020-09-14 16:56:17 +03:00
|
|
|
if (object_property_find(OBJECT(s->cpu), "dsp")) {
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
if (!object_property_set_bool(OBJECT(s->cpu), "dsp", s->dsp, errp)) {
|
2019-05-17 20:40:45 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
2018-06-15 16:57:13 +03:00
|
|
|
|
2019-02-01 17:55:41 +03:00
|
|
|
/*
|
|
|
|
* Tell the CPU where the NVIC is; it will fail realize if it doesn't
|
|
|
|
* have one. Similarly, tell the NVIC where its CPU is.
|
2018-06-15 16:57:13 +03:00
|
|
|
*/
|
|
|
|
s->cpu->env.nvic = &s->nvic;
|
2019-02-01 17:55:41 +03:00
|
|
|
s->nvic.cpu = s->cpu;
|
2018-06-15 16:57:13 +03:00
|
|
|
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
if (!qdev_realize(DEVICE(s->cpu), NULL, errp)) {
|
2017-02-20 18:35:57 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Note that we must realize the NVIC after the CPU */
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->nvic), errp)) {
|
2017-02-20 18:35:57 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Alias the NVIC's input and output GPIOs as our own so the board
|
|
|
|
* code can wire them up. (We do this in realize because the
|
|
|
|
* NVIC doesn't create the input GPIO array until realize.)
|
|
|
|
*/
|
|
|
|
qdev_pass_gpios(DEVICE(&s->nvic), dev, NULL);
|
|
|
|
qdev_pass_gpios(DEVICE(&s->nvic), dev, "SYSRESETREQ");
|
2018-08-20 13:24:33 +03:00
|
|
|
qdev_pass_gpios(DEVICE(&s->nvic), dev, "NMI");
|
2017-02-20 18:35:57 +03:00
|
|
|
|
|
|
|
/* Wire the NVIC up to the CPU */
|
2017-02-20 18:36:00 +03:00
|
|
|
sbd = SYS_BUS_DEVICE(&s->nvic);
|
|
|
|
sysbus_connect_irq(sbd, 0,
|
2017-02-20 18:35:57 +03:00
|
|
|
qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_IRQ));
|
|
|
|
|
hw/intc/armv7m_nvic: Make all of system PPB range be RAZWI/BusFault
For M-profile CPUs, the range from 0xe0000000 to 0xe00fffff is the
Private Peripheral Bus range, which includes all of the memory mapped
devices and registers that are part of the CPU itself, including the
NVIC, systick timer, and debug and trace components like the Data
Watchpoint and Trace unit (DWT). Within this large region, the range
0xe000e000 to 0xe000efff is the System Control Space (NVIC, system
registers, systick) and 0xe002e000 to 0exe002efff is its Non-secure
alias.
The architecture is clear that within the SCS unimplemented registers
should be RES0 for privileged accesses and generate BusFault for
unprivileged accesses, and we currently implement this.
It is less clear about how to handle accesses to unimplemented
regions of the wider PPB. Unprivileged accesses should definitely
cause BusFaults (R_DQQS), but the behaviour of privileged accesses is
not given as a general rule. However, the register definitions of
individual registers for components like the DWT all state that they
are RES0 if the relevant component is not implemented, so the
simplest way to provide that is to provide RAZ/WI for the whole range
for privileged accesses. (The v7M Arm ARM does say that reserved
registers should be UNK/SBZP.)
Expand the container MemoryRegion that the NVIC exposes so that
it covers the whole PPB space. This means:
* moving the address that the ARMV7M device maps it to down by
0xe000 bytes
* moving the off and the offsets within the container of all the
subregions forward by 0xe000 bytes
* adding a new default MemoryRegion that covers the whole container
at a lower priority than anything else and which provides the
RAZWI/BusFault behaviour
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20201119215617.29887-2-peter.maydell@linaro.org
2020-11-20 00:55:50 +03:00
|
|
|
memory_region_add_subregion(&s->container, 0xe0000000,
|
2017-02-20 18:36:00 +03:00
|
|
|
sysbus_mmio_get_region(sbd, 0));
|
|
|
|
|
armv7m: Delete unused "ARM,bitband-memory" devices
These devices are optional, and enabled by property "enable-bitband".
armv7m_instance_init() creates them unconditionally, because the
property has not been set then. armv7m_realize() realizes them only
when the property is true. Works, although it leaves unrealized
devices hanging around in the QOM composition tree. Affects machines
microbit, mps2-an505, mps2-an521, musca-a, and musca-b1.
Delete the unused devices by making armv7m_realize() unparent them.
Visible in "info qom-tree"; here's the change for microbit:
/machine (microbit-machine)
/microbit.twi (microbit.i2c)
/microbit.twi[0] (qemu:memory-region)
/nrf51 (nrf51-soc)
/armv6m (armv7m)
/armv7m-container[0] (qemu:memory-region)
- /bitband[0] (ARM,bitband-memory)
- /bitband[0] (qemu:memory-region)
- /bitband[1] (ARM,bitband-memory)
- /bitband[0] (qemu:memory-region)
/cpu (cortex-m0-arm-cpu)
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200609122339.937862-7-armbru@redhat.com>
2020-06-09 15:23:21 +03:00
|
|
|
for (i = 0; i < ARRAY_SIZE(s->bitband); i++) {
|
|
|
|
if (s->enable_bitband) {
|
2018-08-16 16:05:28 +03:00
|
|
|
Object *obj = OBJECT(&s->bitband[i]);
|
|
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(&s->bitband[i]);
|
|
|
|
|
qom: Use returned bool to check for failure, Coccinelle part
The previous commit enables conversion of
foo(..., &err);
if (err) {
...
}
to
if (!foo(..., errp)) {
...
}
for QOM functions that now return true / false on success / error.
Coccinelle script:
@@
identifier fun = {
object_apply_global_props, object_initialize_child_with_props,
object_initialize_child_with_propsv, object_property_get,
object_property_get_bool, object_property_parse, object_property_set,
object_property_set_bool, object_property_set_int,
object_property_set_link, object_property_set_qobject,
object_property_set_str, object_property_set_uint, object_set_props,
object_set_propv, user_creatable_add_dict,
user_creatable_complete, user_creatable_del
};
expression list args, args2;
typedef Error;
Error *err;
@@
- fun(args, &err, args2);
- if (err)
+ if (!fun(args, &err, args2))
{
...
}
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Line breaks tidied up manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-29-armbru@redhat.com>
2020-07-07 19:05:56 +03:00
|
|
|
if (!object_property_set_int(obj, "base",
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
bitband_input_addr[i], errp)) {
|
2018-08-16 16:05:28 +03:00
|
|
|
return;
|
|
|
|
}
|
qom: Put name parameter before value / visitor parameter
The object_property_set_FOO() setters take property name and value in
an unusual order:
void object_property_set_FOO(Object *obj, FOO_TYPE value,
const char *name, Error **errp)
Having to pass value before name feels grating. Swap them.
Same for object_property_set(), object_property_get(), and
object_property_parse().
Convert callers with this Coccinelle script:
@@
identifier fun = {
object_property_get, object_property_parse, object_property_set_str,
object_property_set_link, object_property_set_bool,
object_property_set_int, object_property_set_uint, object_property_set,
object_property_set_qobject
};
expression obj, v, name, errp;
@@
- fun(obj, v, name, errp)
+ fun(obj, name, v, errp)
Chokes on hw/arm/musicpal.c's lcd_refresh() with the unhelpful error
message "no position information". Convert that one manually.
Fails to convert hw/arm/armsse.c, because Coccinelle gets confused by
ARMSSE being used both as typedef and function-like macro there.
Convert manually.
Fails to convert hw/rx/rx-gdbsim.c, because Coccinelle gets confused
by RXCPU being used both as typedef and function-like macro there.
Convert manually. The other files using RXCPU that way don't need
conversion.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20200707160613.848843-27-armbru@redhat.com>
[Straightforwad conflict with commit 2336172d9b "audio: set default
value for pcspk.iobase property" resolved]
2020-07-07 19:05:54 +03:00
|
|
|
object_property_set_link(obj, "source-memory",
|
|
|
|
OBJECT(s->board_memory), &error_abort);
|
error: Eliminate error_propagate() with Coccinelle, part 1
When all we do with an Error we receive into a local variable is
propagating to somewhere else, we can just as well receive it there
right away. Convert
if (!foo(..., &err)) {
...
error_propagate(errp, err);
...
return ...
}
to
if (!foo(..., errp)) {
...
...
return ...
}
where nothing else needs @err. Coccinelle script:
@rule1 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
binary operator op;
constant c1, c2;
symbol false;
@@
if (
(
- fun(args, &err, args2)
+ fun(args, errp, args2)
|
- !fun(args, &err, args2)
+ !fun(args, errp, args2)
|
- fun(args, &err, args2) op c1
+ fun(args, errp, args2) op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
)
}
@rule2 forall@
identifier fun, err, errp, lbl;
expression list args, args2;
expression var;
binary operator op;
constant c1, c2;
symbol false;
@@
- var = fun(args, &err, args2);
+ var = fun(args, errp, args2);
... when != err
if (
(
var
|
!var
|
var op c1
)
)
{
... when != err
when != lbl:
when strict
- error_propagate(errp, err);
... when != err
(
return;
|
return c2;
|
return false;
|
return var;
)
}
@depends on rule1 || rule2@
identifier err;
@@
- Error *err = NULL;
... when != err
Not exactly elegant, I'm afraid.
The "when != lbl:" is necessary to avoid transforming
if (fun(args, &err)) {
goto out
}
...
out:
error_propagate(errp, err);
even though other paths to label out still need the error_propagate().
For an actual example, see sclp_realize().
Without the "when strict", Coccinelle transforms vfio_msix_setup(),
incorrectly. I don't know what exactly "when strict" does, only that
it helps here.
The match of return is narrower than what I want, but I can't figure
out how to express "return where the operand doesn't use @err". For
an example where it's too narrow, see vfio_intx_enable().
Silently fails to convert hw/arm/armsse.c, because Coccinelle gets
confused by ARMSSE being used both as typedef and function-like macro
there. Converted manually.
Line breaks tidied up manually. One nested declaration of @local_err
deleted manually. Preexisting unwanted blank line dropped in
hw/riscv/sifive_e.c.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20200707160613.848843-35-armbru@redhat.com>
2020-07-07 19:06:02 +03:00
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(obj), errp)) {
|
2018-08-16 16:05:28 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
memory_region_add_subregion(&s->container, bitband_output_addr[i],
|
|
|
|
sysbus_mmio_get_region(sbd, 0));
|
armv7m: Delete unused "ARM,bitband-memory" devices
These devices are optional, and enabled by property "enable-bitband".
armv7m_instance_init() creates them unconditionally, because the
property has not been set then. armv7m_realize() realizes them only
when the property is true. Works, although it leaves unrealized
devices hanging around in the QOM composition tree. Affects machines
microbit, mps2-an505, mps2-an521, musca-a, and musca-b1.
Delete the unused devices by making armv7m_realize() unparent them.
Visible in "info qom-tree"; here's the change for microbit:
/machine (microbit-machine)
/microbit.twi (microbit.i2c)
/microbit.twi[0] (qemu:memory-region)
/nrf51 (nrf51-soc)
/armv6m (armv7m)
/armv7m-container[0] (qemu:memory-region)
- /bitband[0] (ARM,bitband-memory)
- /bitband[0] (qemu:memory-region)
- /bitband[1] (ARM,bitband-memory)
- /bitband[0] (qemu:memory-region)
/cpu (cortex-m0-arm-cpu)
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200609122339.937862-7-armbru@redhat.com>
2020-06-09 15:23:21 +03:00
|
|
|
} else {
|
|
|
|
object_unparent(OBJECT(&s->bitband[i]));
|
2017-02-20 18:35:57 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static Property armv7m_properties[] = {
|
2017-09-13 19:04:57 +03:00
|
|
|
DEFINE_PROP_STRING("cpu-type", ARMv7MState, cpu_type),
|
2017-09-07 15:54:51 +03:00
|
|
|
DEFINE_PROP_LINK("memory", ARMv7MState, board_memory, TYPE_MEMORY_REGION,
|
|
|
|
MemoryRegion *),
|
2018-03-02 13:45:36 +03:00
|
|
|
DEFINE_PROP_LINK("idau", ARMv7MState, idau, TYPE_IDAU_INTERFACE, Object *),
|
2018-03-02 13:45:37 +03:00
|
|
|
DEFINE_PROP_UINT32("init-svtor", ARMv7MState, init_svtor, 0),
|
2018-08-16 16:05:28 +03:00
|
|
|
DEFINE_PROP_BOOL("enable-bitband", ARMv7MState, enable_bitband, false),
|
2019-02-01 17:55:41 +03:00
|
|
|
DEFINE_PROP_BOOL("start-powered-off", ARMv7MState, start_powered_off,
|
|
|
|
false),
|
2019-05-17 20:40:45 +03:00
|
|
|
DEFINE_PROP_BOOL("vfp", ARMv7MState, vfp, true),
|
|
|
|
DEFINE_PROP_BOOL("dsp", ARMv7MState, dsp, true),
|
2017-02-20 18:35:57 +03:00
|
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
|
|
};
|
|
|
|
|
|
|
|
static void armv7m_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
|
|
|
|
dc->realize = armv7m_realize;
|
2020-01-10 18:30:32 +03:00
|
|
|
device_class_set_props(dc, armv7m_properties);
|
2017-02-20 18:35:57 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static const TypeInfo armv7m_info = {
|
|
|
|
.name = TYPE_ARMV7M,
|
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(ARMv7MState),
|
|
|
|
.instance_init = armv7m_instance_init,
|
|
|
|
.class_init = armv7m_class_init,
|
|
|
|
};
|
|
|
|
|
2010-04-05 22:34:51 +04:00
|
|
|
static void armv7m_reset(void *opaque)
|
|
|
|
{
|
2012-05-04 18:11:34 +04:00
|
|
|
ARMCPU *cpu = opaque;
|
|
|
|
|
|
|
|
cpu_reset(CPU(cpu));
|
2010-04-05 22:34:51 +04:00
|
|
|
}
|
|
|
|
|
2017-02-20 18:35:55 +03:00
|
|
|
void armv7m_load_kernel(ARMCPU *cpu, const char *kernel_filename, int mem_size)
|
|
|
|
{
|
|
|
|
int image_size;
|
|
|
|
uint64_t entry;
|
|
|
|
int big_endian;
|
2018-03-02 13:45:36 +03:00
|
|
|
AddressSpace *as;
|
|
|
|
int asidx;
|
|
|
|
CPUState *cs = CPU(cpu);
|
2007-11-11 03:04:49 +03:00
|
|
|
|
2009-09-20 18:58:02 +04:00
|
|
|
#ifdef TARGET_WORDS_BIGENDIAN
|
|
|
|
big_endian = 1;
|
|
|
|
#else
|
|
|
|
big_endian = 0;
|
|
|
|
#endif
|
|
|
|
|
2018-03-02 13:45:36 +03:00
|
|
|
if (arm_feature(&cpu->env, ARM_FEATURE_EL3)) {
|
|
|
|
asidx = ARMASIdx_S;
|
|
|
|
} else {
|
|
|
|
asidx = ARMASIdx_NS;
|
|
|
|
}
|
|
|
|
as = cpu_get_address_space(cs, asidx);
|
|
|
|
|
2013-07-29 20:36:59 +04:00
|
|
|
if (kernel_filename) {
|
2019-01-15 15:18:03 +03:00
|
|
|
image_size = load_elf_as(kernel_filename, NULL, NULL, NULL,
|
2020-07-05 20:22:11 +03:00
|
|
|
&entry, NULL, NULL,
|
2018-03-02 13:45:36 +03:00
|
|
|
NULL, big_endian, EM_ARM, 1, 0, as);
|
2013-07-29 20:36:59 +04:00
|
|
|
if (image_size < 0) {
|
2018-03-02 13:45:36 +03:00
|
|
|
image_size = load_image_targphys_as(kernel_filename, 0,
|
|
|
|
mem_size, as);
|
2013-07-29 20:36:59 +04:00
|
|
|
}
|
|
|
|
if (image_size < 0) {
|
|
|
|
error_report("Could not load kernel '%s'", kernel_filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
2007-11-11 03:04:49 +03:00
|
|
|
}
|
|
|
|
|
2017-02-20 18:35:55 +03:00
|
|
|
/* CPU objects (unlike devices) are not automatically reset on system
|
|
|
|
* reset, so we must always register a handler to do so. Unlike
|
|
|
|
* A-profile CPUs, we don't need to do anything special in the
|
|
|
|
* handler to arrange that it starts correctly.
|
|
|
|
* This is arguably the wrong place to do this, but it matches the
|
|
|
|
* way A-profile does it. Note that this means that every M profile
|
|
|
|
* board must call this function!
|
|
|
|
*/
|
2012-05-04 18:11:34 +04:00
|
|
|
qemu_register_reset(armv7m_reset, cpu);
|
2007-11-11 03:04:49 +03:00
|
|
|
}
|
2009-06-03 18:16:49 +04:00
|
|
|
|
2012-01-24 23:12:29 +04:00
|
|
|
static Property bitband_properties[] = {
|
|
|
|
DEFINE_PROP_UINT32("base", BitBandState, base, 0),
|
2017-09-07 15:54:50 +03:00
|
|
|
DEFINE_PROP_LINK("source-memory", BitBandState, source_memory,
|
|
|
|
TYPE_MEMORY_REGION, MemoryRegion *),
|
2012-01-24 23:12:29 +04:00
|
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
|
|
};
|
|
|
|
|
|
|
|
static void bitband_class_init(ObjectClass *klass, void *data)
|
|
|
|
{
|
2011-12-08 07:34:16 +04:00
|
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
2012-01-24 23:12:29 +04:00
|
|
|
|
2017-02-20 18:36:01 +03:00
|
|
|
dc->realize = bitband_realize;
|
2020-01-10 18:30:32 +03:00
|
|
|
device_class_set_props(dc, bitband_properties);
|
2012-01-24 23:12:29 +04:00
|
|
|
}
|
|
|
|
|
2013-01-10 19:19:07 +04:00
|
|
|
static const TypeInfo bitband_info = {
|
2013-07-24 02:46:43 +04:00
|
|
|
.name = TYPE_BITBAND,
|
2011-12-08 07:34:16 +04:00
|
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
|
|
.instance_size = sizeof(BitBandState),
|
2016-03-07 10:05:42 +03:00
|
|
|
.instance_init = bitband_init,
|
2011-12-08 07:34:16 +04:00
|
|
|
.class_init = bitband_class_init,
|
2009-07-15 15:43:31 +04:00
|
|
|
};
|
|
|
|
|
2012-02-09 18:20:55 +04:00
|
|
|
static void armv7m_register_types(void)
|
2009-06-03 18:16:49 +04:00
|
|
|
{
|
2011-12-08 07:34:16 +04:00
|
|
|
type_register_static(&bitband_info);
|
2017-02-20 18:35:57 +03:00
|
|
|
type_register_static(&armv7m_info);
|
2009-06-03 18:16:49 +04:00
|
|
|
}
|
|
|
|
|
2012-02-09 18:20:55 +04:00
|
|
|
type_init(armv7m_register_types)
|