Commit 60765b6c authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

sdhci: add a 'dma' property to the sysbus devices 



Add a 'dma' property allowing machine creation to provide the address-space
SDHCI DMA operates on.

[based on a patch from Alistair Francis <alistair.francis@xilinx.com>
 from qemu/xilinx tag xilinx-v2016.1]
Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180115182436.2066-15-f4bug@amsat.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent dd55c485

hw/sd/sdhci.c

+17 −1
Original line number Diff line number Diff line
@@ -1354,6 +1354,8 @@ static Property sdhci_sysbus_properties[] = { 
    DEFINE_SDHCI_COMMON_PROPERTIES(SDHCIState),

    DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk,

                     false),

    DEFINE_PROP_LINK("dma", SDHCIState,

                     dma_mr, TYPE_MEMORY_REGION, MemoryRegion *),

    DEFINE_PROP_END_OF_LIST(),

};
@@ -1367,6 +1369,11 @@ static void sdhci_sysbus_init(Object *obj) 
static void sdhci_sysbus_finalize(Object *obj)

{

    SDHCIState *s = SYSBUS_SDHCI(obj);



    if (s->dma_mr) {

        object_unparent(OBJECT(s->dma_mr));

    }



    sdhci_uninitfn(s);

}
@@ -1380,7 +1387,12 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) 
        return;

    }



    if (s->dma_mr) {

        address_space_init(s->dma_as, s->dma_mr, "sdhci-dma");

    } else {

        /* use system_memory() if property "dma" not set */

        s->dma_as = &address_space_memory;

    }



    sysbus_init_irq(sbd, &s->irq);

    sysbus_init_mmio(sbd, &s->iomem);
@@ -1391,6 +1403,10 @@ static void sdhci_sysbus_unrealize(DeviceState *dev, Error **errp) 
    SDHCIState *s = SYSBUS_SDHCI(dev);



    sdhci_common_unrealize(s, &error_abort);



     if (s->dma_mr) {

        address_space_destroy(s->dma_as);

    }

}



static void sdhci_sysbus_class_init(ObjectClass *klass, void *data)

include/hw/sd/sdhci.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ typedef struct SDHCIState { 
    SDBus sdbus;

    MemoryRegion iomem;

    AddressSpace *dma_as;

    MemoryRegion *dma_mr;



    QEMUTimer *insert_timer;       /* timer for 'changing' sd card. */

    QEMUTimer *transfer_timer;