| Message ID | 20180123030630.26613-11-f4bug@amsat.org |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | SDHCI: add tuning sequence for UHS-I cards (part 3) | expand |
On Mon, Jan 22, 2018 at 7:06 PM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > checking Xilinx datasheet "UG1085" (v1.7) > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Alistair > --- > hw/arm/xlnx-zynqmp.c | 29 ++++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) > > diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c > index 325642058b..33d5fe53d8 100644 > --- a/hw/arm/xlnx-zynqmp.c > +++ b/hw/arm/xlnx-zynqmp.c > @@ -50,6 +50,8 @@ > #define DPDMA_ADDR 0xfd4c0000 > #define DPDMA_IRQ 116 > > +#define SDHCI_CAPABILITIES 0x280737ec6481 /* Datasheet: UG1085 (v1.7) */ > + > static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = { > 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, > }; > @@ -381,22 +383,27 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) > sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]); > > for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) { > - char *bus_name; > - > - object_property_set_bool(OBJECT(&s->sdhci[i]), true, > - "realized", &err); > + char *bus_name = g_strdup_printf("sd-bus%d", i); > + SysBusDevice *sbd = SYS_BUS_DEVICE(&s->sdhci[i]); > + Object *sdhci = OBJECT(&s->sdhci[i]); > + > + /* Compatible with: > + * - SD Host Controller Specification Version 3.00 > + * - SDIO Specification Version 3.0 > + * - eMMC Specification Version 4.51 > + */ > + object_property_set_uint(sdhci, 3, "sd-spec-version", &err); > + object_property_set_uint(sdhci, SDHCI_CAPABILITIES, "capareg", &err); > + object_property_set_bool(sdhci, true, "realized", &err); > if (err) { > error_propagate(errp, err); > return; > } > - sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci[i]), 0, > - sdhci_addr[i]); > - sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci[i]), 0, > - gic_spi[sdhci_intr[i]]); > + sysbus_mmio_map(sbd, 0, sdhci_addr[i]); > + sysbus_connect_irq(sbd, 0, gic_spi[sdhci_intr[i]]); > + > /* Alias controller SD bus to the SoC itself */ > - bus_name = g_strdup_printf("sd-bus%d", i); > - object_property_add_alias(OBJECT(s), bus_name, > - OBJECT(&s->sdhci[i]), "sd-bus", > + object_property_add_alias(OBJECT(s), bus_name, sdhci, "sd-bus", > &error_abort); > g_free(bus_name); > } > -- > 2.15.1 > >
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 325642058b..33d5fe53d8 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -50,6 +50,8 @@ #define DPDMA_ADDR 0xfd4c0000 #define DPDMA_IRQ 116 +#define SDHCI_CAPABILITIES 0x280737ec6481 /* Datasheet: UG1085 (v1.7) */ + static const uint64_t gem_addr[XLNX_ZYNQMP_NUM_GEMS] = { 0xFF0B0000, 0xFF0C0000, 0xFF0D0000, 0xFF0E0000, }; @@ -381,22 +383,27 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->sata), 0, gic_spi[SATA_INTR]); for (i = 0; i < XLNX_ZYNQMP_NUM_SDHCI; i++) { - char *bus_name; - - object_property_set_bool(OBJECT(&s->sdhci[i]), true, - "realized", &err); + char *bus_name = g_strdup_printf("sd-bus%d", i); + SysBusDevice *sbd = SYS_BUS_DEVICE(&s->sdhci[i]); + Object *sdhci = OBJECT(&s->sdhci[i]); + + /* Compatible with: + * - SD Host Controller Specification Version 3.00 + * - SDIO Specification Version 3.0 + * - eMMC Specification Version 4.51 + */ + object_property_set_uint(sdhci, 3, "sd-spec-version", &err); + object_property_set_uint(sdhci, SDHCI_CAPABILITIES, "capareg", &err); + object_property_set_bool(sdhci, true, "realized", &err); if (err) { error_propagate(errp, err); return; } - sysbus_mmio_map(SYS_BUS_DEVICE(&s->sdhci[i]), 0, - sdhci_addr[i]); - sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci[i]), 0, - gic_spi[sdhci_intr[i]]); + sysbus_mmio_map(sbd, 0, sdhci_addr[i]); + sysbus_connect_irq(sbd, 0, gic_spi[sdhci_intr[i]]); + /* Alias controller SD bus to the SoC itself */ - bus_name = g_strdup_printf("sd-bus%d", i); - object_property_add_alias(OBJECT(s), bus_name, - OBJECT(&s->sdhci[i]), "sd-bus", + object_property_add_alias(OBJECT(s), bus_name, sdhci, "sd-bus", &error_abort); g_free(bus_name); }
checking Xilinx datasheet "UG1085" (v1.7) Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/arm/xlnx-zynqmp.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)