Add support for gb200-bmc machine
Subsystems (2)
v2 cover Add support for gb200-bmc machine
This patch series adds support for gb200-bmc, a baseboard management controller module based on an Aspeed 2600 SOC.
v2:
- Rebase on master
- Drop duplicated patch for enabling PCA954X
- Updated commit message with source information
- Added functional tests and example openbmc image
Ed Tanous (4):
hw/arm/aspeed: Add second SPI chip to Aspeed model
docs: add support for gb200-bmc hw/arm/aspeed: Add GB200 BMC target tests/functional: Add gb200 tests
docs/system/arm/aspeed.rst | 4 +- hw/arm/aspeed.c | 81 +++++++++++++++++++ hw/arm/aspeed_eeprom.c | 21 +++++ hw/arm/aspeed_eeprom.h | 3 + include/hw/arm/aspeed.h | 2 + tests/functional/aspeed.py | 9 ++- tests/functional/meson.build | 2 + .../test_arm_aspeed_gb200nvl_bmc.py | 26 ++++++ 8 files changed, 144 insertions(+), 4 deletions(-) create mode 100755 tests/functional/test_arm_aspeed_gb200nvl_bmc.py
Signature · 1 line
2.43.0
PATCH v2 1/4 hw/arm/aspeed: Add second SPI chip to Aspeed model
Aspeed2600 has two spi lanes; Add a new struct that can mount the second SPI.
--- hw/arm/aspeed.c | 2 ++ include/hw/arm/aspeed.h | 2 ++ 2 files changed, 4 insertions(+)
hw/arm/aspeed.c +2 -0
@@ -465,6 +465,8 @@ static void aspeed_machine_init(MachineState *machine)aspeed_board_init_flashes (&bmc->soc->spi[0 ], bmc->spi_model ? bmc->spi_model : amc->spi_model,1 , amc->num_cs); +aspeed_board_init_flashes (&bmc->soc->spi[1 ], + amc->spi2_model,1 , amc->num_cs2); }if (machine->kernel_filename && sc->num_cpus >1 ) {
include/hw/arm/aspeed.h +2 -0
@@ -35,7 +35,9 @@ struct AspeedMachineClass {uint32_t hw_strap2;const char *fmc_model;const char *spi_model; +const char *spi2_model;uint32_t num_cs; +uint32_t num_cs2;uint32_t macs_mask;void (*i2c_init)(AspeedMachineState *bmc);uint32_t uart_default;
Signature · 1 line
2.43.0
Re: [PATCH v2 1/4] hw/arm/aspeed: Add second SPI chip to Aspeed model
Quoted 4 lines · Ed Tanous
Aspeed2600 has two spi lanes; Add a new struct that can mount the second SPI.
Signed-off-by Ed Tanous <[email protected]>
Thanks,
C.
Quoted 32 lines
--- hw/arm/aspeed.c | 2 ++ include/hw/arm/aspeed.h | 2 ++ 2 files changed, 4 insertions(+)hw/arm/aspeed.c +2
-0@@ -465,6 +465,8 @@ static void aspeed_machine_init(MachineState *machine)aspeed_board_init_flashes (&bmc->soc->spi[0 ], bmc->spi_model ? bmc->spi_model : amc->spi_model,1 , amc->num_cs); +aspeed_board_init_flashes (&bmc->soc->spi[1 ], + amc->spi2_model,1 , amc->num_cs2); }if (machine->kernel_filename && sc->num_cpus >1 ) {include/hw/arm/aspeed.h +2
-0@@ -35,7 +35,9 @@ struct AspeedMachineClass {uint32_t hw_strap2;const char *fmc_model;const char *spi_model; +const char *spi2_model;uint32_t num_cs; +uint32_t num_cs2;uint32_t macs_mask;void (*i2c_init)(AspeedMachineState *bmc);uint32_t uart_default;
PATCH v2 2/4 docs: add support for gb200-bmc
In reply to Ed TanousThis patch updates the docs for support of gb200-bmc.
--- docs/system/arm/aspeed.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
docs/system/arm/aspeed.rst +2 -2
@@ -1,5 +1,4 @@ -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``) -================================================================================================================================================================================================================================================================================================================================================================================================================================= +Aspeed family boards (``ast2500-evb``, ``ast2600-evb``, ``ast2700-evb``, ``bletchley-bmc``, ``fuji-bmc``, ``gb200nvl-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``) The QEMU Aspeed machines model BMCs of various OpenPOWER systems and Aspeed evaluation boards. They are based on different releases of the
@@ -35,6 +34,7 @@ AST2600 SoC based machines : - ``fuji-bmc`` Facebook Fuji BMC - ``bletchley-bmc`` Facebook Bletchley BMC - ``fby35-bmc`` Facebook fby35 BMC +- ``gb200nvl-bmc`` Nvidia GB200nvl BMC - ``qcom-dc-scm-v1-bmc`` Qualcomm DC-SCM V1 BMC - ``qcom-firework-bmc`` Qualcomm Firework BMC
Signature · 1 line
2.43.0
Re: [PATCH v2 2/4] docs: add support for gb200-bmc
Quoted 3 lines · Ed Tanous
This patch updates the docs for support of gb200-bmc.
Signed-off-by Ed Tanous <[email protected]>
Thanks,
C.
Quoted 23 lines
--- docs/system/arm/aspeed.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)docs/system/arm/aspeed.rst +2
-2@@ -1,5 +1,4 @@ -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``) -================================================================================================================================================================================================================================================================================================================================================================================================================================= +Aspeed family boards (``ast2500-evb``, ``ast2600-evb``, ``ast2700-evb``, ``bletchley-bmc``, ``fuji-bmc``, ``gb200nvl-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``) The QEMU Aspeed machines model BMCs of various OpenPOWER systems and Aspeed evaluation boards. They are based on different releases of the@@ -35,6 +34,7 @@ AST2600 SoC based machines : - ``fuji-bmc`` Facebook Fuji BMC - ``bletchley-bmc`` Facebook Bletchley BMC - ``fby35-bmc`` Facebook fby35 BMC +- ``gb200nvl-bmc`` Nvidia GB200nvl BMC - ``qcom-dc-scm-v1-bmc`` Qualcomm DC-SCM V1 BMC - ``qcom-firework-bmc`` Qualcomm Firework BMC
PATCH v2 3/4 hw/arm/aspeed: Add GB200 BMC target
In reply to Ed TanousGB200nvl72 is a system for for accelerated compute. This is a model for the BMC target within the system.
This is based on the device tree aspeed-bmc-nvidia-gb200nvl-bmc.dts from:
--- hw/arm/aspeed.c | 79 ++++++++++++++++++++++++++++++++++++++++++ hw/arm/aspeed_eeprom.c | 21 +++++++++++ hw/arm/aspeed_eeprom.h | 3 ++ 3 files changed, 103 insertions(+)
hw/arm/aspeed.c +79 -0
@@ -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"
@@ -201,6 +202,10 @@ struct AspeedMachineState {#define BLETCHLEY_BMC_HW_STRAP1 AST2600_EVB_HW_STRAP1#define BLETCHLEY_BMC_HW_STRAP2 AST2600_EVB_HW_STRAP2 +/* GB200NVL hardware value */ +#define GB200NVL_BMC_HW_STRAP1 AST2600_EVB_HW_STRAP1 +#define GB200NVL_BMC_HW_STRAP2 AST2600_EVB_HW_STRAP2 +/* Qualcomm DC-SCM hardware value */ #define QCOM_DC_SCM_V1_BMC_HW_STRAP1 0x00000000#define QCOM_DC_SCM_V1_BMC_HW_STRAP2 0x00000041
@@ -647,6 +652,12 @@ static void create_pca9552(AspeedSoCState *soc, int bus_id, int addr) TYPE_PCA9552, addr); } +static I2CSlave *create_pca9554 (AspeedSoCState *soc,int bus_id,int addr) +{ +return i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c, bus_id), +TYPE_PCA9554 , addr); +} +static void sonorapass_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = bmc->soc;
@@ -1052,6 +1063,45 @@ static void bletchley_bmc_i2c_init(AspeedMachineState *bmc)i2c_slave_create_simple (i2c[12 ],TYPE_PCA9552 ,0x67 ); } + +static void gb200nvl_bmc_i2c_init (AspeedMachineState *bmc) +{ +AspeedSoCState *soc = bmc->soc; +I2CBus *i2c[15 ] = {}; +DeviceState *dev; +for (int i =0 ; i <sizeof (i2c) /sizeof (i2c[0 ]); i++) { +if ((i ==11 ) || (i ==12 ) || (i ==13 )) { +continue ; + } + i2c[i] =aspeed_i2c_get_bus (&soc->i2c, i); + } + +/* Bus 5 Expander */ +create_pca9554 (soc,4 ,0x21 ); + +/* Mux I2c Expanders */ +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x71 ); +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x72 ); +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x73 ); +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x75 ); +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x76 ); +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x77 ); + +/* Bus 10 */ + dev =DEVICE (create_pca9554 (soc,9 ,0x20 )); + +/* Set FPGA_READY */ +object_property_set_str (OBJECT (dev),"pin1" ,"high" , &error_fatal); + +create_pca9554 (soc,9 ,0x21 ); +at24c_eeprom_init (i2c[9 ],0x50 ,64 * KiB); +at24c_eeprom_init (i2c[9 ],0x51 ,64 * KiB); + +/* Bus 11 */ +at24c_eeprom_init_rom (i2c[10 ],0x50 ,256 , gb200nvl_bmc_fruid, + gb200nvl_bmc_fruid_len); +} +static void fby35_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = bmc->soc;
@@ -1587,6 +1637,31 @@ static void aspeed_machine_bletchley_class_init(ObjectClass *oc,aspeed_machine_class_init_cpus_defaults (mc); } +#define GB200NVL_BMC_RAM_SIZE ASPEED_RAM_SIZE(1 * GiB) + +static void aspeed_machine_gb200nvl_class_init (ObjectClass *oc, +const void *data) +{ +MachineClass *mc =MACHINE_CLASS (oc); +AspeedMachineClass *amc =ASPEED_MACHINE_CLASS (oc); + + mc->desc ="Nvidia GB200NVL BMC (Cortex-A7)" ; + amc->soc_name ="ast2600-a3" ; + amc->hw_strap1 =GB200NVL_BMC_HW_STRAP1 ; + amc->hw_strap2 =GB200NVL_BMC_HW_STRAP2 ; + amc->fmc_model ="mx66u51235f" ; + amc->spi_model ="mx66u51235f" ; + amc->num_cs =2 ; + + amc->spi2_model ="mx66u51235f" ; + amc->num_cs2 =1 ; + amc->macs_mask =ASPEED_MAC0_ON |ASPEED_MAC1_ON ; + amc->i2c_init = gb200nvl_bmc_i2c_init; + mc->default_ram_size =GB200NVL_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);
@@ -1879,6 +1954,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("gb200nvl-bmc"), + .parent = TYPE_ASPEED_MACHINE, + .class_init = aspeed_machine_gb200nvl_class_init, }, { .name = MACHINE_TYPE_NAME("fby35-bmc"), .parent = MACHINE_TYPE_NAME("ast2600-evb"),
hw/arm/aspeed_eeprom.c +21 -0
@@ -162,6 +162,25 @@ const uint8_t rainier_bmc_fruid[] = { 0x31, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, }; +const uint8_t gb200nvl_bmc_fruid[] = { +0x01 ,0x00 ,0x00 ,0x01 ,0x0b ,0x00 ,0x00 ,0xf3 ,0x01 ,0x0a ,0x19 ,0x1f , +0x0f ,0xe6 ,0xc6 ,0x4e ,0x56 ,0x49 ,0x44 ,0x49 ,0x41 ,0xc5 ,0x50 ,0x33 , +0x38 ,0x30 ,0x39 ,0xcd ,0x31 ,0x35 ,0x38 ,0x33 ,0x33 ,0x32 ,0x34 ,0x38 , +0x30 ,0x30 ,0x31 ,0x35 ,0x30 ,0xd2 ,0x36 ,0x39 ,0x39 ,0x2d ,0x31 ,0x33 , +0x38 ,0x30 ,0x39 ,0x2d ,0x30 ,0x34 ,0x30 ,0x34 ,0x2d ,0x36 ,0x30 ,0x30 , +0xc0 ,0x01 ,0x01 ,0xd6 ,0x4d ,0x41 ,0x43 ,0x3a ,0x20 ,0x33 ,0x43 ,0x3a , +0x36 ,0x44 ,0x3a ,0x36 ,0x36 ,0x3a ,0x31 ,0x34 ,0x3a ,0x43 ,0x38 ,0x3a , +0x37 ,0x41 ,0xc1 ,0x3b ,0x01 ,0x09 ,0x19 ,0xc6 ,0x4e ,0x56 ,0x49 ,0x44 , +0x49 ,0x41 ,0xc9 ,0x50 ,0x33 ,0x38 ,0x30 ,0x39 ,0x2d ,0x42 ,0x4d ,0x43 , +0xd2 ,0x36 ,0x39 ,0x39 ,0x2d ,0x31 ,0x33 ,0x38 ,0x30 ,0x39 ,0x2d ,0x30 , +0x34 ,0x30 ,0x34 ,0x2d ,0x36 ,0x30 ,0x30 ,0xc4 ,0x41 ,0x45 ,0x2e ,0x31 , +0xcd ,0x31 ,0x35 ,0x38 ,0x33 ,0x33 ,0x32 ,0x34 ,0x38 ,0x30 ,0x30 ,0x31 , +0x35 ,0x30 ,0xc0 ,0xc4 ,0x76 ,0x30 ,0x2e ,0x31 ,0xc1 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0xb4 ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff , +0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff + +}; +const size_t tiogapass_bmc_fruid_len =sizeof (tiogapass_bmc_fruid);const size_t fby35_nic_fruid_len =sizeof (fby35_nic_fruid);const size_t fby35_bb_fruid_len =sizeof (fby35_bb_fruid);
@@ -169,3 +188,5 @@ const size_t fby35_bmc_fruid_len = sizeof(fby35_bmc_fruid);const size_t yosemitev2_bmc_fruid_len =sizeof (yosemitev2_bmc_fruid);const size_t rainier_bb_fruid_len =sizeof (rainier_bb_fruid);const size_t rainier_bmc_fruid_len =sizeof (rainier_bmc_fruid); +const size_t gb200nvl_bmc_fruid_len =sizeof (gb200nvl_bmc_fruid); +
hw/arm/aspeed_eeprom.h +3 -0
@@ -26,4 +26,7 @@ extern const size_t rainier_bb_fruid_len;extern const uint8_t rainier_bmc_fruid[];extern const size_t rainier_bmc_fruid_len; +extern const uint8_t gb200nvl_bmc_fruid[]; +extern const size_t gb200nvl_bmc_fruid_len; +#endif
Signature · 1 line
2.43.0
Re: [PATCH v2 3/4] hw/arm/aspeed: Add GB200 BMC target
Quoted 6 lines · Ed Tanous
GB200nvl72 is a system for for accelerated compute. This is a model for the BMC target within the system.
This is based on the device tree
aspeed-bmc-nvidia-gb200nvl-bmc.dtsfrom:
Quoted 8 lines
Signed-off-by Ed Tanous <[email protected]>--- hw/arm/aspeed.c | 79 ++++++++++++++++++++++++++++++++++++++++++ hw/arm/aspeed_eeprom.c | 21 +++++++++++ hw/arm/aspeed_eeprom.h | 3 ++ 3 files changed, 103 insertions(+)
Thanks,
C.
Quoted 173 lines
hw/arm/aspeed.c +79
-0@@ -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" @@ -201,6 +202,10 @@ struct AspeedMachineState {#define BLETCHLEY_BMC_HW_STRAP1 AST2600_EVB_HW_STRAP1#define BLETCHLEY_BMC_HW_STRAP2 AST2600_EVB_HW_STRAP2 +/* GB200NVL hardware value */ +#define GB200NVL_BMC_HW_STRAP1 AST2600_EVB_HW_STRAP1 +#define GB200NVL_BMC_HW_STRAP2 AST2600_EVB_HW_STRAP2 +/* Qualcomm DC-SCM hardware value */ #define QCOM_DC_SCM_V1_BMC_HW_STRAP1 0x00000000#define QCOM_DC_SCM_V1_BMC_HW_STRAP2 0x00000041@@ -647,6 +652,12 @@ static void create_pca9552(AspeedSoCState *soc, int bus_id, int addr) TYPE_PCA9552, addr); } +static I2CSlave *create_pca9554 (AspeedSoCState *soc,int bus_id,int addr) +{ +return i2c_slave_create_simple (aspeed_i2c_get_bus (&soc->i2c, bus_id), +TYPE_PCA9554 , addr); +} +static void sonorapass_bmc_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = bmc->soc;@@ -1052,6 +1063,45 @@ static void bletchley_bmc_i2c_init(AspeedMachineState *bmc)i2c_slave_create_simple (i2c[12 ],TYPE_PCA9552 ,0x67 ); } + +static void gb200nvl_bmc_i2c_init (AspeedMachineState *bmc) +{ +AspeedSoCState *soc = bmc->soc; +I2CBus *i2c[15 ] = {}; +DeviceState *dev; +for (int i =0 ; i <sizeof (i2c) /sizeof (i2c[0 ]); i++) { +if ((i ==11 ) || (i ==12 ) || (i ==13 )) { +continue ; + } + i2c[i] =aspeed_i2c_get_bus (&soc->i2c, i); + } + +/* Bus 5 Expander */ +create_pca9554 (soc,4 ,0x21 ); + +/* Mux I2c Expanders */ +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x71 ); +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x72 ); +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x73 ); +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x75 ); +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x76 ); +i2c_slave_create_simple (i2c[5 ],"pca9546" ,0x77 ); + +/* Bus 10 */ + dev =DEVICE (create_pca9554 (soc,9 ,0x20 )); + +/* Set FPGA_READY */ +object_property_set_str (OBJECT (dev),"pin1" ,"high" , &error_fatal); + +create_pca9554 (soc,9 ,0x21 ); +at24c_eeprom_init (i2c[9 ],0x50 ,64 * KiB); +at24c_eeprom_init (i2c[9 ],0x51 ,64 * KiB); + +/* Bus 11 */ +at24c_eeprom_init_rom (i2c[10 ],0x50 ,256 , gb200nvl_bmc_fruid, + gb200nvl_bmc_fruid_len); +} +static void fby35_i2c_init (AspeedMachineState *bmc) {AspeedSoCState *soc = bmc->soc;@@ -1587,6 +1637,31 @@ static void aspeed_machine_bletchley_class_init(ObjectClass *oc,aspeed_machine_class_init_cpus_defaults (mc); } +#define GB200NVL_BMC_RAM_SIZE ASPEED_RAM_SIZE(1 * GiB) + +static void aspeed_machine_gb200nvl_class_init (ObjectClass *oc, +const void *data) +{ +MachineClass *mc =MACHINE_CLASS (oc); +AspeedMachineClass *amc =ASPEED_MACHINE_CLASS (oc); + + mc->desc ="Nvidia GB200NVL BMC (Cortex-A7)" ; + amc->soc_name ="ast2600-a3" ; + amc->hw_strap1 =GB200NVL_BMC_HW_STRAP1 ; + amc->hw_strap2 =GB200NVL_BMC_HW_STRAP2 ; + amc->fmc_model ="mx66u51235f" ; + amc->spi_model ="mx66u51235f" ; + amc->num_cs =2 ; + + amc->spi2_model ="mx66u51235f" ; + amc->num_cs2 =1 ; + amc->macs_mask =ASPEED_MAC0_ON |ASPEED_MAC1_ON ; + amc->i2c_init = gb200nvl_bmc_i2c_init; + mc->default_ram_size =GB200NVL_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);@@ -1879,6 +1954,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("gb200nvl-bmc"), + .parent = TYPE_ASPEED_MACHINE, + .class_init = aspeed_machine_gb200nvl_class_init, }, { .name = MACHINE_TYPE_NAME("fby35-bmc"), .parent = MACHINE_TYPE_NAME("ast2600-evb"),hw/arm/aspeed_eeprom.c +21
-0@@ -162,6 +162,25 @@ const uint8_t rainier_bmc_fruid[] = { 0x31, 0x50, 0x46, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, }; +const uint8_t gb200nvl_bmc_fruid[] = { +0x01 ,0x00 ,0x00 ,0x01 ,0x0b ,0x00 ,0x00 ,0xf3 ,0x01 ,0x0a ,0x19 ,0x1f , +0x0f ,0xe6 ,0xc6 ,0x4e ,0x56 ,0x49 ,0x44 ,0x49 ,0x41 ,0xc5 ,0x50 ,0x33 , +0x38 ,0x30 ,0x39 ,0xcd ,0x31 ,0x35 ,0x38 ,0x33 ,0x33 ,0x32 ,0x34 ,0x38 , +0x30 ,0x30 ,0x31 ,0x35 ,0x30 ,0xd2 ,0x36 ,0x39 ,0x39 ,0x2d ,0x31 ,0x33 , +0x38 ,0x30 ,0x39 ,0x2d ,0x30 ,0x34 ,0x30 ,0x34 ,0x2d ,0x36 ,0x30 ,0x30 , +0xc0 ,0x01 ,0x01 ,0xd6 ,0x4d ,0x41 ,0x43 ,0x3a ,0x20 ,0x33 ,0x43 ,0x3a , +0x36 ,0x44 ,0x3a ,0x36 ,0x36 ,0x3a ,0x31 ,0x34 ,0x3a ,0x43 ,0x38 ,0x3a , +0x37 ,0x41 ,0xc1 ,0x3b ,0x01 ,0x09 ,0x19 ,0xc6 ,0x4e ,0x56 ,0x49 ,0x44 , +0x49 ,0x41 ,0xc9 ,0x50 ,0x33 ,0x38 ,0x30 ,0x39 ,0x2d ,0x42 ,0x4d ,0x43 , +0xd2 ,0x36 ,0x39 ,0x39 ,0x2d ,0x31 ,0x33 ,0x38 ,0x30 ,0x39 ,0x2d ,0x30 , +0x34 ,0x30 ,0x34 ,0x2d ,0x36 ,0x30 ,0x30 ,0xc4 ,0x41 ,0x45 ,0x2e ,0x31 , +0xcd ,0x31 ,0x35 ,0x38 ,0x33 ,0x33 ,0x32 ,0x34 ,0x38 ,0x30 ,0x30 ,0x31 , +0x35 ,0x30 ,0xc0 ,0xc4 ,0x76 ,0x30 ,0x2e ,0x31 ,0xc1 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0xb4 ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff , +0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff ,0xff + +}; +const size_t tiogapass_bmc_fruid_len =sizeof (tiogapass_bmc_fruid);const size_t fby35_nic_fruid_len =sizeof (fby35_nic_fruid);const size_t fby35_bb_fruid_len =sizeof (fby35_bb_fruid);@@ -169,3 +188,5 @@ const size_t fby35_bmc_fruid_len = sizeof(fby35_bmc_fruid);const size_t yosemitev2_bmc_fruid_len =sizeof (yosemitev2_bmc_fruid);const size_t rainier_bb_fruid_len =sizeof (rainier_bb_fruid);const size_t rainier_bmc_fruid_len =sizeof (rainier_bmc_fruid); +const size_t gb200nvl_bmc_fruid_len =sizeof (gb200nvl_bmc_fruid); +hw/arm/aspeed_eeprom.h +3
-0@@ -26,4 +26,7 @@ extern const size_t rainier_bb_fruid_len;extern const uint8_t rainier_bmc_fruid[];extern const size_t rainier_bmc_fruid_len; +extern const uint8_t gb200nvl_bmc_fruid[]; +extern const size_t gb200nvl_bmc_fruid_len; +#endif
PATCH v2 4/4 tests/functional: Add gb200 tests
In reply to Ed TanousTo support the newly added gb200 machine, add appropriate tests.
--- tests/functional/aspeed.py | 9 +++++-- tests/functional/meson.build | 2 ++ .../test_arm_aspeed_gb200nvl_bmc.py | 26 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-) create mode 100755 tests/functional/test_arm_aspeed_gb200nvl_bmc.py
tests/functional/aspeed.py +7 -2
@@ -8,8 +8,13 @@ class AspeedTest(LinuxKernelTest): def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04', - cpu_id='0x0', soc='AST2500 rev A1'): - hostname = machine.removesuffix('-bmc') + cpu_id='0x0', soc='AST2500 rev A1', + image_hostname=None): + # Allow for the image hostname to not end in "-bmc" + if image_hostname is not None: + hostname = image_hostname + else: + hostname = machine.removesuffix('-bmc') self.set_machine(machine) self.vm.set_console()
tests/functional/meson.build +2 -0
@@ -32,6 +32,7 @@ test_timeouts = { 'arm_aspeed_ast2500' : 720, 'arm_aspeed_ast2600' : 1200, 'arm_aspeed_bletchley' : 480, + 'arm_aspeed_gb200nvl_bmc' : 480, 'arm_aspeed_rainier' : 480, 'arm_bpim2u' : 500, 'arm_collie' : 180,
@@ -126,6 +127,7 @@ tests_arm_system_thorough = [ 'arm_aspeed_ast2500', 'arm_aspeed_ast2600', 'arm_aspeed_bletchley', + 'arm_aspeed_gb200nvl_bmc', 'arm_aspeed_rainier', 'arm_bpim2u', 'arm_canona1100',
tests/functional/test_arm_aspeed_gb200nvl_bmc.py new file +26 -0
@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# Functional test that boots the ASPEED machines +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from aspeed import AspeedTest + + +class GB200Machine(AspeedTest): + + ASSET_GB200_FLASH = Asset( + 'https://github.com/legoater/qemu-aspeed-boot/raw/refs/heads/master/images/gb200nvl-obmc/obmc-phosphor-image-gb200nvl-obmc-20250702182348.static.mtd.xz', + 'b84819317cb3dc762895ad507705978ef000bfc77c50c33a63bdd37921db0dbc') + + def test_arm_aspeed_gb200_openbmc(self): + image_path = self.uncompress(self.ASSET_GB200_FLASH) + + self.do_test_arm_aspeed_openbmc('gb200nvl-bmc', image=image_path, + uboot='2019.04', cpu_id='0xf00', + soc='AST2600 rev A3', + image_hostname='gb200nvl-obmc') + +if __name__ == '__main__': + AspeedTest.main()
Signature · 1 line
2.43.0
Re: [PATCH v2 4/4] tests/functional: Add gb200 tests
Quoted 17 lines · Ed Tanous
To support the newly added gb200 machine, add appropriate tests.
Signed-off-by Ed Tanous <[email protected]>--- tests/functional/aspeed.py | 9 +++++-- tests/functional/meson.build | 2 ++ .../test_arm_aspeed_gb200nvl_bmc.py | 26 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-)create mode 100755
tests/functional/test_arm_aspeed_gb200nvl_bmc.pytests/functional/aspeed.py +0
-0@@ -8,8 +8,13 @@ class AspeedTest(LinuxKernelTest):
tests/functional/aspeed.py line 17
Quoted 10 lines
tests/functional/aspeed.py +7
-2def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04', - cpu_id='0x0', soc='AST2500 rev A1'): - hostname = machine.removesuffix('-bmc') + cpu_id='0x0', soc='AST2500 rev A1', + image_hostname=None): + # Allow for the image hostname to not end in "-bmc" + if image_hostname is not None: + hostname = image_hostname + else: + hostname = machine.removesuffix('-bmc')
This change belongs to another patch and it doesn't seem that this series needs it. Does it ?
Thanks,
C.
Quoted 54 lines
tests/functional/aspeed.py +0
-0self.set_machine(machine) self.vm.set_console()tests/functional/meson.build +2
-0@@ -32,6 +32,7 @@ test_timeouts = { 'arm_aspeed_ast2500' : 720, 'arm_aspeed_ast2600' : 1200, 'arm_aspeed_bletchley' : 480, + 'arm_aspeed_gb200nvl_bmc' : 480, 'arm_aspeed_rainier' : 480, 'arm_bpim2u' : 500, 'arm_collie' : 180,@@ -126,6 +127,7 @@ tests_arm_system_thorough = [ 'arm_aspeed_ast2500', 'arm_aspeed_ast2600', 'arm_aspeed_bletchley', + 'arm_aspeed_gb200nvl_bmc', 'arm_aspeed_rainier', 'arm_bpim2u', 'arm_canona1100',tests/functional/test_arm_aspeed_gb200nvl_bmc.py new file +26
-0@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# Functional test that boots the ASPEED machines +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from aspeed import AspeedTest + + +class GB200Machine(AspeedTest): + + ASSET_GB200_FLASH = Asset( + 'https://github.com/legoater/qemu-aspeed-boot/raw/refs/heads/master/images/gb200nvl-obmc/obmc-phosphor-image-gb200nvl-obmc-20250702182348.static.mtd.xz', + 'b84819317cb3dc762895ad507705978ef000bfc77c50c33a63bdd37921db0dbc') + + def test_arm_aspeed_gb200_openbmc(self): + image_path = self.uncompress(self.ASSET_GB200_FLASH) + + self.do_test_arm_aspeed_openbmc('gb200nvl-bmc', image=image_path, + uboot='2019.04', cpu_id='0xf00', + soc='AST2600 rev A3', + image_hostname='gb200nvl-obmc') + +if __name__ == '__main__': + AspeedTest.main()
Re: [PATCH v2 4/4] tests/functional: Add gb200 tests
Quoted 23 lines · Cédric Le Goater
Quoted 22 lines · Ed Tanous
To support the newly added gb200 machine, add appropriate tests.
Signed-off-by Ed Tanous <[email protected]>--- tests/functional/aspeed.py | 9 +++++-- tests/functional/meson.build | 2 ++ .../test_arm_aspeed_gb200nvl_bmc.py | 26 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-)create mode 100755
tests/functional/test_arm_aspeed_gb200nvl_bmc.pytests/functional/aspeed.py +3
-2@@ -8,8 +8,13 @@ class AspeedTest(LinuxKernelTest): def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04', - cpu_id='0x0', soc='AST2500 rev A1'): - hostname = machine.removesuffix('-bmc') + cpu_id='0x0', soc='AST2500 rev A1', + image_hostname=None): + # Allow for the image hostname to not end in "-bmc"
Quoted 8 lines
tests/functional/aspeed.py line 17
Quoted 4 lines
tests/functional/aspeed.py +4
-0+ if image_hostname is not None: + hostname = image_hostname + else: + hostname = machine.removesuffix('-bmc')This change belongs to another patch and it doesn't seem that this series needs it. Does it ?
I Should've been made more clear in the commit message, but yes, this is required because the hostname of this system is gb200nvl-obmc, so removing the postfix of -bmc fails, and the test fails because of it. This code allows adding an opt-in param to handle the different string. I can break it out into its own commit if that's an issue.
Quoted 63 lines
Thanks,
C.
Quoted 54 lines
tests/functional/aspeed.py +0
-0self.set_machine(machine) self.vm.set_console()tests/functional/meson.build +2
-0@@ -32,6 +32,7 @@ test_timeouts = { 'arm_aspeed_ast2500' : 720, 'arm_aspeed_ast2600' : 1200, 'arm_aspeed_bletchley' : 480, + 'arm_aspeed_gb200nvl_bmc' : 480, 'arm_aspeed_rainier' : 480, 'arm_bpim2u' : 500, 'arm_collie' : 180,@@ -126,6 +127,7 @@ tests_arm_system_thorough = [ 'arm_aspeed_ast2500', 'arm_aspeed_ast2600', 'arm_aspeed_bletchley', + 'arm_aspeed_gb200nvl_bmc', 'arm_aspeed_rainier', 'arm_bpim2u', 'arm_canona1100',tests/functional/test_arm_aspeed_gb200nvl_bmc.py new file +26
-0@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# Functional test that boots the ASPEED machines +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from aspeed import AspeedTest + + +class GB200Machine(AspeedTest): + + ASSET_GB200_FLASH = Asset( + 'https://github.com/legoater/qemu-aspeed-boot/raw/refs/heads/master/images/gb200nvl-obmc/obmc-phosphor-image-gb200nvl-obmc-20250702182348.static.mtd.xz', + 'b84819317cb3dc762895ad507705978ef000bfc77c50c33a63bdd37921db0dbc') + + def test_arm_aspeed_gb200_openbmc(self): + image_path = self.uncompress(self.ASSET_GB200_FLASH) + + self.do_test_arm_aspeed_openbmc('gb200nvl-bmc', image=image_path, + uboot='2019.04', cpu_id='0xf00', + soc='AST2600 rev A3', + image_hostname='gb200nvl-obmc') + +if __name__ == '__main__': + AspeedTest.main()
Cédric Le Goater
Reviewed-byRe: [PATCH v2 4/4] tests/functional: Add gb200 tests
Quoted 33 lines · Ed Tanous
Quoted 23 lines · Cédric Le Goater
Quoted 22 lines · Ed Tanous
To support the newly added gb200 machine, add appropriate tests.
Signed-off-by Ed Tanous <[email protected]>--- tests/functional/aspeed.py | 9 +++++-- tests/functional/meson.build | 2 ++ .../test_arm_aspeed_gb200nvl_bmc.py | 26 +++++++++++++++++++ 3 files changed, 35 insertions(+), 2 deletions(-)create mode 100755
tests/functional/test_arm_aspeed_gb200nvl_bmc.pytests/functional/aspeed.py +3
-2@@ -8,8 +8,13 @@ class AspeedTest(LinuxKernelTest): def do_test_arm_aspeed_openbmc(self, machine, image, uboot='2019.04', - cpu_id='0x0', soc='AST2500 rev A1'): - hostname = machine.removesuffix('-bmc') + cpu_id='0x0', soc='AST2500 rev A1', + image_hostname=None): + # Allow for the image hostname to not end in "-bmc"Quoted 8 lines
tests/functional/aspeed.py line 17
Quoted 4 lines
tests/functional/aspeed.py +4
-0+ if image_hostname is not None: + hostname = image_hostname + else: + hostname = machine.removesuffix('-bmc')This change belongs to another patch and it doesn't seem that this series needs it. Does it ?
Quoted 2 lines
I Should've been made more clear in the commit message, but yes, this is required because the hostname of this system is gb200nvl-obmc,
Ah. I was looking at the QEMU machine name : gb200nvl-bmc
Quoted 4 lines
so
removing the postfix of -bmc fails, and the test fails because of it. This code allows adding an opt-in param to handle the different string. I can break it out into its own commit if that's an issue.
No it's fine.
Thanks,
C.
Quoted 64 lines
Quoted 64 lines
Thanks,
C.
Quoted 54 lines
tests/functional/aspeed.py +0
-0self.set_machine(machine) self.vm.set_console()tests/functional/meson.build +2
-0@@ -32,6 +32,7 @@ test_timeouts = { 'arm_aspeed_ast2500' : 720, 'arm_aspeed_ast2600' : 1200, 'arm_aspeed_bletchley' : 480, + 'arm_aspeed_gb200nvl_bmc' : 480, 'arm_aspeed_rainier' : 480, 'arm_bpim2u' : 500, 'arm_collie' : 180,@@ -126,6 +127,7 @@ tests_arm_system_thorough = [ 'arm_aspeed_ast2500', 'arm_aspeed_ast2600', 'arm_aspeed_bletchley', + 'arm_aspeed_gb200nvl_bmc', 'arm_aspeed_rainier', 'arm_bpim2u', 'arm_canona1100',tests/functional/test_arm_aspeed_gb200nvl_bmc.py new file +26
-0@@ -0,0 +1,26 @@ +#!/usr/bin/env python3 +# +# Functional test that boots the ASPEED machines +# +# SPDX-License-Identifier: GPL-2.0-or-later + +from qemu_test import Asset +from aspeed import AspeedTest + + +class GB200Machine(AspeedTest): + + ASSET_GB200_FLASH = Asset( + 'https://github.com/legoater/qemu-aspeed-boot/raw/refs/heads/master/images/gb200nvl-obmc/obmc-phosphor-image-gb200nvl-obmc-20250702182348.static.mtd.xz', + 'b84819317cb3dc762895ad507705978ef000bfc77c50c33a63bdd37921db0dbc') + + def test_arm_aspeed_gb200_openbmc(self): + image_path = self.uncompress(self.ASSET_GB200_FLASH) + + self.do_test_arm_aspeed_openbmc('gb200nvl-bmc', image=image_path, + uboot='2019.04', cpu_id='0xf00', + soc='AST2600 rev A3', + image_hostname='gb200nvl-obmc') + +if __name__ == '__main__': + AspeedTest.main()
Quoted 8 lines · Ed Tanous
This patch series adds support for gb200-bmc, a baseboard management controller module based on an Aspeed 2600 SOC.
v2:
- Rebase on master
- Drop duplicated patch for enabling PCA954X
- Updated commit message with source information
- Added functional tests and example openbmc image
Please try to collect the Reviewed-by trailers of the previous series when you resend.
Thanks,
C.
Quoted 18 lines
Ed Tanous (4):
hw/arm/aspeed: Add second SPI chip to Aspeed model
docs: add support for gb200-bmc hw/arm/aspeed: Add GB200 BMC target tests/functional: Add gb200 testsdocs/system/arm/aspeed.rst | 4 +- hw/arm/aspeed.c | 81 +++++++++++++++++++ hw/arm/aspeed_eeprom.c | 21 +++++ hw/arm/aspeed_eeprom.h | 3 + include/hw/arm/aspeed.h | 2 + tests/functional/aspeed.py | 9 ++- tests/functional/meson.build | 2 + .../test_arm_aspeed_gb200nvl_bmc.py | 26 ++++++ 8 files changed, 144 insertions(+), 4 deletions(-)create mode 100755
tests/functional/test_arm_aspeed_gb200nvl_bmc.py
Quoted 11 lines · Cédric Le Goater
Quoted 8 lines · Ed Tanous
This patch series adds support for gb200-bmc, a baseboard management controller module based on an Aspeed 2600 SOC.
v2:
- Rebase on master
- Drop duplicated patch for enabling PCA954X
- Updated commit message with source information
- Added functional tests and example openbmc image
Quoted 2 lines
Please try to collect the Reviewed-by trailers of the previous series when you resend.
ACK. Can do in the next series. I had erroneously thought that git-publish pulled that from the thread.
Quoted 26 lines
Thanks,
C.
Quoted 18 lines
Ed Tanous (4):
hw/arm/aspeed: Add second SPI chip to Aspeed model
docs: add support for gb200-bmc hw/arm/aspeed: Add GB200 BMC target tests/functional: Add gb200 testsdocs/system/arm/aspeed.rst | 4 +- hw/arm/aspeed.c | 81 +++++++++++++++++++ hw/arm/aspeed_eeprom.c | 21 +++++ hw/arm/aspeed_eeprom.h | 3 + include/hw/arm/aspeed.h | 2 + tests/functional/aspeed.py | 9 ++- tests/functional/meson.build | 2 + .../test_arm_aspeed_gb200nvl_bmc.py | 26 ++++++ 8 files changed, 144 insertions(+), 4 deletions(-)create mode 100755
tests/functional/test_arm_aspeed_gb200nvl_bmc.py
Cédric Le Goater
AppliedQuoted 24 lines · Ed Tanous
This patch series adds support for gb200-bmc, a baseboard management controller module based on an Aspeed 2600 SOC.
v2:
- Rebase on master
- Drop duplicated patch for enabling PCA954X
- Updated commit message with source information
- Added functional tests and example openbmc imageEd Tanous (4):
hw/arm/aspeed: Add second SPI chip to Aspeed model
docs: add support for gb200-bmc hw/arm/aspeed: Add GB200 BMC target tests/functional: Add gb200 testsdocs/system/arm/aspeed.rst | 4 +- hw/arm/aspeed.c | 81 +++++++++++++++++++ hw/arm/aspeed_eeprom.c | 21 +++++ hw/arm/aspeed_eeprom.h | 3 + include/hw/arm/aspeed.h | 2 + tests/functional/aspeed.py | 9 ++- tests/functional/meson.build | 2 + .../test_arm_aspeed_gb200nvl_bmc.py | 26 ++++++ 8 files changed, 144 insertions(+), 4 deletions(-)
Quoted 2 lines
create mode 100755
tests/functional/test_arm_aspeed_gb200nvl_bmc.py
Applied to aspeed-next.
Thanks,
C.