Commit eb4f566b authored by Peter Maydell's avatar Peter Maydell
Browse files

sdhci_sysbus: Create SD card device in users, not the device itself 



Move the creation of the SD card device from the sdhci_sysbus
device itself into the boards that create these devices.
This allows us to remove the cannot_instantiate_with_device_add
notation because we no longer call drive_get_next in the device
model.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarAlistair Francis <alistair.francis@xilinx.com>
Message-id: 1455646193-13238-7-git-send-email-peter.maydell@linaro.org
parent 40bbc194

hw/arm/xilinx_zynq.c

+16 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "hw/misc/zynq-xadc.h"

#include "hw/ssi/ssi.h"

#include "qemu/error-report.h"

#include "hw/sd/sd.h"



#define NUM_SPI_FLASHES 4

#define NUM_QSPI_FLASHES 2
@@ -154,8 +155,10 @@ static void zynq_init(MachineState *machine) 
    MemoryRegion *address_space_mem = get_system_memory();

    MemoryRegion *ext_ram = g_new(MemoryRegion, 1);

    MemoryRegion *ocm_ram = g_new(MemoryRegion, 1);

    DeviceState *dev;

    DeviceState *dev, *carddev;

    SysBusDevice *busdev;

    DriveInfo *di;

    BlockBackend *blk;

    qemu_irq pic[64];

    int n;
@@ -245,11 +248,23 @@ static void zynq_init(MachineState *machine) 
    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0100000);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[56-IRQ_OFFSET]);



    di = drive_get_next(IF_SD);

    blk = di ? blk_by_legacy_dinfo(di) : NULL;

    carddev = qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CARD);

    qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);

    object_property_set_bool(OBJECT(carddev), true, "realized", &error_fatal);



    dev = qdev_create(NULL, "generic-sdhci");

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0101000);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[79-IRQ_OFFSET]);



    di = drive_get_next(IF_SD);

    blk = di ? blk_by_legacy_dinfo(di) : NULL;

    carddev = qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CARD);

    qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);

    object_property_set_bool(OBJECT(carddev), true, "realized", &error_fatal);



    dev = qdev_create(NULL, TYPE_ZYNQ_XADC);

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xF8007100);

hw/arm/xlnx-ep108.c

+21 −0
Original line number Diff line number Diff line
@@ -59,6 +59,27 @@ static void xlnx_ep108_init(MachineState *machine) 


    object_property_set_bool(OBJECT(&s->soc), true, "realized", &error_fatal);



    /* Create and plug in the SD cards */

    for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) {

        BusState *bus;

        DriveInfo *di = drive_get_next(IF_SD);

        BlockBackend *blk = di ? blk_by_legacy_dinfo(di) : NULL;

        DeviceState *carddev;

        char *bus_name;



        bus_name = g_strdup_printf("sd-bus%d", i);

        bus = qdev_get_child_bus(DEVICE(&s->soc), bus_name);

        g_free(bus_name);

        if (!bus) {

            error_report("No SD bus found for SD card %d", i);

            exit(1);

        }

        carddev = qdev_create(bus, TYPE_SD_CARD);

        qdev_prop_set_drive(carddev, "drive", blk, &error_fatal);

        object_property_set_bool(OBJECT(carddev), true, "realized",

                                 &error_fatal);

    }



    for (i = 0; i < XLNX_ZYNQMP_NUM_SPIS; i++) {

        SSIBus *spi_bus;

        DeviceState *flash_dev;

hw/arm/xlnx-zynqmp.c

+8 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
    sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]);



    for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) {

        char *bus_name;



        object_property_set_bool(OBJECT(&s->sdhci[i]), true,

                                 "realized", &err);

        if (err) {
@@ -337,6 +339,12 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) 
                        sdhci_addr[i]);

        sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci[i]), 0,

                           gic_spi[sdhci_intr[i]]);

        /* Alias controller SD bus to the SoC itself */

        bus_name = g_strdup_printf("sd-bus%d", i);

        object_property_add_alias(OBJECT(s), bus_name,

                                  OBJECT(&s->sdhci[i]), "sd-bus",

                                  &error_abort);

        g_free(bus_name);

    }



    for (i = 0; i < XLNX_ZYNQMP_NUM_SPIS; i++) {

hw/sd/sdhci.c

+0 −25
Original line number Diff line number Diff line
@@ -1296,29 +1296,6 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) 
{

    SDHCIState *s = SYSBUS_SDHCI(dev);

    SysBusDevice *sbd = SYS_BUS_DEVICE(dev);

    DriveInfo *di;

    BlockBackend *blk;

    DeviceState *carddev;

    Error *err = NULL;



    /* Create and plug in the sd card.

     * FIXME: this should be done by the users of this device so we

     * do not use drive_get_next() here.

     */

    di = drive_get_next(IF_SD);

    blk = di ? blk_by_legacy_dinfo(di) : NULL;



    carddev = qdev_create(qdev_get_child_bus(dev, "sd-bus"), TYPE_SD_CARD);

    qdev_prop_set_drive(carddev, "drive", blk, &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }

    object_property_set_bool(OBJECT(carddev), true, "realized", &err);

    if (err) {

        error_propagate(errp, err);

        return;

    }



    s->buf_maxsz = sdhci_get_fifolen(s);

    s->fifo_buffer = g_malloc0(s->buf_maxsz);
@@ -1335,8 +1312,6 @@ static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) 
    dc->vmsd = &sdhci_vmstate;

    dc->props = sdhci_sysbus_properties;

    dc->realize = sdhci_sysbus_realize;

    /* Reason: instance_init() method uses drive_get_next() */

    dc->cannot_instantiate_with_device_add_yet = true;

}



static const TypeInfo sdhci_sysbus_info = {