 668f62ec62
			
		
	
	
		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>
		
	
			
		
			
				
	
	
		
			189 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			189 lines
		
	
	
		
			6.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * Raspberry Pi emulation (c) 2012 Gregory Estrade
 | |
|  * Upstreaming code cleanup [including bcm2835_*] (c) 2013 Jan Petrous
 | |
|  *
 | |
|  * Rasperry Pi 2 emulation and refactoring Copyright (c) 2015, Microsoft
 | |
|  * Written by Andrew Baumann
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | |
|  * See the COPYING file in the top-level directory.
 | |
|  */
 | |
| 
 | |
| #include "qemu/osdep.h"
 | |
| #include "qapi/error.h"
 | |
| #include "qemu/module.h"
 | |
| #include "cpu.h"
 | |
| #include "hw/arm/bcm2836.h"
 | |
| #include "hw/arm/raspi_platform.h"
 | |
| #include "hw/sysbus.h"
 | |
| 
 | |
| struct BCM283XInfo {
 | |
|     const char *name;
 | |
|     const char *cpu_type;
 | |
|     hwaddr peri_base; /* Peripheral base address seen by the CPU */
 | |
|     hwaddr ctrl_base; /* Interrupt controller and mailboxes etc. */
 | |
|     int clusterid;
 | |
| };
 | |
| 
 | |
| static const BCM283XInfo bcm283x_socs[] = {
 | |
|     {
 | |
|         .name = TYPE_BCM2836,
 | |
|         .cpu_type = ARM_CPU_TYPE_NAME("cortex-a7"),
 | |
|         .peri_base = 0x3f000000,
 | |
|         .ctrl_base = 0x40000000,
 | |
|         .clusterid = 0xf,
 | |
|     },
 | |
| #ifdef TARGET_AARCH64
 | |
|     {
 | |
|         .name = TYPE_BCM2837,
 | |
|         .cpu_type = ARM_CPU_TYPE_NAME("cortex-a53"),
 | |
|         .peri_base = 0x3f000000,
 | |
|         .ctrl_base = 0x40000000,
 | |
|         .clusterid = 0x0,
 | |
|     },
 | |
| #endif
 | |
| };
 | |
| 
 | |
| static void bcm2836_init(Object *obj)
 | |
| {
 | |
|     BCM283XState *s = BCM283X(obj);
 | |
|     BCM283XClass *bc = BCM283X_GET_CLASS(obj);
 | |
|     const BCM283XInfo *info = bc->info;
 | |
|     int n;
 | |
| 
 | |
|     for (n = 0; n < BCM283X_NCPUS; n++) {
 | |
|         object_initialize_child(obj, "cpu[*]", &s->cpu[n].core,
 | |
|                                 info->cpu_type);
 | |
|     }
 | |
| 
 | |
|     object_initialize_child(obj, "control", &s->control, TYPE_BCM2836_CONTROL);
 | |
| 
 | |
|     object_initialize_child(obj, "peripherals", &s->peripherals,
 | |
|                             TYPE_BCM2835_PERIPHERALS);
 | |
|     object_property_add_alias(obj, "board-rev", OBJECT(&s->peripherals),
 | |
|                               "board-rev");
 | |
|     object_property_add_alias(obj, "vcram-size", OBJECT(&s->peripherals),
 | |
|                               "vcram-size");
 | |
| }
 | |
| 
 | |
| static void bcm2836_realize(DeviceState *dev, Error **errp)
 | |
| {
 | |
|     BCM283XState *s = BCM283X(dev);
 | |
|     BCM283XClass *bc = BCM283X_GET_CLASS(dev);
 | |
|     const BCM283XInfo *info = bc->info;
 | |
|     Object *obj;
 | |
|     int n;
 | |
| 
 | |
|     /* common peripherals from bcm2835 */
 | |
| 
 | |
|     obj = object_property_get_link(OBJECT(dev), "ram", &error_abort);
 | |
| 
 | |
|     object_property_add_const_link(OBJECT(&s->peripherals), "ram", obj);
 | |
| 
 | |
|     if (!sysbus_realize(SYS_BUS_DEVICE(&s->peripherals), errp)) {
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     object_property_add_alias(OBJECT(s), "sd-bus", OBJECT(&s->peripherals),
 | |
|                               "sd-bus");
 | |
| 
 | |
|     sysbus_mmio_map_overlap(SYS_BUS_DEVICE(&s->peripherals), 0,
 | |
|                             info->peri_base, 1);
 | |
| 
 | |
|     /* bcm2836 interrupt controller (and mailboxes, etc.) */
 | |
|     if (!sysbus_realize(SYS_BUS_DEVICE(&s->control), errp)) {
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     sysbus_mmio_map(SYS_BUS_DEVICE(&s->control), 0, info->ctrl_base);
 | |
| 
 | |
|     sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 0,
 | |
|         qdev_get_gpio_in_named(DEVICE(&s->control), "gpu-irq", 0));
 | |
|     sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 1,
 | |
|         qdev_get_gpio_in_named(DEVICE(&s->control), "gpu-fiq", 0));
 | |
| 
 | |
|     for (n = 0; n < BCM283X_NCPUS; n++) {
 | |
|         /* TODO: this should be converted to a property of ARM_CPU */
 | |
|         s->cpu[n].core.mp_affinity = (info->clusterid << 8) | n;
 | |
| 
 | |
|         /* set periphbase/CBAR value for CPU-local registers */
 | |
|         if (!object_property_set_int(OBJECT(&s->cpu[n].core), "reset-cbar",
 | |
|                                      info->peri_base, errp)) {
 | |
|             return;
 | |
|         }
 | |
| 
 | |
|         /* start powered off if not enabled */
 | |
|         if (!object_property_set_bool(OBJECT(&s->cpu[n].core),
 | |
|                                       "start-powered-off",
 | |
|                                       n >= s->enabled_cpus,
 | |
|                                       errp)) {
 | |
|             return;
 | |
|         }
 | |
| 
 | |
|         if (!qdev_realize(DEVICE(&s->cpu[n].core), NULL, errp)) {
 | |
|             return;
 | |
|         }
 | |
| 
 | |
|         /* Connect irq/fiq outputs from the interrupt controller. */
 | |
|         qdev_connect_gpio_out_named(DEVICE(&s->control), "irq", n,
 | |
|                 qdev_get_gpio_in(DEVICE(&s->cpu[n].core), ARM_CPU_IRQ));
 | |
|         qdev_connect_gpio_out_named(DEVICE(&s->control), "fiq", n,
 | |
|                 qdev_get_gpio_in(DEVICE(&s->cpu[n].core), ARM_CPU_FIQ));
 | |
| 
 | |
|         /* Connect timers from the CPU to the interrupt controller */
 | |
|         qdev_connect_gpio_out(DEVICE(&s->cpu[n].core), GTIMER_PHYS,
 | |
|                 qdev_get_gpio_in_named(DEVICE(&s->control), "cntpnsirq", n));
 | |
|         qdev_connect_gpio_out(DEVICE(&s->cpu[n].core), GTIMER_VIRT,
 | |
|                 qdev_get_gpio_in_named(DEVICE(&s->control), "cntvirq", n));
 | |
|         qdev_connect_gpio_out(DEVICE(&s->cpu[n].core), GTIMER_HYP,
 | |
|                 qdev_get_gpio_in_named(DEVICE(&s->control), "cnthpirq", n));
 | |
|         qdev_connect_gpio_out(DEVICE(&s->cpu[n].core), GTIMER_SEC,
 | |
|                 qdev_get_gpio_in_named(DEVICE(&s->control), "cntpsirq", n));
 | |
|     }
 | |
| }
 | |
| 
 | |
| static Property bcm2836_props[] = {
 | |
|     DEFINE_PROP_UINT32("enabled-cpus", BCM283XState, enabled_cpus,
 | |
|                        BCM283X_NCPUS),
 | |
|     DEFINE_PROP_END_OF_LIST()
 | |
| };
 | |
| 
 | |
| static void bcm283x_class_init(ObjectClass *oc, void *data)
 | |
| {
 | |
|     DeviceClass *dc = DEVICE_CLASS(oc);
 | |
|     BCM283XClass *bc = BCM283X_CLASS(oc);
 | |
| 
 | |
|     bc->info = data;
 | |
|     dc->realize = bcm2836_realize;
 | |
|     device_class_set_props(dc, bcm2836_props);
 | |
|     /* Reason: Must be wired up in code (see raspi_init() function) */
 | |
|     dc->user_creatable = false;
 | |
| }
 | |
| 
 | |
| static const TypeInfo bcm283x_type_info = {
 | |
|     .name = TYPE_BCM283X,
 | |
|     .parent = TYPE_DEVICE,
 | |
|     .instance_size = sizeof(BCM283XState),
 | |
|     .instance_init = bcm2836_init,
 | |
|     .class_size = sizeof(BCM283XClass),
 | |
|     .abstract = true,
 | |
| };
 | |
| 
 | |
| static void bcm2836_register_types(void)
 | |
| {
 | |
|     int i;
 | |
| 
 | |
|     type_register_static(&bcm283x_type_info);
 | |
|     for (i = 0; i < ARRAY_SIZE(bcm283x_socs); i++) {
 | |
|         TypeInfo ti = {
 | |
|             .name = bcm283x_socs[i].name,
 | |
|             .parent = TYPE_BCM283X,
 | |
|             .class_init = bcm283x_class_init,
 | |
|             .class_data = (void *) &bcm283x_socs[i],
 | |
|         };
 | |
|         type_register(&ti);
 | |
|     }
 | |
| }
 | |
| 
 | |
| type_init(bcm2836_register_types)
 |