* [PATCH] hw/arm/aspeed: add Catalina machine type
@ 2025-06-19 3:43 Patrick Williams
2025-06-19 5:49 ` Cédric Le Goater
0 siblings, 1 reply; 3+ messages in thread
From: Patrick Williams @ 2025-06-19 3:43 UTC (permalink / raw)
To: Paolo Bonzini, Peter Maydell, Cédric Le Goater, Steven Lee,
Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley
Cc: Patrick Williams, qemu-arm, qemu-devel
Add the 'catalina-bmc' machine type based on the kernel DTS[1] as of
6.16-rc2. The i2c model is as complete as the current QEMU models
support, but in some cases I substituted devices that are close enough
for present functionality. Strap registers are were verified with
hardware.
This has been tested with an openbmc image built from [2].
[1]: https://github.com/torvalds/linux/blob/v6.16-rc2/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
[2]: https://github.com/openbmc/openbmc/commit/5bc73ec261f981d5e586bda5ac78eb0cbd5f92b0
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
---
hw/arm/Kconfig | 1 +
hw/arm/aspeed.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 201 insertions(+)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index f543d944c3..6ea86534d5 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -532,6 +532,7 @@ config ASPEED_SOC
select I2C
select DPS310
select PCA9552
+ select PCA9554
select SERIAL_MM
select SMBUS_EEPROM
select PCA954X
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index d0b333646e..b0965ef8a0 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -19,6 +19,7 @@
#include "hw/i2c/i2c_mux_pca954x.h"
#include "hw/i2c/smbus_eeprom.h"
#include "hw/gpio/pca9552.h"
+#include "hw/gpio/pca9554.h"
#include "hw/nvram/eeprom_at24c.h"
#include "hw/sensor/tmp105.h"
#include "hw/misc/led.h"
@@ -1003,6 +1004,180 @@ static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
}
#define TYPE_TMP421 "tmp421"
+#define TYPE_DS1338 "ds1338"
+
+/* Catalina hardware value */
+#define CATALINA_BMC_HW_STRAP1 0x00002002
+#define CATALINA_BMC_HW_STRAP2 0x00000800
+
+#define CATALINA_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB)
+
+static void catalina_bmc_i2c_init(AspeedMachineState *bmc)
+{
+ /* Reference from v6.16-rc2 aspeed-bmc-facebook-catalina.dts */
+
+ AspeedSoCState *soc = bmc->soc;
+ I2CBus *i2c[16] = {};
+ I2CSlave *i2c_mux;
+
+ /* busses 0-15 are all used. */
+ for (int i = 0; i < ARRAY_SIZE(i2c); i++) {
+ i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
+ }
+
+ /* &i2c0 */
+ /* i2c-mux@71 (PCA9546) on i2c0 */
+ i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x71);
+
+ /* i2c-mux@72 (PCA9546) on i2c0 */
+ i2c_mux = i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x72);
+
+ /* i2c0mux1ch1 */
+ /* io_expander7 - pca9535@20 */
+ i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 1),
+ TYPE_PCA9552, 0x20);
+ /* eeprom@50 */
+ at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x50, 8 * KiB);
+
+ /* i2c-mux@73 (PCA9546) on i2c0 */
+ i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x73);
+
+ /* i2c-mux@75 (PCA9546) on i2c0 */
+ i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x75);
+
+ /* i2c-mux@76 (PCA9546) on i2c0 */
+ i2c_mux = i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x76);
+
+ /* i2c0mux4ch1 */
+ /* io_expander8 - pca9535@21 */
+ i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 1),
+ TYPE_PCA9552, 0x21);
+ /* eeprom@50 */
+ at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x50, 8 * KiB);
+
+ /* i2c-mux@77 (PCA9546) on i2c0 */
+ i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x77);
+
+
+ /* &i2c1 */
+ /* i2c-mux@70 (PCA9548) on i2c1 */
+ i2c_mux = i2c_slave_create_simple(i2c[1], TYPE_PCA9548, 0x70);
+ /* i2c1mux0ch0 */
+ /* ina238@41 - no model */
+ /* ina238@42 - no model */
+ /* ina238@44 - no model */
+ /* i2c1mux0ch1 */
+ /* ina238@41 - no model */
+ /* ina238@43 - no model */
+ /* i2c1mux0ch4 */
+ /* ltc4287@42 - no model */
+ /* ltc4287@43 - no model */
+
+ /* i2c1mux0ch5 */
+ /* eeprom@54 */
+ at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 5), 0x54, 8 * KiB);
+ /* tpm75@4f */
+ i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 5), TYPE_TMP75, 0x4f);
+
+ /* i2c1mux0ch6 */
+ /* io_expander5 - pca9554@27 */
+ i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 6),
+ TYPE_PCA9554, 0x27);
+ /* io_expander6 - pca9555@25 */
+ i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 6),
+ TYPE_PCA9552, 0x25);
+ /* eeprom@51 */
+ at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 6), 0x51, 8 * KiB);
+
+ /* i2c1mux0ch7 */
+ /* eeprom@53 */
+ at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 7), 0x53, 8 * KiB);
+ /* temperature-sensor@4b - tmp75 */
+ i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 7), TYPE_TMP75, 0x4b);
+
+ /* &i2c2 */
+ /* io_expander0 - pca9555@20 */
+ i2c_slave_create_simple(i2c[2], TYPE_PCA9552, 0x20);
+ /* io_expander0 - pca9555@21 */
+ i2c_slave_create_simple(i2c[2], TYPE_PCA9552, 0x21);
+ /* io_expander0 - pca9555@27 */
+ i2c_slave_create_simple(i2c[2], TYPE_PCA9552, 0x27);
+ /* eeprom@50 */
+ at24c_eeprom_init(i2c[2], 0x50, 8 * KiB);
+ /* eeprom@51 */
+ at24c_eeprom_init(i2c[2], 0x51, 8 * KiB);
+
+ /* &i2c5 */
+ /* i2c-mux@70 (PCA9548) on i2c5 */
+ i2c_mux = i2c_slave_create_simple(i2c[5], TYPE_PCA9548, 0x70);
+ /* i2c5mux0ch6 */
+ /* eeprom@52 */
+ at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 6), 0x52, 8 * KiB);
+ /* i2c5mux0ch7 */
+ /* ina230@40 - no model */
+ /* ina230@41 - no model */
+ /* ina230@44 - no model */
+ /* ina230@45 - no model */
+
+ /* &i2c6 */
+ /* io_expander3 - pca9555@21 */
+ i2c_slave_create_simple(i2c[6], TYPE_PCA9552, 0x21);
+ /* rtc@6f - nct3018y */
+ i2c_slave_create_simple(i2c[6], TYPE_DS1338, 0x6f);
+
+ /* &i2c9 */
+ /* io_expander4 - pca9555@4f */
+ i2c_slave_create_simple(i2c[9], TYPE_PCA9552, 0x4f);
+ /* temperature-sensor@4b - tpm75 */
+ i2c_slave_create_simple(i2c[9], TYPE_TMP75, 0x4b);
+ /* eeprom@50 */
+ at24c_eeprom_init(i2c[9], 0x50, 8 * KiB);
+ /* eeprom@56 */
+ at24c_eeprom_init(i2c[9], 0x56, 8 * KiB);
+
+ /* &i2c10 */
+ /* temperature-sensor@1f - tpm421 */
+ i2c_slave_create_simple(i2c[10], TYPE_TMP421, 0x1f);
+ /* eeprom@50 */
+ at24c_eeprom_init(i2c[10], 0x50, 8 * KiB);
+
+ /* &i2c11 */
+ /* ssif-bmc@10 - no model */
+
+ /* &i2c12 */
+ /* eeprom@50 */
+ at24c_eeprom_init(i2c[12], 0x50, 8 * KiB);
+
+ /* &i2c13 */
+ /* eeprom@50 */
+ at24c_eeprom_init(i2c[13], 0x50, 8 * KiB);
+ /* eeprom@54 */
+ at24c_eeprom_init(i2c[13], 0x54, 256);
+ /* eeprom@55 */
+ at24c_eeprom_init(i2c[13], 0x55, 256);
+ /* eeprom@57 */
+ at24c_eeprom_init(i2c[13], 0x57, 256);
+
+ /* &i2c14 */
+ /* io_expander9 - pca9555@10 */
+ i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x10);
+ /* io_expander10 - pca9555@11 */
+ i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x11);
+ /* io_expander11 - pca9555@12 */
+ i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x12);
+ /* io_expander12 - pca9555@13 */
+ i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x13);
+ /* io_expander13 - pca9555@14 */
+ i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x14);
+ /* io_expander14 - pca9555@15 */
+ i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x15);
+
+ /* &i2c15 */
+ /* temperature-sensor@1f - tmp421 */
+ i2c_slave_create_simple(i2c[15], TYPE_TMP421, 0x1f);
+ /* eeprom@52 */
+ at24c_eeprom_init(i2c[15], 0x52, 8 * KiB);
+}
static void bletchley_bmc_i2c_init(AspeedMachineState *bmc)
{
@@ -1585,6 +1760,27 @@ static void aspeed_machine_bletchley_class_init(ObjectClass *oc,
aspeed_machine_class_init_cpus_defaults(mc);
}
+static void aspeed_machine_catalina_class_init(ObjectClass *oc,
+ const void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
+
+ mc->desc = "Facebook Catalina BMC (Cortex-A7)";
+ amc->soc_name = "ast2600-a3";
+ amc->hw_strap1 = CATALINA_BMC_HW_STRAP1;
+ amc->hw_strap2 = CATALINA_BMC_HW_STRAP2;
+ amc->fmc_model = "w25q01jvq";
+ amc->spi_model = NULL;
+ amc->num_cs = 2;
+ amc->macs_mask = ASPEED_MAC2_ON;
+ amc->i2c_init = catalina_bmc_i2c_init;
+ mc->auto_create_sdcard = true;
+ mc->default_ram_size = CATALINA_BMC_RAM_SIZE;
+ aspeed_machine_class_init_cpus_defaults(mc);
+ aspeed_machine_ast2600_class_emmc_init(oc);
+}
+
static void fby35_reset(MachineState *state, ResetType type)
{
AspeedMachineState *bmc = ASPEED_MACHINE(state);
@@ -1877,6 +2073,10 @@ static const TypeInfo aspeed_machine_types[] = {
.name = MACHINE_TYPE_NAME("bletchley-bmc"),
.parent = TYPE_ASPEED_MACHINE,
.class_init = aspeed_machine_bletchley_class_init,
+ }, {
+ .name = MACHINE_TYPE_NAME("catalina-bmc"),
+ .parent = TYPE_ASPEED_MACHINE,
+ .class_init = aspeed_machine_catalina_class_init,
}, {
.name = MACHINE_TYPE_NAME("fby35-bmc"),
.parent = MACHINE_TYPE_NAME("ast2600-evb"),
--
2.49.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] hw/arm/aspeed: add Catalina machine type
2025-06-19 3:43 [PATCH] hw/arm/aspeed: add Catalina machine type Patrick Williams
@ 2025-06-19 5:49 ` Cédric Le Goater
2025-06-19 12:31 ` Patrick Williams
0 siblings, 1 reply; 3+ messages in thread
From: Cédric Le Goater @ 2025-06-19 5:49 UTC (permalink / raw)
To: Patrick Williams, Paolo Bonzini, Peter Maydell, Steven Lee,
Troy Lee, Jamin Lin, Andrew Jeffery, Joel Stanley
Cc: qemu-arm, qemu-devel
Hello Patrick,
On 6/19/25 05:43, Patrick Williams wrote:
> Add the 'catalina-bmc' machine type based on the kernel DTS[1] as of
> 6.16-rc2. The i2c model is as complete as the current QEMU models
> support, but in some cases I substituted devices that are close enough
> for present functionality. Strap registers are were verified with
> hardware.
The change looks good.
> This has been tested with an openbmc image built from [2].
>
> [1]: https://github.com/torvalds/linux/blob/v6.16-rc2/arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
> [2]: https://github.com/openbmc/openbmc/commit/5bc73ec261f981d5e586bda5ac78eb0cbd5f92b0
Could you please also provide a functional test using this build ?
(same question for fuji-bmc and fby35-bmc if still possible)
Thanks,
C.
>
> Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
> ---
> hw/arm/Kconfig | 1 +
> hw/arm/aspeed.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 201 insertions(+)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index f543d944c3..6ea86534d5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -532,6 +532,7 @@ config ASPEED_SOC
> select I2C
> select DPS310
> select PCA9552
> + select PCA9554
> select SERIAL_MM
> select SMBUS_EEPROM
> select PCA954X
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index d0b333646e..b0965ef8a0 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -19,6 +19,7 @@
> #include "hw/i2c/i2c_mux_pca954x.h"
> #include "hw/i2c/smbus_eeprom.h"
> #include "hw/gpio/pca9552.h"
> +#include "hw/gpio/pca9554.h"
> #include "hw/nvram/eeprom_at24c.h"
> #include "hw/sensor/tmp105.h"
> #include "hw/misc/led.h"
> @@ -1003,6 +1004,180 @@ static void fuji_bmc_i2c_init(AspeedMachineState *bmc)
> }
>
> #define TYPE_TMP421 "tmp421"
> +#define TYPE_DS1338 "ds1338"
> +
> +/* Catalina hardware value */
> +#define CATALINA_BMC_HW_STRAP1 0x00002002
> +#define CATALINA_BMC_HW_STRAP2 0x00000800
> +
> +#define CATALINA_BMC_RAM_SIZE ASPEED_RAM_SIZE(2 * GiB)
> +
> +static void catalina_bmc_i2c_init(AspeedMachineState *bmc)
> +{
> + /* Reference from v6.16-rc2 aspeed-bmc-facebook-catalina.dts */
> +
> + AspeedSoCState *soc = bmc->soc;
> + I2CBus *i2c[16] = {};
> + I2CSlave *i2c_mux;
> +
> + /* busses 0-15 are all used. */
> + for (int i = 0; i < ARRAY_SIZE(i2c); i++) {
> + i2c[i] = aspeed_i2c_get_bus(&soc->i2c, i);
> + }
> +
> + /* &i2c0 */
> + /* i2c-mux@71 (PCA9546) on i2c0 */
> + i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x71);
> +
> + /* i2c-mux@72 (PCA9546) on i2c0 */
> + i2c_mux = i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x72);
> +
> + /* i2c0mux1ch1 */
> + /* io_expander7 - pca9535@20 */
> + i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 1),
> + TYPE_PCA9552, 0x20);
> + /* eeprom@50 */
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x50, 8 * KiB);
> +
> + /* i2c-mux@73 (PCA9546) on i2c0 */
> + i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x73);
> +
> + /* i2c-mux@75 (PCA9546) on i2c0 */
> + i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x75);
> +
> + /* i2c-mux@76 (PCA9546) on i2c0 */
> + i2c_mux = i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x76);
> +
> + /* i2c0mux4ch1 */
> + /* io_expander8 - pca9535@21 */
> + i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 1),
> + TYPE_PCA9552, 0x21);
> + /* eeprom@50 */
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 1), 0x50, 8 * KiB);
> +
> + /* i2c-mux@77 (PCA9546) on i2c0 */
> + i2c_slave_create_simple(i2c[0], TYPE_PCA9546, 0x77);
> +
> +
> + /* &i2c1 */
> + /* i2c-mux@70 (PCA9548) on i2c1 */
> + i2c_mux = i2c_slave_create_simple(i2c[1], TYPE_PCA9548, 0x70);
> + /* i2c1mux0ch0 */
> + /* ina238@41 - no model */
> + /* ina238@42 - no model */
> + /* ina238@44 - no model */
> + /* i2c1mux0ch1 */
> + /* ina238@41 - no model */
> + /* ina238@43 - no model */
> + /* i2c1mux0ch4 */
> + /* ltc4287@42 - no model */
> + /* ltc4287@43 - no model */
> +
> + /* i2c1mux0ch5 */
> + /* eeprom@54 */
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 5), 0x54, 8 * KiB);
> + /* tpm75@4f */
> + i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 5), TYPE_TMP75, 0x4f);
> +
> + /* i2c1mux0ch6 */
> + /* io_expander5 - pca9554@27 */
> + i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 6),
> + TYPE_PCA9554, 0x27);
> + /* io_expander6 - pca9555@25 */
> + i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 6),
> + TYPE_PCA9552, 0x25);
> + /* eeprom@51 */
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 6), 0x51, 8 * KiB);
> +
> + /* i2c1mux0ch7 */
> + /* eeprom@53 */
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 7), 0x53, 8 * KiB);
> + /* temperature-sensor@4b - tmp75 */
> + i2c_slave_create_simple(pca954x_i2c_get_bus(i2c_mux, 7), TYPE_TMP75, 0x4b);
> +
> + /* &i2c2 */
> + /* io_expander0 - pca9555@20 */
> + i2c_slave_create_simple(i2c[2], TYPE_PCA9552, 0x20);
> + /* io_expander0 - pca9555@21 */
> + i2c_slave_create_simple(i2c[2], TYPE_PCA9552, 0x21);
> + /* io_expander0 - pca9555@27 */
> + i2c_slave_create_simple(i2c[2], TYPE_PCA9552, 0x27);
> + /* eeprom@50 */
> + at24c_eeprom_init(i2c[2], 0x50, 8 * KiB);
> + /* eeprom@51 */
> + at24c_eeprom_init(i2c[2], 0x51, 8 * KiB);
> +
> + /* &i2c5 */
> + /* i2c-mux@70 (PCA9548) on i2c5 */
> + i2c_mux = i2c_slave_create_simple(i2c[5], TYPE_PCA9548, 0x70);
> + /* i2c5mux0ch6 */
> + /* eeprom@52 */
> + at24c_eeprom_init(pca954x_i2c_get_bus(i2c_mux, 6), 0x52, 8 * KiB);
> + /* i2c5mux0ch7 */
> + /* ina230@40 - no model */
> + /* ina230@41 - no model */
> + /* ina230@44 - no model */
> + /* ina230@45 - no model */
> +
> + /* &i2c6 */
> + /* io_expander3 - pca9555@21 */
> + i2c_slave_create_simple(i2c[6], TYPE_PCA9552, 0x21);
> + /* rtc@6f - nct3018y */
> + i2c_slave_create_simple(i2c[6], TYPE_DS1338, 0x6f);
> +
> + /* &i2c9 */
> + /* io_expander4 - pca9555@4f */
> + i2c_slave_create_simple(i2c[9], TYPE_PCA9552, 0x4f);
> + /* temperature-sensor@4b - tpm75 */
> + i2c_slave_create_simple(i2c[9], TYPE_TMP75, 0x4b);
> + /* eeprom@50 */
> + at24c_eeprom_init(i2c[9], 0x50, 8 * KiB);
> + /* eeprom@56 */
> + at24c_eeprom_init(i2c[9], 0x56, 8 * KiB);
> +
> + /* &i2c10 */
> + /* temperature-sensor@1f - tpm421 */
> + i2c_slave_create_simple(i2c[10], TYPE_TMP421, 0x1f);
> + /* eeprom@50 */
> + at24c_eeprom_init(i2c[10], 0x50, 8 * KiB);
> +
> + /* &i2c11 */
> + /* ssif-bmc@10 - no model */
> +
> + /* &i2c12 */
> + /* eeprom@50 */
> + at24c_eeprom_init(i2c[12], 0x50, 8 * KiB);
> +
> + /* &i2c13 */
> + /* eeprom@50 */
> + at24c_eeprom_init(i2c[13], 0x50, 8 * KiB);
> + /* eeprom@54 */
> + at24c_eeprom_init(i2c[13], 0x54, 256);
> + /* eeprom@55 */
> + at24c_eeprom_init(i2c[13], 0x55, 256);
> + /* eeprom@57 */
> + at24c_eeprom_init(i2c[13], 0x57, 256);
> +
> + /* &i2c14 */
> + /* io_expander9 - pca9555@10 */
> + i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x10);
> + /* io_expander10 - pca9555@11 */
> + i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x11);
> + /* io_expander11 - pca9555@12 */
> + i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x12);
> + /* io_expander12 - pca9555@13 */
> + i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x13);
> + /* io_expander13 - pca9555@14 */
> + i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x14);
> + /* io_expander14 - pca9555@15 */
> + i2c_slave_create_simple(i2c[14], TYPE_PCA9552, 0x15);
> +
> + /* &i2c15 */
> + /* temperature-sensor@1f - tmp421 */
> + i2c_slave_create_simple(i2c[15], TYPE_TMP421, 0x1f);
> + /* eeprom@52 */
> + at24c_eeprom_init(i2c[15], 0x52, 8 * KiB);
> +}
>
> static void bletchley_bmc_i2c_init(AspeedMachineState *bmc)
> {
> @@ -1585,6 +1760,27 @@ static void aspeed_machine_bletchley_class_init(ObjectClass *oc,
> aspeed_machine_class_init_cpus_defaults(mc);
> }
>
> +static void aspeed_machine_catalina_class_init(ObjectClass *oc,
> + const void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> + AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
> +
> + mc->desc = "Facebook Catalina BMC (Cortex-A7)";
> + amc->soc_name = "ast2600-a3";
> + amc->hw_strap1 = CATALINA_BMC_HW_STRAP1;
> + amc->hw_strap2 = CATALINA_BMC_HW_STRAP2;
> + amc->fmc_model = "w25q01jvq";
> + amc->spi_model = NULL;
> + amc->num_cs = 2;
> + amc->macs_mask = ASPEED_MAC2_ON;
> + amc->i2c_init = catalina_bmc_i2c_init;
> + mc->auto_create_sdcard = true;
> + mc->default_ram_size = CATALINA_BMC_RAM_SIZE;
> + aspeed_machine_class_init_cpus_defaults(mc);
> + aspeed_machine_ast2600_class_emmc_init(oc);
> +}
> +
> static void fby35_reset(MachineState *state, ResetType type)
> {
> AspeedMachineState *bmc = ASPEED_MACHINE(state);
> @@ -1877,6 +2073,10 @@ static const TypeInfo aspeed_machine_types[] = {
> .name = MACHINE_TYPE_NAME("bletchley-bmc"),
> .parent = TYPE_ASPEED_MACHINE,
> .class_init = aspeed_machine_bletchley_class_init,
> + }, {
> + .name = MACHINE_TYPE_NAME("catalina-bmc"),
> + .parent = TYPE_ASPEED_MACHINE,
> + .class_init = aspeed_machine_catalina_class_init,
> }, {
> .name = MACHINE_TYPE_NAME("fby35-bmc"),
> .parent = MACHINE_TYPE_NAME("ast2600-evb"),
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] hw/arm/aspeed: add Catalina machine type
2025-06-19 5:49 ` Cédric Le Goater
@ 2025-06-19 12:31 ` Patrick Williams
0 siblings, 0 replies; 3+ messages in thread
From: Patrick Williams @ 2025-06-19 12:31 UTC (permalink / raw)
To: Cédric Le Goater
Cc: Paolo Bonzini, Peter Maydell, Steven Lee, Troy Lee, Jamin Lin,
Andrew Jeffery, Joel Stanley, qemu-arm, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
On Thu, Jun 19, 2025 at 07:49:47AM +0200, Cédric Le Goater wrote:
> Could you please also provide a functional test using this build ?
> (same question for fuji-bmc and fby35-bmc if still possible)
I can provide one for Catalina. I just realized that the openbmc
jenkins isn't building that like it should. I fixed it and I'll point
you to an image.
I don't have a way to generate something for fuji or fby35 right now.
Those aren't actually OpenBMC systems (they're the older "Facebook
OpenBMC") so we don't have a public image build infrastructure set up
for them.
--
Patrick Williams
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-06-19 12:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-19 3:43 [PATCH] hw/arm/aspeed: add Catalina machine type Patrick Williams
2025-06-19 5:49 ` Cédric Le Goater
2025-06-19 12:31 ` Patrick Williams
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).