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>
		
	
		
			
				
	
	
		
			255 lines
		
	
	
		
			8.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			255 lines
		
	
	
		
			8.4 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * Copyright (c) 2013 Jean-Christophe Dubois <jcd@tribudubois.net>
 | 
						|
 *
 | 
						|
 * i.MX31 SOC emulation.
 | 
						|
 *
 | 
						|
 * Based on hw/arm/fsl-imx31.c
 | 
						|
 *
 | 
						|
 *  This program is free software; you can redistribute it and/or modify it
 | 
						|
 *  under the terms of the GNU General Public License as published by the
 | 
						|
 *  Free Software Foundation; either version 2 of the License, or
 | 
						|
 *  (at your option) any later version.
 | 
						|
 *
 | 
						|
 *  This program 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 General Public License
 | 
						|
 *  for more details.
 | 
						|
 *
 | 
						|
 *  You should have received a copy of the GNU General Public License along
 | 
						|
 *  with this program; if not, see <http://www.gnu.org/licenses/>.
 | 
						|
 */
 | 
						|
 | 
						|
#include "qemu/osdep.h"
 | 
						|
#include "qapi/error.h"
 | 
						|
#include "cpu.h"
 | 
						|
#include "hw/arm/fsl-imx31.h"
 | 
						|
#include "sysemu/sysemu.h"
 | 
						|
#include "exec/address-spaces.h"
 | 
						|
#include "hw/qdev-properties.h"
 | 
						|
#include "chardev/char.h"
 | 
						|
 | 
						|
static void fsl_imx31_init(Object *obj)
 | 
						|
{
 | 
						|
    FslIMX31State *s = FSL_IMX31(obj);
 | 
						|
    int i;
 | 
						|
 | 
						|
    object_initialize_child(obj, "cpu", &s->cpu, ARM_CPU_TYPE_NAME("arm1136"));
 | 
						|
 | 
						|
    object_initialize_child(obj, "avic", &s->avic, TYPE_IMX_AVIC);
 | 
						|
 | 
						|
    object_initialize_child(obj, "ccm", &s->ccm, TYPE_IMX31_CCM);
 | 
						|
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_UARTS; i++) {
 | 
						|
        object_initialize_child(obj, "uart[*]", &s->uart[i], TYPE_IMX_SERIAL);
 | 
						|
    }
 | 
						|
 | 
						|
    object_initialize_child(obj, "gpt", &s->gpt, TYPE_IMX31_GPT);
 | 
						|
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_EPITS; i++) {
 | 
						|
        object_initialize_child(obj, "epit[*]", &s->epit[i], TYPE_IMX_EPIT);
 | 
						|
    }
 | 
						|
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_I2CS; i++) {
 | 
						|
        object_initialize_child(obj, "i2c[*]", &s->i2c[i], TYPE_IMX_I2C);
 | 
						|
    }
 | 
						|
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_GPIOS; i++) {
 | 
						|
        object_initialize_child(obj, "gpio[*]", &s->gpio[i], TYPE_IMX_GPIO);
 | 
						|
    }
 | 
						|
 | 
						|
    object_initialize_child(obj, "wdt", &s->wdt, TYPE_IMX2_WDT);
 | 
						|
}
 | 
						|
 | 
						|
static void fsl_imx31_realize(DeviceState *dev, Error **errp)
 | 
						|
{
 | 
						|
    FslIMX31State *s = FSL_IMX31(dev);
 | 
						|
    uint16_t i;
 | 
						|
    Error *err = NULL;
 | 
						|
 | 
						|
    if (!qdev_realize(DEVICE(&s->cpu), NULL, errp)) {
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    if (!sysbus_realize(SYS_BUS_DEVICE(&s->avic), errp)) {
 | 
						|
        return;
 | 
						|
    }
 | 
						|
    sysbus_mmio_map(SYS_BUS_DEVICE(&s->avic), 0, FSL_IMX31_AVIC_ADDR);
 | 
						|
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 0,
 | 
						|
                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ));
 | 
						|
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->avic), 1,
 | 
						|
                       qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ));
 | 
						|
 | 
						|
    if (!sysbus_realize(SYS_BUS_DEVICE(&s->ccm), errp)) {
 | 
						|
        return;
 | 
						|
    }
 | 
						|
    sysbus_mmio_map(SYS_BUS_DEVICE(&s->ccm), 0, FSL_IMX31_CCM_ADDR);
 | 
						|
 | 
						|
    /* Initialize all UARTS */
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_UARTS; i++) {
 | 
						|
        static const struct {
 | 
						|
            hwaddr addr;
 | 
						|
            unsigned int irq;
 | 
						|
        } serial_table[FSL_IMX31_NUM_UARTS] = {
 | 
						|
            { FSL_IMX31_UART1_ADDR, FSL_IMX31_UART1_IRQ },
 | 
						|
            { FSL_IMX31_UART2_ADDR, FSL_IMX31_UART2_IRQ },
 | 
						|
        };
 | 
						|
 | 
						|
        qdev_prop_set_chr(DEVICE(&s->uart[i]), "chardev", serial_hd(i));
 | 
						|
 | 
						|
        if (!sysbus_realize(SYS_BUS_DEVICE(&s->uart[i]), errp)) {
 | 
						|
            return;
 | 
						|
        }
 | 
						|
 | 
						|
        sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart[i]), 0, serial_table[i].addr);
 | 
						|
        sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart[i]), 0,
 | 
						|
                           qdev_get_gpio_in(DEVICE(&s->avic),
 | 
						|
                                            serial_table[i].irq));
 | 
						|
    }
 | 
						|
 | 
						|
    s->gpt.ccm = IMX_CCM(&s->ccm);
 | 
						|
 | 
						|
    if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpt), errp)) {
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpt), 0, FSL_IMX31_GPT_ADDR);
 | 
						|
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpt), 0,
 | 
						|
                       qdev_get_gpio_in(DEVICE(&s->avic), FSL_IMX31_GPT_IRQ));
 | 
						|
 | 
						|
    /* Initialize all EPIT timers */
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_EPITS; i++) {
 | 
						|
        static const struct {
 | 
						|
            hwaddr addr;
 | 
						|
            unsigned int irq;
 | 
						|
        } epit_table[FSL_IMX31_NUM_EPITS] = {
 | 
						|
            { FSL_IMX31_EPIT1_ADDR, FSL_IMX31_EPIT1_IRQ },
 | 
						|
            { FSL_IMX31_EPIT2_ADDR, FSL_IMX31_EPIT2_IRQ },
 | 
						|
        };
 | 
						|
 | 
						|
        s->epit[i].ccm = IMX_CCM(&s->ccm);
 | 
						|
 | 
						|
        if (!sysbus_realize(SYS_BUS_DEVICE(&s->epit[i]), errp)) {
 | 
						|
            return;
 | 
						|
        }
 | 
						|
 | 
						|
        sysbus_mmio_map(SYS_BUS_DEVICE(&s->epit[i]), 0, epit_table[i].addr);
 | 
						|
        sysbus_connect_irq(SYS_BUS_DEVICE(&s->epit[i]), 0,
 | 
						|
                           qdev_get_gpio_in(DEVICE(&s->avic),
 | 
						|
                                            epit_table[i].irq));
 | 
						|
    }
 | 
						|
 | 
						|
    /* Initialize all I2C */
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_I2CS; i++) {
 | 
						|
        static const struct {
 | 
						|
            hwaddr addr;
 | 
						|
            unsigned int irq;
 | 
						|
        } i2c_table[FSL_IMX31_NUM_I2CS] = {
 | 
						|
            { FSL_IMX31_I2C1_ADDR, FSL_IMX31_I2C1_IRQ },
 | 
						|
            { FSL_IMX31_I2C2_ADDR, FSL_IMX31_I2C2_IRQ },
 | 
						|
            { FSL_IMX31_I2C3_ADDR, FSL_IMX31_I2C3_IRQ }
 | 
						|
        };
 | 
						|
 | 
						|
        /* Initialize the I2C */
 | 
						|
        if (!sysbus_realize(SYS_BUS_DEVICE(&s->i2c[i]), errp)) {
 | 
						|
            return;
 | 
						|
        }
 | 
						|
        /* Map I2C memory */
 | 
						|
        sysbus_mmio_map(SYS_BUS_DEVICE(&s->i2c[i]), 0, i2c_table[i].addr);
 | 
						|
        /* Connect I2C IRQ to PIC */
 | 
						|
        sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c[i]), 0,
 | 
						|
                           qdev_get_gpio_in(DEVICE(&s->avic),
 | 
						|
                                            i2c_table[i].irq));
 | 
						|
    }
 | 
						|
 | 
						|
    /* Initialize all GPIOs */
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_GPIOS; i++) {
 | 
						|
        static const struct {
 | 
						|
            hwaddr addr;
 | 
						|
            unsigned int irq;
 | 
						|
        } gpio_table[FSL_IMX31_NUM_GPIOS] = {
 | 
						|
            { FSL_IMX31_GPIO1_ADDR, FSL_IMX31_GPIO1_IRQ },
 | 
						|
            { FSL_IMX31_GPIO2_ADDR, FSL_IMX31_GPIO2_IRQ },
 | 
						|
            { FSL_IMX31_GPIO3_ADDR, FSL_IMX31_GPIO3_IRQ }
 | 
						|
        };
 | 
						|
 | 
						|
        object_property_set_bool(OBJECT(&s->gpio[i]), "has-edge-sel", false,
 | 
						|
                                 &error_abort);
 | 
						|
        if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpio[i]), errp)) {
 | 
						|
            return;
 | 
						|
        }
 | 
						|
        sysbus_mmio_map(SYS_BUS_DEVICE(&s->gpio[i]), 0, gpio_table[i].addr);
 | 
						|
        /* Connect GPIO IRQ to PIC */
 | 
						|
        sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio[i]), 0,
 | 
						|
                           qdev_get_gpio_in(DEVICE(&s->avic),
 | 
						|
                                            gpio_table[i].irq));
 | 
						|
    }
 | 
						|
 | 
						|
    /* Watchdog */
 | 
						|
    sysbus_realize(SYS_BUS_DEVICE(&s->wdt), &error_abort);
 | 
						|
    sysbus_mmio_map(SYS_BUS_DEVICE(&s->wdt), 0, FSL_IMX31_WDT_ADDR);
 | 
						|
 | 
						|
    /* On a real system, the first 16k is a `secure boot rom' */
 | 
						|
    memory_region_init_rom(&s->secure_rom, OBJECT(dev), "imx31.secure_rom",
 | 
						|
                           FSL_IMX31_SECURE_ROM_SIZE, &err);
 | 
						|
    if (err) {
 | 
						|
        error_propagate(errp, err);
 | 
						|
        return;
 | 
						|
    }
 | 
						|
    memory_region_add_subregion(get_system_memory(), FSL_IMX31_SECURE_ROM_ADDR,
 | 
						|
                                &s->secure_rom);
 | 
						|
 | 
						|
    /* There is also a 16k ROM */
 | 
						|
    memory_region_init_rom(&s->rom, OBJECT(dev), "imx31.rom",
 | 
						|
                           FSL_IMX31_ROM_SIZE, &err);
 | 
						|
    if (err) {
 | 
						|
        error_propagate(errp, err);
 | 
						|
        return;
 | 
						|
    }
 | 
						|
    memory_region_add_subregion(get_system_memory(), FSL_IMX31_ROM_ADDR,
 | 
						|
                                &s->rom);
 | 
						|
 | 
						|
    /* initialize internal RAM (16 KB) */
 | 
						|
    memory_region_init_ram(&s->iram, NULL, "imx31.iram", FSL_IMX31_IRAM_SIZE,
 | 
						|
                           &err);
 | 
						|
    if (err) {
 | 
						|
        error_propagate(errp, err);
 | 
						|
        return;
 | 
						|
    }
 | 
						|
    memory_region_add_subregion(get_system_memory(), FSL_IMX31_IRAM_ADDR,
 | 
						|
                                &s->iram);
 | 
						|
 | 
						|
    /* internal RAM (16 KB) is aliased over 256 MB - 16 KB */
 | 
						|
    memory_region_init_alias(&s->iram_alias, OBJECT(dev), "imx31.iram_alias",
 | 
						|
                             &s->iram, 0, FSL_IMX31_IRAM_ALIAS_SIZE);
 | 
						|
    memory_region_add_subregion(get_system_memory(), FSL_IMX31_IRAM_ALIAS_ADDR,
 | 
						|
                                &s->iram_alias);
 | 
						|
}
 | 
						|
 | 
						|
static void fsl_imx31_class_init(ObjectClass *oc, void *data)
 | 
						|
{
 | 
						|
    DeviceClass *dc = DEVICE_CLASS(oc);
 | 
						|
 | 
						|
    dc->realize = fsl_imx31_realize;
 | 
						|
    dc->desc = "i.MX31 SOC";
 | 
						|
    /*
 | 
						|
     * Reason: uses serial_hds in realize and the kzm board does not
 | 
						|
     * support multiple CPUs
 | 
						|
     */
 | 
						|
    dc->user_creatable = false;
 | 
						|
}
 | 
						|
 | 
						|
static const TypeInfo fsl_imx31_type_info = {
 | 
						|
    .name = TYPE_FSL_IMX31,
 | 
						|
    .parent = TYPE_DEVICE,
 | 
						|
    .instance_size = sizeof(FslIMX31State),
 | 
						|
    .instance_init = fsl_imx31_init,
 | 
						|
    .class_init = fsl_imx31_class_init,
 | 
						|
};
 | 
						|
 | 
						|
static void fsl_imx31_register_types(void)
 | 
						|
{
 | 
						|
    type_register_static(&fsl_imx31_type_info);
 | 
						|
}
 | 
						|
 | 
						|
type_init(fsl_imx31_register_types)
 |