mirror of https://github.com/xemu-project/xemu.git
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: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20180115182436.2066-15-f4bug@amsat.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
dd55c485ec
commit
60765b6cee
|
@ -1354,6 +1354,8 @@ static Property sdhci_sysbus_properties[] = {
|
||||||
DEFINE_SDHCI_COMMON_PROPERTIES(SDHCIState),
|
DEFINE_SDHCI_COMMON_PROPERTIES(SDHCIState),
|
||||||
DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk,
|
DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk,
|
||||||
false),
|
false),
|
||||||
|
DEFINE_PROP_LINK("dma", SDHCIState,
|
||||||
|
dma_mr, TYPE_MEMORY_REGION, MemoryRegion *),
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1367,6 +1369,11 @@ static void sdhci_sysbus_init(Object *obj)
|
||||||
static void sdhci_sysbus_finalize(Object *obj)
|
static void sdhci_sysbus_finalize(Object *obj)
|
||||||
{
|
{
|
||||||
SDHCIState *s = SYSBUS_SDHCI(obj);
|
SDHCIState *s = SYSBUS_SDHCI(obj);
|
||||||
|
|
||||||
|
if (s->dma_mr) {
|
||||||
|
object_unparent(OBJECT(s->dma_mr));
|
||||||
|
}
|
||||||
|
|
||||||
sdhci_uninitfn(s);
|
sdhci_uninitfn(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1380,7 +1387,12 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
s->dma_as = &address_space_memory;
|
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_irq(sbd, &s->irq);
|
||||||
sysbus_init_mmio(sbd, &s->iomem);
|
sysbus_init_mmio(sbd, &s->iomem);
|
||||||
|
@ -1391,6 +1403,10 @@ static void sdhci_sysbus_unrealize(DeviceState *dev, Error **errp)
|
||||||
SDHCIState *s = SYSBUS_SDHCI(dev);
|
SDHCIState *s = SYSBUS_SDHCI(dev);
|
||||||
|
|
||||||
sdhci_common_unrealize(s, &error_abort);
|
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)
|
static void sdhci_sysbus_class_init(ObjectClass *klass, void *data)
|
||||||
|
|
|
@ -42,6 +42,7 @@ typedef struct SDHCIState {
|
||||||
SDBus sdbus;
|
SDBus sdbus;
|
||||||
MemoryRegion iomem;
|
MemoryRegion iomem;
|
||||||
AddressSpace *dma_as;
|
AddressSpace *dma_as;
|
||||||
|
MemoryRegion *dma_mr;
|
||||||
|
|
||||||
QEMUTimer *insert_timer; /* timer for 'changing' sd card. */
|
QEMUTimer *insert_timer; /* timer for 'changing' sd card. */
|
||||||
QEMUTimer *transfer_timer;
|
QEMUTimer *transfer_timer;
|
||||||
|
|
Loading…
Reference in New Issue