@samitouri / QOSamiQemu / commits / 2eca3dad83

hw/arm: Remove sonorapass-bmc machine

The sonorapass-bmc machine was deprecated in QEMU 10.2 and is now removed in QEMU 11.1. This OCP SonoraPass BMC lab server never entered production and can be replaced by the ast2500-evb machine with appropriate fmc-model and I2C device configuration via command line. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Link: https://lore.kernel.org/qemu-devel/20260510165704.2935316-2-clg@redhat.com Signed-off-by: Cédric Le Goater <clg@redhat.com>

Cédric Le Goater committed May 10, 2026 at 18:57 UTC 2eca3dad83ea1c970306f3bcf6956fc43ce8d284
5 files changed +11 -116
docs/about/deprecated.rst
-9
@@ -250,15 +250,6 @@ deprecated; use the new name ``dtb-randomness`` instead. The new name
250 better reflects the way this property affects all random data within
251 the device tree blob, not just the ``kaslr-seed`` node.
252
253 -Arm ``sonorapass-bmc`` machine (since 10.2)
254 -'''''''''''''''''''''''''''''''''''''''''''
255 -
256 -The ``sonorapass-bmc`` machine represents a lab server that never
257 -entered production. Since it does not rely on any specific device
258 -models, it can be replaced by the ``ast2500-evb`` machine using the
259 -``fmc-model`` option to specify the flash type. The I2C devices
260 -connected to the board can be defined via the QEMU command line.
261 -
253 Arm ``qcom-dc-scm-v1-bmc`` and ``qcom-firework-bmc`` machine (since 10.2)
254 '''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''
255
docs/about/removed-features.rst
+9 -1
@@ -1112,7 +1112,7 @@ This machine was removed because it was unused. Alternative AST2500 based
1112 OpenPOWER machines are ``witherspoon-bmc`` and ``romulus-bmc``.
1113
1114 ppc ``taihu`` machine (removed in 7.2)
1115 -'''''''''''''''''''''''''''''''''''''''''''''
1115 +''''''''''''''''''''''''''''''''''''''
1116
1117 This machine was removed because it was partially emulated and 405
1118 machines are very similar. Use the ``ref405ep`` machine instead.
@@ -1186,6 +1186,14 @@ Arm ``highbank`` and ``midway`` machines (removed in 11.0)
1186 There were no known users left for these machines. If you just want to
1187 boot a Cortex-A15 or Cortex-A9 Linux, use the ``virt`` machine instead.
1188
1189 +Arm ``sonorapass-bmc`` machine (removed in 11.1)
1190 +''''''''''''''''''''''''''''''''''''''''''''''''
1191 +
1192 +The ``sonorapass-bmc`` machine represents a lab server that never
1193 +entered production. It can be replaced by the ``ast2500-evb`` machine
1194 +using the ``fmc-model`` option to specify the flash type. The I2C
1195 +devices connected to the board can be defined via the QEMU command
1196 +line.
1197
1198 linux-user mode CPUs
1199 --------------------
docs/system/arm/aspeed.rst
+2 -3
@@ -1,5 +1,5 @@
1 -Aspeed family boards (``ast2500-evb``, ``ast2600-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``)
2 -===================================================================================================================================================================================================================================================================================================================================================================================================================
1 +Aspeed family boards (``ast2500-evb``, ``ast2600-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``, ``supermicrox11-bmc``, ``supermicrox11spi-bmc``, ``tiogapass-bmc``, ``witherspoon-bmc``, ``yosemitev2-bmc``)
2 +===============================================================================================================================================================================================================================================================================================================================================================================================
3
4 The QEMU Aspeed machines model BMCs of various OpenPOWER systems and
5 Aspeed evaluation boards. They are based on different releases of the
@@ -22,7 +22,6 @@ AST2500 SoC based machines :
22 - ``ast2500-evb`` Aspeed AST2500 Evaluation board
23 - ``romulus-bmc`` OpenPOWER Romulus POWER9 BMC
24 - ``witherspoon-bmc`` OpenPOWER Witherspoon POWER9 BMC
25 -- ``sonorapass-bmc`` OCP SonoraPass BMC
25 - ``fp5280g2-bmc`` Inspur FP5280G2 BMC
26 - ``g220a-bmc`` Bytedance G220A BMC
27 - ``yosemitev2-bmc`` Facebook YosemiteV2 BMC
hw/arm/aspeed_ast2500_sonorapass.c deleted
-102
@@ -1,102 +0,0 @@
1 -/*
2 - * OCP SonoraPass
3 - *
4 - * Copyright 2016 IBM Corp.
5 - *
6 - * SPDX-License-Identifier: GPL-2.0-or-later
7 - */
8 -
9 -#include "qemu/osdep.h"
10 -#include "qapi/error.h"
11 -#include "hw/arm/machines-qom.h"
12 -#include "hw/arm/aspeed.h"
13 -#include "hw/arm/aspeed_soc.h"
14 -#include "hw/i2c/smbus_eeprom.h"
15 -
16 -/* Sonorapass hardware value: 0xF100D216 */
17 -#define SONORAPASS_BMC_HW_STRAP1 ( \
18 - SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \
19 - SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \
20 - SCU_AST2500_HW_STRAP_UART_DEBUG | \
21 - SCU_AST2500_HW_STRAP_RESERVED28 | \
22 - SCU_AST2500_HW_STRAP_DDR4_ENABLE | \
23 - SCU_HW_STRAP_VGA_CLASS_CODE | \
24 - SCU_HW_STRAP_LPC_RESET_PIN | \
25 - SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER) | \
26 - SCU_AST2500_HW_STRAP_SET_AXI_AHB_RATIO(AXI_AHB_RATIO_2_1) | \
27 - SCU_HW_STRAP_VGA_BIOS_ROM | \
28 - SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \
29 - SCU_AST2500_HW_STRAP_RESERVED1)
30 -
31 -static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc)
32 -{
33 - AspeedSoCState *soc = bmc->soc;
34 -
35 - /* bus 2 : */
36 - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x48);
37 - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 2), "tmp105", 0x49);
38 - /* bus 2 : pca9546 @ 0x73 */
39 -
40 - /* bus 3 : pca9548 @ 0x70 */
41 -
42 - /* bus 4 : */
43 - uint8_t *eeprom4_54 = g_malloc0(8 * 1024);
44 - smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 4), 0x54,
45 - eeprom4_54);
46 - /* PCA9539 @ 0x76, but PCA9552 is compatible */
47 - aspeed_create_pca9552(soc, 4, 0x76);
48 - /* PCA9539 @ 0x77, but PCA9552 is compatible */
49 - aspeed_create_pca9552(soc, 4, 0x77);
50 -
51 - /* bus 6 : */
52 - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6), "tmp105", 0x48);
53 - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 6), "tmp105", 0x49);
54 - /* bus 6 : pca9546 @ 0x73 */
55 -
56 - /* bus 8 : */
57 - uint8_t *eeprom8_56 = g_malloc0(8 * 1024);
58 - smbus_eeprom_init_one(aspeed_i2c_get_bus(&soc->i2c, 8), 0x56,
59 - eeprom8_56);
60 - aspeed_create_pca9552(soc, 8, 0x60);
61 - aspeed_create_pca9552(soc, 8, 0x61);
62 - /* bus 8 : adc128d818 @ 0x1d */
63 - /* bus 8 : adc128d818 @ 0x1f */
64 -
65 - /*
66 - * bus 13 : pca9548 @ 0x71
67 - * - channel 3:
68 - * - tmm421 @ 0x4c
69 - * - tmp421 @ 0x4e
70 - * - tmp421 @ 0x4f
71 - */
72 -
73 -}
74 -
75 -static void aspeed_machine_sonorapass_class_init(ObjectClass *oc,
76 - const void *data)
77 -{
78 - MachineClass *mc = MACHINE_CLASS(oc);
79 - AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
80 -
81 - mc->desc = "OCP SonoraPass BMC (ARM1176)";
82 - mc->deprecation_reason = "use 'ast2500-evb' instead";
83 - amc->soc_name = "ast2500-a1";
84 - amc->hw_strap1 = SONORAPASS_BMC_HW_STRAP1;
85 - amc->fmc_model = "mx66l1g45g";
86 - amc->spi_model = "mx66l1g45g";
87 - amc->num_cs = 2;
88 - amc->i2c_init = sonorapass_bmc_i2c_init;
89 - mc->default_ram_size = 512 * MiB;
90 - aspeed_machine_class_init_cpus_defaults(mc);
91 -};
92 -
93 -static const TypeInfo aspeed_ast2500_sonorapass_types[] = {
94 - {
95 - .name = MACHINE_TYPE_NAME("sonorapass-bmc"),
96 - .parent = TYPE_ASPEED_MACHINE,
97 - .class_init = aspeed_machine_sonorapass_class_init,
98 - .interfaces = arm_machine_interfaces,
99 - }
100 -};
101 -
102 -DEFINE_TYPES(aspeed_ast2500_sonorapass_types)
hw/arm/meson.build
-1
@@ -50,7 +50,6 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
50 'aspeed_ast2500_fp5280g2.c',
51 'aspeed_ast2500_g220a.c',
52 'aspeed_ast2500_romulus.c',
53 - 'aspeed_ast2500_sonorapass.c',
53 'aspeed_ast2500_supermicro-x11spi.c',
54 'aspeed_ast2500_tiogapass.c',
55 'aspeed_ast2500_witherspoon.c',