[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 06/17] sdhci: refactor common sysbus/pci realize(
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [PATCH v4 06/17] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn() |
Date: |
Wed, 3 Jan 2018 08:01:15 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
---
hw/sd/sdhci.c | 35 ++++++++++++++++++++++++++---------
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index 38d82b4c61..d5c6d8ab0b 100644
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -29,6 +29,7 @@
#include "sysemu/dma.h"
#include "qemu/timer.h"
#include "qemu/bitops.h"
+#include "qapi/error.h"
#include "hw/sd/sdhci.h"
#include "sdhci-internal.h"
#include "qemu/log.h"
@@ -1194,6 +1195,15 @@ static void sdhci_initfn(SDHCIState *s)
s->transfer_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_transfer,
s);
}
+static void sdhci_realizefn(SDHCIState *s, Error **errp)
+{
+ s->buf_maxsz = sdhci_get_fifolen(s);
+ s->fifo_buffer = g_malloc0(s->buf_maxsz);
+
+ memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",
+ SDHC_REGISTERS_MAP_SIZE);
+}
+
static void sdhci_uninitfn(SDHCIState *s)
{
timer_del(s->insert_timer);
@@ -1290,14 +1300,18 @@ static void sdhci_class_init(ObjectClass *klass, void
*data)
static void sdhci_pci_realize(PCIDevice *dev, Error **errp)
{
SDHCIState *s = PCI_SDHCI(dev);
+ Error *err_local = NULL;
+
+ sdhci_initfn(s);
+ sdhci_realizefn(s, errp);
+ if (errp) {
+ error_propagate(errp, err_local);
+ return;
+ }
+
dev->config[PCI_CLASS_PROG] = 0x01; /* Standard Host supported DMA */
dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */
- sdhci_initfn(s);
- s->buf_maxsz = sdhci_get_fifolen(s);
- s->fifo_buffer = g_malloc0(s->buf_maxsz);
s->irq = pci_allocate_irq(dev);
- memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",
- SDHC_REGISTERS_MAP_SIZE);
pci_register_bar(dev, 0, 0, &s->iomem);
}
@@ -1350,12 +1364,15 @@ static void sdhci_sysbus_realize(DeviceState *dev,
Error ** errp)
{
SDHCIState *s = SYSBUS_SDHCI(dev);
SysBusDevice *sbd = SYS_BUS_DEVICE(dev);
+ Error *err_local = NULL;
+
+ sdhci_realizefn(s, &err_local);
+ if (errp) {
+ error_propagate(errp, err_local);
+ return;
+ }
- s->buf_maxsz = sdhci_get_fifolen(s);
- s->fifo_buffer = g_malloc0(s->buf_maxsz);
sysbus_init_irq(sbd, &s->irq);
- memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci",
- SDHC_REGISTERS_MAP_SIZE);
sysbus_init_mmio(sbd, &s->iomem);
}
--
2.15.1
- [Qemu-devel] [PATCH v4 00/17] SDHCI: housekeeping, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 01/17] sdhci: clean up includes, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 03/17] sdhci: remove dead code, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 02/17] sdhci: sort registers comments, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 04/17] sdhci: refactor same sysbus/pci properties into a common one, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 05/17] sdhci: refactor common sysbus/pci class_init() into sdhci_class_init(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 07/17] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 06/17] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn(),
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v4 08/17] sdhci: use qemu_log_mask(UNIMP) instead of fprintf(), Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 09/17] sdhci: convert the DPRINT() calls into trace events, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 10/17] sdhci: add a GPIO for the 'access control' LED, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 11/17] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 12/17] sdhci: use FIELD_DP32() macro for the WRITE_PROTECT flag, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 13/17] sdhci: rename the SDHC_CAPAB register, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 14/17] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 15/17] sdhci: Implement write method of ACMD12ERRSTS register, Philippe Mathieu-Daudé, 2018/01/03
- [Qemu-devel] [PATCH v4 16/17] sdhci: use deposit64() on admasysaddr, Philippe Mathieu-Daudé, 2018/01/03