668f62ec62
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>
138 lines
3.9 KiB
C
138 lines
3.9 KiB
C
/*
|
|
* RealView ARM11MPCore internal peripheral emulation
|
|
*
|
|
* Copyright (c) 2006-2007 CodeSourcery.
|
|
* Copyright (c) 2013 SUSE LINUX Products GmbH
|
|
* Written by Paul Brook and Andreas Färber
|
|
*
|
|
* This code is licensed under the GPL.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/cpu/arm11mpcore.h"
|
|
#include "hw/intc/realview_gic.h"
|
|
#include "hw/irq.h"
|
|
#include "hw/qdev-properties.h"
|
|
|
|
#define TYPE_REALVIEW_MPCORE_RIRQ "realview_mpcore"
|
|
#define REALVIEW_MPCORE_RIRQ(obj) \
|
|
OBJECT_CHECK(mpcore_rirq_state, (obj), TYPE_REALVIEW_MPCORE_RIRQ)
|
|
|
|
/* Dummy PIC to route IRQ lines. The baseboard has 4 independent IRQ
|
|
controllers. The output of these, plus some of the raw input lines
|
|
are fed into a single SMP-aware interrupt controller on the CPU. */
|
|
typedef struct {
|
|
SysBusDevice parent_obj;
|
|
|
|
qemu_irq cpuic[32];
|
|
qemu_irq rvic[4][64];
|
|
uint32_t num_cpu;
|
|
|
|
ARM11MPCorePriveState priv;
|
|
RealViewGICState gic[4];
|
|
} mpcore_rirq_state;
|
|
|
|
/* Map baseboard IRQs onto CPU IRQ lines. */
|
|
static const int mpcore_irq_map[32] = {
|
|
-1, -1, -1, -1, 1, 2, -1, -1,
|
|
-1, -1, 6, -1, 4, 5, -1, -1,
|
|
-1, 14, 15, 0, 7, 8, -1, -1,
|
|
-1, -1, -1, -1, 9, 3, -1, -1,
|
|
};
|
|
|
|
static void mpcore_rirq_set_irq(void *opaque, int irq, int level)
|
|
{
|
|
mpcore_rirq_state *s = (mpcore_rirq_state *)opaque;
|
|
int i;
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
qemu_set_irq(s->rvic[i][irq], level);
|
|
}
|
|
if (irq < 32) {
|
|
irq = mpcore_irq_map[irq];
|
|
if (irq >= 0) {
|
|
qemu_set_irq(s->cpuic[irq], level);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void realview_mpcore_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
|
mpcore_rirq_state *s = REALVIEW_MPCORE_RIRQ(dev);
|
|
DeviceState *priv = DEVICE(&s->priv);
|
|
DeviceState *gic;
|
|
SysBusDevice *gicbusdev;
|
|
int n;
|
|
int i;
|
|
|
|
qdev_prop_set_uint32(priv, "num-cpu", s->num_cpu);
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->priv), errp)) {
|
|
return;
|
|
}
|
|
sysbus_pass_irq(sbd, SYS_BUS_DEVICE(&s->priv));
|
|
for (i = 0; i < 32; i++) {
|
|
s->cpuic[i] = qdev_get_gpio_in(priv, i);
|
|
}
|
|
/* ??? IRQ routing is hardcoded to "normal" mode. */
|
|
for (n = 0; n < 4; n++) {
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gic[n]), errp)) {
|
|
return;
|
|
}
|
|
gic = DEVICE(&s->gic[n]);
|
|
gicbusdev = SYS_BUS_DEVICE(&s->gic[n]);
|
|
sysbus_mmio_map(gicbusdev, 0, 0x10040000 + n * 0x10000);
|
|
sysbus_connect_irq(gicbusdev, 0, s->cpuic[10 + n]);
|
|
for (i = 0; i < 64; i++) {
|
|
s->rvic[n][i] = qdev_get_gpio_in(gic, i);
|
|
}
|
|
}
|
|
qdev_init_gpio_in(dev, mpcore_rirq_set_irq, 64);
|
|
}
|
|
|
|
static void mpcore_rirq_init(Object *obj)
|
|
{
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
|
mpcore_rirq_state *s = REALVIEW_MPCORE_RIRQ(obj);
|
|
SysBusDevice *privbusdev;
|
|
int i;
|
|
|
|
object_initialize_child(obj, "a11priv", &s->priv, TYPE_ARM11MPCORE_PRIV);
|
|
privbusdev = SYS_BUS_DEVICE(&s->priv);
|
|
sysbus_init_mmio(sbd, sysbus_mmio_get_region(privbusdev, 0));
|
|
|
|
for (i = 0; i < 4; i++) {
|
|
object_initialize_child(obj, "gic[*]", &s->gic[i], TYPE_REALVIEW_GIC);
|
|
}
|
|
}
|
|
|
|
static Property mpcore_rirq_properties[] = {
|
|
DEFINE_PROP_UINT32("num-cpu", mpcore_rirq_state, num_cpu, 1),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void mpcore_rirq_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
dc->realize = realview_mpcore_realize;
|
|
device_class_set_props(dc, mpcore_rirq_properties);
|
|
}
|
|
|
|
static const TypeInfo mpcore_rirq_info = {
|
|
.name = TYPE_REALVIEW_MPCORE_RIRQ,
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(mpcore_rirq_state),
|
|
.instance_init = mpcore_rirq_init,
|
|
.class_init = mpcore_rirq_class_init,
|
|
};
|
|
|
|
static void realview_mpcore_register_types(void)
|
|
{
|
|
type_register_static(&mpcore_rirq_info);
|
|
}
|
|
|
|
type_init(realview_mpcore_register_types)
|