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>
196 lines
6.3 KiB
C
196 lines
6.3 KiB
C
/*
|
|
* Coherent Processing System emulation.
|
|
*
|
|
* Copyright (c) 2016 Imagination Technologies
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu/module.h"
|
|
#include "hw/mips/cps.h"
|
|
#include "hw/mips/mips.h"
|
|
#include "hw/qdev-properties.h"
|
|
#include "hw/mips/cpudevs.h"
|
|
#include "sysemu/kvm.h"
|
|
#include "sysemu/reset.h"
|
|
|
|
qemu_irq get_cps_irq(MIPSCPSState *s, int pin_number)
|
|
{
|
|
assert(pin_number < s->num_irq);
|
|
return s->gic.irq_state[pin_number].irq;
|
|
}
|
|
|
|
static void mips_cps_init(Object *obj)
|
|
{
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
|
MIPSCPSState *s = MIPS_CPS(obj);
|
|
|
|
/*
|
|
* Cover entire address space as there do not seem to be any
|
|
* constraints for the base address of CPC and GIC.
|
|
*/
|
|
memory_region_init(&s->container, obj, "mips-cps-container", UINT64_MAX);
|
|
sysbus_init_mmio(sbd, &s->container);
|
|
}
|
|
|
|
static void main_cpu_reset(void *opaque)
|
|
{
|
|
MIPSCPU *cpu = opaque;
|
|
CPUState *cs = CPU(cpu);
|
|
|
|
cpu_reset(cs);
|
|
|
|
/* All VPs are halted on reset. Leave powering up to CPC. */
|
|
cs->halted = 1;
|
|
}
|
|
|
|
static bool cpu_mips_itu_supported(CPUMIPSState *env)
|
|
{
|
|
bool is_mt = (env->CP0_Config5 & (1 << CP0C5_VP)) ||
|
|
(env->CP0_Config3 & (1 << CP0C3_MT));
|
|
|
|
return is_mt && !kvm_enabled();
|
|
}
|
|
|
|
static void mips_cps_realize(DeviceState *dev, Error **errp)
|
|
{
|
|
MIPSCPSState *s = MIPS_CPS(dev);
|
|
CPUMIPSState *env;
|
|
MIPSCPU *cpu;
|
|
int i;
|
|
target_ulong gcr_base;
|
|
bool itu_present = false;
|
|
bool saar_present = false;
|
|
|
|
for (i = 0; i < s->num_vp; i++) {
|
|
cpu = MIPS_CPU(cpu_create(s->cpu_type));
|
|
|
|
/* Init internal devices */
|
|
cpu_mips_irq_init_cpu(cpu);
|
|
cpu_mips_clock_init(cpu);
|
|
|
|
env = &cpu->env;
|
|
if (cpu_mips_itu_supported(env)) {
|
|
itu_present = true;
|
|
/* Attach ITC Tag to the VP */
|
|
env->itc_tag = mips_itu_get_tag_region(&s->itu);
|
|
env->itu = &s->itu;
|
|
}
|
|
qemu_register_reset(main_cpu_reset, cpu);
|
|
}
|
|
|
|
cpu = MIPS_CPU(first_cpu);
|
|
env = &cpu->env;
|
|
saar_present = (bool)env->saarp;
|
|
|
|
/* Inter-Thread Communication Unit */
|
|
if (itu_present) {
|
|
object_initialize_child(OBJECT(dev), "itu", &s->itu, TYPE_MIPS_ITU);
|
|
object_property_set_int(OBJECT(&s->itu), "num-fifo", 16,
|
|
&error_abort);
|
|
object_property_set_int(OBJECT(&s->itu), "num-semaphores", 16,
|
|
&error_abort);
|
|
object_property_set_bool(OBJECT(&s->itu), "saar-present", saar_present,
|
|
&error_abort);
|
|
if (saar_present) {
|
|
s->itu.saar = &env->CP0_SAAR;
|
|
}
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->itu), errp)) {
|
|
return;
|
|
}
|
|
|
|
memory_region_add_subregion(&s->container, 0,
|
|
sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->itu), 0));
|
|
}
|
|
|
|
/* Cluster Power Controller */
|
|
object_initialize_child(OBJECT(dev), "cpc", &s->cpc, TYPE_MIPS_CPC);
|
|
object_property_set_int(OBJECT(&s->cpc), "num-vp", s->num_vp,
|
|
&error_abort);
|
|
object_property_set_int(OBJECT(&s->cpc), "vp-start-running", 1,
|
|
&error_abort);
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->cpc), errp)) {
|
|
return;
|
|
}
|
|
|
|
memory_region_add_subregion(&s->container, 0,
|
|
sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->cpc), 0));
|
|
|
|
/* Global Interrupt Controller */
|
|
object_initialize_child(OBJECT(dev), "gic", &s->gic, TYPE_MIPS_GIC);
|
|
object_property_set_int(OBJECT(&s->gic), "num-vp", s->num_vp,
|
|
&error_abort);
|
|
object_property_set_int(OBJECT(&s->gic), "num-irq", 128,
|
|
&error_abort);
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gic), errp)) {
|
|
return;
|
|
}
|
|
|
|
memory_region_add_subregion(&s->container, 0,
|
|
sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gic), 0));
|
|
|
|
/* Global Configuration Registers */
|
|
gcr_base = env->CP0_CMGCRBase << 4;
|
|
|
|
object_initialize_child(OBJECT(dev), "gcr", &s->gcr, TYPE_MIPS_GCR);
|
|
object_property_set_int(OBJECT(&s->gcr), "num-vp", s->num_vp,
|
|
&error_abort);
|
|
object_property_set_int(OBJECT(&s->gcr), "gcr-rev", 0x800,
|
|
&error_abort);
|
|
object_property_set_int(OBJECT(&s->gcr), "gcr-base", gcr_base,
|
|
&error_abort);
|
|
object_property_set_link(OBJECT(&s->gcr), "gic", OBJECT(&s->gic.mr),
|
|
&error_abort);
|
|
object_property_set_link(OBJECT(&s->gcr), "cpc", OBJECT(&s->cpc.mr),
|
|
&error_abort);
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gcr), errp)) {
|
|
return;
|
|
}
|
|
|
|
memory_region_add_subregion(&s->container, gcr_base,
|
|
sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->gcr), 0));
|
|
}
|
|
|
|
static Property mips_cps_properties[] = {
|
|
DEFINE_PROP_UINT32("num-vp", MIPSCPSState, num_vp, 1),
|
|
DEFINE_PROP_UINT32("num-irq", MIPSCPSState, num_irq, 256),
|
|
DEFINE_PROP_STRING("cpu-type", MIPSCPSState, cpu_type),
|
|
DEFINE_PROP_END_OF_LIST()
|
|
};
|
|
|
|
static void mips_cps_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
dc->realize = mips_cps_realize;
|
|
device_class_set_props(dc, mips_cps_properties);
|
|
}
|
|
|
|
static const TypeInfo mips_cps_info = {
|
|
.name = TYPE_MIPS_CPS,
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(MIPSCPSState),
|
|
.instance_init = mips_cps_init,
|
|
.class_init = mips_cps_class_init,
|
|
};
|
|
|
|
static void mips_cps_register_types(void)
|
|
{
|
|
type_register_static(&mips_cps_info);
|
|
}
|
|
|
|
type_init(mips_cps_register_types)
|