From: Inès Varhol <ines.varhol@telecom-paris.fr>
This patch adds a new STM32L475VG SoC, it is necessary to add support for
the B-L475E-IOT01A board.
The implementation is derived from the STM32F405 SoC.
The implementation contains no peripherals, only memory regions are
implemented.
Signed-off-by: Arnaud Minier <arnaud.minier@telecom-paris.fr>
Signed-off-by: Inès Varhol <ines.varhol@telecom-paris.fr>
---
hw/arm/Kconfig | 5 +
hw/arm/meson.build | 1 +
hw/arm/stm32l475vg_soc.c | 241 +++++++++++++++++++++++++++++++
include/hw/arm/stm32l475vg_soc.h | 60 ++++++++
4 files changed, 307 insertions(+)
create mode 100644 hw/arm/stm32l475vg_soc.c
create mode 100644 include/hw/arm/stm32l475vg_soc.h
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 3ada335a24..763510afeb 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -448,6 +448,11 @@ config STM32F405_SOC
select STM32F4XX_SYSCFG
select STM32F4XX_EXTI
+config STM32L475VG_SOC
+ bool
+ select ARM_V7M
+ select OR_IRQ
+
config XLNX_ZYNQMP_ARM
bool
default y if PIXMAN
diff --git a/hw/arm/meson.build b/hw/arm/meson.build
index 68245d3ad1..6b2e1228e5 100644
--- a/hw/arm/meson.build
+++ b/hw/arm/meson.build
@@ -42,6 +42,7 @@ arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.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'))
+arm_ss.add(when: 'CONFIG_STM32L475VG_SOC', if_true: files('stm32l475vg_soc.c'))
arm_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp.c', 'xlnx-zcu102.c'))
arm_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal.c', 'xlnx-versal-virt.c'))
arm_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', 'imx25_pdk.c'))
diff --git a/hw/arm/stm32l475vg_soc.c b/hw/arm/stm32l475vg_soc.c
new file mode 100644
index 0000000000..7dd5d70eb3
--- /dev/null
+++ b/hw/arm/stm32l475vg_soc.c
@@ -0,0 +1,241 @@
+/*
+ * STM32L475VG SoC
+ *
+ * Copyright (c) 2014 Alistair Francis <alistair@alistair23.me>
+ * Copyright (c) 2023 Arnaud Minier <arnaud.minier@telecom-paris.fr>
+ * Copyright (c) 2023 Inès Varhol <ines.varhol@telecom-paris.fr>
+ *
+ * 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 "exec/address-spaces.h"
+#include "sysemu/sysemu.h"
+#include "hw/arm/stm32l475vg_soc.h"
+#include "hw/qdev-clock.h"
+#include "hw/misc/unimp.h"
+
+/* stm32l475vg_soc implementation is derived from stm32f405_soc */
+
+static void stm32l475vg_soc_initfn(Object *obj)
+{
+ STM32L475VGState *s = STM32L475VG_SOC(obj);
+
+ object_initialize_child(obj, "armv7m", &s->armv7m, TYPE_ARMV7M);
+
+ s->sysclk = qdev_init_clock_in(DEVICE(s), "sysclk", NULL, NULL, 0);
+ s->refclk = qdev_init_clock_in(DEVICE(s), "refclk", NULL, NULL, 0);
+}
+
+static void stm32l475vg_soc_realize(DeviceState *dev_soc, Error **errp)
+{
+ STM32L475VGState *s = STM32L475VG_SOC(dev_soc);
+ MemoryRegion *system_memory = get_system_memory();
+ DeviceState *armv7m;
+ Error *err = NULL;
+
+ /*
+ * We use s->refclk internally and only define it with qdev_init_clock_in()
+ * so it is correctly parented and not leaked on an init/deinit; it is not
+ * intended as an externally exposed clock.
+ */
+ if (clock_has_source(s->refclk)) {
+ error_setg(errp, "refclk clock must not be wired up by the board code");
+ return;
+ }
+
+ if (!clock_has_source(s->sysclk)) {
+ error_setg(errp, "sysclk clock must be wired up by the board code");
+ return;
+ }
+
+ /*
+ * TODO: ideally we should model the SoC RCC and its ability to
+ * change the sysclk frequency and define different sysclk sources.
+ */
+
+ /* The refclk always runs at frequency HCLK / 8 */
+ clock_set_mul_div(s->refclk, 8, 1);
+ clock_set_source(s->refclk, s->sysclk);
+
+ memory_region_init_rom(&s->flash, OBJECT(dev_soc), "STM32L475VG.flash",
+ FLASH_SIZE, &err);
+ if (err != NULL) {
+ error_propagate(errp, err);
+ return;
+ }
+ memory_region_init_alias(&s->flash_alias, OBJECT(dev_soc),
+ "STM32L475VG.flash.alias", &s->flash, 0,
+ FLASH_SIZE);
+
+ memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, &s->flash);
+ memory_region_add_subregion(system_memory, 0, &s->flash_alias);
+
+ memory_region_init_ram(&s->sram1, NULL, "STM32L475VG.sram1", SRAM1_SIZE,
+ &err);
+ if (err != NULL) {
+ error_propagate(errp, err);
+ return;
+ }
+ memory_region_add_subregion(system_memory, SRAM1_BASE_ADDRESS, &s->sram1);
+
+ memory_region_init_ram(&s->sram2, NULL, "STM32L475VG.sram2", SRAM2_SIZE,
+ &err);
+ if (err != NULL) {
+ error_propagate(errp, err);
+ return;
+ }
+ memory_region_add_subregion(system_memory, SRAM2_BASE_ADDRESS, &s->sram2);
+
+ armv7m = DEVICE(&s->armv7m);
+ qdev_prop_set_uint32(armv7m, "num-irq", 96);
+ qdev_prop_set_string(armv7m, "cpu-type", s->cpu_type);
+ qdev_prop_set_bit(armv7m, "enable-bitband", true);
+ qdev_connect_clock_in(armv7m, "cpuclk", s->sysclk);
+ qdev_connect_clock_in(armv7m, "refclk", s->refclk);
+ object_property_set_link(OBJECT(&s->armv7m), "memory",
+ OBJECT(system_memory), &error_abort);
+ if (!sysbus_realize(SYS_BUS_DEVICE(&s->armv7m), errp)) {
+ return;
+ }
+
+ /* APB1 BUS */
+ create_unimplemented_device("TIM2", 0x40000000, 0x400);
+ create_unimplemented_device("TIM3", 0x40000400, 0x400);
+ create_unimplemented_device("TIM4", 0x40000800, 0x400);
+ create_unimplemented_device("TIM5", 0x40000C00, 0x400);
+ create_unimplemented_device("TIM6", 0x40001000, 0x400);
+ create_unimplemented_device("TIM7", 0x40001400, 0x400);
+ /* RESERVED: 0x40001800, 0x1000 */
+ create_unimplemented_device("RTC", 0x40002800, 0x400);
+ create_unimplemented_device("WWDG", 0x40002C00, 0x400);
+ create_unimplemented_device("IWDG", 0x40003000, 0x400);
+ /* RESERVED: 0x40001800, 0x400 */
+ create_unimplemented_device("SPI2", 0x40003800, 0x400);
+ create_unimplemented_device("SPI3", 0x40003C00, 0x400);
+ /* RESERVED: 0x40004000, 0x400 */
+ create_unimplemented_device("USART2", 0x40004400, 0x400);
+ create_unimplemented_device("USART3", 0x40004800, 0x400);
+ create_unimplemented_device("UART4", 0x40004C00, 0x400);
+ create_unimplemented_device("UART5", 0x40005000, 0x400);
+ create_unimplemented_device("I2C1", 0x40005400, 0x400);
+ create_unimplemented_device("I2C2", 0x40005800, 0x400);
+ create_unimplemented_device("I2C3", 0x40005C00, 0x400);
+ /* RESERVED: 0x40006000, 0x400 */
+ create_unimplemented_device("CAN1", 0x40006400, 0x400);
+ /* RESERVED: 0x40006800, 0x400 */
+ create_unimplemented_device("PWR", 0x40007000, 0x400);
+ create_unimplemented_device("DAC1", 0x40007400, 0x400);
+ create_unimplemented_device("OPAMP", 0x40007800, 0x400);
+ create_unimplemented_device("LPTIM1", 0x40007C00, 0x400);
+ create_unimplemented_device("LPUART1", 0x40008000, 0x400);
+ /* RESERVED: 0x40008400, 0x400 */
+ create_unimplemented_device("SWPMI1", 0x40008800, 0x400);
+ /* RESERVED: 0x40008C00, 0x800 */
+ create_unimplemented_device("LPTIM2", 0x40009400, 0x400);
+ /* RESERVED: 0x40009800, 0x6800 */
+
+ /* APB2 BUS */
+ create_unimplemented_device("SYSCFG", 0x40010000, 0x30);
+ create_unimplemented_device("VREFBUF", 0x40010030, 0x1D0);
+ create_unimplemented_device("COMP", 0x40010200, 0x200);
+ create_unimplemented_device("EXTI", 0x40010400, 0x400);
+ /* RESERVED: 0x40010800, 0x1400 */
+ create_unimplemented_device("FIREWALL", 0x40011C00, 0x400);
+ /* RESERVED: 0x40012000, 0x800 */
+ create_unimplemented_device("SDMMC1", 0x40012800, 0x400);
+ create_unimplemented_device("TIM1", 0x40012C00, 0x400);
+ create_unimplemented_device("SPI1", 0x40013000, 0x400);
+ create_unimplemented_device("TIM8", 0x40013400, 0x400);
+ create_unimplemented_device("USART1", 0x40013800, 0x400);
+ /* RESERVED: 0x40013C00, 0x400 */
+ create_unimplemented_device("TIM15", 0x40014000, 0x400);
+ create_unimplemented_device("TIM16", 0x40014400, 0x400);
+ create_unimplemented_device("TIM17", 0x40014800, 0x400);
+ /* RESERVED: 0x40014C00, 0x800 */
+ create_unimplemented_device("SAI1", 0x40015400, 0x400);
+ create_unimplemented_device("SAI2", 0x40015800, 0x400);
+ /* RESERVED: 0x40015C00, 0x400 */
+ create_unimplemented_device("DFSDM1", 0x40016000, 0x400);
+ /* RESERVED: 0x40016400, 0x9C00 */
+
+ /* AHB1 BUS */
+ create_unimplemented_device("DMA1", 0x40020000, 0x400);
+ create_unimplemented_device("DMA2", 0x40020400, 0x400);
+ /* RESERVED: 0x40020800, 0x800 */
+ create_unimplemented_device("RCC", 0x40021000, 0x400);
+ /* RESERVED: 0x40021400, 0xC00 */
+ create_unimplemented_device("FLASH", 0x40022000, 0x400);
+ /* RESERVED: 0x40022400, 0xC00 */
+ create_unimplemented_device("CRC", 0x40023000, 0x400);
+ /* RESERVED: 0x40023400, 0x400 */
+ create_unimplemented_device("TSC", 0x40024000, 0x400);
+
+ /* RESERVED: 0x40024400, 0x7FDBC00 */
+
+ /* AHB2 BUS */
+ create_unimplemented_device("GPIOA", 0x48000000, 0x400);
+ create_unimplemented_device("GPIOB", 0x48000400, 0x400);
+ create_unimplemented_device("GPIOC", 0x48000800, 0x400);
+ create_unimplemented_device("GPIOD", 0x48000C00, 0x400);
+ create_unimplemented_device("GPIOE", 0x48001000, 0x400);
+ create_unimplemented_device("GPIOF", 0x48001400, 0x400);
+ create_unimplemented_device("GPIOG", 0x48001800, 0x400);
+ create_unimplemented_device("GPIOH", 0x48001C00, 0x400);
+ /* RESERVED: 0x48002000, 0x7FDBC00 */
+ create_unimplemented_device("OTG_FS", 0x50000000, 0x40000);
+ create_unimplemented_device("ADC", 0x50040000, 0x400);
+ /* RESERVED: 0x50040400, 0x20400 */
+ create_unimplemented_device("RNG", 0x50060800, 0x400);
+
+ /* AHB3 BUS */
+ create_unimplemented_device("FMC", 0xA0000000, 0x1000);
+ create_unimplemented_device("QUADSPI", 0xA0001000, 0x400);
+}
+
+static Property stm32l475vg_soc_properties[] = {
+ DEFINE_PROP_STRING("cpu-type", STM32L475VGState, cpu_type),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void stm32l475vg_soc_class_init(ObjectClass *klass, void *data)
+{
+
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->realize = stm32l475vg_soc_realize;
+ device_class_set_props(dc, stm32l475vg_soc_properties);
+ /* No vmstate or reset required: device has no internal state */
+}
+
+static const TypeInfo stm32l475vg_soc_info = {
+ .name = TYPE_STM32L475VG_SOC,
+ .parent = TYPE_DEVICE,
+ .instance_size = sizeof(STM32L475VGState),
+ .instance_init = stm32l475vg_soc_initfn,
+ .class_init = stm32l475vg_soc_class_init,
+};
+
+static void stm32l475vg_soc_register_types(void)
+{
+ type_register_static(&stm32l475vg_soc_info);
+}
+
+type_init(stm32l475vg_soc_register_types)
diff --git a/include/hw/arm/stm32l475vg_soc.h b/include/hw/arm/stm32l475vg_soc.h
new file mode 100644
index 0000000000..a224cb6384
--- /dev/null
+++ b/include/hw/arm/stm32l475vg_soc.h
@@ -0,0 +1,60 @@
+/*
+ * STM32L475VG SoC
+ *
+ * Copyright (c) 2023 Arnaud Minier <arnaud.minier@telecom-paris.fr>
+ * Copyright (c) 2023 Inès Varhol <ines.varhol@telecom-paris.fr>
+ *
+ * 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.
+ */
+
+#ifndef HW_ARM_STM32L475VG_SOC_H
+#define HW_ARM_STM32L475VG_SOC_H
+
+#include "hw/arm/armv7m.h"
+#include "qom/object.h"
+
+#define TYPE_STM32L475VG_SOC "stm32l475vg-soc"
+OBJECT_DECLARE_SIMPLE_TYPE(STM32L475VGState, STM32L475VG_SOC)
+
+#define FLASH_BASE_ADDRESS 0x08000000
+#define FLASH_SIZE (1024 * 1024)
+#define SRAM1_BASE_ADDRESS 0x20000000
+#define SRAM1_SIZE (96 * 1024)
+#define SRAM2_BASE_ADDRESS 0x10000000
+#define SRAM2_SIZE (32 * 1024)
+
+struct STM32L475VGState {
+ /*< private >*/
+ DeviceState parent_obj;
+ /*< public >*/
+
+ char *cpu_type;
+
+ ARMv7MState armv7m;
+
+ MemoryRegion sram1;
+ MemoryRegion sram2;
+ MemoryRegion flash;
+ MemoryRegion flash_alias;
+
+ Clock *sysclk;
+ Clock *refclk;
+};
+
+#endif
--
2.38.5Hi Inès,
On 15/11/23 08:59, ~inesvarhol wrote:
> From: Inès Varhol <ines.varhol@telecom-paris.fr>
>
> This patch adds a new STM32L475VG SoC, it is necessary to add support for
> the B-L475E-IOT01A board.
Thanks for your first contribution! See my comments inline.
> The implementation is derived from the STM32F405 SoC.
You might want to Cc the STM32F405 maintainer to get more reviewers
(doing that for you).
$ ./scripts/get_maintainer.pl -f hw/arm/stm32f405_soc.c
Alistair Francis <alistair@alistair23.me> (maintainer:STM32F405)
Peter Maydell <peter.maydell@linaro.org> (maintainer:STM32F405)
qemu-arm@nongnu.org (open list:STM32F405)
qemu-devel@nongnu.org (open list:All patches CC here)
Also, do not forget to Cc the qemu-arm@nongnu.org list which
is almost a subset of qemu-devel@ subscribers.
> The implementation contains no peripherals, only memory regions are
> implemented.
>
> Signed-off-by: Arnaud Minier <arnaud.minier@telecom-paris.fr>
> Signed-off-by: Inès Varhol <ines.varhol@telecom-paris.fr>
> ---
> hw/arm/Kconfig | 5 +
> hw/arm/meson.build | 1 +
> hw/arm/stm32l475vg_soc.c | 241 +++++++++++++++++++++++++++++++
> include/hw/arm/stm32l475vg_soc.h | 60 ++++++++
> 4 files changed, 307 insertions(+)
> create mode 100644 hw/arm/stm32l475vg_soc.c
> create mode 100644 include/hw/arm/stm32l475vg_soc.h
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 3ada335a24..763510afeb 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -448,6 +448,11 @@ config STM32F405_SOC
> select STM32F4XX_SYSCFG
> select STM32F4XX_EXTI
>
> +config STM32L475VG_SOC
> + bool
> + select ARM_V7M
> + select OR_IRQ
> +
> config XLNX_ZYNQMP_ARM
> bool
> default y if PIXMAN
> diff --git a/hw/arm/meson.build b/hw/arm/meson.build
> index 68245d3ad1..6b2e1228e5 100644
> --- a/hw/arm/meson.build
> +++ b/hw/arm/meson.build
> @@ -42,6 +42,7 @@ arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.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'))
> +arm_ss.add(when: 'CONFIG_STM32L475VG_SOC', if_true: files('stm32l475vg_soc.c'))
"V" refers to the packaging. This SoC can be encapsulated in multiple
formats, for example as 64-pin LQFP or as 100-pin.
For QEMU the packaging is irrelevant, so you can strip the -V suffix.
"G" refers to the flash/sram size (here 1 MiB / 320 KiB).
With few more lines we can support the "C" (256 KiB / 128 KiB) and "E"
(512 / 128).
(See for example how hw/avr/atmega.c uses a class_init() method to
set the flash_size/sram_size values for the different SoC it models).
(I'm not asking to do that now, just giving you references. This can
be done later on top).
This SoC is from the USB OTG lines family, maybe better name it
generically as STM32L4x5, so we can reuse the base class for the
whole family?
> arm_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zynqmp.c', 'xlnx-zcu102.c'))
> arm_ss.add(when: 'CONFIG_XLNX_VERSAL', if_true: files('xlnx-versal.c', 'xlnx-versal-virt.c'))
> arm_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', 'imx25_pdk.c'))
> diff --git a/hw/arm/stm32l475vg_soc.c b/hw/arm/stm32l475vg_soc.c
> new file mode 100644
> index 0000000000..7dd5d70eb3
> --- /dev/null
> +++ b/hw/arm/stm32l475vg_soc.c
> @@ -0,0 +1,241 @@
> +/*
> + * STM32L475VG SoC
> + *
> + * Copyright (c) 2014 Alistair Francis <alistair@alistair23.me>
> + * Copyright (c) 2023 Arnaud Minier <arnaud.minier@telecom-paris.fr>
> + * Copyright (c) 2023 Inès Varhol <ines.varhol@telecom-paris.fr>
> + *
Consider including a SPDX tag which is easier to process than a full
license:
* SPDX-License-Identifier: MIT
> + * 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 "exec/address-spaces.h"
> +#include "sysemu/sysemu.h"
> +#include "hw/arm/stm32l475vg_soc.h"
> +#include "hw/qdev-clock.h"
> +#include "hw/misc/unimp.h"
> +
> +/* stm32l475vg_soc implementation is derived from stm32f405_soc */
> +
> +static void stm32l475vg_soc_initfn(Object *obj)
> +{
> + STM32L475VGState *s = STM32L475VG_SOC(obj);
> +
> + object_initialize_child(obj, "armv7m", &s->armv7m, TYPE_ARMV7M);
Since you only "forward" the 'cpu-type' property from the board to
the ARM core, you can do:
object_property_add_alias(obj, "cpu-type",
OBJECT(&s->armv7m), "cpu-type");
So the board code setting this property directly sets the core cpu type,
and you don't need to register any stm32l475vg_soc_properties[].
*But* this SoC family can only accept Cortex-M4 cores. Better would be
to hardcode the type previous to the realize call, instead of letting
the board code decide which CPU type to use. Also we could check at the
SoC level that the board CPU type requested is really a Cortex-M4,
returning an error otherwise.
I see you follow the template from hw/arm/netduino2.c. Hmm OK then,
no need to over-engineer at this point.
> + s->sysclk = qdev_init_clock_in(DEVICE(s), "sysclk", NULL, NULL, 0);
> + s->refclk = qdev_init_clock_in(DEVICE(s), "refclk", NULL, NULL, 0);
> +}
> +
> +static void stm32l475vg_soc_realize(DeviceState *dev_soc, Error **errp)
> +{
> + STM32L475VGState *s = STM32L475VG_SOC(dev_soc);
> + MemoryRegion *system_memory = get_system_memory();
Note for myself, this SoC aperture is 4GiB. get_system_memory() is
wider. Not an issue.
> + DeviceState *armv7m;
> + Error *err = NULL;
Using the ERRP_GUARD() macro is safer. See include/qapi/error.h.
> +
> + /*
> + * We use s->refclk internally and only define it with qdev_init_clock_in()
> + * so it is correctly parented and not leaked on an init/deinit; it is not
> + * intended as an externally exposed clock.
> + */
> + if (clock_has_source(s->refclk)) {
> + error_setg(errp, "refclk clock must not be wired up by the board code");
> + return;
> + }
> +
> + if (!clock_has_source(s->sysclk)) {
> + error_setg(errp, "sysclk clock must be wired up by the board code");
> + return;
> + }
> +
> + /*
> + * TODO: ideally we should model the SoC RCC and its ability to
> + * change the sysclk frequency and define different sysclk sources.
> + */
> +
> + /* The refclk always runs at frequency HCLK / 8 */
> + clock_set_mul_div(s->refclk, 8, 1);
> + clock_set_source(s->refclk, s->sysclk);
> +
> + memory_region_init_rom(&s->flash, OBJECT(dev_soc), "STM32L475VG.flash",
Just name it "flash" as in datasheet.
> + FLASH_SIZE, &err);
> + if (err != NULL) {
> + error_propagate(errp, err);
> + return;
> + }
> + memory_region_init_alias(&s->flash_alias, OBJECT(dev_soc),
> + "STM32L475VG.flash.alias", &s->flash, 0,
"flash_boot_alias".
> + FLASH_SIZE);
> +
> + memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, &s->flash);
> + memory_region_add_subregion(system_memory, 0, &s->flash_alias);
> +
> + memory_region_init_ram(&s->sram1, NULL, "STM32L475VG.sram1", SRAM1_SIZE,
Why NULL and not OBJECT(dev_soc) like for the flash earlier?
> + &err);
"SRAM1".
> + if (err != NULL) {
> + error_propagate(errp, err);
> + return;
> + }
> + memory_region_add_subregion(system_memory, SRAM1_BASE_ADDRESS, &s->sram1);
> +
> + memory_region_init_ram(&s->sram2, NULL, "STM32L475VG.sram2", SRAM2_SIZE,
Ditto OBJECT(dev_soc) parent.
> + &err);
"SRAM2"
> + if (err != NULL) {
> + error_propagate(errp, err);
> + return;
> + }
> + memory_region_add_subregion(system_memory, SRAM2_BASE_ADDRESS, &s->sram2);
> +
> + armv7m = DEVICE(&s->armv7m);
> + qdev_prop_set_uint32(armv7m, "num-irq", 96);
> + qdev_prop_set_string(armv7m, "cpu-type", s->cpu_type);
This SoC family can only accept Cortex-M4 cores. Better would be to
hardcode it here. Hmm I see, the code you used as template,
hw/arm/netduino2.c, do the same. OK.
> + qdev_prop_set_bit(armv7m, "enable-bitband", true);
> + qdev_connect_clock_in(armv7m, "cpuclk", s->sysclk);
> + qdev_connect_clock_in(armv7m, "refclk", s->refclk);
> + object_property_set_link(OBJECT(&s->armv7m), "memory",
> + OBJECT(system_memory), &error_abort);
> + if (!sysbus_realize(SYS_BUS_DEVICE(&s->armv7m), errp)) {
> + return;
> + }
> +
> + /* APB1 BUS */
> + create_unimplemented_device("TIM2", 0x40000000, 0x400);
> + create_unimplemented_device("TIM3", 0x40000400, 0x400);
> + create_unimplemented_device("TIM4", 0x40000800, 0x400);
> + create_unimplemented_device("TIM5", 0x40000C00, 0x400);
> + create_unimplemented_device("TIM6", 0x40001000, 0x400);
> + create_unimplemented_device("TIM7", 0x40001400, 0x400);
> + /* RESERVED: 0x40001800, 0x1000 */
> + create_unimplemented_device("RTC", 0x40002800, 0x400);
> + create_unimplemented_device("WWDG", 0x40002C00, 0x400);
> + create_unimplemented_device("IWDG", 0x40003000, 0x400);
> + /* RESERVED: 0x40001800, 0x400 */
> + create_unimplemented_device("SPI2", 0x40003800, 0x400);
> + create_unimplemented_device("SPI3", 0x40003C00, 0x400);
> + /* RESERVED: 0x40004000, 0x400 */
> + create_unimplemented_device("USART2", 0x40004400, 0x400);
> + create_unimplemented_device("USART3", 0x40004800, 0x400);
> + create_unimplemented_device("UART4", 0x40004C00, 0x400);
> + create_unimplemented_device("UART5", 0x40005000, 0x400);
> + create_unimplemented_device("I2C1", 0x40005400, 0x400);
> + create_unimplemented_device("I2C2", 0x40005800, 0x400);
> + create_unimplemented_device("I2C3", 0x40005C00, 0x400);
> + /* RESERVED: 0x40006000, 0x400 */
> + create_unimplemented_device("CAN1", 0x40006400, 0x400);
> + /* RESERVED: 0x40006800, 0x400 */
> + create_unimplemented_device("PWR", 0x40007000, 0x400);
> + create_unimplemented_device("DAC1", 0x40007400, 0x400);
> + create_unimplemented_device("OPAMP", 0x40007800, 0x400);
> + create_unimplemented_device("LPTIM1", 0x40007C00, 0x400);
> + create_unimplemented_device("LPUART1", 0x40008000, 0x400);
> + /* RESERVED: 0x40008400, 0x400 */
> + create_unimplemented_device("SWPMI1", 0x40008800, 0x400);
> + /* RESERVED: 0x40008C00, 0x800 */
> + create_unimplemented_device("LPTIM2", 0x40009400, 0x400);
> + /* RESERVED: 0x40009800, 0x6800 */
> +
> + /* APB2 BUS */
> + create_unimplemented_device("SYSCFG", 0x40010000, 0x30);
> + create_unimplemented_device("VREFBUF", 0x40010030, 0x1D0);
> + create_unimplemented_device("COMP", 0x40010200, 0x200);
> + create_unimplemented_device("EXTI", 0x40010400, 0x400);
> + /* RESERVED: 0x40010800, 0x1400 */
> + create_unimplemented_device("FIREWALL", 0x40011C00, 0x400);
> + /* RESERVED: 0x40012000, 0x800 */
> + create_unimplemented_device("SDMMC1", 0x40012800, 0x400);
> + create_unimplemented_device("TIM1", 0x40012C00, 0x400);
> + create_unimplemented_device("SPI1", 0x40013000, 0x400);
> + create_unimplemented_device("TIM8", 0x40013400, 0x400);
> + create_unimplemented_device("USART1", 0x40013800, 0x400);
> + /* RESERVED: 0x40013C00, 0x400 */
> + create_unimplemented_device("TIM15", 0x40014000, 0x400);
> + create_unimplemented_device("TIM16", 0x40014400, 0x400);
> + create_unimplemented_device("TIM17", 0x40014800, 0x400);
> + /* RESERVED: 0x40014C00, 0x800 */
> + create_unimplemented_device("SAI1", 0x40015400, 0x400);
> + create_unimplemented_device("SAI2", 0x40015800, 0x400);
> + /* RESERVED: 0x40015C00, 0x400 */
> + create_unimplemented_device("DFSDM1", 0x40016000, 0x400);
> + /* RESERVED: 0x40016400, 0x9C00 */
> +
> + /* AHB1 BUS */
> + create_unimplemented_device("DMA1", 0x40020000, 0x400);
> + create_unimplemented_device("DMA2", 0x40020400, 0x400);
> + /* RESERVED: 0x40020800, 0x800 */
> + create_unimplemented_device("RCC", 0x40021000, 0x400);
> + /* RESERVED: 0x40021400, 0xC00 */
> + create_unimplemented_device("FLASH", 0x40022000, 0x400);
> + /* RESERVED: 0x40022400, 0xC00 */
> + create_unimplemented_device("CRC", 0x40023000, 0x400);
> + /* RESERVED: 0x40023400, 0x400 */
> + create_unimplemented_device("TSC", 0x40024000, 0x400);
> +
> + /* RESERVED: 0x40024400, 0x7FDBC00 */
> +
> + /* AHB2 BUS */
> + create_unimplemented_device("GPIOA", 0x48000000, 0x400);
> + create_unimplemented_device("GPIOB", 0x48000400, 0x400);
> + create_unimplemented_device("GPIOC", 0x48000800, 0x400);
> + create_unimplemented_device("GPIOD", 0x48000C00, 0x400);
> + create_unimplemented_device("GPIOE", 0x48001000, 0x400);
> + create_unimplemented_device("GPIOF", 0x48001400, 0x400);
> + create_unimplemented_device("GPIOG", 0x48001800, 0x400);
> + create_unimplemented_device("GPIOH", 0x48001C00, 0x400);
> + /* RESERVED: 0x48002000, 0x7FDBC00 */
> + create_unimplemented_device("OTG_FS", 0x50000000, 0x40000);
> + create_unimplemented_device("ADC", 0x50040000, 0x400);
> + /* RESERVED: 0x50040400, 0x20400 */
> + create_unimplemented_device("RNG", 0x50060800, 0x400);
> +
> + /* AHB3 BUS */
> + create_unimplemented_device("FMC", 0xA0000000, 0x1000);
> + create_unimplemented_device("QUADSPI", 0xA0001000, 0x400);
> +}
> +
> +static Property stm32l475vg_soc_properties[] = {
> + DEFINE_PROP_STRING("cpu-type", STM32L475VGState, cpu_type),
> + DEFINE_PROP_END_OF_LIST(),
> +};
> +
> +static void stm32l475vg_soc_class_init(ObjectClass *klass, void *data)
> +{
> +
> + DeviceClass *dc = DEVICE_CLASS(klass);
> +
> + dc->realize = stm32l475vg_soc_realize;
> + device_class_set_props(dc, stm32l475vg_soc_properties);
> + /* No vmstate or reset required: device has no internal state */
> +}
> +
> +static const TypeInfo stm32l475vg_soc_info = {
> + .name = TYPE_STM32L475VG_SOC,
> + .parent = TYPE_DEVICE,
> + .instance_size = sizeof(STM32L475VGState),
> + .instance_init = stm32l475vg_soc_initfn,
> + .class_init = stm32l475vg_soc_class_init,
> +};
> +
> +static void stm32l475vg_soc_register_types(void)
> +{
> + type_register_static(&stm32l475vg_soc_info);
> +}
> +
> +type_init(stm32l475vg_soc_register_types)
Although for a single TypeInfo entry there is no difference,
DEFINE_TYPES() is preferred over type_init().
> diff --git a/include/hw/arm/stm32l475vg_soc.h b/include/hw/arm/stm32l475vg_soc.h
> new file mode 100644
> index 0000000000..a224cb6384
> --- /dev/null
> +++ b/include/hw/arm/stm32l475vg_soc.h
> @@ -0,0 +1,60 @@
> +/*
> + * STM32L475VG SoC
"STM32L4x5 SoC family"
> + *
> + * Copyright (c) 2023 Arnaud Minier <arnaud.minier@telecom-paris.fr>
> + * Copyright (c) 2023 Inès Varhol <ines.varhol@telecom-paris.fr>
> + *
Again SPDX tag if possible.
> + * 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.
> + */
> +
> +#ifndef HW_ARM_STM32L475VG_SOC_H
> +#define HW_ARM_STM32L475VG_SOC_H
> +
> +#include "hw/arm/armv7m.h"
> +#include "qom/object.h"
You also need to include "hw/qdev-core.h" and "exec/memory.h"
to get the DeviceState and MemoryRegion definitions, because
STM32L475VGState uses these types.
For Clock* we don't need anything because it is forward declared
by "qemu/typedefs.h", which all QEMU source files already include.
> +#define TYPE_STM32L475VG_SOC "stm32l475vg-soc"
> +OBJECT_DECLARE_SIMPLE_TYPE(STM32L475VGState, STM32L475VG_SOC)
> +
> +#define FLASH_BASE_ADDRESS 0x08000000
> +#define FLASH_SIZE (1024 * 1024)
> +#define SRAM1_BASE_ADDRESS 0x20000000
> +#define SRAM1_SIZE (96 * 1024)
> +#define SRAM2_BASE_ADDRESS 0x10000000
> +#define SRAM2_SIZE (32 * 1024)
These definitions are specific to the SoC. No code out of the SoC should
require them, so no need to expose them. Better keep them local in the
stm32l4x5xx_soc.c source file.
> +struct STM32L475VGState {
> + /*< private >*/
> + DeviceState parent_obj;
> + /*< public >*/
Please remove these <private/public> lines, we try to not use them
anymore.
> + char *cpu_type;
> +
> + ARMv7MState armv7m;
> +
> + MemoryRegion sram1;
> + MemoryRegion sram2;
> + MemoryRegion flash;
> + MemoryRegion flash_alias;
> +
> + Clock *sysclk;
> + Clock *refclk;
> +};
> +
> +#endif
Very good first contribution, I'm glad you posted it :)
I mostly asked for minor style change. Looking for your
next iteration!
Regards,
Phil.
© 2016 - 2024 Red Hat, Inc.