@@ -76,6 +76,7 @@ struct Versal {
struct {
MemoryRegion *mr_ddr;
uint32_t psci_conduit;
+ bool has_emmc;
} cfg;
};
@@ -46,6 +46,7 @@ struct VersalVirt {
struct {
bool secure;
+ bool has_emmc;
} cfg;
};
@@ -333,6 +334,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 (s->cfg.has_emmc && 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);
}
}
@@ -524,11 +532,17 @@ static void sd_plugin_card(SDHCIState *sd, DriveInfo *di)
&error_fatal);
}
+static void versal_virt_set_emmc(Object *obj, bool value, Error **errp)
+{
+ VersalVirt *s = XLNX_VERSAL_VIRT_MACHINE(obj);
+
+ s->cfg.has_emmc = value;
+}
+
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
@@ -560,6 +574,8 @@ static void versal_virt_init(MachineState *machine)
&error_abort);
object_property_set_int(OBJECT(&s->soc), "psci-conduit", psci_conduit,
&error_abort);
+ object_property_set_bool(OBJECT(&s->soc), "has-emmc", s->cfg.has_emmc,
+ &error_abort);
sysbus_realize(SYS_BUS_DEVICE(&s->soc), &error_fatal);
fdt_create(s);
@@ -581,10 +597,12 @@ static void versal_virt_init(MachineState *machine)
memory_region_add_subregion_overlap(get_system_memory(),
0, &s->soc.fpd.apu.mr, 0);
- /* 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));
+ if (!s->cfg.has_emmc) {
+ sd_plugin_card(&s->soc.pmc.iou.sd[0],
+ drive_get_next(IF_SD));
}
+ /* Plugin SD cards. */
+ sd_plugin_card(&s->soc.pmc.iou.sd[1], drive_get_next(IF_SD));
s->binfo.ram_size = machine->ram_size;
s->binfo.loader_start = 0x0;
@@ -621,6 +639,9 @@ static void versal_virt_machine_class_init(ObjectClass *oc, void *data)
mc->default_cpus = XLNX_VERSAL_NR_ACPUS;
mc->no_cdrom = true;
mc->default_ram_id = "ddr";
+ object_class_property_add_bool(oc, "emmc",
+ NULL, versal_virt_set_emmc);
+
}
static const TypeInfo versal_virt_machine_init_typeinfo = {
@@ -230,6 +230,9 @@ static void versal_create_admas(Versal *s, qemu_irq *pic)
}
#define SDHCI_CAPABILITIES 0x280737ec6481 /* Same as on ZynqMP. */
+#define SDHCI_EMMC_CAPS ((SDHCI_CAPABILITIES & ~(3 << 30)) | \
+ (1 << 30))
+
static void versal_create_sds(Versal *s, qemu_irq *pic)
{
int i;
@@ -242,11 +245,17 @@ static void versal_create_sds(Versal *s, qemu_irq *pic)
TYPE_SYSBUS_SDHCI);
dev = DEVICE(&s->pmc.iou.sd[i]);
+ dev->id = g_strdup_printf("sdhci%d", i);
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", SDHCI_EMMC_CAPS,
&error_fatal);
- object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal);
+ /*
+ * UHS is not applicable for eMMC
+ */
+ if (!s->cfg.has_emmc || 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);
@@ -386,6 +395,7 @@ static Property versal_properties[] = {
DEFINE_PROP_LINK("ddr", Versal, cfg.mr_ddr, TYPE_MEMORY_REGION,
MemoryRegion *),
DEFINE_PROP_UINT32("psci-conduit", Versal, cfg.psci_conduit, 0),
+ DEFINE_PROP_BOOL("has-emmc", Versal, cfg.has_emmc, false),
DEFINE_PROP_END_OF_LIST()
};
Configuring SDHCI-0 to act as eMMC controller. Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com> --- include/hw/arm/xlnx-versal.h | 1 + hw/arm/xlnx-versal-virt.c | 29 +++++++++++++++++++++++++---- hw/arm/xlnx-versal.c | 14 ++++++++++++-- 3 files changed, 38 insertions(+), 6 deletions(-)