From: Jamin Lin via <qemu-devel@nongnu.org>
To: "Cédric Le Goater" <clg@kaod.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Steven Lee" <steven_lee@aspeedtech.com>,
"Troy Lee" <leetroy@gmail.com>,
"Andrew Jeffery" <andrew@codeconstruct.com.au>,
"Joel Stanley" <joel@jms.id.au>,
"open list:ASPEED BMCs" <qemu-arm@nongnu.org>,
"open list:All patches CC here" <qemu-devel@nongnu.org>
Cc: <jamin_lin@aspeedtech.com>, <troy_lee@aspeedtech.com>,
<kane_chen@aspeedtech.com>
Subject: [PATCH v1 09/13] hw/arm/aspeed: Split Witherspoon machine into a separate source file for maintainability
Date: Thu, 23 Oct 2025 18:01:42 +0800 [thread overview]
Message-ID: <20251023100150.295370-10-jamin_lin@aspeedtech.com> (raw)
In-Reply-To: <20251023100150.295370-1-jamin_lin@aspeedtech.com>
This commit moves the Witherspoon BMC machine implementation out of
aspeed.c and into a new dedicated file aspeed_ast2500_witherspoon.c.
To support splitting Witherspoon into a dedicated source file,
a new WITHERSPOON_BMC_HW_STRAP1 macro is added as a copy of
ROMULUS_BMC_HW_STRAP1.
The change is part of a broader effort to modularize Aspeed board
definitions, allowing each machine type to be maintained and updated
independently. By isolating Witherspoon logic, the aspeed.c file
becomes cleaner and easier to manage as more platforms are added.
Key updates include:
- Moved witherspoon_bmc_i2c_init() and related LED setup code into
aspeed_ast2500_witherspoon.c.
- Added WITHERSPOON_BMC_HW_STRAP1 replacement macro for local use.
- Removed aspeed_machine_witherspoon_class_init() and type
registration from aspeed.c.
- Added the new file to meson.build for compilation.
No functional changes.
Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
hw/arm/aspeed.c | 81 --------------------
hw/arm/aspeed_ast2500_witherspoon.c | 111 ++++++++++++++++++++++++++++
hw/arm/meson.build | 1 +
3 files changed, 112 insertions(+), 81 deletions(-)
create mode 100644 hw/arm/aspeed_ast2500_witherspoon.c
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index f890d30d0e..91d59e0d2d 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -116,9 +116,6 @@ static struct arm_boot_info aspeed_board_binfo = {
SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \
SCU_AST2500_HW_STRAP_RESERVED1)
-/* Witherspoon hardware value: 0xF10AD216 (but use romulus definition) */
-#define WITHERSPOON_BMC_HW_STRAP1 ROMULUS_BMC_HW_STRAP1
-
/* Quanta-Q71l hardware value */
#define QUANTA_Q71L_BMC_HW_STRAP1 ( \
SCU_AST2400_HW_STRAP_DRAM_SIZE(DRAM_SIZE_128MB) | \
@@ -536,63 +533,6 @@ static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc)
}
-static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc)
-{
- static const struct {
- unsigned gpio_id;
- LEDColor color;
- const char *description;
- bool gpio_polarity;
- } pca1_leds[] = {
- {13, LED_COLOR_GREEN, "front-fault-4", GPIO_POLARITY_ACTIVE_LOW},
- {14, LED_COLOR_GREEN, "front-power-3", GPIO_POLARITY_ACTIVE_LOW},
- {15, LED_COLOR_GREEN, "front-id-5", GPIO_POLARITY_ACTIVE_LOW},
- };
- AspeedSoCState *soc = bmc->soc;
- uint8_t *eeprom_buf = g_malloc0(8 * 1024);
- DeviceState *dev;
- LEDState *led;
-
- /* Bus 3: TODO bmp280@77 */
- dev = DEVICE(i2c_slave_new(TYPE_PCA9552, 0x60));
- qdev_prop_set_string(dev, "description", "pca1");
- i2c_slave_realize_and_unref(I2C_SLAVE(dev),
- aspeed_i2c_get_bus(&soc->i2c, 3),
- &error_fatal);
-
- for (size_t i = 0; i < ARRAY_SIZE(pca1_leds); i++) {
- led = led_create_simple(OBJECT(bmc),
- pca1_leds[i].gpio_polarity,
- pca1_leds[i].color,
- pca1_leds[i].description);
- qdev_connect_gpio_out(dev, pca1_leds[i].gpio_id,
- qdev_get_gpio_in(DEVICE(led), 0));
- }
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "dps310", 0x76);
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "max31785", 0x52);
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 4), "tmp423", 0x4c);
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 5), "tmp423", 0x4c);
-
- /* The Witherspoon expects a TMP275 but a TMP105 is compatible */
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), TYPE_TMP105,
- 0x4a);
-
- /*
- * The witherspoon board expects Epson RX8900 I2C RTC but a ds1338 is
- * good enough
- */
- i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);
-
- smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 11), 0x51,
- eeprom_buf);
- dev = DEVICE(i2c_slave_new(TYPE_PCA9552, 0x60));
- qdev_prop_set_string(dev, "description", "pca0");
- i2c_slave_realize_and_unref(I2C_SLAVE(dev),
- aspeed_i2c_get_bus(&soc->i2c, 11),
- &error_fatal);
- /* Bus 11: TODO ucd90160@64 */
-}
-
static void rainier_bmc_i2c_init(AspeedMachineState *bmc)
{
AspeedSoCState *soc = bmc->soc;
@@ -1396,23 +1336,6 @@ static void aspeed_machine_sonorapass_class_init(ObjectClass *oc,
aspeed_machine_class_init_cpus_defaults(mc);
};
-static void aspeed_machine_witherspoon_class_init(ObjectClass *oc,
- const void *data)
-{
- MachineClass *mc = MACHINE_CLASS(oc);
- AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
-
- mc->desc = "OpenPOWER Witherspoon BMC (ARM1176)";
- amc->soc_name = "ast2500-a1";
- amc->hw_strap1 = WITHERSPOON_BMC_HW_STRAP1;
- amc->fmc_model = "mx25l25635f";
- amc->spi_model = "mx66l1g45g";
- amc->num_cs = 2;
- amc->i2c_init = witherspoon_bmc_i2c_init;
- mc->default_ram_size = 512 * MiB;
- aspeed_machine_class_init_cpus_defaults(mc);
-};
-
static void aspeed_machine_ast2600_evb_class_init(ObjectClass *oc,
const void *data)
{
@@ -1782,10 +1705,6 @@ static const TypeInfo aspeed_machine_types[] = {
.name = MACHINE_TYPE_NAME("sonorapass-bmc"),
.parent = TYPE_ASPEED_MACHINE,
.class_init = aspeed_machine_sonorapass_class_init,
- }, {
- .name = MACHINE_TYPE_NAME("witherspoon-bmc"),
- .parent = TYPE_ASPEED_MACHINE,
- .class_init = aspeed_machine_witherspoon_class_init,
}, {
.name = MACHINE_TYPE_NAME("ast2600-evb"),
.parent = TYPE_ASPEED_MACHINE,
diff --git a/hw/arm/aspeed_ast2500_witherspoon.c b/hw/arm/aspeed_ast2500_witherspoon.c
new file mode 100644
index 0000000000..249d63a9dd
--- /dev/null
+++ b/hw/arm/aspeed_ast2500_witherspoon.c
@@ -0,0 +1,111 @@
+/*
+ * OpenPOWER Witherspoon
+ *
+ * Copyright (C) 2025 ASPEED Technology Inc.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "qapi/error.h"
+#include "hw/arm/aspeed.h"
+#include "hw/arm/aspeed_soc.h"
+#include "hw/misc/led.h"
+#include "hw/sensor/tmp105.h"
+#include "hw/i2c/smbus_eeprom.h"
+#include "hw/gpio/pca9552.h"
+
+/* Witherspoon hardware value: 0xF10AD216 */
+#define WITHERSPOON_BMC_HW_STRAP1 ( \
+ AST2500_HW_STRAP1_DEFAULTS | \
+ SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \
+ SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \
+ SCU_AST2500_HW_STRAP_UART_DEBUG | \
+ SCU_AST2500_HW_STRAP_DDR4_ENABLE | \
+ SCU_AST2500_HW_STRAP_ACPI_ENABLE | \
+ SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER))
+
+static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc)
+{
+ static const struct {
+ unsigned gpio_id;
+ LEDColor color;
+ const char *description;
+ bool gpio_polarity;
+ } pca1_leds[] = {
+ {13, LED_COLOR_GREEN, "front-fault-4", GPIO_POLARITY_ACTIVE_LOW},
+ {14, LED_COLOR_GREEN, "front-power-3", GPIO_POLARITY_ACTIVE_LOW},
+ {15, LED_COLOR_GREEN, "front-id-5", GPIO_POLARITY_ACTIVE_LOW},
+ };
+ AspeedSoCState *soc = bmc->soc;
+ uint8_t *eeprom_buf = g_malloc0(8 * 1024);
+ DeviceState *dev;
+ LEDState *led;
+
+ /* Bus 3: TODO bmp280@77 */
+ dev = DEVICE(i2c_slave_new(TYPE_PCA9552, 0x60));
+ qdev_prop_set_string(dev, "description", "pca1");
+ i2c_slave_realize_and_unref(I2C_SLAVE(dev),
+ aspeed_i2c_get_bus(&soc->i2c, 3),
+ &error_fatal);
+
+ for (size_t i = 0; i < ARRAY_SIZE(pca1_leds); i++) {
+ led = led_create_simple(OBJECT(bmc),
+ pca1_leds[i].gpio_polarity,
+ pca1_leds[i].color,
+ pca1_leds[i].description);
+ qdev_connect_gpio_out(dev, pca1_leds[i].gpio_id,
+ qdev_get_gpio_in(DEVICE(led), 0));
+ }
+ i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "dps310", 0x76);
+ i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "max31785", 0x52);
+ i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 4), "tmp423", 0x4c);
+ i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 5), "tmp423", 0x4c);
+
+ /* The Witherspoon expects a TMP275 but a TMP105 is compatible */
+ i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), TYPE_TMP105,
+ 0x4a);
+
+ /*
+ * The witherspoon board expects Epson RX8900 I2C RTC but a ds1338 is
+ * good enough
+ */
+ i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32);
+
+ smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 11), 0x51,
+ eeprom_buf);
+ dev = DEVICE(i2c_slave_new(TYPE_PCA9552, 0x60));
+ qdev_prop_set_string(dev, "description", "pca0");
+ i2c_slave_realize_and_unref(I2C_SLAVE(dev),
+ aspeed_i2c_get_bus(&soc->i2c, 11),
+ &error_fatal);
+ /* Bus 11: TODO ucd90160@64 */
+}
+
+static void aspeed_machine_witherspoon_class_init(ObjectClass *oc,
+ const void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
+
+ mc->desc = "OpenPOWER Witherspoon BMC (ARM1176)";
+ amc->soc_name = "ast2500-a1";
+ amc->hw_strap1 = WITHERSPOON_BMC_HW_STRAP1;
+ amc->fmc_model = "mx25l25635f";
+ amc->spi_model = "mx66l1g45g";
+ amc->num_cs = 2;
+ amc->i2c_init = witherspoon_bmc_i2c_init;
+ mc->default_ram_size = 512 * MiB;
+ aspeed_machine_class_init_cpus_defaults(mc);
+};
+
+static const TypeInfo aspeed_ast2500_witherspoon_types[] = {
+ {
+ .name = MACHINE_TYPE_NAME("witherspoon-bmc"),
+ .parent = TYPE_ASPEED_MACHINE,
+ .class_init = aspeed_machine_witherspoon_class_init,
+ }
+};
+
+DEFINE_TYPES(aspeed_ast2500_witherspoon_types)
+
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
index d07ebc9dd7..d3726d1b9d 100644
--- a/hw/arm/meson.build
+++ b/hw/arm/meson.build
@@ -47,6 +47,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
'aspeed_ast2500_fp5280g2.c',
'aspeed_ast2500_g220a.c',
'aspeed_ast2500_tiogapass.c',
+ 'aspeed_ast2500_witherspoon.c',
'aspeed_ast2500_yosemitev2.c',
'aspeed_ast2600.c',
'aspeed_ast10x0.c',
--
2.43.0
next prev parent reply other threads:[~2025-10-23 10:04 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-23 10:01 [PATCH v1 00/13] Split AST2500 SoC machines into separate source files for maintainability Jamin Lin via
2025-10-23 10:01 ` [PATCH v1 01/13] hw/arm/aspeed: Move AspeedMachineState definition to common header for reuse Jamin Lin via
2025-10-29 17:06 ` [SPAM] " Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 02/13] hw/arm/aspeed: Make aspeed_machine_class_init_cpus_defaults() globally accessible Jamin Lin via
2025-10-29 17:08 ` [SPAM] " Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 03/13] hw/arm/aspeed: Make create_pca9552() globally accessible for reuse Jamin Lin via
2025-10-29 17:08 ` [SPAM] " Cédric Le Goater
2025-10-31 6:45 ` Jamin Lin
2025-10-31 6:59 ` Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 04/13] hw/arm/aspeed: Make create_pca9554() available for use by other Aspeed machines Jamin Lin via
2025-10-29 17:09 ` [SPAM] " Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 05/13] hw/arm/aspeed: Split FP5280G2 machine into a separate source file for maintenance Jamin Lin via
2025-10-29 17:09 ` [SPAM] " Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 06/13] hw/arm/aspeed: Split G220A machine into a separate source file for better maintenance Jamin Lin via
2025-10-29 17:09 ` [SPAM] " Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 07/13] hw/arm/aspeed: Split Tiogapass machine into a separate source file for cleanup Jamin Lin via
2025-10-29 17:09 ` [SPAM] " Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 08/13] hw/arm/aspeed: Split YosemiteV2 machine into a separate source file for maintainability Jamin Lin via
2025-10-29 17:09 ` [SPAM] " Cédric Le Goater
2025-10-23 10:01 ` Jamin Lin via [this message]
2025-10-29 17:09 ` [SPAM] [PATCH v1 09/13] hw/arm/aspeed: Split Witherspoon " Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 10/13] hw/arm/aspeed: Split Sonorapass " Jamin Lin via
2025-10-29 17:09 ` [SPAM] " Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 11/13] hw/arm/aspeed: Split Romulus " Jamin Lin via
2025-10-29 17:09 ` [SPAM] " Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 12/13] hw/arm/aspeed: Split Supermicro X11SPI machine into a separate " Jamin Lin via
2025-10-29 17:10 ` [SPAM] " Cédric Le Goater
2025-10-23 10:01 ` [PATCH v1 13/13] hw/arm/aspeed: Split AST2500 EVB machine into a separate source " Jamin Lin via
2025-10-29 17:10 ` [SPAM] " Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251023100150.295370-10-jamin_lin@aspeedtech.com \
--to=qemu-devel@nongnu.org \
--cc=andrew@codeconstruct.com.au \
--cc=clg@kaod.org \
--cc=jamin_lin@aspeedtech.com \
--cc=joel@jms.id.au \
--cc=kane_chen@aspeedtech.com \
--cc=leetroy@gmail.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=steven_lee@aspeedtech.com \
--cc=troy_lee@aspeedtech.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).