[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/24] hw/sd/omap_mmc: Reset SD card on controller re
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 08/24] hw/sd/omap_mmc: Reset SD card on controller reset |
Date: |
Tue, 16 Jan 2018 13:34:03 +0000 |
Since omap_mmc is still using the legacy SD card API, the SD
card created by sd_init() is not plugged into any bus. This
means that the controller has to reset it manually.
Failing to do this mostly didn't affect the guest since the
guest typically does a programmed SD card reset as part of
its SD controller driver initialization, but would mean that
migration fails because it's only in sd_reset() that we
set up the wpgrps_size field.
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
---
hw/sd/omap_mmc.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/sd/omap_mmc.c b/hw/sd/omap_mmc.c
index e934cd3..5b47cad 100644
--- a/hw/sd/omap_mmc.c
+++ b/hw/sd/omap_mmc.c
@@ -305,6 +305,12 @@ void omap_mmc_reset(struct omap_mmc_s *host)
host->cdet_enable = 0;
qemu_set_irq(host->coverswitch, host->cdet_state);
host->clkdiv = 0;
+
+ /* Since we're still using the legacy SD API the card is not plugged
+ * into any bus, and we must reset it manually. When omap_mmc is
+ * QOMified this must move into the QOM reset function.
+ */
+ device_reset(DEVICE(host->card));
}
static uint64_t omap_mmc_read(void *opaque, hwaddr offset,
@@ -587,8 +593,6 @@ struct omap_mmc_s *omap_mmc_init(hwaddr base,
s->lines = 1; /* TODO: needs to be settable per-board */
s->rev = 1;
- omap_mmc_reset(s);
-
memory_region_init_io(&s->iomem, NULL, &omap_mmc_ops, s, "omap.mmc",
0x800);
memory_region_add_subregion(sysmem, base, &s->iomem);
@@ -598,6 +602,8 @@ struct omap_mmc_s *omap_mmc_init(hwaddr base,
exit(1);
}
+ omap_mmc_reset(s);
+
return s;
}
@@ -613,8 +619,6 @@ struct omap_mmc_s *omap2_mmc_init(struct
omap_target_agent_s *ta,
s->lines = 4;
s->rev = 2;
- omap_mmc_reset(s);
-
memory_region_init_io(&s->iomem, NULL, &omap_mmc_ops, s, "omap.mmc",
omap_l4_region_size(ta, 0));
omap_l4_attach(ta, 0, &s->iomem);
@@ -628,6 +632,8 @@ struct omap_mmc_s *omap2_mmc_init(struct
omap_target_agent_s *ta,
s->cdet = qemu_allocate_irq(omap_mmc_cover_cb, s, 0);
sd_set_cb(s->card, NULL, s->cdet);
+ omap_mmc_reset(s);
+
return s;
}
--
2.7.4
- [Qemu-devel] [PULL 10/24] target/arm: Add fp16 support to vfp_expand_imm, (continued)
- [Qemu-devel] [PULL 10/24] target/arm: Add fp16 support to vfp_expand_imm, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 12/24] sdhci: remove dead code, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 03/24] hw/arm/virt: Add virt-2.12 machine type, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 07/24] hw/sd/ssi-sd: Reset SD card on controller reset, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 04/24] target/arm: Handle page table walk load failures correctly, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 19/24] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h", Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 09/24] target/arm: Split out vfp_expand_imm, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 15/24] sdhci: refactor common sysbus/pci realize() into sdhci_common_realize(), Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 06/24] hw/sd/milkymist-memcard: Reset SD card on controller reset, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 02/24] get_phys_addr_pmsav7: Support AP=0b111 for v7M, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 08/24] hw/sd/omap_mmc: Reset SD card on controller reset,
Peter Maydell <=
- [Qemu-devel] [PULL 05/24] hw/sd/pl181: Reset SD card on controller reset, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 13/24] sdhci: use DEFINE_SDHCI_COMMON_PROPERTIES() for common sysbus/pci properties, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 14/24] sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init(), Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 20/24] sdhci: rename the SDHC_CAPAB register, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 23/24] sdhci: fix the PCI device, using the PCI address space for DMA, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 22/24] sdhci: Implement write method of ACMD12ERRSTS register, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 21/24] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 11/24] sdhci: clean up includes, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 01/24] hw/intc/armv7m: Support byte and halfword accesses to CFSR, Peter Maydell, 2018/01/16
- [Qemu-devel] [PULL 16/24] sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize(), Peter Maydell, 2018/01/16