Skip to contentSkip to conversation

hw/arm: Add support for STM32 H405 and fix STM32F405 memory layout

PATCH Superseded Felipe Balbi 3 participants 8 messages Dec 18, 2022 – Dec 19, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover hw/arm: Add support for STM32 H405 and fix STM32F405 memory layout

Hi,

The following patches pass checkpatch.pl and have been tested against today's HEAD (55745005e90a).

Felipe Balbi (2):
hw/arm/stm32f405: correctly describe the memory layout hw/arm: Add Olimex H405

 MAINTAINERS                             |  6 +++
 configs/devices/arm-softmmu/default.mak |  1 +
 hw/arm/Kconfig                          |  4 ++
 hw/arm/meson.build                      |  1 +
 hw/arm/olimex-stm32-h405.c              | 65 +++++++++++++++++++++++++
 hw/arm/stm32f405_soc.c                  |  8 +++
 include/hw/arm/stm32f405_soc.h          |  5 +-
 7 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 hw/arm/olimex-stm32-h405.c
Signature · 1 line
2.38.1
#1 lore raw

PATCH 1/2 hw/arm/stm32f405: correctly describe the memory layout

STM32F405 has 128K of SRAM and another 64K of CCM (Core-coupled Memory) at a different base address. Correctly describe the memory layout to give existing FW images have a chance to run unmodified.

---
 hw/arm/stm32f405_soc.c         | 8 ++++++++
 include/hw/arm/stm32f405_soc.h | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
hw/arm/stm32f405_soc.c +8 -0
index c07947d9f8b1..cef23d7ee41a 100644
@@ -139,6 +139,14 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)
     }
     memory_region_add_subregion(system_memory, SRAM_BASE_ADDRESS, &s->sram);
 
+    memory_region_init_ram(&s->ccm, NULL, "STM32F405.ccm", CCM_SIZE,
+                           &err);
+    if (err != NULL) {
+        error_propagate(errp, err);
+        return;
+    }
+    memory_region_add_subregion(system_memory, CCM_BASE_ADDRESS, &s->ccm);
+
     armv7m = DEVICE(&s->armv7m);
     qdev_prop_set_uint32(armv7m, "num-irq", 96);
     qdev_prop_set_string(armv7m, "cpu-type", s->cpu_type);
include/hw/arm/stm32f405_soc.h +4 -1
index 5bb0c8d56979..249ab5434ec7 100644
@@ -46,7 +46,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(STM32F405State, STM32F405_SOC)
 #define FLASH_BASE_ADDRESS 0x08000000
 #define FLASH_SIZE (1024 * 1024)
 #define SRAM_BASE_ADDRESS 0x20000000
-#define SRAM_SIZE (192 * 1024)
+#define SRAM_SIZE (128 * 1024)
+#define CCM_BASE_ADDRESS 0x10000000
+#define CCM_SIZE (64 * 1024)
 
 struct STM32F405State {
     /*< private >*/
@@ -65,6 +67,7 @@ struct STM32F405State {
     STM32F2XXADCState adc[STM_NUM_ADCS];
     STM32F2XXSPIState spi[STM_NUM_SPIS];
 
+    MemoryRegion ccm;
     MemoryRegion sram;
     MemoryRegion flash;
     MemoryRegion flash_alias;
Signature · 1 line
2.38.1
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] hw/arm/stm32f405: correctly describe the memory layout

Quoted 6 lines · Felipe Balbi

STM32F405 has 128K of SRAM and another 64K of CCM (Core-coupled Memory) at a different base address. Correctly describe the memory layout to give existing FW images have a chance to run unmodified.

Alistair

Quoted 51 lines
---
 hw/arm/stm32f405_soc.c         | 8 ++++++++
 include/hw/arm/stm32f405_soc.h | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
hw/arm/stm32f405_soc.c +8 -0
index c07947d9f8b1..cef23d7ee41a 100644
@@ -139,6 +139,14 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)
     }
     memory_region_add_subregion(system_memory, SRAM_BASE_ADDRESS, &s->sram);
 
+    memory_region_init_ram(&s->ccm, NULL, "STM32F405.ccm", CCM_SIZE,
+                           &err);
+    if (err != NULL) {
+        error_propagate(errp, err);
+        return;
+    }
+    memory_region_add_subregion(system_memory, CCM_BASE_ADDRESS, &s->ccm);
+
     armv7m = DEVICE(&s->armv7m);
     qdev_prop_set_uint32(armv7m, "num-irq", 96);
     qdev_prop_set_string(armv7m, "cpu-type", s->cpu_type);
include/hw/arm/stm32f405_soc.h +4 -2
index 5bb0c8d56979..249ab5434ec7 100644
@@ -46,7 +46,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(STM32F405State, STM32F405_SOC)
 #define FLASH_BASE_ADDRESS 0x08000000
 #define FLASH_SIZE (1024 * 1024)
 #define SRAM_BASE_ADDRESS 0x20000000
-#define SRAM_SIZE (192 * 1024)
+#define SRAM_SIZE (128 * 1024)
+#define CCM_BASE_ADDRESS 0x10000000
+#define CCM_SIZE (64 * 1024)
 
 struct STM32F405State {
     /*< private >*/
@@ -65,6 +67,7 @@ struct STM32F405State {
     STM32F2XXADCState adc[STM_NUM_ADCS];
     STM32F2XXSPIState spi[STM_NUM_SPIS];
 
+    MemoryRegion ccm;
     MemoryRegion sram;
     MemoryRegion flash;
     MemoryRegion flash_alias;
--

2.38.1

Reviewed-by on v1 1/2
#3 lore raw

Re: [PATCH 1/2] hw/arm/stm32f405: correctly describe the memory layout

In reply to Felipe Balbi

Hi Felipe,

Quoted 15 lines · Felipe Balbi

STM32F405 has 128K of SRAM and another 64K of CCM (Core-coupled Memory) at a different base address. Correctly describe the memory layout to give existing FW images have a chance to run unmodified.

---
  hw/arm/stm32f405_soc.c         | 8 ++++++++
  include/hw/arm/stm32f405_soc.h | 5 ++++-
  2 files changed, 12 insertions(+), 1 deletion(-)
hw/arm/stm32f405_soc.c +0 -0
index c07947d9f8b1..cef23d7ee41a 100644

hw/arm/stm32f405_soc.c static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp) · line 142

Quoted 4 lines
hw/arm/stm32f405_soc.c +1 -0
@@ -139,6 +139,14 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)
      }
      memory_region_add_subregion(system_memory, SRAM_BASE_ADDRESS, &s->sram);
 
+    memory_region_init_ram(&s->ccm, NULL, "STM32F405.ccm", CCM_SIZE,

Including the machine name in the memory description seems a bad habit from old days. What do you think about renaming as 'core-coupled-memory'?

Quoted 15 lines
hw/arm/stm32f405_soc.c +7 -0
+                           &err);
+    if (err != NULL) {
+        error_propagate(errp, err);
+        return;
+    }
+    memory_region_add_subregion(system_memory, CCM_BASE_ADDRESS, &s->ccm);
+
      armv7m = DEVICE(&s->armv7m);
      qdev_prop_set_uint32(armv7m, "num-irq", 96);
      qdev_prop_set_string(armv7m, "cpu-type", s->cpu_type);
include/hw/arm/stm32f405_soc.h +0 -0
index 5bb0c8d56979..249ab5434ec7 100644

include/hw/arm/stm32f405_soc.h OBJECT_DECLARE_SIMPLE_TYPE(STM32F405State, STM32F405_SOC) · line 51

Quoted 7 lines
include/hw/arm/stm32f405_soc.h +3 -1
@@ -46,7 +46,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(STM32F405State, STM32F405_SOC)
  #define FLASH_BASE_ADDRESS 0x08000000
  #define FLASH_SIZE (1024 * 1024)
  #define SRAM_BASE_ADDRESS 0x20000000
-#define SRAM_SIZE (192 * 1024)
+#define SRAM_SIZE (128 * 1024)
+#define CCM_BASE_ADDRESS 0x10000000
+#define CCM_SIZE (64 * 1024)

Since the CCM_SIZE won't be used elsewhere, we can simply use '64 * KiB' in the memory_region_init_ram() in the source file. Up to the maintainer :)

#4 lore raw

Re: [PATCH 1/2] hw/arm/stm32f405: correctly describe the memory layout

Hi,

Quoted 19 lines · Philippe Mathieu-Daudé
Quoted 18 lines · Felipe Balbi

STM32F405 has 128K of SRAM and another 64K of CCM (Core-coupled Memory) at a different base address. Correctly describe the memory layout to give existing FW images have a chance to run unmodified.

---
  hw/arm/stm32f405_soc.c         | 8 ++++++++
  include/hw/arm/stm32f405_soc.h | 5 ++++-
  2 files changed, 12 insertions(+), 1 deletion(-)
hw/arm/stm32f405_soc.c +0 -0
index c07947d9f8b1..cef23d7ee41a 100644
@@ -139,6 +139,14 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp)
      }
      memory_region_add_subregion(system_memory, SRAM_BASE_ADDRESS, &s->sram);
 
Quoted 5 lines

hw/arm/stm32f405_soc.c static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp) · line 142

Quoted 1 line
hw/arm/stm32f405_soc.c +1 -0
+    memory_region_init_ram(&s->ccm, NULL, "STM32F405.ccm", CCM_SIZE,

Including the machine name in the memory description seems a bad habit from old days. What do you think about renaming as 'core-coupled-memory'?

I don't oppose it, but I was merely following the model from `netduino2plus'.

Quoted 18 lines
Quoted 18 lines
hw/arm/stm32f405_soc.c +7 -0
+                           &err);
+    if (err != NULL) {
+        error_propagate(errp, err);
+        return;
+    }
+    memory_region_add_subregion(system_memory, CCM_BASE_ADDRESS, &s->ccm);
+
      armv7m = DEVICE(&s->armv7m);
      qdev_prop_set_uint32(armv7m, "num-irq", 96);
      qdev_prop_set_string(armv7m, "cpu-type", s->cpu_type);
include/hw/arm/stm32f405_soc.h +0 -0
index 5bb0c8d56979..249ab5434ec7 100644
@@ -46,7 +46,9 @@ OBJECT_DECLARE_SIMPLE_TYPE(STM32F405State, STM32F405_SOC)
  #define FLASH_BASE_ADDRESS 0x08000000
  #define FLASH_SIZE (1024 * 1024)
  #define SRAM_BASE_ADDRESS 0x20000000
Quoted 8 lines

include/hw/arm/stm32f405_soc.h OBJECT_DECLARE_SIMPLE_TYPE(STM32F405State, STM32F405_SOC) · line 51

Quoted 4 lines
include/hw/arm/stm32f405_soc.h +3 -1
-#define SRAM_SIZE (192 * 1024)
+#define SRAM_SIZE (128 * 1024)
+#define CCM_BASE_ADDRESS 0x10000000
+#define CCM_SIZE (64 * 1024)

Since the CCM_SIZE won't be used elsewhere, we can simply use '64 * KiB' in the memory_region_init_ram() in the source file. Up to the maintainer :)

Also not opposed. I'll wait a couple days before respinning the patch to give the rest of the community time to reply.

Signature · 1 line
balbi
#5 lore raw

PATCH 2/2 hw/arm: Add Olimex H405

In reply to Felipe Balbi

Olimex makes a series of low-cost STM32 boards. This commit introduces the minimum setup to support SMT32-H405. See [1] for details

[1] https://www.olimex.com/Products/ARM/ST/STM32-H405/

---
 MAINTAINERS                             |  6 +++
 configs/devices/arm-softmmu/default.mak |  1 +
 hw/arm/Kconfig                          |  4 ++
 hw/arm/meson.build                      |  1 +
 hw/arm/olimex-stm32-h405.c              | 65 +++++++++++++++++++++++++
 5 files changed, 77 insertions(+)
 create mode 100644 hw/arm/olimex-stm32-h405.c
MAINTAINERS +6 -0
index 3bd433b65a55..e37846df0071 100644
@@ -1026,6 +1026,12 @@ L: [email protected]
 S: Maintained
 F: hw/arm/netduinoplus2.c
 
+Olimex STM32 H405
+M: Felipe Balbi <[email protected]>
+L: [email protected]
+S: Maintained
+F: hw/arm/olimex-stm32-h405.c
+
 SmartFusion2
 M: Subbaraya Sundeep <[email protected]>
 M: Peter Maydell <[email protected]>
configs/devices/arm-softmmu/default.mak +1 -0
index 6985a25377a0..1b49a7830c7e 100644
@@ -30,6 +30,7 @@ CONFIG_COLLIE=y
 CONFIG_ASPEED_SOC=y
 CONFIG_NETDUINO2=y
 CONFIG_NETDUINOPLUS2=y
+CONFIG_OLIMEX_STM32_H405=y
 CONFIG_MPS2=y
 CONFIG_RASPI=y
 CONFIG_DIGIC=y
hw/arm/Kconfig +4 -0
index 17fcde8e1ccc..9143533ef792 100644
@@ -119,6 +119,10 @@ config NETDUINOPLUS2
     bool
     select STM32F405_SOC
 
+config OLIMEX_STM32_H405
+    bool
+    select STM32F405_SOC
+
 config NSERIES
     bool
     select OMAP
hw/arm/meson.build +1 -0
index 92f9f6e000ea..76d4d650e42e 100644
@@ -12,6 +12,7 @@ arm_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c'))
 arm_ss.add(when: 'CONFIG_MUSICPAL', if_true: files('musicpal.c'))
 arm_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.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'))
 arm_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npcm7xx_boards.c'))
 arm_ss.add(when: 'CONFIG_NSERIES', if_true: files('nseries.c'))
 arm_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c'))
hw/arm/olimex-stm32-h405.c new file +65 -0

65 lines not on this page · raw message

Signature · 1 line
2.38.1
#6 lore raw

Re: [PATCH 2/2] hw/arm: Add Olimex H405

Quoted 6 lines · Felipe Balbi

Olimex makes a series of low-cost STM32 boards. This commit introduces the minimum setup to support SMT32-H405. See [1] for details

[1] https://www.olimex.com/Products/ARM/ST/STM32-H405/

Quoted 8 lines
---
  MAINTAINERS                             |  6 +++
  configs/devices/arm-softmmu/default.mak |  1 +
  hw/arm/Kconfig                          |  4 ++
  hw/arm/meson.build                      |  1 +
  hw/arm/olimex-stm32-h405.c              | 65 +++++++++++++++++++++++++
  5 files changed, 77 insertions(+)

create mode 100644 hw/arm/olimex-stm32-h405.c

See also docs/system/arm/stm32.rst

Quoted 46 lines
hw/arm/meson.build +1 -0
index 92f9f6e000ea..76d4d650e42e 100644
@@ -12,6 +12,7 @@ arm_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c'))
  arm_ss.add(when: 'CONFIG_MUSICPAL', if_true: files('musicpal.c'))
  arm_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.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'))
  arm_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npcm7xx_boards.c'))
  arm_ss.add(when: 'CONFIG_NSERIES', if_true: files('nseries.c'))
  arm_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c'))
hw/arm/olimex-stm32-h405.c new file +28 -0
new file mode 100644
index 000000000000..5171a66074bb
@@ -0,0 +1,65 @@
+/*
+ * ST STM32VLDISCOVERY machine
+ * Olimex STM32-H405 machine
+ *
+ * Copyright (c) 2022 Felipe Balbi <[email protected]>
+ *
+ * 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"

hw/arm/olimex-stm32-h405.c line 38

Quoted 10 lines
hw/arm/olimex-stm32-h405.c new file +10 -0
+#include "hw/qdev-properties.h"
+#include "hw/qdev-clock.h"
+#include "qemu/error-report.h"
+#include "hw/arm/stm32f405_soc.h"
+#include "hw/arm/boot.h"
+
+/* olimex-stm32-h405 implementation is derived from netduinoplus2 */
+
+/* Main SYSCLK frequency in Hz (168MHz) */
+#define SYSCLK_FRQ 168000000ULL

No need to comment if named MAIN_SYSCLK_FREQ_HZ.

hw/arm/olimex-stm32-h405.c line 43

Quoted 4 lines
hw/arm/olimex-stm32-h405.c new file +4 -0
+static void olimex_stm32_h405_init(MachineState *machine)
+{
+    DeviceState *dev;
+    Clock *sysclk;

I like the simplicity, but wonder if we shouldn't add checks such the MPS2 machines, in case one use different -cpu / -m values:

       if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) {
           error_report("This board can only be used with CPU %s",
                        mc->default_cpu_type);
           exit(1);
       }

       if (machine->ram_size != mc->default_ram_size) {
           g_autofree char *sz = size_to_str(mc->default_ram_size);
           error_report("Invalid RAM size, should be %s", sz);
           exit(1);
       }

Or maybe better would be to refactor that since this pattern is common to SoC/SoM.

Quoted 8 lines
hw/arm/olimex-stm32-h405.c new file +8 -0
+    /* This clock doesn't need migration because it is fixed-frequency */
+    sysclk = clock_new(OBJECT(machine), "SYSCLK");
+    clock_set_hz(sysclk, SYSCLK_FRQ);
+
+    dev = qdev_new(TYPE_STM32F405_SOC);
+    qdev_prop_set_string(dev, "cpu-type", ARM_CPU_TYPE_NAME("cortex-m4"));
+    qdev_connect_clock_in(dev, "sysclk", sysclk);
+    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);

hw/arm/olimex-stm32-h405.c line 62

Quoted 10 lines
hw/arm/olimex-stm32-h405.c new file +10 -0
+
+    armv7m_load_kernel(ARM_CPU(first_cpu),
+                       machine->kernel_filename,
+                       0, FLASH_SIZE);
+}
+
+static void olimex_stm32_h405_machine_init(MachineClass *mc)
+{
+    mc->desc = "Olimex STM32-H405 (Cortex-M4)";
+    mc->init = olimex_stm32_h405_init;

Per previous comment:

       mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m4");
       mc->default_ram_size = 0; /* SRAM already allocated in SoC */
Quoted 3 lines
hw/arm/olimex-stm32-h405.c new file +3 -0
+}
+
+DEFINE_MACHINE("olimex-stm32-h405", olimex_stm32_h405_machine_init)
#7 lore raw

Re: [PATCH 2/2] hw/arm: Add Olimex H405

Hi,

Quoted 16 lines · Philippe Mathieu-Daudé
Quoted 6 lines · Felipe Balbi

Olimex makes a series of low-cost STM32 boards. This commit introduces the minimum setup to support SMT32-H405. See [1] for details

[1] https://www.olimex.com/Products/ARM/ST/STM32-H405/

Quoted 8 lines
---
  MAINTAINERS                             |  6 +++
  configs/devices/arm-softmmu/default.mak |  1 +
  hw/arm/Kconfig                          |  4 ++
  hw/arm/meson.build                      |  1 +
  hw/arm/olimex-stm32-h405.c              | 65 +++++++++++++++++++++++++
  5 files changed, 77 insertions(+)

create mode 100644 hw/arm/olimex-stm32-h405.c

Quoted 1 line

See also docs/system/arm/stm32.rst

Added an entry, thanks

Quoted 50 lines
Quoted 50 lines
hw/arm/meson.build +1 -0
index 92f9f6e000ea..76d4d650e42e 100644
@@ -12,6 +12,7 @@ arm_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c'))
  arm_ss.add(when: 'CONFIG_MUSICPAL', if_true: files('musicpal.c'))
  arm_ss.add(when: 'CONFIG_NETDUINO2', if_true: files('netduino2.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'))
  arm_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npcm7xx_boards.c'))
  arm_ss.add(when: 'CONFIG_NSERIES', if_true: files('nseries.c'))
  arm_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c'))
hw/arm/olimex-stm32-h405.c new file +32 -0
new file mode 100644
index 000000000000..5171a66074bb
@@ -0,0 +1,65 @@
+/*
+ * ST STM32VLDISCOVERY machine
+ * Olimex STM32-H405 machine
+ *
+ * Copyright (c) 2022 Felipe Balbi <[email protected]>
+ *
+ * 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 "hw/qdev-clock.h"
+#include "qemu/error-report.h"
+#include "hw/arm/stm32f405_soc.h"
Quoted 8 lines

hw/arm/olimex-stm32-h405.c line 38

Quoted 6 lines
hw/arm/olimex-stm32-h405.c new file +6 -0
+#include "hw/arm/boot.h"
+
+/* olimex-stm32-h405 implementation is derived from netduinoplus2 */
+
+/* Main SYSCLK frequency in Hz (168MHz) */
+#define SYSCLK_FRQ 168000000ULL

No need to comment if named MAIN_SYSCLK_FREQ_HZ.

Heh, came verbatim from netduino2plus.

Quoted 8 lines

hw/arm/olimex-stm32-h405.c line 43

Quoted 4 lines
hw/arm/olimex-stm32-h405.c new file +4 -0
+static void olimex_stm32_h405_init(MachineState *machine)
+{
+    DeviceState *dev;
+    Clock *sysclk;

I like the simplicity, but wonder if we shouldn't add checks such the MPS2 machines, in case one use different -cpu / -m values:

Quoted 11 lines
        if (strcmp(machine->cpu_type, mc->default_cpu_type) != 0) {
            error_report("This board can only be used with CPU %s",
                         mc->default_cpu_type);
            exit(1);
        }

        if (machine->ram_size != mc->default_ram_size) {
            g_autofree char *sz = size_to_str(mc->default_ram_size);
            error_report("Invalid RAM size, should be %s", sz);
            exit(1);
        }

yeah, I see where you're coming from, but leaving those flexible might be useful in case e.g. Olimex wants to respin the board with a slightly different SoC and would like to very, before building HW, that their SW is still valid.

I don't have a strong opinion either way, though.

Quoted 2 lines

Or maybe better would be to refactor that since this pattern is common to SoC/SoM.

refactoring should be done as a separate patchset, IMHO.

Quoted 21 lines
Quoted 8 lines
hw/arm/olimex-stm32-h405.c new file +8 -0
+    /* This clock doesn't need migration because it is fixed-frequency */
+    sysclk = clock_new(OBJECT(machine), "SYSCLK");
+    clock_set_hz(sysclk, SYSCLK_FRQ);
+
+    dev = qdev_new(TYPE_STM32F405_SOC);
+    qdev_prop_set_string(dev, "cpu-type", ARM_CPU_TYPE_NAME("cortex-m4"));
+    qdev_connect_clock_in(dev, "sysclk", sysclk);
+    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);

hw/arm/olimex-stm32-h405.c line 62

Quoted 10 lines
hw/arm/olimex-stm32-h405.c new file +10 -0
+
+    armv7m_load_kernel(ARM_CPU(first_cpu),
+                       machine->kernel_filename,
+                       0, FLASH_SIZE);
+}
+
+static void olimex_stm32_h405_machine_init(MachineClass *mc)
+{
+    mc->desc = "Olimex STM32-H405 (Cortex-M4)";
+    mc->init = olimex_stm32_h405_init;

Per previous comment:

Quoted 2 lines
        mc->default_cpu_type = ARM_CPU_TYPE_NAME("cortex-m4");
        mc->default_ram_size = 0; /* SRAM already allocated in SoC */

I can add these, no problem.

Signature · 1 line
balbi