| Message ID | 20240206132931.38376-9-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | hw/arm: Implement new machine mps3-an536 (Cortex-R52 MPS3 AN536 FPGA image) | expand |
Hi Peter, On 6/2/24 14:29, Peter Maydell wrote: > The AN536 is another FPGA image for the MPS3 development board. Unlike > the existing FPGA images we already model, this board uses a Cortex-R > family CPU, and it does not use any equivalent to the M-profile > "Subsystem for Embedded" SoC-equivalent that we model in hw/arm/armsse.c. > It's therefore more convenient for us to model it as a completely > separate C file. > > This commit adds the basic skeleton of the board model, and the > code to create all the RAM and ROM. We assume that we're probably > going to want to add more images in future, so use the same > base class/subclass setup that mps2-tz.c uses, even though at > the moment there's only a single subclass. > > Following commits will add the CPUs and the peripherals. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > MAINTAINERS | 3 +- > configs/devices/arm-softmmu/default.mak | 1 + > hw/arm/mps3r.c | 239 ++++++++++++++++++++++++ > hw/arm/Kconfig | 5 + > hw/arm/meson.build | 1 + > 5 files changed, 248 insertions(+), 1 deletion(-) > create mode 100644 hw/arm/mps3r.c > +static MemoryRegion *mr_for_raminfo(MPS3RMachineState *mms, > + const RAMInfo *raminfo) > +{ > + /* Return an initialized MemoryRegion for the RAMInfo. */ > + MemoryRegion *ram; > + > + if (raminfo->mrindex < 0) { > + /* Means this RAMInfo is for QEMU's "system memory" */ > + MachineState *machine = MACHINE(mms); > + assert(!(raminfo->flags & IS_ROM)); > + return machine->ram; > + } > + > + assert(raminfo->mrindex < MPS3R_RAM_MAX); > + ram = &mms->ram[raminfo->mrindex]; > + > + memory_region_init_ram(ram, NULL, raminfo->name, You are not using the parent=mms, is that deliberate? (as in: easier to migrate eventually?) > + raminfo->size, &error_fatal); > + if (raminfo->flags & IS_ROM) { > + memory_region_set_readonly(ram, true); > + } > + return ram; > +}
On Tue, 6 Feb 2024 at 19:21, Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > > Hi Peter, > > On 6/2/24 14:29, Peter Maydell wrote: > > The AN536 is another FPGA image for the MPS3 development board. Unlike > > the existing FPGA images we already model, this board uses a Cortex-R > > family CPU, and it does not use any equivalent to the M-profile > > "Subsystem for Embedded" SoC-equivalent that we model in hw/arm/armsse.c. > > It's therefore more convenient for us to model it as a completely > > separate C file. > > > > This commit adds the basic skeleton of the board model, and the > > code to create all the RAM and ROM. We assume that we're probably > > going to want to add more images in future, so use the same > > base class/subclass setup that mps2-tz.c uses, even though at > > the moment there's only a single subclass. > > > > Following commits will add the CPUs and the peripherals. > > > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > --- > > MAINTAINERS | 3 +- > > configs/devices/arm-softmmu/default.mak | 1 + > > hw/arm/mps3r.c | 239 ++++++++++++++++++++++++ > > hw/arm/Kconfig | 5 + > > hw/arm/meson.build | 1 + > > 5 files changed, 248 insertions(+), 1 deletion(-) > > create mode 100644 hw/arm/mps3r.c > > > > +static MemoryRegion *mr_for_raminfo(MPS3RMachineState *mms, > > + const RAMInfo *raminfo) > > +{ > > + /* Return an initialized MemoryRegion for the RAMInfo. */ > > + MemoryRegion *ram; > > + > > + if (raminfo->mrindex < 0) { > > + /* Means this RAMInfo is for QEMU's "system memory" */ > > + MachineState *machine = MACHINE(mms); > > + assert(!(raminfo->flags & IS_ROM)); > > + return machine->ram; > > + } > > + > > + assert(raminfo->mrindex < MPS3R_RAM_MAX); > > + ram = &mms->ram[raminfo->mrindex]; > > + > > + memory_region_init_ram(ram, NULL, raminfo->name, > > You are not using the parent=mms, is that deliberate? > (as in: easier to migrate eventually?) No, I didn't have a particular reason for not setting the parent; I just copied this bit of code from mps2-tz.c, which also doesn't set the parent pointer... -- PMM
On 6/2/24 14:29, Peter Maydell wrote: > The AN536 is another FPGA image for the MPS3 development board. Unlike > the existing FPGA images we already model, this board uses a Cortex-R > family CPU, and it does not use any equivalent to the M-profile > "Subsystem for Embedded" SoC-equivalent that we model in hw/arm/armsse.c. > It's therefore more convenient for us to model it as a completely > separate C file. > > This commit adds the basic skeleton of the board model, and the > code to create all the RAM and ROM. We assume that we're probably > going to want to add more images in future, so use the same > base class/subclass setup that mps2-tz.c uses, even though at > the moment there's only a single subclass. > > Following commits will add the CPUs and the peripherals. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > MAINTAINERS | 3 +- > configs/devices/arm-softmmu/default.mak | 1 + > hw/arm/mps3r.c | 239 ++++++++++++++++++++++++ > hw/arm/Kconfig | 5 + > hw/arm/meson.build | 1 + > 5 files changed, 248 insertions(+), 1 deletion(-) > create mode 100644 hw/arm/mps3r.c > +/* > + * The MPS3 DDR is 3GiB, but on a 32-bit host QEMU doesn't permit > + * emulation of that much guest RAM, so artificially make it smaller. > + */ > +#if HOST_LONG_BITS == 32 > +#define MPS3_DDR_SIZE (1 * GiB) > +#else > +#define MPS3_DDR_SIZE (3 * GiB) > +#endif Generically, can we migrate a VM started on a 32-bit host to a 64-bit one? > +static void mps3r_set_default_ram_info(MPS3RMachineClass *mmc) > +{ > + /* > + * Set mc->default_ram_size and default_ram_id from the > + * information in mmc->raminfo. > + */ > + MachineClass *mc = MACHINE_CLASS(mmc); > + const RAMInfo *p; > + > + for (p = mmc->raminfo; p->name; p++) { > + if (p->mrindex < 0) { > + /* Found the entry for "system memory" */ > + mc->default_ram_size = p->size; > + mc->default_ram_id = p->name; Nice. > + return; > + } > + } > + g_assert_not_reached(); > +} Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
On Wed, 7 Feb 2024 at 09:02, Philippe Mathieu-Daudé <philmd@linaro.org> wrote: > > On 6/2/24 14:29, Peter Maydell wrote: > > The AN536 is another FPGA image for the MPS3 development board. Unlike > > the existing FPGA images we already model, this board uses a Cortex-R > > family CPU, and it does not use any equivalent to the M-profile > > "Subsystem for Embedded" SoC-equivalent that we model in hw/arm/armsse.c. > > It's therefore more convenient for us to model it as a completely > > separate C file. > > > > This commit adds the basic skeleton of the board model, and the > > code to create all the RAM and ROM. We assume that we're probably > > going to want to add more images in future, so use the same > > base class/subclass setup that mps2-tz.c uses, even though at > > the moment there's only a single subclass. > > > > Following commits will add the CPUs and the peripherals. > > > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > > --- > > MAINTAINERS | 3 +- > > configs/devices/arm-softmmu/default.mak | 1 + > > hw/arm/mps3r.c | 239 ++++++++++++++++++++++++ > > hw/arm/Kconfig | 5 + > > hw/arm/meson.build | 1 + > > 5 files changed, 248 insertions(+), 1 deletion(-) > > create mode 100644 hw/arm/mps3r.c > > > > +/* > > + * The MPS3 DDR is 3GiB, but on a 32-bit host QEMU doesn't permit > > + * emulation of that much guest RAM, so artificially make it smaller. > > + */ > > +#if HOST_LONG_BITS == 32 > > +#define MPS3_DDR_SIZE (1 * GiB) > > +#else > > +#define MPS3_DDR_SIZE (3 * GiB) > > +#endif > > Generically, can we migrate a VM started on a 32-bit host to a 64-bit > one? I think it's one of those things that in theory is supposed to be possible and in practice nobody tests so it might well not work. At any rate, this is the same thing we do already in mps2-tz.c for the 2GB DRAM those boards have. > > +static void mps3r_set_default_ram_info(MPS3RMachineClass *mmc) > > +{ > > + /* > > + * Set mc->default_ram_size and default_ram_id from the > > + * information in mmc->raminfo. > > + */ > > + MachineClass *mc = MACHINE_CLASS(mmc); > > + const RAMInfo *p; > > + > > + for (p = mmc->raminfo; p->name; p++) { > > + if (p->mrindex < 0) { > > + /* Found the entry for "system memory" */ > > + mc->default_ram_size = p->size; > > + mc->default_ram_id = p->name; > > Nice. > > > + return; > > + } > > + } > > + g_assert_not_reached(); > > +} > > Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Thanks. I have remembered why we don't pass the MachineState as the owner pointer for memory_region_init_ram(): in that function we do a cast of the owner pointer to a DeviceState, so we can hand it to vmstate_register_ram(). And a MachineState inherits directly from Object, not from DeviceState. There's a paragraph in the doc-comment for memory_region_init_ram() explaining this: currently we require the owner pointer to be either NULL or a DeviceState. thanks -- PMM
>>> +/* >>> + * The MPS3 DDR is 3GiB, but on a 32-bit host QEMU doesn't permit >>> + * emulation of that much guest RAM, so artificially make it smaller. >>> + */ >>> +#if HOST_LONG_BITS == 32 >>> +#define MPS3_DDR_SIZE (1 * GiB) >>> +#else >>> +#define MPS3_DDR_SIZE (3 * GiB) >>> +#endif >> >> Generically, can we migrate a VM started on a 32-bit host to a 64-bit >> one? > > I think it's one of those things that in theory is supposed > to be possible and in practice nobody tests so it might well > not work. At any rate, this is the same thing we do already > in mps2-tz.c for the 2GB DRAM those boards have. We could have a common helper may be. Aspeed does: /* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ #if HOST_LONG_BITS == 32 #define ASPEED_RAM_SIZE(sz) MIN((sz), 1 * GiB) #else #define ASPEED_RAM_SIZE(sz) (sz) #endif Thanks, C.
On 8/2/24 18:07, Cédric Le Goater wrote: > >>>> +/* >>>> + * The MPS3 DDR is 3GiB, but on a 32-bit host QEMU doesn't permit >>>> + * emulation of that much guest RAM, so artificially make it smaller. >>>> + */ >>>> +#if HOST_LONG_BITS == 32 >>>> +#define MPS3_DDR_SIZE (1 * GiB) >>>> +#else >>>> +#define MPS3_DDR_SIZE (3 * GiB) >>>> +#endif >>> >>> Generically, can we migrate a VM started on a 32-bit host to a 64-bit >>> one? >> >> I think it's one of those things that in theory is supposed >> to be possible and in practice nobody tests so it might well >> not work. At any rate, this is the same thing we do already >> in mps2-tz.c for the 2GB DRAM those boards have. > > We could have a common helper may be. Aspeed does: > > /* On 32-bit hosts, lower RAM to 1G because of the 2047 MB limit */ > #if HOST_LONG_BITS == 32 > #define ASPEED_RAM_SIZE(sz) MIN((sz), 1 * GiB) > #else > #define ASPEED_RAM_SIZE(sz) (sz) > #endif Or deprecate system emulation on 32-bit hosts.
diff --git a/MAINTAINERS b/MAINTAINERS index 2f9741b898e..8219ed9068c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -819,12 +819,13 @@ F: include/hw/misc/imx7_*.h F: hw/pci-host/designware.c F: include/hw/pci-host/designware.h -MPS2 +MPS2 / MPS3 M: Peter Maydell <peter.maydell@linaro.org> L: qemu-arm@nongnu.org S: Maintained F: hw/arm/mps2.c F: hw/arm/mps2-tz.c +F: hw/arm/mps3r.c F: hw/misc/mps2-*.c F: include/hw/misc/mps2-*.h F: hw/arm/armsse.c diff --git a/configs/devices/arm-softmmu/default.mak b/configs/devices/arm-softmmu/default.mak index 023faa2f750..6ee31bc1ab9 100644 --- a/configs/devices/arm-softmmu/default.mak +++ b/configs/devices/arm-softmmu/default.mak @@ -13,6 +13,7 @@ CONFIG_ARM_VIRT=y # CONFIG_INTEGRATOR=n # CONFIG_FSL_IMX31=n # CONFIG_MUSICPAL=n +# CONFIG_MPS3R=n # CONFIG_MUSCA=n # CONFIG_CHEETAH=n # CONFIG_SX1=n diff --git a/hw/arm/mps3r.c b/hw/arm/mps3r.c new file mode 100644 index 00000000000..888a846d23c --- /dev/null +++ b/hw/arm/mps3r.c @@ -0,0 +1,239 @@ +/* + * Arm MPS3 board emulation for Cortex-R-based FPGA images. + * (For M-profile images see mps2.c and mps2tz.c.) + * + * Copyright (c) 2017 Linaro Limited + * Written by Peter Maydell + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 or + * (at your option) any later version. + */ + +/* + * The MPS3 is an FPGA based dev board. This file handles FPGA images + * which use the Cortex-R CPUs. We model these separately from the + * M-profile images, because on M-profile the FPGA image is based on + * a "Subsystem for Embedded" which is similar to an SoC, whereas + * the R-profile FPGA images don't have that abstraction layer. + * + * We model the following FPGA images here: + * "mps3-an536" -- dual Cortex-R52 as documented in Arm Application Note AN536 + * + * Application Note AN536: + * https://developer.arm.com/documentation/dai0536/latest/ + */ + +#include "qemu/osdep.h" +#include "qemu/units.h" +#include "qapi/error.h" +#include "exec/address-spaces.h" +#include "cpu.h" +#include "hw/boards.h" +#include "hw/arm/boot.h" + +/* Define the layout of RAM and ROM in a board */ +typedef struct RAMInfo { + const char *name; + hwaddr base; + hwaddr size; + int mrindex; /* index into rams[]; -1 for the system RAM block */ + int flags; +} RAMInfo; + +/* + * The MPS3 DDR is 3GiB, but on a 32-bit host QEMU doesn't permit + * emulation of that much guest RAM, so artificially make it smaller. + */ +#if HOST_LONG_BITS == 32 +#define MPS3_DDR_SIZE (1 * GiB) +#else +#define MPS3_DDR_SIZE (3 * GiB) +#endif + +/* + * Flag values: + * IS_MAIN: this is the main machine RAM + * IS_ROM: this area is read-only + */ +#define IS_MAIN 1 +#define IS_ROM 2 + +#define MPS3R_RAM_MAX 9 + +typedef enum MPS3RFPGAType { + FPGA_AN536, +} MPS3RFPGAType; + +struct MPS3RMachineClass { + MachineClass parent; + MPS3RFPGAType fpga_type; + const RAMInfo *raminfo; +}; + +struct MPS3RMachineState { + MachineState parent; + MemoryRegion ram[MPS3R_RAM_MAX]; +}; + +#define TYPE_MPS3R_MACHINE "mps3r" +#define TYPE_MPS3R_AN536_MACHINE MACHINE_TYPE_NAME("mps3-an536") + +OBJECT_DECLARE_TYPE(MPS3RMachineState, MPS3RMachineClass, MPS3R_MACHINE) + +static const RAMInfo an536_raminfo[] = { + { + .name = "ATCM", + .base = 0x00000000, + .size = 0x00008000, + .mrindex = 0, + }, { + /* We model the QSPI flash as simple ROM for now */ + .name = "QSPI", + .base = 0x08000000, + .size = 0x00800000, + .flags = IS_ROM, + .mrindex = 1, + }, { + .name = "BRAM", + .base = 0x10000000, + .size = 0x00080000, + .mrindex = 2, + }, { + .name = "DDR", + .base = 0x20000000, + .size = MPS3_DDR_SIZE, + .mrindex = -1, + }, { + .name = "ATCM0", + .base = 0xee000000, + .size = 0x00008000, + .mrindex = 3, + }, { + .name = "BTCM0", + .base = 0xee100000, + .size = 0x00008000, + .mrindex = 4, + }, { + .name = "CTCM0", + .base = 0xee200000, + .size = 0x00008000, + .mrindex = 5, + }, { + .name = "ATCM1", + .base = 0xee400000, + .size = 0x00008000, + .mrindex = 6, + }, { + .name = "BTCM1", + .base = 0xee500000, + .size = 0x00008000, + .mrindex = 7, + }, { + .name = "CTCM1", + .base = 0xee600000, + .size = 0x00008000, + .mrindex = 8, + }, { + .name = NULL, + } +}; + +static MemoryRegion *mr_for_raminfo(MPS3RMachineState *mms, + const RAMInfo *raminfo) +{ + /* Return an initialized MemoryRegion for the RAMInfo. */ + MemoryRegion *ram; + + if (raminfo->mrindex < 0) { + /* Means this RAMInfo is for QEMU's "system memory" */ + MachineState *machine = MACHINE(mms); + assert(!(raminfo->flags & IS_ROM)); + return machine->ram; + } + + assert(raminfo->mrindex < MPS3R_RAM_MAX); + ram = &mms->ram[raminfo->mrindex]; + + memory_region_init_ram(ram, NULL, raminfo->name, + raminfo->size, &error_fatal); + if (raminfo->flags & IS_ROM) { + memory_region_set_readonly(ram, true); + } + return ram; +} + +static void mps3r_common_init(MachineState *machine) +{ + MPS3RMachineState *mms = MPS3R_MACHINE(machine); + MPS3RMachineClass *mmc = MPS3R_MACHINE_GET_CLASS(mms); + MemoryRegion *sysmem = get_system_memory(); + + for (const RAMInfo *ri = mmc->raminfo; ri->name; ri++) { + MemoryRegion *mr = mr_for_raminfo(mms, ri); + memory_region_add_subregion(sysmem, ri->base, mr); + } +} + +static void mps3r_set_default_ram_info(MPS3RMachineClass *mmc) +{ + /* + * Set mc->default_ram_size and default_ram_id from the + * information in mmc->raminfo. + */ + MachineClass *mc = MACHINE_CLASS(mmc); + const RAMInfo *p; + + for (p = mmc->raminfo; p->name; p++) { + if (p->mrindex < 0) { + /* Found the entry for "system memory" */ + mc->default_ram_size = p->size; + mc->default_ram_id = p->name; + return; + } + } + g_assert_not_reached(); +} + +static void mps3r_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->init = mps3r_common_init; +} + +static void mps3r_an536_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + MPS3RMachineClass *mmc = MPS3R_MACHINE_CLASS(oc); + static const char * const valid_cpu_types[] = { + ARM_CPU_TYPE_NAME("cortex-r52"), + NULL + }; + + mc->desc = "ARM MPS3 with AN536 FPGA image for Cortex-R52"; + mc->default_cpus = 2; + mc->min_cpus = mc->default_cpus; + mc->max_cpus = mc->default_cpus; + mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-r52"); + mc->valid_cpu_types = valid_cpu_types; + mmc->raminfo = an536_raminfo; + mps3r_set_default_ram_info(mmc); +} + +static const TypeInfo mps3r_machine_types[] = { + { + .name = TYPE_MPS3R_MACHINE, + .parent = TYPE_MACHINE, + .abstract = true, + .instance_size = sizeof(MPS3RMachineState), + .class_size = sizeof(MPS3RMachineClass), + .class_init = mps3r_class_init, + }, { + .name = TYPE_MPS3R_AN536_MACHINE, + .parent = TYPE_MPS3R_MACHINE, + .class_init = mps3r_an536_class_init, + }, +}; + +DEFINE_TYPES(mps3r_machine_types); diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index db08a00a45b..8b45dc116ae 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -106,6 +106,11 @@ config MAINSTONE select PFLASH_CFI01 select SMC91C111 +config MPS3R + bool + default y + depends on TCG && ARM + config MUSCA bool default y diff --git a/hw/arm/meson.build b/hw/arm/meson.build index c4017790670..a16d3479055 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -8,6 +8,7 @@ arm_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) arm_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c')) arm_ss.add(when: 'CONFIG_MAINSTONE', if_true: files('mainstone.c')) arm_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c')) +arm_ss.add(when: 'CONFIG_MPS3R', if_true: files('mps3r.c')) arm_ss.add(when: 'CONFIG_MUSICPAL', if_true: files('musicpal.c')) arm_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c')) arm_ss.add(when: 'CONFIG_OLIMEX_STM32_H405', if_true: files('olimex-stm32-h405.c'))
The AN536 is another FPGA image for the MPS3 development board. Unlike the existing FPGA images we already model, this board uses a Cortex-R family CPU, and it does not use any equivalent to the M-profile "Subsystem for Embedded" SoC-equivalent that we model in hw/arm/armsse.c. It's therefore more convenient for us to model it as a completely separate C file. This commit adds the basic skeleton of the board model, and the code to create all the RAM and ROM. We assume that we're probably going to want to add more images in future, so use the same base class/subclass setup that mps2-tz.c uses, even though at the moment there's only a single subclass. Following commits will add the CPUs and the peripherals. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- MAINTAINERS | 3 +- configs/devices/arm-softmmu/default.mak | 1 + hw/arm/mps3r.c | 239 ++++++++++++++++++++++++ hw/arm/Kconfig | 5 + hw/arm/meson.build | 1 + 5 files changed, 248 insertions(+), 1 deletion(-) create mode 100644 hw/arm/mps3r.c