@samitouri / QOSamiQemu / commits / 34f634a207

hw/arm: Remove fby35 machine

The fby35 machine was deprecated in QEMU 10.2 and is now removed in QEMU 11.1. This multi-SoC machine was added as an example of heterogeneous systems, but the models never evolved and no public firmware is available to boot it. Users needing multi-SoC emulation should use the ast2700fc machine instead, which is based on newer AST2700 SoCs with better support. Link: https://lore.kernel.org/qemu-devel/20260510165704.2935316-5-clg@redhat.com Acked-by: Peter Delevoryas <peter@pjd.dev> Signed-off-by: Cédric Le Goater <clg@redhat.com>

Cédric Le Goater committed May 10, 2026 at 18:57 UTC 34f634a20721bbe12a58c4c6d0b22d1df4da9154
7 files changed +11 -270
MAINTAINERS
-2
@@ -1276,12 +1276,10 @@ F: include/hw/*/*aspeed*
1276 F: hw/net/ftgmac100.c
1277 F: include/hw/net/ftgmac100.h
1278 F: docs/system/arm/aspeed.rst
1279 -F: docs/system/arm/fby35.rst
1279 F: docs/specs/aspeed*
1280 F: tests/functional/*/*aspeed*
1281 F: tests/*/*aspeed*
1282 F: tests/*/*ast2700*
1284 -F: hw/arm/fby35.c
1283 F: pc-bios/ast27x0_bootrom.bin
1284 F: roms/vbootrom
1285
docs/about/deprecated.rst
-10
@@ -250,16 +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 ``fby35`` machine (since 10.2)
254 -''''''''''''''''''''''''''''''''''
255 -
256 -The ``fby35`` machine was originally added as an example of a
257 -multi-SoC system, with the expectation the models would evolve over
258 -time in an heterogeneous system. This hasn't happened and no public
259 -firmware is available to boot it. It can be replaced by the
260 -``ast2700fc``, another multi-SoC machine based on the newer AST2700
261 -SoCs which are excepted to receive better support in the future.
262 -
253
254 RISC-V default machine option (since 10.0)
255 ''''''''''''''''''''''''''''''''''''''''''
docs/about/removed-features.rst
+10
@@ -1213,6 +1213,16 @@ models, it can be replaced by the ``ast2500-evb`` machine using the
1213 ``fmc-model`` option to specify the flash type. The I2C devices
1214 connected to the board can be defined via the QEMU command line.
1215
1216 +Arm ``fby35`` machine (removed in 11.1)
1217 +'''''''''''''''''''''''''''''''''''''''
1218 +
1219 +The ``fby35`` machine was originally added as an example of a
1220 +multi-SoC system, with the expectation the models would evolve over
1221 +time in an heterogeneous system. This hasn't happened and no public
1222 +firmware is available to boot it. It can be replaced by the
1223 +``ast2700fc``, another multi-SoC machine based on the newer AST2700
1224 +SoCs which are excepted to receive better support in the future.
1225 +
1226 linux-user mode CPUs
1227 --------------------
1228
docs/system/arm/fby35.rst deleted
-52
@@ -1,52 +0,0 @@
1 -Facebook Yosemite v3.5 Platform and CraterLake Server (``fby35``)
2 -==================================================================
3 -
4 -Facebook has a series of multi-node compute server designs named
5 -Yosemite. The most recent version released was
6 -`Yosemite v3 <https://www.opencompute.org/documents/ocp-yosemite-v3-platform-design-specification-1v16-pdf>`__.
7 -
8 -Yosemite v3.5 is an iteration on this design, and is very similar: there's a
9 -baseboard with a BMC, and 4 server slots. The new server board design termed
10 -"CraterLake" includes a Bridge IC (BIC), with room for expansion boards to
11 -include various compute accelerators (video, inferencing, etc). At the moment,
12 -only the first server slot's BIC is included.
13 -
14 -Yosemite v3.5 is itself a sled which fits into a 40U chassis, and 3 sleds
15 -can be fit into a chassis. See `here <https://www.opencompute.org/products-chiplets/237/wiwynn-yosemite-v3-server>`__
16 -for an example.
17 -
18 -In this generation, the BMC is an AST2600 and each BIC is an AST1030. The BMC
19 -runs `OpenBMC <https://github.com/facebook/openbmc>`__, and the BIC runs
20 -`OpenBIC <https://github.com/facebook/openbic>`__.
21 -
22 -Firmware images can be retrieved from the Github releases or built from the
23 -source code, see the README's for instructions on that. This image uses the
24 -"fby35" machine recipe from OpenBMC, and the "yv35-cl" target from OpenBIC.
25 -Some reference images can also be found here:
26 -
27 -.. code-block:: bash
28 -
29 - $ wget https://github.com/facebook/openbmc/releases/download/openbmc-e2294ff5d31d/fby35.mtd
30 - $ wget https://github.com/peterdelevoryas/OpenBIC/releases/download/oby35-cl-2022.13.01/Y35BCL.elf
31 -
32 -Since this machine has multiple SoC's, each with their own serial console, the
33 -recommended way to run it is to allocate a pseudoterminal for each serial
34 -console and let the monitor use stdio. Also, starting in a paused state is
35 -useful because it allows you to attach to the pseudoterminals before the boot
36 -process starts.
37 -
38 -.. code-block:: bash
39 -
40 - $ qemu-system-arm -machine fby35 \
41 - -drive file=fby35.mtd,format=raw,if=mtd \
42 - -device loader,file=Y35BCL.elf,addr=0,cpu-num=2 \
43 - -serial pty -serial pty -serial mon:stdio \
44 - -display none -S
45 - $ screen /dev/tty0 # In a separate TMUX pane, terminal window, etc.
46 - $ screen /dev/tty1
47 - $ (qemu) c # Start the boot process once screen is setup.
48 -
49 -This machine model supports emulation of the boot from the CE0 flash device by
50 -setting option ``execute-in-place``. When using this option, the CPU fetches
51 -instructions to execute by reading CE0 and not from a preloaded ROM
52 -initialized at machine init time. As a result, execution will be slower.
docs/system/target-arm.rst
-1
@@ -87,7 +87,6 @@ Board-specific documentation
87 arm/cubieboard
88 arm/emcraft-sf2
89 arm/exynos
90 - arm/fby35
90 arm/musicpal
91 arm/kzm
92 arm/nrf
hw/arm/fby35.c deleted
-203
@@ -1,203 +0,0 @@
1 -/*
2 - * Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com)
3 - *
4 - * This code is licensed under the GPL version 2 or later. See the COPYING
5 - * file in the top-level directory.
6 - */
7 -
8 -#include "qemu/osdep.h"
9 -#include "qemu/units.h"
10 -#include "qapi/error.h"
11 -#include "system/system.h"
12 -#include "system/block-backend.h"
13 -#include "hw/core/boards.h"
14 -#include "hw/core/qdev-clock.h"
15 -#include "hw/arm/aspeed_soc.h"
16 -#include "hw/arm/boot.h"
17 -#include "hw/arm/machines-qom.h"
18 -
19 -#define TYPE_FBY35 MACHINE_TYPE_NAME("fby35")
20 -OBJECT_DECLARE_SIMPLE_TYPE(Fby35State, FBY35);
21 -
22 -struct Fby35State {
23 - MachineState parent_obj;
24 -
25 - MemoryRegion bmc_memory;
26 - MemoryRegion bmc_dram;
27 - MemoryRegion bmc_boot_rom;
28 - MemoryRegion bic_memory;
29 - Clock *bic_sysclk;
30 -
31 - Aspeed2600SoCState bmc;
32 - Aspeed10x0SoCState bic;
33 -
34 - bool mmio_exec;
35 -};
36 -
37 -#define FBY35_BMC_RAM_SIZE (2 * GiB)
38 -#define FBY35_BMC_FIRMWARE_ADDR 0x0
39 -
40 -static void fby35_bmc_write_boot_rom(DriveInfo *dinfo, MemoryRegion *mr,
41 - hwaddr offset, size_t rom_size,
42 - Error **errp)
43 -{
44 - BlockBackend *blk = blk_by_legacy_dinfo(dinfo);
45 - g_autofree void *storage = NULL;
46 - int64_t size;
47 -
48 - /*
49 - * The block backend size should have already been 'validated' by
50 - * the creation of the m25p80 object.
51 - */
52 - size = blk_getlength(blk);
53 - if (size <= 0) {
54 - error_setg(errp, "failed to get flash size");
55 - return;
56 - }
57 -
58 - if (rom_size > size) {
59 - rom_size = size;
60 - }
61 -
62 - storage = g_malloc0(rom_size);
63 - if (blk_pread(blk, 0, rom_size, storage, 0) < 0) {
64 - error_setg(errp, "failed to read the initial flash content");
65 - return;
66 - }
67 -
68 - /* TODO: find a better way to install the ROM */
69 - memcpy(memory_region_get_ram_ptr(mr) + offset, storage, rom_size);
70 -}
71 -
72 -static void fby35_bmc_init(Fby35State *s)
73 -{
74 - AspeedSoCState *soc;
75 - AspeedSoCClass *sc;
76 -
77 - object_initialize_child(OBJECT(s), "bmc", &s->bmc, "ast2600-a3");
78 - soc = ASPEED_SOC(&s->bmc);
79 - sc = ASPEED_SOC_GET_CLASS(soc);
80 -
81 - memory_region_init(&s->bmc_memory, OBJECT(&s->bmc), "bmc-memory",
82 - UINT64_MAX);
83 - memory_region_add_subregion(get_system_memory(), 0, &s->bmc_memory);
84 - memory_region_init_ram(&s->bmc_dram, OBJECT(&s->bmc), "bmc-dram",
85 - FBY35_BMC_RAM_SIZE, &error_abort);
86 -
87 - object_property_set_int(OBJECT(&s->bmc), "ram-size", FBY35_BMC_RAM_SIZE,
88 - &error_abort);
89 - object_property_set_link(OBJECT(&s->bmc), "memory", OBJECT(&s->bmc_memory),
90 - &error_abort);
91 - object_property_set_link(OBJECT(&s->bmc), "dram", OBJECT(&s->bmc_dram),
92 - &error_abort);
93 - object_property_set_int(OBJECT(&s->bmc), "hw-strap1", 0x000000C0,
94 - &error_abort);
95 - object_property_set_int(OBJECT(&s->bmc), "hw-strap2", 0x00000003,
96 - &error_abort);
97 - aspeed_soc_uart_set_chr(soc->uart, ASPEED_DEV_UART5, sc->uarts_base,
98 - sc->uarts_num, serial_hd(0));
99 - qdev_realize(DEVICE(&s->bmc), NULL, &error_abort);
100 -
101 - aspeed_board_init_flashes(&soc->fmc, "n25q00", 2, 0);
102 -
103 - /* Install first FMC flash content as a boot rom. */
104 - if (!s->mmio_exec) {
105 - DriveInfo *mtd0 = drive_get(IF_MTD, 0, 0);
106 -
107 - if (mtd0) {
108 - uint64_t rom_size = memory_region_size(&soc->spi_boot);
109 -
110 - memory_region_init_rom(&s->bmc_boot_rom, NULL, "aspeed.boot_rom",
111 - rom_size, &error_abort);
112 - memory_region_add_subregion_overlap(&soc->spi_boot_container, 0,
113 - &s->bmc_boot_rom, 1);
114 -
115 - fby35_bmc_write_boot_rom(mtd0, &s->bmc_boot_rom,
116 - FBY35_BMC_FIRMWARE_ADDR,
117 - rom_size, &error_abort);
118 - }
119 - }
120 -}
121 -
122 -static void fby35_bic_init(Fby35State *s)
123 -{
124 - AspeedSoCState *soc;
125 - AspeedSoCClass *sc;
126 -
127 - s->bic_sysclk = clock_new(OBJECT(s), "SYSCLK");
128 - clock_set_hz(s->bic_sysclk, 200000000ULL);
129 -
130 - object_initialize_child(OBJECT(s), "bic", &s->bic, "ast1030-a1");
131 - soc = ASPEED_SOC(&s->bic);
132 - sc = ASPEED_SOC_GET_CLASS(soc);
133 -
134 - memory_region_init(&s->bic_memory, OBJECT(&s->bic), "bic-memory",
135 - UINT64_MAX);
136 -
137 - qdev_connect_clock_in(DEVICE(&s->bic), "sysclk", s->bic_sysclk);
138 - object_property_set_link(OBJECT(&s->bic), "memory", OBJECT(&s->bic_memory),
139 - &error_abort);
140 - aspeed_soc_uart_set_chr(soc->uart, ASPEED_DEV_UART5, sc->uarts_base,
141 - sc->uarts_num, serial_hd(1));
142 - qdev_realize(DEVICE(&s->bic), NULL, &error_abort);
143 -
144 - aspeed_board_init_flashes(&soc->fmc, "sst25vf032b", 2, 2);
145 - aspeed_board_init_flashes(&soc->spi[0], "sst25vf032b", 2, 4);
146 - aspeed_board_init_flashes(&soc->spi[1], "sst25vf032b", 2, 6);
147 -}
148 -
149 -static void fby35_init(MachineState *machine)
150 -{
151 - Fby35State *s = FBY35(machine);
152 -
153 - fby35_bmc_init(s);
154 - fby35_bic_init(s);
155 -}
156 -
157 -
158 -static bool fby35_get_mmio_exec(Object *obj, Error **errp)
159 -{
160 - return FBY35(obj)->mmio_exec;
161 -}
162 -
163 -static void fby35_set_mmio_exec(Object *obj, bool value, Error **errp)
164 -{
165 - FBY35(obj)->mmio_exec = value;
166 -}
167 -
168 -static void fby35_instance_init(Object *obj)
169 -{
170 - FBY35(obj)->mmio_exec = false;
171 -}
172 -
173 -static void fby35_class_init(ObjectClass *oc, const void *data)
174 -{
175 - MachineClass *mc = MACHINE_CLASS(oc);
176 -
177 - mc->desc = "Meta Platforms fby35";
178 - mc->deprecation_reason = "For a multi-soc machine, use 'ast2700fc' instead";
179 - mc->init = fby35_init;
180 - mc->no_floppy = 1;
181 - mc->no_cdrom = 1;
182 - mc->auto_create_sdcard = true;
183 - mc->min_cpus = mc->max_cpus = mc->default_cpus = 3;
184 -
185 - object_class_property_add_bool(oc, "execute-in-place",
186 - fby35_get_mmio_exec,
187 - fby35_set_mmio_exec);
188 - object_class_property_set_description(oc, "execute-in-place",
189 - "boot directly from CE0 flash device");
190 -}
191 -
192 -static const TypeInfo fby35_types[] = {
193 - {
194 - .name = MACHINE_TYPE_NAME("fby35"),
195 - .parent = TYPE_MACHINE,
196 - .class_init = fby35_class_init,
197 - .instance_size = sizeof(Fby35State),
198 - .instance_init = fby35_instance_init,
199 - .interfaces = arm_machine_interfaces,
200 - },
201 -};
202 -
203 -DEFINE_TYPES(fby35_types);
hw/arm/meson.build
+1 -2
@@ -62,8 +62,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
62 'aspeed_ast2600_gb200nvl.c',
63 'aspeed_ast2600_rainier.c',
64 'aspeed_ast10x0.c',
65 - 'aspeed_ast10x0_evb.c',
66 - 'fby35.c'))
65 + 'aspeed_ast10x0_evb.c'))
66 arm_common_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: files(
67 'aspeed_ast1700.c',
68 'aspeed_ast27x0.c',