Running QEMU with valgrind indicates a problem here:
echo "{'execute':'qmp_capabilities'} {'execute':'device-list-properties'," \
 "'arguments':{'typename':'fsl,imx31'}}" \
 "{'execute': 'human-monitor-command', " \
 "'arguments': {'command-line': 'info qtree'}}" | \
 valgrind -q aarch64-softmmu/qemu-system-aarch64 -M none,accel=qtest -qmp stdio
[...]
==26172== Invalid read of size 8
==26172==    at 0x6191FA: qdev_print (qdev-monitor.c:686)
==26172==    by 0x6191FA: qbus_print (qdev-monitor.c:719)
[...]
Use the new sysbus_init_child_obj() to make sure that the objects are
cleaned up correctly when the parent gets destroyed.
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-id: 1531745974-17187-12-git-send-email-thuth@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
		
	
			
		
			
				
	
	
		
			271 lines
		
	
	
		
			9.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			271 lines
		
	
	
		
			9.0 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 "qemu-common.h"
 | 
						|
#include "cpu.h"
 | 
						|
#include "hw/arm/fsl-imx31.h"
 | 
						|
#include "sysemu/sysemu.h"
 | 
						|
#include "exec/address-spaces.h"
 | 
						|
#include "hw/boards.h"
 | 
						|
#include "chardev/char.h"
 | 
						|
 | 
						|
static void fsl_imx31_init(Object *obj)
 | 
						|
{
 | 
						|
    FslIMX31State *s = FSL_IMX31(obj);
 | 
						|
    int i;
 | 
						|
 | 
						|
    object_initialize(&s->cpu, sizeof(s->cpu), "arm1136-" TYPE_ARM_CPU);
 | 
						|
 | 
						|
    sysbus_init_child_obj(obj, "avic", &s->avic, sizeof(s->avic),
 | 
						|
                          TYPE_IMX_AVIC);
 | 
						|
 | 
						|
    sysbus_init_child_obj(obj, "ccm", &s->ccm, sizeof(s->ccm), TYPE_IMX31_CCM);
 | 
						|
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_UARTS; i++) {
 | 
						|
        sysbus_init_child_obj(obj, "uart[*]", &s->uart[i], sizeof(s->uart[i]),
 | 
						|
                              TYPE_IMX_SERIAL);
 | 
						|
    }
 | 
						|
 | 
						|
    sysbus_init_child_obj(obj, "gpt", &s->gpt, sizeof(s->gpt), TYPE_IMX31_GPT);
 | 
						|
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_EPITS; i++) {
 | 
						|
        sysbus_init_child_obj(obj, "epit[*]", &s->epit[i], sizeof(s->epit[i]),
 | 
						|
                              TYPE_IMX_EPIT);
 | 
						|
    }
 | 
						|
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_I2CS; i++) {
 | 
						|
        sysbus_init_child_obj(obj, "i2c[*]", &s->i2c[i], sizeof(s->i2c[i]),
 | 
						|
                              TYPE_IMX_I2C);
 | 
						|
    }
 | 
						|
 | 
						|
    for (i = 0; i < FSL_IMX31_NUM_GPIOS; i++) {
 | 
						|
        sysbus_init_child_obj(obj, "gpio[*]", &s->gpio[i], sizeof(s->gpio[i]),
 | 
						|
                              TYPE_IMX_GPIO);
 | 
						|
    }
 | 
						|
}
 | 
						|
 | 
						|
static void fsl_imx31_realize(DeviceState *dev, Error **errp)
 | 
						|
{
 | 
						|
    FslIMX31State *s = FSL_IMX31(dev);
 | 
						|
    uint16_t i;
 | 
						|
    Error *err = NULL;
 | 
						|
 | 
						|
    object_property_set_bool(OBJECT(&s->cpu), true, "realized", &err);
 | 
						|
    if (err) {
 | 
						|
        error_propagate(errp, err);
 | 
						|
        return;
 | 
						|
    }
 | 
						|
 | 
						|
    object_property_set_bool(OBJECT(&s->avic), true, "realized", &err);
 | 
						|
    if (err) {
 | 
						|
        error_propagate(errp, err);
 | 
						|
        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));
 | 
						|
 | 
						|
    object_property_set_bool(OBJECT(&s->ccm), true, "realized", &err);
 | 
						|
    if (err) {
 | 
						|
        error_propagate(errp, err);
 | 
						|
        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));
 | 
						|
 | 
						|
        object_property_set_bool(OBJECT(&s->uart[i]), true, "realized", &err);
 | 
						|
        if (err) {
 | 
						|
            error_propagate(errp, err);
 | 
						|
            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);
 | 
						|
 | 
						|
    object_property_set_bool(OBJECT(&s->gpt), true, "realized", &err);
 | 
						|
    if (err) {
 | 
						|
        error_propagate(errp, err);
 | 
						|
        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);
 | 
						|
 | 
						|
        object_property_set_bool(OBJECT(&s->epit[i]), true, "realized", &err);
 | 
						|
        if (err) {
 | 
						|
            error_propagate(errp, err);
 | 
						|
            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 */
 | 
						|
        object_property_set_bool(OBJECT(&s->i2c[i]), true, "realized", &err);
 | 
						|
        if (err) {
 | 
						|
            error_propagate(errp, err);
 | 
						|
            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]), false, "has-edge-sel",
 | 
						|
                                 &error_abort);
 | 
						|
        object_property_set_bool(OBJECT(&s->gpio[i]), true, "realized", &err);
 | 
						|
        if (err) {
 | 
						|
            error_propagate(errp, err);
 | 
						|
            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));
 | 
						|
    }
 | 
						|
 | 
						|
    /* On a real system, the first 16k is a `secure boot rom' */
 | 
						|
    memory_region_init_rom(&s->secure_rom, NULL, "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, NULL, "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, NULL, "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)
 |