mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/sd/pxa2xx_mmci: Do not create SD card within the SD host controller

Browse Source 
SD/MMC host controllers provide a SD Bus to plug SD cards,
but don't come with SD card plugged in :)

The machine/board object is where the SD cards are created.
Since the PXA2xx is not qdevified, for now create the cards
in pxa270_init() which is the SoC model.
In the future we will move this to the board model.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Acked-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200705213350.24725-2-f4bug@amsat.org>
This commit is contained in:
Philippe Mathieu-Daudé 2020-07-05 23:22:10 +02:00
parent d6f83a72a7
commit d7ebca748e
3 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
hw/arm/pxa2xx.c
View File

@ -22,6 +22,7 @@
#include "hw/irq.h" #include "hw/irq.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/ssi/ssi.h" #include "hw/ssi/ssi.h"
#include "hw/sd/sd.h"
#include "chardev/char-fe.h" #include "chardev/char-fe.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
@ -2136,15 +2137,24 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space,
s->gpio = pxa2xx_gpio_init(0x40e00000, s->cpu, s->pic, 121); s->gpio = pxa2xx_gpio_init(0x40e00000, s->cpu, s->pic, 121);
dinfo = drive_get(IF_SD, 0, 0);
if (!dinfo && !qtest_enabled()) {
warn_report("missing SecureDigital device");
}
s->mmc = pxa2xx_mmci_init(address_space, 0x41100000, s->mmc = pxa2xx_mmci_init(address_space, 0x41100000,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
qdev_get_gpio_in(s->pic, PXA2XX_PIC_MMC), qdev_get_gpio_in(s->pic, PXA2XX_PIC_MMC),
qdev_get_gpio_in(s->dma, PXA2XX_RX_RQ_MMCI), qdev_get_gpio_in(s->dma, PXA2XX_RX_RQ_MMCI),
qdev_get_gpio_in(s->dma, PXA2XX_TX_RQ_MMCI)); qdev_get_gpio_in(s->dma, PXA2XX_TX_RQ_MMCI));
dinfo = drive_get(IF_SD, 0, 0);
if (dinfo) {
DeviceState *carddev;
/* Create and plug in the sd card */
carddev = qdev_new(TYPE_SD_CARD);
qdev_prop_set_drive_err(carddev, "drive",
blk_by_legacy_dinfo(dinfo), &error_fatal);
qdev_realize_and_unref(carddev, qdev_get_child_bus(DEVICE(s->mmc),
"sd-bus"),
&error_fatal);
} else if (!qtest_enabled()) {
warn_report("missing SecureDigital device");
}
for (i = 0; pxa270_serial[i].io_base; i++) { for (i = 0; pxa270_serial[i].io_base; i++) {
if (serial_hd(i)) { if (serial_hd(i)) {
@ -2260,15 +2270,24 @@ PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size)
s->gpio = pxa2xx_gpio_init(0x40e00000, s->cpu, s->pic, 85); s->gpio = pxa2xx_gpio_init(0x40e00000, s->cpu, s->pic, 85);
dinfo = drive_get(IF_SD, 0, 0);
if (!dinfo && !qtest_enabled()) {
warn_report("missing SecureDigital device");
}
s->mmc = pxa2xx_mmci_init(address_space, 0x41100000, s->mmc = pxa2xx_mmci_init(address_space, 0x41100000,
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
qdev_get_gpio_in(s->pic, PXA2XX_PIC_MMC), qdev_get_gpio_in(s->pic, PXA2XX_PIC_MMC),
qdev_get_gpio_in(s->dma, PXA2XX_RX_RQ_MMCI), qdev_get_gpio_in(s->dma, PXA2XX_RX_RQ_MMCI),
qdev_get_gpio_in(s->dma, PXA2XX_TX_RQ_MMCI)); qdev_get_gpio_in(s->dma, PXA2XX_TX_RQ_MMCI));
dinfo = drive_get(IF_SD, 0, 0);
if (dinfo) {
DeviceState *carddev;
/* Create and plug in the sd card */
carddev = qdev_new(TYPE_SD_CARD);
qdev_prop_set_drive_err(carddev, "drive",
blk_by_legacy_dinfo(dinfo), &error_fatal);
qdev_realize_and_unref(carddev, qdev_get_child_bus(DEVICE(s->mmc),
"sd-bus"),
&error_fatal);
} else if (!qtest_enabled()) {
warn_report("missing SecureDigital device");
}
for (i = 0; pxa255_serial[i].io_base; i++) { for (i = 0; pxa255_serial[i].io_base; i++) {
if (serial_hd(i)) { if (serial_hd(i)) {

11
hw/sd/pxa2xx_mmci.c
View File

@ -476,10 +476,9 @@ static const MemoryRegionOps pxa2xx_mmci_ops = {
PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem, PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem,
hwaddr base, hwaddr base,
BlockBackend *blk, qemu_irq irq, qemu_irq irq, qemu_irq rx_dma, qemu_irq tx_dma)
qemu_irq rx_dma, qemu_irq tx_dma)
{ {
DeviceState *dev, *carddev; DeviceState *dev;
SysBusDevice *sbd; SysBusDevice *sbd;
PXA2xxMMCIState *s; PXA2xxMMCIState *s;
@ -492,12 +491,6 @@ PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem,
qdev_connect_gpio_out_named(dev, "tx-dma", 0, tx_dma); qdev_connect_gpio_out_named(dev, "tx-dma", 0, tx_dma);
sysbus_realize_and_unref(sbd, &error_fatal); sysbus_realize_and_unref(sbd, &error_fatal);
/* Create and plug in the sd card */
carddev = qdev_new(TYPE_SD_CARD);
qdev_prop_set_drive_err(carddev, "drive", blk, &error_fatal);
qdev_realize_and_unref(carddev, qdev_get_child_bus(dev, "sd-bus"),
&error_fatal);
return s; return s;
} }

3
include/hw/arm/pxa.h
View File

@ -89,8 +89,7 @@ void pxa2xx_lcd_vsync_notifier(PXA2xxLCDState *s, qemu_irq handler);
typedef struct PXA2xxMMCIState PXA2xxMMCIState; typedef struct PXA2xxMMCIState PXA2xxMMCIState;
PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem, PXA2xxMMCIState *pxa2xx_mmci_init(MemoryRegion *sysmem,
hwaddr base, hwaddr base,
BlockBackend *blk, qemu_irq irq, qemu_irq irq, qemu_irq rx_dma, qemu_irq tx_dma);
qemu_irq rx_dma, qemu_irq tx_dma);
void pxa2xx_mmci_handlers(PXA2xxMMCIState *s, qemu_irq readonly, void pxa2xx_mmci_handlers(PXA2xxMMCIState *s, qemu_irq readonly,
qemu_irq coverswitch); qemu_irq coverswitch);