| Message ID | 20210608161028.4159582-3-erdnaxe@crans.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | STM32VLDISCOVERY Machine Model | expand |
On Tue, 8 Jun 2021 at 17:10, Alexandre Iooss <erdnaxe@crans.org> wrote: > > This is a Cortex-M3 based machine. Information can be found at: > https://www.st.com/en/evaluation-tools/stm32vldiscovery.html > > Signed-off-by: Alexandre Iooss <erdnaxe@crans.org> The commit message says this is Cortex-M3 based, but the code gives it a Cortex-M4. Which is correct? > --- > MAINTAINERS | 6 +++ > default-configs/devices/arm-softmmu.mak | 1 + > hw/arm/Kconfig | 4 ++ > hw/arm/meson.build | 1 + > hw/arm/stm32vldiscovery.c | 66 +++++++++++++++++++++++++ > 5 files changed, 78 insertions(+) > create mode 100644 hw/arm/stm32vldiscovery.c Could you add some documentation for the new board, please? This lives in docs/system/arm. Commit c9f8511ea8d2b807 gives an example of adding docs for a board. thanks -- PMM
On 6/14/21 5:52 PM, Peter Maydell wrote: > On Tue, 8 Jun 2021 at 17:10, Alexandre Iooss <erdnaxe@crans.org> wrote: >> >> This is a Cortex-M3 based machine. Information can be found at: >> https://www.st.com/en/evaluation-tools/stm32vldiscovery.html >> >> Signed-off-by: Alexandre Iooss <erdnaxe@crans.org> > > The commit message says this is Cortex-M3 based, but the > code gives it a Cortex-M4. Which is correct? This is an typo. The board is Cortex-M3 so I will fix the machine code in next version of this patchset. >> --- >> MAINTAINERS | 6 +++ >> default-configs/devices/arm-softmmu.mak | 1 + >> hw/arm/Kconfig | 4 ++ >> hw/arm/meson.build | 1 + >> hw/arm/stm32vldiscovery.c | 66 +++++++++++++++++++++++++ >> 5 files changed, 78 insertions(+) >> create mode 100644 hw/arm/stm32vldiscovery.c > > Could you add some documentation for the new board, please? > This lives in docs/system/arm. Commit c9f8511ea8d2b807 gives > an example of adding docs for a board. > > thanks > -- PMM > Should I rather: 1. Add `docs/system/arm/stm32vldiscovery.rst` to document only this new machine? 2. Add `docs/system/arm/stm32discovery.rst` to document this new machine and future STM32 Discovery boards? 3. Add `docs/system/arm/stm32.rst` to document all STM32-based boards? STM32 boards share a lot in common so I believe option 3 is more appropriate, what is your opinion? If we go with option 3, I can also try to document the Netduino Plus 2 (maybe in another commit, or another patchset later). Thanks, -- Alexandre
On Tue, Jun 15, 2021 at 5:17 PM Alexandre IOOSS <erdnaxe@crans.org> wrote: > > On 6/14/21 5:52 PM, Peter Maydell wrote: > > On Tue, 8 Jun 2021 at 17:10, Alexandre Iooss <erdnaxe@crans.org> wrote: > >> > >> This is a Cortex-M3 based machine. Information can be found at: > >> https://www.st.com/en/evaluation-tools/stm32vldiscovery.html > >> > >> Signed-off-by: Alexandre Iooss <erdnaxe@crans.org> > > > > The commit message says this is Cortex-M3 based, but the > > code gives it a Cortex-M4. Which is correct? > > This is an typo. The board is Cortex-M3 so I will fix the machine code > in next version of this patchset. > > >> --- > >> MAINTAINERS | 6 +++ > >> default-configs/devices/arm-softmmu.mak | 1 + > >> hw/arm/Kconfig | 4 ++ > >> hw/arm/meson.build | 1 + > >> hw/arm/stm32vldiscovery.c | 66 +++++++++++++++++++++++++ > >> 5 files changed, 78 insertions(+) > >> create mode 100644 hw/arm/stm32vldiscovery.c > > > > Could you add some documentation for the new board, please? > > This lives in docs/system/arm. Commit c9f8511ea8d2b807 gives > > an example of adding docs for a board. > > > > thanks > > -- PMM > > > > Should I rather: > 1. Add `docs/system/arm/stm32vldiscovery.rst` to document only this new > machine? > 2. Add `docs/system/arm/stm32discovery.rst` to document this new machine > and future STM32 Discovery boards? > 3. Add `docs/system/arm/stm32.rst` to document all STM32-based boards? > > STM32 boards share a lot in common so I believe option 3 is more > appropriate, what is your opinion? > If we go with option 3, I can also try to document the Netduino Plus 2 > (maybe in another commit, or another patchset later). Looking at the existing `nuvoton.rst` file I would say option 3 is the best bet here. Alistair > > Thanks, > -- Alexandre >
On Tue, 15 Jun 2021 at 08:16, Alexandre IOOSS <erdnaxe@crans.org> wrote: > > On 6/14/21 5:52 PM, Peter Maydell wrote: > > Could you add some documentation for the new board, please? > > This lives in docs/system/arm. Commit c9f8511ea8d2b807 gives > > an example of adding docs for a board. > Should I rather: > 1. Add `docs/system/arm/stm32vldiscovery.rst` to document only this new > machine? > 2. Add `docs/system/arm/stm32discovery.rst` to document this new machine > and future STM32 Discovery boards? > 3. Add `docs/system/arm/stm32.rst` to document all STM32-based boards? > > STM32 boards share a lot in common so I believe option 3 is more > appropriate, what is your opinion? > If we go with option 3, I can also try to document the Netduino Plus 2 > (maybe in another commit, or another patchset later). Yes, I think that a shared stm32.rst is probably the best thing. If you want to document the netduino boards too that would be great, but I don't insist on it. thanks -- PMM
diff --git a/MAINTAINERS b/MAINTAINERS index 62dfa31800..0aa8016936 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -891,6 +891,12 @@ F: hw/*/stellaris* F: include/hw/input/gamepad.h F: docs/system/arm/stellaris.rst +STM32VLDISCOVERY +M: Alexandre Iooss <erdnaxe@crans.org> +L: qemu-arm@nongnu.org +S: Maintained +F: hw/arm/stm32vldiscovery.c + Versatile Express M: Peter Maydell <peter.maydell@linaro.org> L: qemu-arm@nongnu.org diff --git a/default-configs/devices/arm-softmmu.mak b/default-configs/devices/arm-softmmu.mak index 0500156a0c..cdc0e97f9d 100644 --- a/default-configs/devices/arm-softmmu.mak +++ b/default-configs/devices/arm-softmmu.mak @@ -18,6 +18,7 @@ CONFIG_CHEETAH=y CONFIG_SX1=y CONFIG_NSERIES=y CONFIG_STELLARIS=y +CONFIG_STM32VLDISCOVERY=y CONFIG_REALVIEW=y CONFIG_VERSATILE=y CONFIG_VEXPRESS=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 0bc3ee3e91..dc4e47b721 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -239,6 +239,10 @@ config STELLARIS select STELLARIS_ENET # ethernet select UNIMP +config STM32VLDISCOVERY + bool + select STM32F100_SOC + config STRONGARM bool select PXA2XX diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 0e637e6a9e..721a8eb8be 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -24,6 +24,7 @@ arm_ss.add(when: 'CONFIG_Z2', if_true: files('z2.c')) arm_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) arm_ss.add(when: 'CONFIG_STELLARIS', if_true: files('stellaris.c')) +arm_ss.add(when: 'CONFIG_STM32VLDISCOVERY', if_true: files('stm32vldiscovery.c')) arm_ss.add(when: 'CONFIG_COLLIE', if_true: files('collie.c')) arm_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) arm_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) diff --git a/hw/arm/stm32vldiscovery.c b/hw/arm/stm32vldiscovery.c new file mode 100644 index 0000000000..ab9297bc38 --- /dev/null +++ b/hw/arm/stm32vldiscovery.c @@ -0,0 +1,66 @@ +/* + * ST STM32VLDISCOVERY machine + * + * Copyright (c) 2021 Alexandre Iooss <erdnaxe@crans.org> + * Copyright (c) 2014 Alistair Francis <alistair@alistair23.me> + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/boards.h" +#include "hw/qdev-properties.h" +#include "qemu/error-report.h" +#include "hw/arm/stm32f100_soc.h" +#include "hw/arm/boot.h" + +/* stm32vldiscovery implementation is derived from netduinoplus2 */ + +/* Main SYSCLK frequency in Hz (24MHz) */ +#define SYSCLK_FRQ 24000000ULL + +static void stm32vldiscovery_init(MachineState *machine) +{ + DeviceState *dev; + + /* + * TODO: ideally we would model the SoC RCC and let it handle + * system_clock_scale, including its ability to define different + * possible SYSCLK sources. + */ + system_clock_scale = NANOSECONDS_PER_SECOND / SYSCLK_FRQ; + + dev = qdev_new(TYPE_STM32F100_SOC); + qdev_prop_set_string(dev, "cpu-type", ARM_CPU_TYPE_NAME("cortex-m4")); + sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal); + + armv7m_load_kernel(ARM_CPU(first_cpu), + machine->kernel_filename, + FLASH_SIZE); +} + +static void stm32vldiscovery_machine_init(MachineClass *mc) +{ + mc->desc = "ST STM32VLDISCOVERY (Cortex-M4)"; + mc->init = stm32vldiscovery_init; +} + +DEFINE_MACHINE("stm32vldiscovery", stm32vldiscovery_machine_init) +
This is a Cortex-M3 based machine. Information can be found at: https://www.st.com/en/evaluation-tools/stm32vldiscovery.html Signed-off-by: Alexandre Iooss <erdnaxe@crans.org> --- MAINTAINERS | 6 +++ default-configs/devices/arm-softmmu.mak | 1 + hw/arm/Kconfig | 4 ++ hw/arm/meson.build | 1 + hw/arm/stm32vldiscovery.c | 66 +++++++++++++++++++++++++ 5 files changed, 78 insertions(+) create mode 100644 hw/arm/stm32vldiscovery.c