fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hw/arm/xlnx-versal: sdhci: refactor creation

Browse source 
Refactor the SDHCI controllers creation using the VersalMap structure.

Signed-off-by: Luc Michel <luc.michel@amd.com>
Reviewed-by: Francisco Iglesias <francisco.iglesias@amd.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@amd.com>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-id: 20250926070806.292065-6-luc.michel@amd.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Luc Michel 2025-09-26 09:07:23 +02:00 • committed by Peter Maydell
parent d70df574d6
commit b392177e42
3 changed files with 83 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

43
hw/arm/xlnx-versal-virt.c
View file

@ -284,32 +284,6 @@ static void fdt_add_zdma_nodes(VersalVirt *s)
}
}
static void fdt_add_sd_nodes(VersalVirt *s)
{
const char clocknames[] = "clk_xin\0clk_ahb";
const char compat[] = "arasan,sdhci-8.9a";
int i;
for (i = ARRAY_SIZE(s->soc.pmc.iou.sd) - 1; i >= 0; i--) {
uint64_t addr = MM_PMC_SD0 + MM_PMC_SD0_SIZE * i;
char *name = g_strdup_printf("/sdhci@%" PRIx64, addr);
qemu_fdt_add_subnode(s->fdt, name);
qemu_fdt_setprop_cells(s->fdt, name, "clocks",
s->phandle.clk_25Mhz, s->phandle.clk_25Mhz);
qemu_fdt_setprop(s->fdt, name, "clock-names",
clocknames, sizeof(clocknames));
qemu_fdt_setprop_cells(s->fdt, name, "interrupts",
GIC_FDT_IRQ_TYPE_SPI, VERSAL_SD0_IRQ_0 + i * 2,
GIC_FDT_IRQ_FLAGS_LEVEL_HI);
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));
g_free(name);
}
}
static void fdt_add_rtc_node(VersalVirt *s)
{
const char compat[] = "xlnx,zynqmp-rtc";
@ -564,16 +538,11 @@ static void efuse_attach_drive(XlnxEFuse *dev)
}
}
static void sd_plugin_card(SDHCIState *sd, DriveInfo *di)
static void sd_plug_card(VersalVirt *s, int idx, DriveInfo *di)
{
BlockBackend *blk = di ? blk_by_legacy_dinfo(di) : NULL;
DeviceState *card;
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);
qdev_realize_and_unref(card, qdev_get_child_bus(DEVICE(sd), "sd-bus"),
&error_fatal);
versal_sdhci_plug_card(&s->soc, idx, blk);
}
static char *versal_get_ospi_model(Object *obj, Error **errp)
@ -648,7 +617,6 @@ static void versal_virt_init(MachineState *machine)
fdt_add_timer_nodes(s);
fdt_add_zdma_nodes(s);
fdt_add_usb_xhci_nodes(s);
fdt_add_sd_nodes(s);
fdt_add_rtc_node(s);
fdt_add_bbram_node(s);
fdt_add_efuse_ctrl_node(s);
@ -668,10 +636,9 @@ static void versal_virt_init(MachineState *machine)
/* Attach efuse backend, if given */
efuse_attach_drive(&s->soc.pmc.efuse);
/* 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(IF_SD, 0, i));
/* Plug SD cards */
for (i = 0; i < versal_get_num_sdhci(VERSAL_VER_VERSAL); i++) {
sd_plug_card(s, i, drive_get(IF_SD, 0, i));
}
s->binfo.ram_size = machine->ram_size;

96
hw/arm/xlnx-versal.c
View file

@ -28,6 +28,7 @@
#include "hw/arm/fdt.h"
#include "hw/char/pl011.h"
#include "hw/net/xlnx-versal-canfd.h"
#include "hw/sd/sdhci.h"
#define XLNX_VERSAL_ACPU_TYPE ARM_CPU_TYPE_NAME("cortex-a72")
#define XLNX_VERSAL_RCPU_TYPE ARM_CPU_TYPE_NAME("cortex-r5f")
@ -47,6 +48,9 @@ typedef struct VersalMap {
VersalSimplePeriphMap canfd[4];
size_t num_canfd;
VersalSimplePeriphMap sdhci[2];
size_t num_sdhci;
} VersalMap;
static const VersalMap VERSAL_MAP = {
@ -57,6 +61,10 @@ static const VersalMap VERSAL_MAP = {
.canfd[0] = { 0xff060000, 20 },
.canfd[1] = { 0xff070000, 21 },
.num_canfd = 2,
.sdhci[0] = { 0xf1040000, 126 },
.sdhci[1] = { 0xf1050000, 128 },
.num_sdhci = 2,
};
static const VersalMap *VERSION_TO_MAP[] = {
@ -73,6 +81,18 @@ static inline const VersalMap *versal_get_map(Versal *s)
return VERSION_TO_MAP[versal_get_version(s)];
}
static inline Object *versal_get_child(Versal *s, const char *child)
{
return object_resolve_path_at(OBJECT(s), child);
}
static inline Object *versal_get_child_idx(Versal *s, const char *child,
size_t idx)
{
g_autofree char *n = g_strdup_printf("%s[%zu]", child, idx);
return versal_get_child(s, n);
}
static qemu_irq versal_get_irq(Versal *s, int irq_idx)
{
@ -424,32 +444,39 @@ static void versal_create_admas(Versal *s, qemu_irq *pic)
}
#define SDHCI_CAPABILITIES 0x280737ec6481 /* Same as on ZynqMP. */
static void versal_create_sds(Versal *s, qemu_irq *pic)
static void versal_create_sdhci(Versal *s,
const VersalSimplePeriphMap *map)
{
int i;
DeviceState *dev;
MemoryRegion *mr;
g_autofree char *node;
const char compatible[] = "arasan,sdhci-8.9a";
const char clocknames[] = "clk_xin\0clk_ahb";
for (i = 0; i < ARRAY_SIZE(s->pmc.iou.sd); i++) {
DeviceState *dev;
MemoryRegion *mr;
dev = qdev_new(TYPE_SYSBUS_SDHCI);
object_property_add_child(OBJECT(s), "sdhci[*]", OBJECT(dev));
object_initialize_child(OBJECT(s), "sd[*]", &s->pmc.iou.sd[i],
TYPE_SYSBUS_SDHCI);
dev = DEVICE(&s->pmc.iou.sd[i]);
object_property_set_uint(OBJECT(dev), "sd-spec-version", 3,
&error_fatal);
object_property_set_uint(OBJECT(dev), "capareg", SDHCI_CAPABILITIES,
&error_fatal);
object_property_set_uint(OBJECT(dev), "uhs", UHS_I, &error_fatal);
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
object_property_set_uint(OBJECT(dev), "sd-spec-version", 3,
&error_fatal);
object_property_set_uint(OBJECT(dev), "capareg", SDHCI_CAPABILITIES,
&error_fatal);
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);
memory_region_add_subregion(&s->mr_ps, map->addr, mr);
mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(dev), 0);
memory_region_add_subregion(&s->mr_ps,
MM_PMC_SD0 + i * MM_PMC_SD0_SIZE, mr);
versal_sysbus_connect_irq(s, SYS_BUS_DEVICE(dev), 0, map->irq);
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0,
pic[VERSAL_SD0_IRQ_0 + i * 2]);
}
node = versal_fdt_add_simple_subnode(s, "/sdhci", map->addr, 0x10000,
compatible, sizeof(compatible));
qemu_fdt_setprop_cells(s->cfg.fdt, node, "clocks",
s->phandle.clk_25mhz, s->phandle.clk_25mhz);
qemu_fdt_setprop(s->cfg.fdt, node, "clock-names",
clocknames, sizeof(clocknames));
qemu_fdt_setprop_cells(s->cfg.fdt, node, "interrupts",
GIC_FDT_IRQ_TYPE_SPI, map->irq,
GIC_FDT_IRQ_FLAGS_LEVEL_HI);
}
static void versal_create_pmc_apb_irq_orgate(Versal *s, qemu_irq *pic)
@ -1062,10 +1089,13 @@ static void versal_realize(DeviceState *dev, Error **errp)
versal_create_canfd(s, &map->canfd[i], s->cfg.canbus[i]);
}
for (i = 0; i < map->num_sdhci; i++) {
versal_create_sdhci(s, &map->sdhci[i]);
}
versal_create_usbs(s, pic);
versal_create_gems(s, pic);
versal_create_admas(s, pic);
versal_create_sds(s, pic);
versal_create_pmc_apb_irq_orgate(s, pic);
versal_create_rtc(s, pic);
versal_create_trng(s, pic);
@ -1089,6 +1119,23 @@ static void versal_realize(DeviceState *dev, Error **errp)
&s->lpd.rpu.mr_ps_alias, 0);
}
void versal_sdhci_plug_card(Versal *s, int sd_idx, BlockBackend *blk)
{
DeviceState *sdhci, *card;
sdhci = DEVICE(versal_get_child_idx(s, "sdhci", sd_idx));
if (sdhci == NULL) {
return;
}
card = qdev_new(TYPE_SD_CARD);
object_property_add_child(OBJECT(sdhci), "card[*]", OBJECT(card));
qdev_prop_set_drive_err(card, "drive", blk, &error_fatal);
qdev_realize_and_unref(card, qdev_get_child_bus(DEVICE(sdhci), "sd-bus"),
&error_fatal);
}
int versal_get_num_can(VersalVersion version)
{
const VersalMap *map = VERSION_TO_MAP[version];
@ -1096,6 +1143,13 @@ int versal_get_num_can(VersalVersion version)
return map->num_canfd;
}
int versal_get_num_sdhci(VersalVersion version)
{
const VersalMap *map = VERSION_TO_MAP[version];
return map->num_sdhci;
}
static void versal_base_init(Object *obj)
{
Versal *s = XLNX_VERSAL_BASE(obj);

5
include/hw/arm/xlnx-versal.h
View file

@ -16,7 +16,6 @@
#include "hw/sysbus.h"
#include "hw/cpu/cluster.h"
#include "hw/or-irq.h"
#include "hw/sd/sdhci.h"
#include "hw/intc/arm_gicv3.h"
#include "hw/dma/xlnx-zdma.h"
#include "hw/net/cadence_gem.h"
@ -105,7 +104,6 @@ struct Versal {
/* The Platform Management Controller subsystem. */
struct {
struct {
SDHCIState sd[XLNX_VERSAL_NR_SDS];
XlnxVersalPmcIouSlcr slcr;
struct {
@ -156,7 +154,10 @@ static inline void versal_set_fdt(Versal *s, void *fdt)
s->cfg.fdt = fdt;
}
void versal_sdhci_plug_card(Versal *s, int sd_idx, BlockBackend *blk);
int versal_get_num_can(VersalVersion version);
int versal_get_num_sdhci(VersalVersion version);
/* Memory-map and IRQ definitions. Copied a subset from
* auto-generated files. */