Re: [PATCH v2 2/2] hw/arm: ast2600: Wire up the eMMC controller
On 13/12/2019 05:28, Andrew Jeffery wrote:
> Initialise another SDHCI model instance for the AST2600's eMMC
> controller and use the SDHCI's num_slots value introduced previously to
> determine whether we should create an SD card instance for the new slot.
>
> Signed-off-by: Andrew Jeffery
Reviewed-by: Cédric Le Goater
> ---
>
> v2:
> * Extract instantiation of SD cards to helper function
>
> hw/arm/aspeed.c | 25 -
> hw/arm/aspeed_ast2600.c | 21 +
> include/hw/arm/aspeed_soc.h | 2 ++
> 3 files changed, 39 insertions(+), 9 deletions(-)
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index 862549b1f3a9..87baac0ea46c 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -167,6 +167,18 @@ static void aspeed_board_init_flashes(AspeedSMCState *s,
> const char *flashtype,
> }
> }
>
> +static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo)
> +{
> +BlockBackend *blk;
> +DeviceState *card;
> +
> +blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL;
> +card = qdev_create(qdev_get_child_bus(DEVICE(sdhci), "sd-bus"),
> + TYPE_SD_CARD);
> +qdev_prop_set_drive(card, "drive", blk, &error_fatal);
> +object_property_set_bool(OBJECT(card), true, "realized",
> &error_fatal);
> +}
> +
> static void aspeed_board_init(MachineState *machine,
>const AspeedBoardConfig *cfg)
> {
> @@ -260,16 +272,11 @@ static void aspeed_board_init(MachineState *machine,
> }
>
> for (i = 0; i < bmc->soc.sdhci.num_slots; i++) {
> -SDHCIState *sdhci = &bmc->soc.sdhci.slots[i];
> -DriveInfo *dinfo = drive_get_next(IF_SD);
> -BlockBackend *blk;
> -DeviceState *card;
> +sdhci_attach_drive(&bmc->soc.sdhci.slots[i], drive_get_next(IF_SD));
> +}
>
> -blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL;
> -card = qdev_create(qdev_get_child_bus(DEVICE(sdhci), "sd-bus"),
> - TYPE_SD_CARD);
> -qdev_prop_set_drive(card, "drive", blk, &error_fatal);
> -object_property_set_bool(OBJECT(card), true, "realized",
> &error_fatal);
> +if (bmc->soc.emmc.num_slots) {
> +sdhci_attach_drive(&bmc->soc.emmc.slots[0], drive_get_next(IF_SD));
> }
>
> arm_load_kernel(ARM_CPU(first_cpu), machine, &aspeed_board_binfo);
> diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
> index 931ee5aae183..723c8196c8a5 100644
> --- a/hw/arm/aspeed_ast2600.c
> +++ b/hw/arm/aspeed_ast2600.c
> @@ -46,6 +46,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = {
> [ASPEED_ADC] = 0x1E6E9000,
> [ASPEED_VIDEO] = 0x1E70,
> [ASPEED_SDHCI] = 0x1E74,
> +[ASPEED_EMMC] = 0x1E75,
> [ASPEED_GPIO] = 0x1E78,
> [ASPEED_GPIO_1_8V] = 0x1E780800,
> [ASPEED_RTC] = 0x1E781000,
> @@ -64,6 +65,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = {
>
> #define ASPEED_SOC_AST2600_MAX_IRQ 128
>
> +/* Shared Peripheral Interrupt values below are offset by -32 from datasheet
> */
> static const int aspeed_soc_ast2600_irqmap[] = {
> [ASPEED_UART1] = 47,
> [ASPEED_UART2] = 48,
> @@ -77,6 +79,7 @@ static const int aspeed_soc_ast2600_irqmap[] = {
> [ASPEED_ADC] = 78,
> [ASPEED_XDMA] = 6,
> [ASPEED_SDHCI] = 43,
> +[ASPEED_EMMC] = 15,
> [ASPEED_GPIO] = 40,
> [ASPEED_GPIO_1_8V] = 11,
> [ASPEED_RTC] = 13,
> @@ -215,6 +218,14 @@ static void aspeed_soc_ast2600_init(Object *obj)
> sysbus_init_child_obj(obj, "sdhci[*]", OBJECT(&s->sdhci.slots[i]),
>sizeof(s->sdhci.slots[i]), TYPE_SYSBUS_SDHCI);
> }
> +
> +sysbus_init_child_obj(obj, "emmc", OBJECT(&s->emmc), sizeof(s->emmc),
> + TYPE_ASPEED_SDHCI);
> +
> +object_property_set_int(OBJECT(&s->emmc), 1, "num-slots", &error_abort);
> +
> +sysbus_init_child_obj(obj, "emmc[*]", OBJECT(&s->emmc.slots[0]),
> +sizeof(s->emmc.slots[0]), TYPE_SYSBUS_SDHCI);
> }
>
> /*
> @@ -487,6 +498,16 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev,
> Error **errp)
> sc->memmap[ASPEED_SDHCI]);
> sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci), 0,
> aspeed_soc_get_irq(s, ASPEED_SDHCI));
> +
> +/* eMMC */
> +object_property_set_bool(OBJECT(&s->emmc), true, "realized", &err);
> +if (err) {
> +error_propagate(errp, err);
> +return;
> +}
> +sysbus_mmio_map(SYS_BUS_DEVICE(&s->emmc), 0, sc->memmap[ASPEED_EMMC]);
> +sysbus_connect_irq(SYS_BUS_DEVICE(&s->emmc), 0,
> + aspeed_soc_get_irq(s, ASPEED_EMMC));
> }
>
> static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data)
> diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
> index 495c08be1b84..911
[PATCH v2 2/2] hw/arm: ast2600: Wire up the eMMC controller
Initialise another SDHCI model instance for the AST2600's eMMC
controller and use the SDHCI's num_slots value introduced previously to
determine whether we should create an SD card instance for the new slot.
Signed-off-by: Andrew Jeffery
---
v2:
* Extract instantiation of SD cards to helper function
hw/arm/aspeed.c | 25 -
hw/arm/aspeed_ast2600.c | 21 +
include/hw/arm/aspeed_soc.h | 2 ++
3 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 862549b1f3a9..87baac0ea46c 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -167,6 +167,18 @@ static void aspeed_board_init_flashes(AspeedSMCState *s,
const char *flashtype,
}
}
+static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo)
+{
+BlockBackend *blk;
+DeviceState *card;
+
+blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL;
+card = qdev_create(qdev_get_child_bus(DEVICE(sdhci), "sd-bus"),
+ TYPE_SD_CARD);
+qdev_prop_set_drive(card, "drive", blk, &error_fatal);
+object_property_set_bool(OBJECT(card), true, "realized", &error_fatal);
+}
+
static void aspeed_board_init(MachineState *machine,
const AspeedBoardConfig *cfg)
{
@@ -260,16 +272,11 @@ static void aspeed_board_init(MachineState *machine,
}
for (i = 0; i < bmc->soc.sdhci.num_slots; i++) {
-SDHCIState *sdhci = &bmc->soc.sdhci.slots[i];
-DriveInfo *dinfo = drive_get_next(IF_SD);
-BlockBackend *blk;
-DeviceState *card;
+sdhci_attach_drive(&bmc->soc.sdhci.slots[i], drive_get_next(IF_SD));
+}
-blk = dinfo ? blk_by_legacy_dinfo(dinfo) : NULL;
-card = qdev_create(qdev_get_child_bus(DEVICE(sdhci), "sd-bus"),
- TYPE_SD_CARD);
-qdev_prop_set_drive(card, "drive", blk, &error_fatal);
-object_property_set_bool(OBJECT(card), true, "realized", &error_fatal);
+if (bmc->soc.emmc.num_slots) {
+sdhci_attach_drive(&bmc->soc.emmc.slots[0], drive_get_next(IF_SD));
}
arm_load_kernel(ARM_CPU(first_cpu), machine, &aspeed_board_binfo);
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
index 931ee5aae183..723c8196c8a5 100644
--- a/hw/arm/aspeed_ast2600.c
+++ b/hw/arm/aspeed_ast2600.c
@@ -46,6 +46,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = {
[ASPEED_ADC] = 0x1E6E9000,
[ASPEED_VIDEO] = 0x1E70,
[ASPEED_SDHCI] = 0x1E74,
+[ASPEED_EMMC] = 0x1E75,
[ASPEED_GPIO] = 0x1E78,
[ASPEED_GPIO_1_8V] = 0x1E780800,
[ASPEED_RTC] = 0x1E781000,
@@ -64,6 +65,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = {
#define ASPEED_SOC_AST2600_MAX_IRQ 128
+/* Shared Peripheral Interrupt values below are offset by -32 from datasheet */
static const int aspeed_soc_ast2600_irqmap[] = {
[ASPEED_UART1] = 47,
[ASPEED_UART2] = 48,
@@ -77,6 +79,7 @@ static const int aspeed_soc_ast2600_irqmap[] = {
[ASPEED_ADC] = 78,
[ASPEED_XDMA] = 6,
[ASPEED_SDHCI] = 43,
+[ASPEED_EMMC] = 15,
[ASPEED_GPIO] = 40,
[ASPEED_GPIO_1_8V] = 11,
[ASPEED_RTC] = 13,
@@ -215,6 +218,14 @@ static void aspeed_soc_ast2600_init(Object *obj)
sysbus_init_child_obj(obj, "sdhci[*]", OBJECT(&s->sdhci.slots[i]),
sizeof(s->sdhci.slots[i]), TYPE_SYSBUS_SDHCI);
}
+
+sysbus_init_child_obj(obj, "emmc", OBJECT(&s->emmc), sizeof(s->emmc),
+ TYPE_ASPEED_SDHCI);
+
+object_property_set_int(OBJECT(&s->emmc), 1, "num-slots", &error_abort);
+
+sysbus_init_child_obj(obj, "emmc[*]", OBJECT(&s->emmc.slots[0]),
+sizeof(s->emmc.slots[0]), TYPE_SYSBUS_SDHCI);
}
/*
@@ -487,6 +498,16 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev,
Error **errp)
sc->memmap[ASPEED_SDHCI]);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci), 0,
aspeed_soc_get_irq(s, ASPEED_SDHCI));
+
+/* eMMC */
+object_property_set_bool(OBJECT(&s->emmc), true, "realized", &err);
+if (err) {
+error_propagate(errp, err);
+return;
+}
+sysbus_mmio_map(SYS_BUS_DEVICE(&s->emmc), 0, sc->memmap[ASPEED_EMMC]);
+sysbus_connect_irq(SYS_BUS_DEVICE(&s->emmc), 0,
+ aspeed_soc_get_irq(s, ASPEED_EMMC));
}
static void aspeed_soc_ast2600_class_init(ObjectClass *oc, void *data)
diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
index 495c08be1b84..911443f4c071 100644
--- a/include/hw/arm/aspeed_soc.h
+++ b/include/hw/arm/aspeed_soc.h
@@ -56,6 +56,7 @@ typedef struct AspeedSoCState {
AspeedGPIOState gpio;
AspeedGPIOState gpio_1_8v;
AspeedSDHCIState sdhci;
+AspeedSDHCIState emmc;
} AspeedSoCState;
#define TYPE_ASPEED_SOC "aspeed-soc"
@@ -125,6 +126,7 @@ e
