qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH v4 07/10] hw/sd/pl181: Do not create SD card within the SDHCI


From: Alistair Francis
Subject: Re: [PATCH v4 07/10] hw/sd/pl181: Do not create SD card within the SDHCI controller
Date: Mon, 6 Jul 2020 09:06:19 -0700

On Sun, Jul 5, 2020 at 1:52 PM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> SDHCI controllers provide a SD Bus to plug SD cards, but don't
> come with SD card plugged in :) Let the machine/board object
> create and plug the SD cards when required.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

> ---
>  hw/arm/integratorcp.c | 13 +++++++++++++
>  hw/arm/realview.c     | 12 ++++++++++++
>  hw/arm/versatilepb.c  | 26 ++++++++++++++++++++++++--
>  hw/arm/vexpress.c     | 11 +++++++++++
>  hw/sd/pl181.c         | 19 +------------------
>  5 files changed, 61 insertions(+), 20 deletions(-)
>
> diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
> index 2595e4d052..9bf25945d2 100644
> --- a/hw/arm/integratorcp.c
> +++ b/hw/arm/integratorcp.c
> @@ -25,6 +25,7 @@
>  #include "hw/char/pl011.h"
>  #include "hw/hw.h"
>  #include "hw/irq.h"
> +#include "hw/sd/sd.h"
>
>  #define TYPE_INTEGRATOR_CM "integrator_core"
>  #define INTEGRATOR_CM(obj) \
> @@ -595,6 +596,7 @@ static void integratorcp_init(MachineState *machine)
>      MemoryRegion *ram_alias = g_new(MemoryRegion, 1);
>      qemu_irq pic[32];
>      DeviceState *dev, *sic, *icp;
> +    DriveInfo *dinfo;
>      int i;
>
>      cpuobj = object_new(machine->cpu_type);
> @@ -649,6 +651,17 @@ static void integratorcp_init(MachineState *machine)
>                            qdev_get_gpio_in_named(icp, ICP_GPIO_MMC_WPROT, 
> 0));
>      qdev_connect_gpio_out_named(dev, "card-inserted", 0,
>                            qdev_get_gpio_in_named(icp, ICP_GPIO_MMC_CARDIN, 
> 0));
> +    dinfo = drive_get_next(IF_SD);
> +    if (dinfo) {
> +        DeviceState *card;
> +
> +        card = qdev_new(TYPE_SD_CARD);
> +        qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo),
> +                                &error_fatal);
> +        qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"),
> +                               &error_fatal);
> +    }
> +
>      sysbus_create_varargs("pl041", 0x1d000000, pic[25], NULL);
>
>      if (nd_table[0].used)
> diff --git a/hw/arm/realview.c b/hw/arm/realview.c
> index 8dc5f77139..4df8ea4fce 100644
> --- a/hw/arm/realview.c
> +++ b/hw/arm/realview.c
> @@ -27,6 +27,7 @@
>  #include "hw/intc/realview_gic.h"
>  #include "hw/irq.h"
>  #include "hw/i2c/arm_sbcon_i2c.h"
> +#include "hw/sd/sd.h"
>
>  #define SMP_BOOT_ADDR 0xe0000000
>  #define SMP_BOOTREG_ADDR 0x10000030
> @@ -69,6 +70,7 @@ static void realview_init(MachineState *machine,
>      qemu_irq mmc_irq[2];
>      PCIBus *pci_bus = NULL;
>      NICInfo *nd;
> +    DriveInfo *dinfo;
>      I2CBus *i2c;
>      int n;
>      unsigned int smp_cpus = machine->smp.cpus;
> @@ -236,6 +238,16 @@ static void realview_init(MachineState *machine,
>          qemu_irq_invert(qdev_get_gpio_in(gpio2, 0)));
>      qdev_connect_gpio_out_named(dev, "card-read-only", 0, mmc_irq[0]);
>      qdev_connect_gpio_out_named(dev, "card-inserted", 0, mmc_irq[1]);
> +    dinfo = drive_get_next(IF_SD);
> +    if (dinfo) {
> +        DeviceState *card;
> +
> +        card = qdev_new(TYPE_SD_CARD);
> +        qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo),
> +                                &error_fatal);
> +        qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"),
> +                               &error_fatal);
> +    }
>
>      sysbus_create_simple("pl031", 0x10017000, pic[10]);
>
> diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
> index 45a13ae2b9..7fb9da5a47 100644
> --- a/hw/arm/versatilepb.c
> +++ b/hw/arm/versatilepb.c
> @@ -25,6 +25,7 @@
>  #include "hw/block/flash.h"
>  #include "qemu/error-report.h"
>  #include "hw/char/pl011.h"
> +#include "hw/sd/sd.h"
>
>  #define VERSATILE_FLASH_ADDR 0x34000000
>  #define VERSATILE_FLASH_SIZE (64 * 1024 * 1024)
> @@ -309,10 +310,31 @@ static void versatile_init(MachineState *machine, int 
> board_id)
>      /* Wire up the mux control signals from the SYS_CLCD register */
>      qdev_connect_gpio_out(sysctl, 0, qdev_get_gpio_in(dev, 0));
>
> -    sysbus_create_varargs("pl181", 0x10005000, sic[22], sic[1], NULL);
> +    dev = sysbus_create_varargs("pl181", 0x10005000, sic[22], sic[1], NULL);
>      /* FIXME wire 'card is readonly' and 'card inserted' IRQs? */
> -    sysbus_create_varargs("pl181", 0x1000b000, sic[23], sic[2], NULL);
> +    dinfo = drive_get_next(IF_SD);
> +    if (dinfo) {
> +        DeviceState *card;
> +
> +        card = qdev_new(TYPE_SD_CARD);
> +        qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo),
> +                                &error_fatal);
> +        qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"),
> +                               &error_fatal);
> +    }
> +
> +    dev = sysbus_create_varargs("pl181", 0x1000b000, sic[23], sic[2], NULL);
>      /* FIXME wire 'card is readonly' and 'card inserted' IRQs? */
> +    dinfo = drive_get_next(IF_SD);
> +    if (dinfo) {
> +        DeviceState *card;
> +
> +        card = qdev_new(TYPE_SD_CARD);
> +        qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo),
> +                                &error_fatal);
> +        qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"),
> +                               &error_fatal);
> +    }
>
>      /* Add PL031 Real Time Clock. */
>      sysbus_create_simple("pl031", 0x101e8000, pic[10]);
> diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
> index 16629d6599..a2f70588bd 100644
> --- a/hw/arm/vexpress.c
> +++ b/hw/arm/vexpress.c
> @@ -43,6 +43,7 @@
>  #include "hw/cpu/a9mpcore.h"
>  #include "hw/cpu/a15mpcore.h"
>  #include "hw/i2c/arm_sbcon_i2c.h"
> +#include "hw/sd/sd.h"
>
>  #define VEXPRESS_BOARD_ID 0x8e0
>  #define VEXPRESS_FLASH_SIZE (64 * 1024 * 1024)
> @@ -628,6 +629,16 @@ static void vexpress_common_init(MachineState *machine)
>                            qdev_get_gpio_in(sysctl, 
> ARM_SYSCTL_GPIO_MMC_WPROT));
>      qdev_connect_gpio_out_named(dev, "card-inserted", 0,
>                            qdev_get_gpio_in(sysctl, 
> ARM_SYSCTL_GPIO_MMC_CARDIN));
> +    dinfo = drive_get_next(IF_SD);
> +    if (dinfo) {
> +        DeviceState *card;
> +
> +        card = qdev_new(TYPE_SD_CARD);
> +        qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo),
> +                                &error_fatal);
> +        qdev_realize_and_unref(card, qdev_get_child_bus(dev, "sd-bus"),
> +                               &error_fatal);
> +    }
>
>      sysbus_create_simple("pl050_keyboard", map[VE_KMI0], pic[12]);
>      sysbus_create_simple("pl050_mouse", map[VE_KMI1], pic[13]);
> diff --git a/hw/sd/pl181.c b/hw/sd/pl181.c
> index f6de06ece8..f69488ebac 100644
> --- a/hw/sd/pl181.c
> +++ b/hw/sd/pl181.c
> @@ -17,7 +17,6 @@
>  #include "qemu/module.h"
>  #include "qemu/error-report.h"
>  #include "qapi/error.h"
> -#include "hw/qdev-properties.h"
>
>  //#define DEBUG_PL181 1
>
> @@ -518,30 +517,14 @@ static void pl181_init(Object *obj)
>                          TYPE_PL181_BUS, dev, "sd-bus");
>  }
>
> -static void pl181_realize(DeviceState *dev, Error **errp)
> -{
> -    DeviceState *card;
> -    DriveInfo *dinfo;
> -
> -    /* FIXME use a qdev drive property instead of drive_get_next() */
> -    card = qdev_new(TYPE_SD_CARD);
> -    dinfo = drive_get_next(IF_SD);
> -    qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo),
> -                            &error_fatal);
> -    qdev_realize_and_unref(card,
> -                           qdev_get_child_bus(dev, "sd-bus"),
> -                           &error_fatal);
> -}
> -
>  static void pl181_class_init(ObjectClass *klass, void *data)
>  {
>      DeviceClass *k = DEVICE_CLASS(klass);
>
>      k->vmsd = &vmstate_pl181;
>      k->reset = pl181_reset;
> -    /* Reason: init() method uses drive_get_next() */
> +    /* Reason: output IRQs should be wired up */
>      k->user_creatable = false;
> -    k->realize = pl181_realize;
>  }
>
>  static const TypeInfo pl181_info = {
> --
> 2.21.3
>
>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]