[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 14/14] sdhci: add a 'dma' property to the sysbus
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v8 14/14] sdhci: add a 'dma' property to the sysbus devices |
Date: |
Mon, 15 Jan 2018 15:24:36 -0300 |
Add a 'dma' property allowing machine creation to provide the address-space
SDHCI DMA operates on.
[based on a patch from Alistair Francis <address@hidden>
from qemu/xilinx tag xilinx-v2016.1]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
include/hw/sd/sdhci.h | 1 +
hw/sd/sdhci.c | 18 +++++++++++++++++-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h
index 4a102b86ce..cb37182536 100644
--- a/include/hw/sd/sdhci.h
+++ b/include/hw/sd/sdhci.h
@@ -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;
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index dd400695e4..f9264d3be5 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -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;
}
- 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_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)
--
2.15.1
- [Qemu-devel] [PATCH v8 05/14] sdhci: refactor common sysbus/pci realize() into sdhci_common_realize(), (continued)
- [Qemu-devel] [PATCH v8 05/14] sdhci: refactor common sysbus/pci realize() into sdhci_common_realize(), Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 06/14] sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize(), Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 07/14] sdhci: use qemu_log_mask(UNIMP) instead of fprintf(), Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 08/14] sdhci: convert the DPRINT() calls into trace events, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 09/14] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 10/14] sdhci: rename the SDHC_CAPAB register, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 11/14] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 12/14] sdhci: Implement write method of ACMD12ERRSTS register, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 13/14] sdhci: fix the PCI device, using the PCI address space for DMA, Philippe Mathieu-Daudé, 2018/01/15
- [Qemu-devel] [PATCH v8 14/14] sdhci: add a 'dma' property to the sysbus devices,
Philippe Mathieu-Daudé <=
- Re: [Qemu-devel] [PATCH v8 00/14] SDHCI: housekeeping (part 1), Peter Maydell, 2018/01/16