Skip to content

Commit 7faf9d2

Browse files
stefanhaRHstefanhaRH
committed
Merge tag 'pull-aspeed-20250127' of https://github.com/legoater/qemu into staging
aspeed queue: * Fixed serial definitions on the command line * Fixed sdhci write protected pin on AST2600 EVB machine * Added timer support on AST2700 SoC * Updated buildroot and SDK images of functional tests * Removed sd devices creation when -nodefaults is used * Added software reset mode support on AST2600 SoC # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmeXSIwACgkQUaNDx8/7 # 7KH5Ew/+Ne9Z0lksOEUw5BJ6Qm3U2oLS90hcjo3MBHpmMHX0MXY2qYOKV2aS7spO # kvWpTUiPaT682X4IrBuxdCdi2F80dhJSmky81vMn7a3+DZgSsUoPEgw2Ophm5Q37 # 788qVEKk55F8m4r4ZCpAd3+Mc+3rVw6YQW/Rvu2+fVbfaLu6dE4fnQdXmDYc2EzF # pCYAcYlRp19dP0YnBJnv4/JK6Eybced1VG1cKGNy8VSyMY3vWM7ZOdP4Ybz+d88R # 0DNEIGRQJQZZFNxvkEJX/tPsK+m2M9G/t5YOuJP22EoF3L8v+rnt7yg+NWE4pbtI # dqzg8ikICidcP6NMYjTe6C2m9PBcKBhbPumRZOW1lWRoZOShy6cHO7KajJZ3oj8K # GUOEEh7i5tKbPGdg46ifc0waGMKh97S3dy/8V/N2XqPfL99TXfRAyiq0sG0mS1je # xGV9vN7LPJ9OYMri6U5SLewrWO93q7Vv4SBv7iDVupZ8Ww6wcJaCWgvUWjxbK7SH # qE003RvQYmK6gkCH4cYnI2LZBlJyp7wKdO7nG4K2vI+05GVpALTkZPcCQ84WhF5L # 8wO5wrQPalQrOwkvankqgEJOifWmBAi3Gs/3y/tRg+u4VHoPKcaXLujBqq8pZl6F # meYAzqqksFj8PJwiCVJVNcHpqvhmyBzvvPAf6NEgbRsDyUiFZAo= # =gOq1 # -----END PGP SIGNATURE----- # gpg: Signature made Mon 27 Jan 2025 03:49:16 EST # gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1 # gpg: Good signature from "Cédric Le Goater <clg@redhat.com>" [full] # gpg: aka "Cédric Le Goater <clg@kaod.org>" [full] # Primary key fingerprint: A0F6 6548 F048 95EB FE6B 0B60 51A3 43C7 CFFB ECA1 * tag 'pull-aspeed-20250127' of https://github.com/legoater/qemu: docs/system/arm/aspeed: Remove tacoma-bmc from the documentation aspeed/wdt: Support software reset mode for AST2600 aspeed/wdt: Fix coding style aspeed: Create sd devices only when defaults are enabled test/functional: Update buildroot images to 2024.11 test/functional: Update the Aspeed aarch64 test aspeed/soc: Support Timer for AST2700 hw/timer/aspeed: Add AST2700 Support hw/timer/aspeed: Refactor Timer Callbacks for SoC-Specific Implementations hw/arm/aspeed: Invert sdhci write protected pin for AST2600 EVB hw/sd/sdhci: Introduce a new Write Protected pin inverted property hw/arm/aspeed: fix connect_serial_hds_to_uarts Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2 parents b5afd8c + 8b7ccc6 commit 7faf9d2

File tree

14 files changed

+323
-38
lines changed

14 files changed

+323
-38
lines changed

‎docs/system/arm/aspeed.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
Aspeed family boards (``ast2500-evb``, ``ast2600-evb``, ``ast2700-evb``, ``bletchley-bmc``, ``fuji-bmc``, ``fby35-bmc``, ``fp5280g2-bmc``, ``g220a-bmc``, ``palmetto-bmc``, ``qcom-dc-scm-v1-bmc``, ``qcom-firework-bmc``, ``quanta-q71l-bmc``, ``rainier-bmc``, ``romulus-bmc``, ``sonorapass-bmc``, ``supermicrox11-bmc``, ``supermicrox11spi-bmc``, ``tiogapass-bmc``, ``tacoma-bmc``, ``witherspoon-bmc``, ``yosemitev2-bmc``)
2-
==================================================================================================================================================================================================================================================================================================================================================================================================================================
1+
Aspeed family boards (``ast2500-evb``, ``ast2600-evb``, ``ast2700-evb``, ``bletchley-bmc``, ``fuji-bmc``, ``fby35-bmc``, ``fp5280g2-bmc``, ``g220a-bmc``, ``palmetto-bmc``, ``qcom-dc-scm-v1-bmc``, ``qcom-firework-bmc``, ``quanta-q71l-bmc``, ``rainier-bmc``, ``romulus-bmc``, ``sonorapass-bmc``, ``supermicrox11-bmc``, ``supermicrox11spi-bmc``, ``tiogapass-bmc``, ``witherspoon-bmc``, ``yosemitev2-bmc``)
2+
==================================================================================================================================================================================================================================================================================================================================================================================================================
33

44
The QEMU Aspeed machines model BMCs of various OpenPOWER systems and
55
Aspeed evaluation boards. They are based on different releases of the

‎hw/arm/aspeed.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,11 +364,11 @@ static void connect_serial_hds_to_uarts(AspeedMachineState *bmc)
364364
int uart_chosen = bmc->uart_chosen ? bmc->uart_chosen : amc->uart_default;
365365

366366
aspeed_soc_uart_set_chr(s, uart_chosen, serial_hd(0));
367-
for (int i = 1, uart = sc->uarts_base; i < sc->uarts_num; i++, uart++) {
367+
for (int i = 1, uart = sc->uarts_base; i < sc->uarts_num; uart++) {
368368
if (uart == uart_chosen) {
369369
continue;
370370
}
371-
aspeed_soc_uart_set_chr(s, uart, serial_hd(i));
371+
aspeed_soc_uart_set_chr(s, uart, serial_hd(i++));
372372
}
373373
}
374374

@@ -409,6 +409,12 @@ static void aspeed_machine_init(MachineState *machine)
409409
OBJECT(get_system_memory()), &error_abort);
410410
object_property_set_link(OBJECT(bmc->soc), "dram",
411411
OBJECT(machine->ram), &error_abort);
412+
if (amc->sdhci_wp_inverted) {
413+
for (i = 0; i < bmc->soc->sdhci.num_slots; i++) {
414+
object_property_set_bool(OBJECT(&bmc->soc->sdhci.slots[i]),
415+
"wp-inverted", true, &error_abort);
416+
}
417+
}
412418
if (machine->kernel_filename) {
413419
/*
414420
* When booting with a -kernel command line there is no u-boot
@@ -450,14 +456,14 @@ static void aspeed_machine_init(MachineState *machine)
450456
amc->i2c_init(bmc);
451457
}
452458

453-
for (i = 0; i < bmc->soc->sdhci.num_slots; i++) {
459+
for (i = 0; i < bmc->soc->sdhci.num_slots && defaults_enabled(); i++) {
454460
sdhci_attach_drive(&bmc->soc->sdhci.slots[i],
455461
drive_get(IF_SD, 0, i), false, false);
456462
}
457463

458464
boot_emmc = sc->boot_from_emmc(bmc->soc);
459465

460-
if (bmc->soc->emmc.num_slots) {
466+
if (bmc->soc->emmc.num_slots && defaults_enabled()) {
461467
emmc0 = drive_get(IF_SD, 0, bmc->soc->sdhci.num_slots);
462468
sdhci_attach_drive(&bmc->soc->emmc.slots[0], emmc0, true, boot_emmc);
463469
}
@@ -1415,6 +1421,7 @@ static void aspeed_machine_ast2600_evb_class_init(ObjectClass *oc, void *data)
14151421
amc->num_cs = 1;
14161422
amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON | ASPEED_MAC2_ON |
14171423
ASPEED_MAC3_ON;
1424+
amc->sdhci_wp_inverted = true;
14181425
amc->i2c_init = ast2600_evb_i2c_init;
14191426
mc->default_ram_size = 1 * GiB;
14201427
aspeed_machine_class_init_cpus_defaults(mc);

‎hw/arm/aspeed_ast27x0.c

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = {
6666
[ASPEED_DEV_GPIO] = 0x14C0B000,
6767
[ASPEED_DEV_RTC] = 0x12C0F000,
6868
[ASPEED_DEV_SDHCI] = 0x14080000,
69+
[ASPEED_DEV_TIMER1] = 0x12C10000,
6970
};
7071

7172
#define AST2700_MAX_IRQ 256
@@ -397,6 +398,9 @@ static void aspeed_soc_ast2700_init(Object *obj)
397398

398399
object_initialize_child(obj, "emmc-controller.sdhci", &s->emmc.slots[0],
399400
TYPE_SYSBUS_SDHCI);
401+
402+
snprintf(typename, sizeof(typename), "aspeed.timer-%s", socname);
403+
object_initialize_child(obj, "timerctrl", &s->timerctrl, typename);
400404
}
401405

402406
/*
@@ -716,6 +720,19 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
716720
sysbus_connect_irq(SYS_BUS_DEVICE(&s->emmc), 0,
717721
aspeed_soc_get_irq(s, ASPEED_DEV_EMMC));
718722

723+
/* Timer */
724+
object_property_set_link(OBJECT(&s->timerctrl), "scu", OBJECT(&s->scu),
725+
&error_abort);
726+
if (!sysbus_realize(SYS_BUS_DEVICE(&s->timerctrl), errp)) {
727+
return;
728+
}
729+
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->timerctrl), 0,
730+
sc->memmap[ASPEED_DEV_TIMER1]);
731+
for (i = 0; i < ASPEED_TIMER_NR_TIMERS; i++) {
732+
irq = aspeed_soc_get_irq(s, ASPEED_DEV_TIMER1 + i);
733+
sysbus_connect_irq(SYS_BUS_DEVICE(&s->timerctrl), i, irq);
734+
}
735+
719736
create_unimplemented_device("ast2700.dpmcu", 0x11000000, 0x40000);
720737
create_unimplemented_device("ast2700.iomem0", 0x12000000, 0x01000000);
721738
create_unimplemented_device("ast2700.iomem1", 0x14000000, 0x01000000);

‎hw/sd/sdhci.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,10 @@ static void sdhci_set_readonly(DeviceState *dev, bool level)
274274
{
275275
SDHCIState *s = (SDHCIState *)dev;
276276

277+
if (s->wp_inverted) {
278+
level = !level;
279+
}
280+
277281
if (level) {
278282
s->prnsts &= ~SDHC_WRITE_PROTECT;
279283
} else {
@@ -1555,6 +1559,8 @@ static const Property sdhci_sysbus_properties[] = {
15551559
false),
15561560
DEFINE_PROP_LINK("dma", SDHCIState,
15571561
dma_mr, TYPE_MEMORY_REGION, MemoryRegion *),
1562+
DEFINE_PROP_BOOL("wp-inverted", SDHCIState,
1563+
wp_inverted, false),
15581564
};
15591565

15601566
static void sdhci_sysbus_init(Object *obj)

0 commit comments

Comments
 (0)