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>
170 lines
5.8 KiB
C
170 lines
5.8 KiB
C
/*
|
|
* ARM11MPCore internal peripheral emulation.
|
|
*
|
|
* Copyright (c) 2006-2007 CodeSourcery.
|
|
* Written by Paul Brook
|
|
*
|
|
* 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 ARM11MPCORE_NUM_GIC_PRIORITY_BITS 4
|
|
|
|
static void mpcore_priv_set_irq(void *opaque, int irq, int level)
|
|
{
|
|
ARM11MPCorePriveState *s = (ARM11MPCorePriveState *)opaque;
|
|
|
|
qemu_set_irq(qdev_get_gpio_in(DEVICE(&s->gic), irq), level);
|
|
}
|
|
|
|
static void mpcore_priv_map_setup(ARM11MPCorePriveState *s)
|
|
{
|
|
int i;
|
|
SysBusDevice *scubusdev = SYS_BUS_DEVICE(&s->scu);
|
|
DeviceState *gicdev = DEVICE(&s->gic);
|
|
SysBusDevice *gicbusdev = SYS_BUS_DEVICE(&s->gic);
|
|
SysBusDevice *timerbusdev = SYS_BUS_DEVICE(&s->mptimer);
|
|
SysBusDevice *wdtbusdev = SYS_BUS_DEVICE(&s->wdtimer);
|
|
|
|
memory_region_add_subregion(&s->container, 0,
|
|
sysbus_mmio_get_region(scubusdev, 0));
|
|
/* GIC CPU interfaces: "current CPU" at 0x100, then specific CPUs
|
|
* at 0x200, 0x300...
|
|
*/
|
|
for (i = 0; i < (s->num_cpu + 1); i++) {
|
|
hwaddr offset = 0x100 + (i * 0x100);
|
|
memory_region_add_subregion(&s->container, offset,
|
|
sysbus_mmio_get_region(gicbusdev, i + 1));
|
|
}
|
|
/* Add the regions for timer and watchdog for "current CPU" and
|
|
* for each specific CPU.
|
|
*/
|
|
for (i = 0; i < (s->num_cpu + 1); i++) {
|
|
/* Timers at 0x600, 0x700, ...; watchdogs at 0x620, 0x720, ... */
|
|
hwaddr offset = 0x600 + i * 0x100;
|
|
memory_region_add_subregion(&s->container, offset,
|
|
sysbus_mmio_get_region(timerbusdev, i));
|
|
memory_region_add_subregion(&s->container, offset + 0x20,
|
|
sysbus_mmio_get_region(wdtbusdev, i));
|
|
}
|
|
memory_region_add_subregion(&s->container, 0x1000,
|
|
sysbus_mmio_get_region(gicbusdev, 0));
|
|
/* Wire up the interrupt from each watchdog and timer.
|
|
* For each core the timer is PPI 29 and the watchdog PPI 30.
|
|
*/
|
|
for (i = 0; i < s->num_cpu; i++) {
|
|
int ppibase = (s->num_irq - 32) + i * 32;
|
|
sysbus_connect_irq(timerbusdev, i,
|
|
qdev_get_gpio_in(gicdev, ppibase + 29));
|
|
sysbus_connect_irq(wdtbusdev, i,
|
|
qdev_get_gpio_in(gicdev, ppibase + 30));
|
|
}
|
|
}
|
|
|
|
static void mpcore_priv_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
|
|
ARM11MPCorePriveState *s = ARM11MPCORE_PRIV(dev);
|
|
DeviceState *scudev = DEVICE(&s->scu);
|
|
DeviceState *gicdev = DEVICE(&s->gic);
|
|
DeviceState *mptimerdev = DEVICE(&s->mptimer);
|
|
DeviceState *wdtimerdev = DEVICE(&s->wdtimer);
|
|
|
|
qdev_prop_set_uint32(scudev, "num-cpu", s->num_cpu);
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) {
|
|
return;
|
|
}
|
|
|
|
qdev_prop_set_uint32(gicdev, "num-cpu", s->num_cpu);
|
|
qdev_prop_set_uint32(gicdev, "num-irq", s->num_irq);
|
|
qdev_prop_set_uint32(gicdev, "num-priority-bits",
|
|
ARM11MPCORE_NUM_GIC_PRIORITY_BITS);
|
|
|
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gic), errp)) {
|
|
return;
|
|
}
|
|
|
|
/* Pass through outbound IRQ lines from the GIC */
|
|
sysbus_pass_irq(sbd, SYS_BUS_DEVICE(&s->gic));
|
|
|
|
/* Pass through inbound GPIO lines to the GIC */
|
|
qdev_init_gpio_in(dev, mpcore_priv_set_irq, s->num_irq - 32);
|
|
|
|
qdev_prop_set_uint32(mptimerdev, "num-cpu", s->num_cpu);
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->mptimer), errp)) {
|
|
return;
|
|
}
|
|
|
|
qdev_prop_set_uint32(wdtimerdev, "num-cpu", s->num_cpu);
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->wdtimer), errp)) {
|
|
return;
|
|
}
|
|
|
|
mpcore_priv_map_setup(s);
|
|
}
|
|
|
|
static void mpcore_priv_initfn(Object *obj)
|
|
{
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
|
ARM11MPCorePriveState *s = ARM11MPCORE_PRIV(obj);
|
|
|
|
memory_region_init(&s->container, OBJECT(s),
|
|
"mpcore-priv-container", 0x2000);
|
|
sysbus_init_mmio(sbd, &s->container);
|
|
|
|
object_initialize_child(obj, "scu", &s->scu, TYPE_ARM11_SCU);
|
|
|
|
object_initialize_child(obj, "gic", &s->gic, TYPE_ARM_GIC);
|
|
/* Request the legacy 11MPCore GIC behaviour: */
|
|
qdev_prop_set_uint32(DEVICE(&s->gic), "revision", 0);
|
|
|
|
object_initialize_child(obj, "mptimer", &s->mptimer, TYPE_ARM_MPTIMER);
|
|
|
|
object_initialize_child(obj, "wdtimer", &s->wdtimer, TYPE_ARM_MPTIMER);
|
|
}
|
|
|
|
static Property mpcore_priv_properties[] = {
|
|
DEFINE_PROP_UINT32("num-cpu", ARM11MPCorePriveState, num_cpu, 1),
|
|
/* The ARM11 MPCORE TRM says the on-chip controller may have
|
|
* anything from 0 to 224 external interrupt IRQ lines (with another
|
|
* 32 internal). We default to 32+32, which is the number provided by
|
|
* the ARM11 MPCore test chip in the Realview Versatile Express
|
|
* coretile. Other boards may differ and should set this property
|
|
* appropriately. Some Linux kernels may not boot if the hardware
|
|
* has more IRQ lines than the kernel expects.
|
|
*/
|
|
DEFINE_PROP_UINT32("num-irq", ARM11MPCorePriveState, num_irq, 64),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void mpcore_priv_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
dc->realize = mpcore_priv_realize;
|
|
device_class_set_props(dc, mpcore_priv_properties);
|
|
}
|
|
|
|
static const TypeInfo mpcore_priv_info = {
|
|
.name = TYPE_ARM11MPCORE_PRIV,
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(ARM11MPCorePriveState),
|
|
.instance_init = mpcore_priv_initfn,
|
|
.class_init = mpcore_priv_class_init,
|
|
};
|
|
|
|
static void arm11mpcore_register_types(void)
|
|
{
|
|
type_register_static(&mpcore_priv_info);
|
|
}
|
|
|
|
type_init(arm11mpcore_register_types)
|