We shouldn't access a QOM parent object directly. Use the appropriate type-cast macro. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org&gt; --- hw/arm/raspi.c | 2 +- hw/arm/raspi4b.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index a7a662f40db..508f90479e2 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -312,7 +312,7 @@ void raspi_machine_init(MachineState *machine) object_initialize_child(OBJECT(machine), "soc", soc, board_soc_type(mc->board_rev)); - raspi_base_machine_init(machine, &soc->parent_obj); + raspi_base_machine_init(machine, BCM283X_BASE(soc)); } void raspi_machine_class_common_init(MachineClass *mc, diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index 1264e0d6eed..9b08a598f39 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -104,7 +104,7 @@ static void raspi4b_machine_init(MachineState *machine) object_initialize_child(OBJECT(machine), "soc", soc, board_soc_type(mc->board_rev)); - raspi_base_machine_init(machine, &soc->parent_obj); + raspi_base_machine_init(machine, BCM283X_BASE(soc)); } static void raspi4b_machine_class_init(ObjectClass *oc, void *data) -- 2.47.1

Except we alter the device tree blob, the 4B is just another raspi model. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org&gt; --- hw/arm/raspi.c | 114 ++++++++++++++++++++++++++++++++++++- hw/arm/raspi4b.c | 136 --------------------------------------------- hw/arm/meson.build | 2 +- 3 files changed, 114 insertions(+), 138 deletions(-) delete mode 100644 hw/arm/raspi4b.c diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 508f90479e2..3fa382d62ce 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -8,6 +8,10 @@ * Raspberry Pi 3 emulation Copyright (c) 2018 Zoltán Baldaszti * Upstream code cleanup (c) 2018 Pekka Enberg * + * Raspberry Pi 4 emulation Copyright (C) 2022 Ovchinnikov Vitalii + * + * SPDX-License-Identifier: GPL-2.0-or-later + * * This work is licensed under the terms of the GNU GPL, version 2 or later. * See the COPYING file in the top-level directory. */ @@ -16,20 +20,27 @@ #include "qemu/units.h" #include "qemu/cutils.h" #include "qapi/error.h" +#include "qapi/visitor.h" #include "hw/arm/boot.h" #include "hw/arm/bcm2836.h" #include "hw/arm/bcm2838.h" #include "hw/arm/raspi_platform.h" +#include "hw/display/bcm2835_fb.h" #include "hw/registerfields.h" #include "qemu/error-report.h" #include "hw/boards.h" #include "hw/loader.h" #include "hw/arm/boot.h" #include "qom/object.h" +#include "system/device_tree.h" +#include <libfdt.h> #define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common") OBJECT_DECLARE_SIMPLE_TYPE(RaspiMachineState, RASPI_MACHINE) +#define TYPE_RASPI4B_MACHINE MACHINE_TYPE_NAME("raspi4b") +OBJECT_DECLARE_SIMPLE_TYPE(Raspi4bMachineState, RASPI4B_MACHINE) + #define SMPBOOT_ADDR 0x300 /* this should leave enough space for ATAGS */ #define MVBAR_ADDR 0x400 /* secure vectors */ #define BOARDSETUP_ADDR (MVBAR_ADDR + 0x20) /* board setup code */ @@ -44,6 +55,11 @@ struct RaspiMachineState { BCM283XState soc; }; +struct Raspi4bMachineState { + RaspiBaseMachineState parent_obj; + BCM2838State soc; +}; + /* * Board revision codes: * www.raspberrypi.org/documentation/hardware/raspberrypi/revision-codes/ @@ -301,6 +317,83 @@ void raspi_base_machine_init(MachineState *machine, boot_ram_size); } +#ifdef TARGET_AARCH64 +/* + * Add second memory region if board RAM amount exceeds VC base address + * (see https://datasheets.raspberrypi.com/bcm2711/bcm2711-peripherals.pdf + * 1.2 Address Map) + */ +static int raspi4_add_memory_node(void *fdt, hwaddr mem_base, hwaddr mem_len) +{ + int ret; + uint32_t acells, scells; + char *nodename = g_strdup_printf("/memory@%" PRIx64, mem_base); + + acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells", + NULL, &error_fatal); + scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells", + NULL, &error_fatal); + if (acells == 0 || scells == 0) { + fprintf(stderr, "dtb file invalid (#address-cells or #size-cells 0)\n"); + ret = -1; + } else { + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory"); + ret = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", + acells, mem_base, + scells, mem_len); + } + + g_free(nodename); + return ret; +} + +static void raspi4_modify_dtb(const struct arm_boot_info *info, void *fdt) +{ + uint64_t ram_size; + + /* Temporarily disable following devices until they are implemented */ + const char *nodes_to_remove[] = { + "brcm,bcm2711-pcie", + "brcm,bcm2711-rng200", + "brcm,bcm2711-thermal", + "brcm,bcm2711-genet-v5", + }; + + for (int i = 0; i < ARRAY_SIZE(nodes_to_remove); i++) { + const char *dev_str = nodes_to_remove[i]; + + int offset = fdt_node_offset_by_compatible(fdt, -1, dev_str); + if (offset >= 0) { + if (!fdt_nop_node(fdt, offset)) { + warn_report("bcm2711 dtc: %s has been disabled!", dev_str); + } + } + } + + ram_size = board_ram_size(info->board_id); + + if (info->ram_size > UPPER_RAM_BASE) { + raspi4_add_memory_node(fdt, UPPER_RAM_BASE, ram_size - UPPER_RAM_BASE); + } +} + +static void raspi4b_machine_init(MachineState *machine) +{ + Raspi4bMachineState *s = RASPI4B_MACHINE(machine); + RaspiBaseMachineState *s_base = RASPI_BASE_MACHINE(machine); + RaspiBaseMachineClass *mc = RASPI_BASE_MACHINE_GET_CLASS(machine); + BCM2838State *soc = &s->soc; + + s_base->binfo.modify_dtb = raspi4_modify_dtb; + s_base->binfo.board_id = mc->board_rev; + + object_initialize_child(OBJECT(machine), "soc", soc, + board_soc_type(mc->board_rev)); + raspi_base_machine_init(machine, BCM283X_BASE(soc)); +} +#endif /* TARGET_AARCH64 */ + void raspi_machine_init(MachineState *machine) { RaspiMachineState *s = RASPI_MACHINE(machine); @@ -382,6 +475,20 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0xa02082; raspi_machine_class_init(mc, rmc->board_rev); }; + +static void raspi4b_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc); + +#if HOST_LONG_BITS == 32 + rmc->board_rev = 0xa03111; /* Revision 1.1, 1 Gb RAM */ +#else + rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */ +#endif + raspi_machine_class_common_init(mc, rmc->board_rev); + mc->init = raspi4b_machine_init; +} #endif /* TARGET_AARCH64 */ static const TypeInfo raspi_machine_types[] = { @@ -406,7 +513,12 @@ static const TypeInfo raspi_machine_types[] = { .name = MACHINE_TYPE_NAME("raspi3b"), .parent = TYPE_RASPI_MACHINE, .class_init = raspi3b_machine_class_init, -#endif + }, { + .name = MACHINE_TYPE_NAME("raspi4"), + .parent = TYPE_RASPI_BASE_MACHINE, + .instance_size = sizeof(Raspi4bMachineState), + .class_init = raspi4b_machine_class_init, +#endif /* TARGET_AARCH64 */ }, { .name = TYPE_RASPI_MACHINE, .parent = TYPE_RASPI_BASE_MACHINE, diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c deleted file mode 100644 index 9b08a598f39..00000000000 --- a/hw/arm/raspi4b.c +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Raspberry Pi 4B emulation - * - * Copyright (C) 2022 Ovchinnikov Vitalii <vitalii.ovchinnikov(a)auriga.com&gt; - * - * SPDX-License-Identifier: GPL-2.0-or-later - */ - -#include "qemu/osdep.h" -#include "qemu/units.h" -#include "qemu/cutils.h" -#include "qapi/error.h" -#include "qapi/visitor.h" -#include "hw/arm/raspi_platform.h" -#include "hw/display/bcm2835_fb.h" -#include "hw/registerfields.h" -#include "qemu/error-report.h" -#include "system/device_tree.h" -#include "hw/boards.h" -#include "hw/loader.h" -#include "hw/arm/boot.h" -#include "qom/object.h" -#include "hw/arm/bcm2838.h" -#include <libfdt.h> - -#define TYPE_RASPI4B_MACHINE MACHINE_TYPE_NAME("raspi4b") -OBJECT_DECLARE_SIMPLE_TYPE(Raspi4bMachineState, RASPI4B_MACHINE) - -struct Raspi4bMachineState { - RaspiBaseMachineState parent_obj; - BCM2838State soc; -}; - -/* - * Add second memory region if board RAM amount exceeds VC base address - * (see https://datasheets.raspberrypi.com/bcm2711/bcm2711-peripherals.pdf - * 1.2 Address Map) - */ -static int raspi_add_memory_node(void *fdt, hwaddr mem_base, hwaddr mem_len) -{ - int ret; - uint32_t acells, scells; - char *nodename = g_strdup_printf("/memory@%" PRIx64, mem_base); - - acells = qemu_fdt_getprop_cell(fdt, "/", "#address-cells", - NULL, &error_fatal); - scells = qemu_fdt_getprop_cell(fdt, "/", "#size-cells", - NULL, &error_fatal); - if (acells == 0 || scells == 0) { - fprintf(stderr, "dtb file invalid (#address-cells or #size-cells 0)\n"); - ret = -1; - } else { - qemu_fdt_add_subnode(fdt, nodename); - qemu_fdt_setprop_string(fdt, nodename, "device_type", "memory"); - ret = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", - acells, mem_base, - scells, mem_len); - } - - g_free(nodename); - return ret; -} - -static void raspi4_modify_dtb(const struct arm_boot_info *info, void *fdt) -{ - uint64_t ram_size; - - /* Temporarily disable following devices until they are implemented */ - const char *nodes_to_remove[] = { - "brcm,bcm2711-pcie", - "brcm,bcm2711-rng200", - "brcm,bcm2711-thermal", - "brcm,bcm2711-genet-v5", - }; - - for (int i = 0; i < ARRAY_SIZE(nodes_to_remove); i++) { - const char *dev_str = nodes_to_remove[i]; - - int offset = fdt_node_offset_by_compatible(fdt, -1, dev_str); - if (offset >= 0) { - if (!fdt_nop_node(fdt, offset)) { - warn_report("bcm2711 dtc: %s has been disabled!", dev_str); - } - } - } - - ram_size = board_ram_size(info->board_id); - - if (info->ram_size > UPPER_RAM_BASE) { - raspi_add_memory_node(fdt, UPPER_RAM_BASE, ram_size - UPPER_RAM_BASE); - } -} - -static void raspi4b_machine_init(MachineState *machine) -{ - Raspi4bMachineState *s = RASPI4B_MACHINE(machine); - RaspiBaseMachineState *s_base = RASPI_BASE_MACHINE(machine); - RaspiBaseMachineClass *mc = RASPI_BASE_MACHINE_GET_CLASS(machine); - BCM2838State *soc = &s->soc; - - s_base->binfo.modify_dtb = raspi4_modify_dtb; - s_base->binfo.board_id = mc->board_rev; - - object_initialize_child(OBJECT(machine), "soc", soc, - board_soc_type(mc->board_rev)); - - raspi_base_machine_init(machine, BCM283X_BASE(soc)); -} - -static void raspi4b_machine_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc = MACHINE_CLASS(oc); - RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc); - -#if HOST_LONG_BITS == 32 - rmc->board_rev = 0xa03111; /* Revision 1.1, 1 Gb RAM */ -#else - rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */ -#endif - raspi_machine_class_common_init(mc, rmc->board_rev); - mc->init = raspi4b_machine_init; -} - -static const TypeInfo raspi4b_machine_type = { - .name = TYPE_RASPI4B_MACHINE, - .parent = TYPE_RASPI_BASE_MACHINE, - .instance_size = sizeof(Raspi4bMachineState), - .class_init = raspi4b_machine_class_init, -}; - -static void raspi4b_machine_register_type(void) -{ - type_register_static(&raspi4b_machine_type); -} - -type_init(raspi4b_machine_register_type) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 490234b3b84..5177260d42b 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -27,7 +27,7 @@ arm_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c', 'cubi arm_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c', 'orangepi.c')) arm_ss.add(when: 'CONFIG_ALLWINNER_R40', if_true: files('allwinner-r40.c', 'bananapi_m2u.c')) arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c')) -arm_ss.add(when: ['CONFIG_RASPI', 'TARGET_AARCH64'], if_true: files('bcm2838.c', 'raspi4b.c')) +arm_ss.add(when: ['CONFIG_RASPI', 'TARGET_AARCH64'], if_true: files('bcm2838.c')) arm_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_soc.c')) arm_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c')) arm_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c')) -- 2.47.1

Merge Raspi4bMachineState within RaspiMachineState by using an unnamed union. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org&gt; --- hw/arm/raspi.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 3fa382d62ce..ef94d57dab5 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -38,9 +38,6 @@ #define TYPE_RASPI_MACHINE MACHINE_TYPE_NAME("raspi-common") OBJECT_DECLARE_SIMPLE_TYPE(RaspiMachineState, RASPI_MACHINE) -#define TYPE_RASPI4B_MACHINE MACHINE_TYPE_NAME("raspi4b") -OBJECT_DECLARE_SIMPLE_TYPE(Raspi4bMachineState, RASPI4B_MACHINE) - #define SMPBOOT_ADDR 0x300 /* this should leave enough space for ATAGS */ #define MVBAR_ADDR 0x400 /* secure vectors */ #define BOARDSETUP_ADDR (MVBAR_ADDR + 0x20) /* board setup code */ @@ -49,15 +46,12 @@ OBJECT_DECLARE_SIMPLE_TYPE(Raspi4bMachineState, RASPI4B_MACHINE) #define SPINTABLE_ADDR 0xd8 /* Pi 3 bootloader spintable */ struct RaspiMachineState { - /*< private >*/ RaspiBaseMachineState parent_obj; - /*< public >*/ - BCM283XState soc; -}; -struct Raspi4bMachineState { - RaspiBaseMachineState parent_obj; - BCM2838State soc; + union { + BCM283XState soc; + BCM2838State soc4; + }; }; /* @@ -380,10 +374,10 @@ static void raspi4_modify_dtb(const struct arm_boot_info *info, void *fdt) static void raspi4b_machine_init(MachineState *machine) { - Raspi4bMachineState *s = RASPI4B_MACHINE(machine); + RaspiMachineState *s = RASPI_MACHINE(machine); RaspiBaseMachineState *s_base = RASPI_BASE_MACHINE(machine); RaspiBaseMachineClass *mc = RASPI_BASE_MACHINE_GET_CLASS(machine); - BCM2838State *soc = &s->soc; + BCM2838State *soc = &s->soc4; s_base->binfo.modify_dtb = raspi4_modify_dtb; s_base->binfo.board_id = mc->board_rev; @@ -515,8 +509,7 @@ static const TypeInfo raspi_machine_types[] = { .class_init = raspi3b_machine_class_init, }, { .name = MACHINE_TYPE_NAME("raspi4"), - .parent = TYPE_RASPI_BASE_MACHINE, - .instance_size = sizeof(Raspi4bMachineState), + .parent = TYPE_RASPI_MACHINE, .class_init = raspi4b_machine_class_init, #endif /* TARGET_AARCH64 */ }, { -- 2.47.1

Since callers already have reference to the RaspiBaseMachineClass, directly pass 'board_rev' as argument to raspi_base_machine_init(). Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org&gt; --- include/hw/arm/raspi_platform.h | 2 +- hw/arm/raspi.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platform.h index 7bc4807fa51..defb786153b 100644 --- a/include/hw/arm/raspi_platform.h +++ b/include/hw/arm/raspi_platform.h @@ -58,7 +58,7 @@ void raspi_machine_init(MachineState *machine); typedef struct BCM283XBaseState BCM283XBaseState; void raspi_base_machine_init(MachineState *machine, - BCM283XBaseState *soc); + BCM283XBaseState *soc, const uint32_t board_rev); void raspi_machine_class_common_init(MachineClass *mc, uint32_t board_rev); diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index ef94d57dab5..571b50bef7e 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -254,10 +254,8 @@ static void setup_boot(MachineState *machine, ARMCPU *cpu, } void raspi_base_machine_init(MachineState *machine, - BCM283XBaseState *soc) + BCM283XBaseState *soc, const uint32_t board_rev) { - RaspiBaseMachineClass *mc = RASPI_BASE_MACHINE_GET_CLASS(machine); - uint32_t board_rev = mc->board_rev; uint64_t ram_size = board_ram_size(board_rev); uint32_t vcram_base, vcram_size; size_t boot_ram_size; @@ -384,7 +382,7 @@ static void raspi4b_machine_init(MachineState *machine) object_initialize_child(OBJECT(machine), "soc", soc, board_soc_type(mc->board_rev)); - raspi_base_machine_init(machine, BCM283X_BASE(soc)); + raspi_base_machine_init(machine, BCM283X_BASE(soc), mc->board_rev); } #endif /* TARGET_AARCH64 */ @@ -399,7 +397,7 @@ void raspi_machine_init(MachineState *machine) object_initialize_child(OBJECT(machine), "soc", soc, board_soc_type(mc->board_rev)); - raspi_base_machine_init(machine, BCM283X_BASE(soc)); + raspi_base_machine_init(machine, BCM283X_BASE(soc), mc->board_rev); } void raspi_machine_class_common_init(MachineClass *mc, -- 2.47.1

On Tue, 4 Feb 2025 at 00:23, Philippe Mathieu-Daudé <philmd(a)linaro.org&gt; wrote: Why bother, if we don't do anything anyway? We can say in the TODO comment /* TODO: "B" models have a LAN9512 on the USB bus */ thanks -- PMM

On Tue, 4 Feb 2025 at 00:23, Philippe Mathieu-Daudé <philmd(a)linaro.org&gt; wrote: Indent error? Otherwise Reviewed-by: Peter Maydell <peter.maydell(a)linaro.org&gt; thanks -- PMM

Add a property to specify the board revision. This allows to create a Raspberry Pi 2B with BCM2836 SoC (rev 1.0 and 1.1) or BCM2837 (rev 1.2 up to 1.5). Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org&gt; --- hw/arm/raspi.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 1dc41701efe..b184ac3c446 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -491,6 +491,10 @@ static void raspi_update_board_rev(RaspiBaseMachineState *s) model_index = FIELD_EX32(s->board_rev, REV_CODE, TYPE); proc = types[model_index].proc_id; + if (model_index == 4 && FIELD_EX32(s->board_rev, REV_CODE, REVISION) > 1) { + /* 2B rev 1.0 and 1.1 have BCM2836, 1.2+ have BCM2837 */ + proc = PROCESSOR_ID_BCM2837; + } s->board_rev = FIELD_DP32(s->board_rev, REV_CODE, PROCESSOR, proc); ms->smp.max_cpus = soc_property[proc].cores_count; @@ -517,6 +521,35 @@ static char *raspi_get_machine_model(Object *obj, Error **errp) return g_strdup(types[FIELD_EX32(s->board_rev, REV_CODE, TYPE)].model); } +static void raspi_set_machine_rev(Object *obj, const char *value, Error **errp) +{ + RaspiBaseMachineState *s; + int rev; + + if (strlen(value) != 3 || value[0] != '1' || value[1] != '.') { + error_setg(errp, "Invalid revision"); + return; + } + rev = value[2] - '0'; + if (rev < 0 || rev > 5) { + error_setg(errp, "Invalid revision"); + return; + } + + s = RASPI_BASE_MACHINE(obj); + s->board_rev = FIELD_DP32(s->board_rev, REV_CODE, REVISION, rev); + + return raspi_update_board_rev(s); +} + +static char *raspi_get_machine_rev(Object *obj, Error **errp) +{ + RaspiBaseMachineState *s = RASPI_BASE_MACHINE(obj); + + return g_strdup_printf("1.%u", + FIELD_EX32(s->board_rev, REV_CODE, REVISION)); +} + static void raspi_generic_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -540,6 +573,12 @@ static void raspi_generic_machine_class_init(ObjectClass *oc, void *data) raspi_get_machine_model, raspi_set_machine_model); object_class_property_set_description(oc, "model", "Set machine model."); + object_class_property_add_str(oc, "revision", + raspi_get_machine_rev, + raspi_set_machine_rev); + object_class_property_set_description(oc, "revision", + "Set machine revision. " + "Valid values are 1.0 to 1.5"); }; -- 2.47.1

All previous raspi machines can be created using the generic machine. Deprecate the old names to maintain a single one. Update the tests. Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org&gt; --- QOM HMP introspection test fails because without the 'model' argument set, no machine is created... $ qemu-system-aarch64 -M raspi qemu-system-aarch64: Missing model, try -M raspi,model=help --- docs/about/deprecated.rst | 13 +++++++++++++ hw/arm/raspi.c | 5 +++++ tests/qtest/bcm2835-dma-test.c | 2 +- tests/qtest/bcm2835-i2c-test.c | 2 +- tests/qtest/boot-serial-test.c | 3 ++- tests/functional/test_aarch64_raspi3.py | 5 ++--- tests/functional/test_aarch64_raspi4.py | 4 ++-- tests/functional/test_arm_raspi2.py | 4 ++-- 8 files changed, 28 insertions(+), 10 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 4a3c302962a..c9a11a52f78 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -257,6 +257,19 @@ Big-Endian variants of MicroBlaze ``petalogix-ml605`` and ``xlnx-zynqmp-pmu`` ma Both ``petalogix-ml605`` and ``xlnx-zynqmp-pmu`` were added for little endian CPUs. Big endian support is not tested. +ARM ``raspi0``, ``raspi1ap``, ``raspi2b``, ``raspi3ap``, ``raspi3b`` and ``raspi4b`` machines (since 10.0) +'''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''''' + +The Raspberry Pi machines have been unified under the generic ``raspi`` machine, +which takes the model as argument. + + - `raspi0`` is now an alias for ``raspi,model=Zero`` + - `raspi1ap`` is now an alias for ``raspi,model=1A+`` + - `raspi2b`` is now an alias for ``raspi,model=2B`` + - `raspi3ap`` is now an alias for ``raspi,model=3A+`` + - `raspi3b`` is now an alias for ``raspi,model=3B`` + - `raspi4b`` is now an alias for ``raspi,model=4B`` + Backend options --------------- diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 8cae1ff6f93..86ecc988e06 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -637,6 +637,7 @@ static void raspi0_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0x920092; /* Revision 1.2 */ raspi_machine_class_init(mc, rmc->board_rev); + mc->deprecation_reason = "-M raspi,model=Zero"; }; static void raspi1ap_machine_class_init(ObjectClass *oc, void *data) @@ -646,6 +647,7 @@ static void raspi1ap_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0x900021; /* Revision 1.1 */ raspi_machine_class_init(mc, rmc->board_rev); + mc->deprecation_reason = "-M raspi,model=A+ (-m 512m)"; }; static void raspi2b_machine_class_init(ObjectClass *oc, void *data) @@ -655,6 +657,7 @@ static void raspi2b_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0xa21041; raspi_machine_class_init(mc, rmc->board_rev); + mc->deprecation_reason = "-M raspi,model=2B -m 1g"; }; #ifdef TARGET_AARCH64 @@ -665,6 +668,7 @@ static void raspi3ap_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0x9020e0; /* Revision 1.0 */ raspi_machine_class_init(mc, rmc->board_rev); + mc->deprecation_reason = "-M raspi,model=3A+ -m 512m"; }; static void raspi3b_machine_class_init(ObjectClass *oc, void *data) @@ -674,6 +678,7 @@ static void raspi3b_machine_class_init(ObjectClass *oc, void *data) rmc->board_rev = 0xa02082; raspi_machine_class_init(mc, rmc->board_rev); + mc->deprecation_reason = "-M raspi,model=3B -m 1g"; }; static void raspi4b_machine_class_init(ObjectClass *oc, void *data) diff --git a/tests/qtest/bcm2835-dma-test.c b/tests/qtest/bcm2835-dma-test.c index 18901b76d21..705e6b2362b 100644 --- a/tests/qtest/bcm2835-dma-test.c +++ b/tests/qtest/bcm2835-dma-test.c @@ -111,7 +111,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); qtest_add_func("/bcm2835/dma/test_interrupts", bcm2835_dma_test_interrupts); - qtest_start("-machine raspi3b"); + qtest_start("-machine raspi,model=3B -m 1g"); ret = g_test_run(); qtest_end(); return ret; diff --git a/tests/qtest/bcm2835-i2c-test.c b/tests/qtest/bcm2835-i2c-test.c index 15991949260..15904abf393 100644 --- a/tests/qtest/bcm2835-i2c-test.c +++ b/tests/qtest/bcm2835-i2c-test.c @@ -104,7 +104,7 @@ int main(int argc, char **argv) } /* Run I2C tests with TMP105 slaves on all three buses */ - qtest_start("-M raspi3b " + qtest_start("-M raspi,model=3B -m 1g " "-device tmp105,address=0x50,bus=i2c-bus.0 " "-device tmp105,address=0x50,bus=i2c-bus.1 " "-device tmp105,address=0x50,bus=i2c-bus.2"); diff --git a/tests/qtest/boot-serial-test.c b/tests/qtest/boot-serial-test.c index a05d26ee996..fbafd73facb 100644 --- a/tests/qtest/boot-serial-test.c +++ b/tests/qtest/boot-serial-test.c @@ -188,7 +188,8 @@ static const testdef_t tests[] = { sizeof(kernel_pls3adsp1800), kernel_pls3adsp1800 }, { "microblazeel", "petalogix-ml605", "", "TT", sizeof(kernel_plml605), kernel_plml605 }, - { "arm", "raspi2b", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 }, + { "arm", "raspi,model=2B -m 1g", "", "TT", + sizeof(bios_raspi2), 0, bios_raspi2 }, { "aarch64", "virt", "-cpu max", "TT", sizeof(kernel_aarch64), kernel_aarch64 }, { "arm", "microbit", "", "T", sizeof(kernel_nrf51), kernel_nrf51 }, diff --git a/tests/functional/test_aarch64_raspi3.py b/tests/functional/test_aarch64_raspi3.py index 74f6630ed26..05766d93b3f 100755 --- a/tests/functional/test_aarch64_raspi3.py +++ b/tests/functional/test_aarch64_raspi3.py @@ -21,10 +21,9 @@ def test_aarch64_raspi3_atf(self): efi_name = 'RPI_EFI.fd' efi_fd = self.archive_extract(self.ASSET_RPI3_UEFI, member=efi_name) - self.set_machine('raspi3b') + self.set_machine('raspi,model=3B -m 1g') self.vm.set_console(console_index=1) - self.vm.add_args('-cpu', 'cortex-a53', - '-nodefaults', + self.vm.add_args('-nodefaults', '-device', f'loader,file={efi_fd},force-raw=true') self.vm.launch() self.wait_for_console_pattern('version UEFI Firmware v1.15') diff --git a/tests/functional/test_aarch64_raspi4.py b/tests/functional/test_aarch64_raspi4.py index 7a4302b0c5a..3becee9333a 100755 --- a/tests/functional/test_aarch64_raspi4.py +++ b/tests/functional/test_aarch64_raspi4.py @@ -34,7 +34,7 @@ def test_arm_raspi4(self): dtb_path = self.archive_extract(self.ASSET_KERNEL_20190215, member='boot/bcm2711-rpi-4-b.dtb') - self.set_machine('raspi4b') + self.set_machine('raspi,model=4B -m 1g') self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + 'earlycon=pl011,mmio32,0xfe201000 ' + @@ -64,7 +64,7 @@ def test_arm_raspi4_initrd(self): member='boot/bcm2711-rpi-4-b.dtb') initrd_path = self.uncompress(self.ASSET_INITRD) - self.set_machine('raspi4b') + self.set_machine('raspi,model=4B -m 1g') self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + 'earlycon=pl011,mmio32,0xfe201000 ' + diff --git a/tests/functional/test_arm_raspi2.py b/tests/functional/test_arm_raspi2.py index d3c7aaa39b0..37390a9c360 100755 --- a/tests/functional/test_arm_raspi2.py +++ b/tests/functional/test_arm_raspi2.py @@ -39,7 +39,7 @@ def do_test_arm_raspi2(self, uart_id): dtb_path = self.archive_extract(self.ASSET_KERNEL_20190215, member='boot/bcm2709-rpi-2-b.dtb') - self.set_machine('raspi2b') + self.set_machine('raspi,model=2B -m 1g') self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + serial_kernel_cmdline[uart_id] + @@ -65,7 +65,7 @@ def test_arm_raspi2_initrd(self): member='boot/bcm2709-rpi-2-b.dtb') initrd_path = self.uncompress(self.ASSET_INITRD) - self.set_machine('raspi2b') + self.set_machine('raspi,model=2B -m 1g') self.vm.set_console() kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE + 'earlycon=pl011,0x3f201000 console=ttyAMA0 ' -- 2.47.1

On 4/2/25 10:22, Peter Maydell wrote: Zoltan and you don't want to add more machine names, then you don't want a generic machine. This is very confusing. See previous patch: $ qemu-system-aarch64 -M raspi,model=help Available models (processor): - A (BCM2835) - B (BCM2835) - A+ (BCM2835) - B+ (BCM2835) - CM1 (BCM2835) - Zero (BCM2835) - ZeroW (BCM2835) - 2B (BCM2836) - 3B (BCM2837) - CM3 (BCM2837) - 3B+ (BCM2837) - 3A+ (BCM2837) - CM3+ (BCM2837) - 4B (BCM2838) Can we or not add the other raspi models? We surely can if we find developers motivated to do the work. Regards, Phil.

On 4/2/25 10:57, Daniel P. Berrangé wrote: Got it. Unfortunately I spent more than my hobbyist time credit doing this, so if I find the motivation to revisit, it'll be later. Still, having machine memory size depending on the host config was a bad design choice IMHO, as we test different setup depending on the host being used, so not really a "reproducible" setup.

On Tue, 4 Feb 2025 at 09:57, Daniel P. Berrangé <berrange(a)redhat.com&gt; wrote: Yes, this was what I was intending to suggest. Apologies if I was confusing with what I said the previous time round. thanks -- PMM

On Tue, 4 Feb 2025, Philippe Mathieu-Daudé wrote: I said either rastpi4b,revision=1.4 or -machine raspi4b -memory 4g would be better IMHO. Peter perefers -memory which is also fine with me. I just don't think adding more machine names where only RAM size is different would be better than using -memory for that as usual. Regards, BALATON Zoltan