diff mbox series

[RFC,15/15] arm: xlnx-versal: Add emmc to versal

Message ID 1613031446-22154-16-git-send-email-sai.pavan.boddu@xilinx.com (mailing list archive)
State New, archived
Headers show
Series eMMC support | expand

Commit Message

Sai Pavan Boddu Feb. 11, 2021, 8:17 a.m. UTC 
Configuring SDHCI-0 to act as eMMC controller.

Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
---
 hw/arm/xlnx-versal-virt.c | 16 +++++++++++-----
 hw/arm/xlnx-versal.c      | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 7 deletions(-)

Comments

Alistair Francis Feb. 12, 2021, 9:37 p.m. UTC | #1 
On Thu, Feb 11, 2021 at 12:36 AM Sai Pavan Boddu
<sai.pavan.boddu@xilinx.com> wrote:
>
> Configuring SDHCI-0 to act as eMMC controller.
>
> Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>

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

Alistair

> ---
>  hw/arm/xlnx-versal-virt.c | 16 +++++++++++-----
>  hw/arm/xlnx-versal.c      | 14 ++++++++++++--
>  2 files changed, 23 insertions(+), 7 deletions(-)
>
> diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
> index 8482cd6..18489e4 100644
> --- a/hw/arm/xlnx-versal-virt.c
> +++ b/hw/arm/xlnx-versal-virt.c
> @@ -333,6 +333,13 @@ static void fdt_add_sd_nodes(VersalVirt *s)
>          qemu_fdt_setprop_sized_cells(s->fdt, name, "reg",
>                                       2, addr, 2, MM_PMC_SD0_SIZE);
>          qemu_fdt_setprop(s->fdt, name, "compatible", compat, sizeof(compat));
> +        /*
> +         * eMMC specific properties
> +         */
> +        if (i == 0) {
> +            qemu_fdt_setprop(s->fdt, name, "non-removable", NULL, 0);
> +            qemu_fdt_setprop_sized_cells(s->fdt, name, "bus-width", 1, 8);
> +        }
>          g_free(name);
>      }
>  }
> @@ -512,7 +519,7 @@ static void create_virtio_regions(VersalVirt *s)
>      }
>  }
>
> -static void sd_plugin_card(SDHCIState *sd, DriveInfo *di)
> +static void sd_plugin_card(SDHCIState *sd, DriveInfo *di, bool emmc)
>  {
>      BlockBackend *blk = di ? blk_by_legacy_dinfo(di) : NULL;
>      DeviceState *card;
> @@ -520,6 +527,7 @@ static void sd_plugin_card(SDHCIState *sd, DriveInfo *di)
>      card = qdev_new(TYPE_SD_CARD);
>      object_property_add_child(OBJECT(sd), "card[*]", OBJECT(card));
>      qdev_prop_set_drive_err(card, "drive", blk, &error_fatal);
> +    object_property_set_bool(OBJECT(card), "emmc", emmc, &error_fatal);
>      qdev_realize_and_unref(card, qdev_get_child_bus(DEVICE(sd), "sd-bus"),
>                             &error_fatal);
>  }
> @@ -528,7 +536,6 @@ static void versal_virt_init(MachineState *machine)
>  {
>      VersalVirt *s = XLNX_VERSAL_VIRT_MACHINE(machine);
>      int psci_conduit = QEMU_PSCI_CONDUIT_DISABLED;
> -    int i;
>
>      /*
>       * If the user provides an Operating System to be loaded, we expect them
> @@ -581,10 +588,9 @@ static void versal_virt_init(MachineState *machine)
>      memory_region_add_subregion_overlap(get_system_memory(),
>                                          0, &s->soc.fpd.apu.mr, 0);
>
> +    sd_plugin_card(&s->soc.pmc.iou.sd[0], drive_get_next(IF_EMMC), true);
>      /* Plugin SD cards.  */
> -    for (i = 0; i < ARRAY_SIZE(s->soc.pmc.iou.sd); i++) {
> -        sd_plugin_card(&s->soc.pmc.iou.sd[i], drive_get_next(IF_SD));
> -    }
> +    sd_plugin_card(&s->soc.pmc.iou.sd[1], drive_get_next(IF_SD), false);
>
>      s->binfo.ram_size = machine->ram_size;
>      s->binfo.loader_start = 0x0;
> diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
> index b077716..3498dd9 100644
> --- a/hw/arm/xlnx-versal.c
> +++ b/hw/arm/xlnx-versal.c
> @@ -230,9 +230,14 @@ static void versal_create_admas(Versal *s, qemu_irq *pic)
>  }
>
>  #define SDHCI_CAPABILITIES  0x280737ec6481 /* Same as on ZynqMP.  */
> +#define SDHCI0_CAPS ((SDHCI_CAPABILITIES & ~(3 << 30)) | \
> +                     (1 << 30))
> +#define SDHCI1_CAPS SDHCI_CAPABILITIES
> +
>  static void versal_create_sds(Versal *s, qemu_irq *pic)
>  {
>      int i;
> +    uint64_t caps[] = {SDHCI0_CAPS, SDHCI1_CAPS};
>
>      for (i = 0; i < ARRAY_SIZE(s->pmc.iou.sd); i++) {
>          DeviceState *dev;
> @@ -244,9 +249,14 @@ static void versal_create_sds(Versal *s, qemu_irq *pic)
>
>          object_property_set_uint(OBJECT(dev), "sd-spec-version", 3,
>                                   &error_fatal);
> -        object_property_set_uint(OBJECT(dev), "capareg", SDHCI_CAPABILITIES,
> +        object_property_set_uint(OBJECT(dev), "capareg", caps[i],
>                                   &error_fatal);
> -        object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal);
> +        /*
> +         * UHS is not applicable for eMMC
> +         */
> +        if (i == 1) {
> +            object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal);
> +        }
>          sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
>
>          mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
> --
> 2.7.4
>
>
Edgar E. Iglesias Feb. 13, 2021, 7:25 a.m. UTC | #2 
On Fri, Feb 12, 2021 at 01:37:18PM -0800, Alistair Francis wrote:
> On Thu, Feb 11, 2021 at 12:36 AM Sai Pavan Boddu
> <sai.pavan.boddu@xilinx.com> wrote:
> >
> > Configuring SDHCI-0 to act as eMMC controller.
> >
> > Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
> 
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> 
> Alistair



Hi Sai,

It would be great, if EMMC somehow could be made optional.
In any case, I think this is OK!

Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>

Could you please also add an example command-line in docs/system/arm/xlnx-versal-virt.rst?

Thanks,
Edgar



> 
> > ---
> >  hw/arm/xlnx-versal-virt.c | 16 +++++++++++-----
> >  hw/arm/xlnx-versal.c      | 14 ++++++++++++--
> >  2 files changed, 23 insertions(+), 7 deletions(-)
> >
> > diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
> > index 8482cd6..18489e4 100644
> > --- a/hw/arm/xlnx-versal-virt.c
> > +++ b/hw/arm/xlnx-versal-virt.c
> > @@ -333,6 +333,13 @@ static void fdt_add_sd_nodes(VersalVirt *s)
> >          qemu_fdt_setprop_sized_cells(s->fdt, name, "reg",
> >                                       2, addr, 2, MM_PMC_SD0_SIZE);
> >          qemu_fdt_setprop(s->fdt, name, "compatible", compat, sizeof(compat));
> > +        /*
> > +         * eMMC specific properties
> > +         */
> > +        if (i == 0) {
> > +            qemu_fdt_setprop(s->fdt, name, "non-removable", NULL, 0);
> > +            qemu_fdt_setprop_sized_cells(s->fdt, name, "bus-width", 1, 8);
> > +        }
> >          g_free(name);
> >      }
> >  }
> > @@ -512,7 +519,7 @@ static void create_virtio_regions(VersalVirt *s)
> >      }
> >  }
> >
> > -static void sd_plugin_card(SDHCIState *sd, DriveInfo *di)
> > +static void sd_plugin_card(SDHCIState *sd, DriveInfo *di, bool emmc)
> >  {
> >      BlockBackend *blk = di ? blk_by_legacy_dinfo(di) : NULL;
> >      DeviceState *card;
> > @@ -520,6 +527,7 @@ static void sd_plugin_card(SDHCIState *sd, DriveInfo *di)
> >      card = qdev_new(TYPE_SD_CARD);
> >      object_property_add_child(OBJECT(sd), "card[*]", OBJECT(card));
> >      qdev_prop_set_drive_err(card, "drive", blk, &error_fatal);
> > +    object_property_set_bool(OBJECT(card), "emmc", emmc, &error_fatal);
> >      qdev_realize_and_unref(card, qdev_get_child_bus(DEVICE(sd), "sd-bus"),
> >                             &error_fatal);
> >  }
> > @@ -528,7 +536,6 @@ static void versal_virt_init(MachineState *machine)
> >  {
> >      VersalVirt *s = XLNX_VERSAL_VIRT_MACHINE(machine);
> >      int psci_conduit = QEMU_PSCI_CONDUIT_DISABLED;
> > -    int i;
> >
> >      /*
> >       * If the user provides an Operating System to be loaded, we expect them
> > @@ -581,10 +588,9 @@ static void versal_virt_init(MachineState *machine)
> >      memory_region_add_subregion_overlap(get_system_memory(),
> >                                          0, &s->soc.fpd.apu.mr, 0);
> >
> > +    sd_plugin_card(&s->soc.pmc.iou.sd[0], drive_get_next(IF_EMMC), true);
> >      /* Plugin SD cards.  */
> > -    for (i = 0; i < ARRAY_SIZE(s->soc.pmc.iou.sd); i++) {
> > -        sd_plugin_card(&s->soc.pmc.iou.sd[i], drive_get_next(IF_SD));
> > -    }
> > +    sd_plugin_card(&s->soc.pmc.iou.sd[1], drive_get_next(IF_SD), false);
> >
> >      s->binfo.ram_size = machine->ram_size;
> >      s->binfo.loader_start = 0x0;
> > diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
> > index b077716..3498dd9 100644
> > --- a/hw/arm/xlnx-versal.c
> > +++ b/hw/arm/xlnx-versal.c
> > @@ -230,9 +230,14 @@ static void versal_create_admas(Versal *s, qemu_irq *pic)
> >  }
> >
> >  #define SDHCI_CAPABILITIES  0x280737ec6481 /* Same as on ZynqMP.  */
> > +#define SDHCI0_CAPS ((SDHCI_CAPABILITIES & ~(3 << 30)) | \
> > +                     (1 << 30))
> > +#define SDHCI1_CAPS SDHCI_CAPABILITIES
> > +
> >  static void versal_create_sds(Versal *s, qemu_irq *pic)
> >  {
> >      int i;
> > +    uint64_t caps[] = {SDHCI0_CAPS, SDHCI1_CAPS};
> >
> >      for (i = 0; i < ARRAY_SIZE(s->pmc.iou.sd); i++) {
> >          DeviceState *dev;
> > @@ -244,9 +249,14 @@ static void versal_create_sds(Versal *s, qemu_irq *pic)
> >
> >          object_property_set_uint(OBJECT(dev), "sd-spec-version", 3,
> >                                   &error_fatal);
> > -        object_property_set_uint(OBJECT(dev), "capareg", SDHCI_CAPABILITIES,
> > +        object_property_set_uint(OBJECT(dev), "capareg", caps[i],
> >                                   &error_fatal);
> > -        object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal);
> > +        /*
> > +         * UHS is not applicable for eMMC
> > +         */
> > +        if (i == 1) {
> > +            object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal);
> > +        }
> >          sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
> >
> >          mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
> > --
> > 2.7.4
> >
> >
diff mbox series

Patch

diff --git a/hw/arm/xlnx-versal-virt.c b/hw/arm/xlnx-versal-virt.c
index 8482cd6..18489e4 100644
--- a/hw/arm/xlnx-versal-virt.c
+++ b/hw/arm/xlnx-versal-virt.c
@@ -333,6 +333,13 @@  static void fdt_add_sd_nodes(VersalVirt *s)
         qemu_fdt_setprop_sized_cells(s->fdt, name, "reg",
                                      2, addr, 2, MM_PMC_SD0_SIZE);
         qemu_fdt_setprop(s->fdt, name, "compatible", compat, sizeof(compat));
+        /*
+         * eMMC specific properties
+         */
+        if (i == 0) {
+            qemu_fdt_setprop(s->fdt, name, "non-removable", NULL, 0);
+            qemu_fdt_setprop_sized_cells(s->fdt, name, "bus-width", 1, 8);
+        }
         g_free(name);
     }
 }
@@ -512,7 +519,7 @@  static void create_virtio_regions(VersalVirt *s)
     }
 }
 
-static void sd_plugin_card(SDHCIState *sd, DriveInfo *di)
+static void sd_plugin_card(SDHCIState *sd, DriveInfo *di, bool emmc)
 {
     BlockBackend *blk = di ? blk_by_legacy_dinfo(di) : NULL;
     DeviceState *card;
@@ -520,6 +527,7 @@  static void sd_plugin_card(SDHCIState *sd, DriveInfo *di)
     card = qdev_new(TYPE_SD_CARD);
     object_property_add_child(OBJECT(sd), "card[*]", OBJECT(card));
     qdev_prop_set_drive_err(card, "drive", blk, &error_fatal);
+    object_property_set_bool(OBJECT(card), "emmc", emmc, &error_fatal);
     qdev_realize_and_unref(card, qdev_get_child_bus(DEVICE(sd), "sd-bus"),
                            &error_fatal);
 }
@@ -528,7 +536,6 @@  static void versal_virt_init(MachineState *machine)
 {
     VersalVirt *s = XLNX_VERSAL_VIRT_MACHINE(machine);
     int psci_conduit = QEMU_PSCI_CONDUIT_DISABLED;
-    int i;
 
     /*
      * If the user provides an Operating System to be loaded, we expect them
@@ -581,10 +588,9 @@  static void versal_virt_init(MachineState *machine)
     memory_region_add_subregion_overlap(get_system_memory(),
                                         0, &s->soc.fpd.apu.mr, 0);
 
+    sd_plugin_card(&s->soc.pmc.iou.sd[0], drive_get_next(IF_EMMC), true);
     /* Plugin SD cards.  */
-    for (i = 0; i < ARRAY_SIZE(s->soc.pmc.iou.sd); i++) {
-        sd_plugin_card(&s->soc.pmc.iou.sd[i], drive_get_next(IF_SD));
-    }
+    sd_plugin_card(&s->soc.pmc.iou.sd[1], drive_get_next(IF_SD), false);
 
     s->binfo.ram_size = machine->ram_size;
     s->binfo.loader_start = 0x0;
diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c
index b077716..3498dd9 100644
--- a/hw/arm/xlnx-versal.c
+++ b/hw/arm/xlnx-versal.c
@@ -230,9 +230,14 @@  static void versal_create_admas(Versal *s, qemu_irq *pic)
 }
 
 #define SDHCI_CAPABILITIES  0x280737ec6481 /* Same as on ZynqMP.  */
+#define SDHCI0_CAPS ((SDHCI_CAPABILITIES & ~(3 << 30)) | \
+                     (1 << 30))
+#define SDHCI1_CAPS SDHCI_CAPABILITIES
+
 static void versal_create_sds(Versal *s, qemu_irq *pic)
 {
     int i;
+    uint64_t caps[] = {SDHCI0_CAPS, SDHCI1_CAPS};
 
     for (i = 0; i < ARRAY_SIZE(s->pmc.iou.sd); i++) {
         DeviceState *dev;
@@ -244,9 +249,14 @@  static void versal_create_sds(Versal *s, qemu_irq *pic)
 
         object_property_set_uint(OBJECT(dev), "sd-spec-version", 3,
                                  &error_fatal);
-        object_property_set_uint(OBJECT(dev), "capareg", SDHCI_CAPABILITIES,
+        object_property_set_uint(OBJECT(dev), "capareg", caps[i],
                                  &error_fatal);
-        object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal);
+        /*
+         * UHS is not applicable for eMMC
+         */
+        if (i == 1) {
+            object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal);
+        }
         sysbus_realize(SYS_BUS_DEVICE(dev), &error_fatal);
 
         mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);