hw/arm: Add support for STM32 H405 and fix STM32F405 memory layout
Subsystems (2)
v2 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 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 + docs/system/arm/stm32.rst | 1 + hw/arm/Kconfig | 4 ++ hw/arm/meson.build | 1 + hw/arm/olimex-stm32-h405.c | 69 +++++++++++++++++++++++++ hw/arm/stm32f405_soc.c | 8 +++ include/hw/arm/stm32f405_soc.h | 5 +- 8 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 hw/arm/olimex-stm32-h405.c
Signature · 1 line
2.39.0
PATCH v2 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 a chance to run unmodified.
---
Changes since v1:
- None
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
@@ -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
@@ -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.39.0
PATCH v2 2/2 hw/arm: Add Olimex H405
In reply to Felipe BalbiOlimex 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/
---
Changes since v1:
- Add a note in stm32.rst
- Initialize default_cpu_type to cortex-m4
- 0-initialize default_ram_size
MAINTAINERS | 6 +++ configs/devices/arm-softmmu/default.mak | 1 + docs/system/arm/stm32.rst | 1 + hw/arm/Kconfig | 4 ++ hw/arm/meson.build | 1 + hw/arm/olimex-stm32-h405.c | 69 +++++++++++++++++++++++++ 6 files changed, 82 insertions(+) create mode 100644 hw/arm/olimex-stm32-h405.c
MAINTAINERS +6 -0
@@ -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
@@ -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
docs/system/arm/stm32.rst +1 -0
@@ -20,6 +20,7 @@ The STM32F4 series is based on ARM Cortex-M4F core. This series is pin-to-pin compatible with STM32F2 series. The following machines are based on this chip : - ``netduinoplus2`` Netduino Plus 2 board with STM32F405RGT6 microcontroller +- ``olimex-stm32-h405`` Olimex STM32 H405 board with STM32F405RGT6 microcontroller There are many other STM32 series that are currently not supported by QEMU.
hw/arm/Kconfig +4 -0
@@ -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
@@ -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 +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.39.0
Re: [PATCH v2 2/2] hw/arm: Add Olimex H405
Quoted 13 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/
Signed-off-by Felipe Balbi <[email protected]>---
Changes since v1:
- Add a note instm32.rst
- Initializedefault_cpu_typeto cortex-m4
- 0-initializedefault_ram_size
Quoted 8 lines
MAINTAINERS | 6 +++ configs/devices/arm-softmmu/default.mak | 1 + docs/system/arm/stm32.rst | 1 + hw/arm/Kconfig | 4 ++ hw/arm/meson.build | 1 + hw/arm/olimex-stm32-h405.c | 69 +++++++++++++++++++++++++ 6 files changed, 82 insertions(+)create mode 100644
hw/arm/olimex-stm32-h405.c
Re: [PATCH v2 2/2] hw/arm: Add Olimex H405
In reply to Felipe BalbiQuoted 7 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/
Signed-off-by Felipe Balbi <[email protected]>
Alistair
Quoted 163 lines
---
Changes since v1:
- Add a note instm32.rst
- Initializedefault_cpu_typeto cortex-m4
- 0-initializedefault_ram_sizeMAINTAINERS | 6 +++ configs/devices/arm-softmmu/default.mak | 1 + docs/system/arm/stm32.rst | 1 + hw/arm/Kconfig | 4 ++ hw/arm/meson.build | 1 + hw/arm/olimex-stm32-h405.c | 69 +++++++++++++++++++++++++ 6 files changed, 82 insertions(+) create mode 100644 hw/arm/olimex-stm32-h405.cMAINTAINERS +6
-0@@ -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@@ -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=ydocs/system/arm/stm32.rst +1
-0@@ -20,6 +20,7 @@ The STM32F4 series is based on ARM Cortex-M4F core. This series is pin-to-pin compatible with STM32F2 series. The following machines are based on this chip : - ``netduinoplus2`` Netduino Plus 2 board with STM32F405RGT6 microcontroller +- ``olimex-stm32-h405`` Olimex STM32 H405 board with STM32F405RGT6 microcontroller There are many other STM32 series that are currently not supported by QEMU.hw/arm/Kconfig +4
-0@@ -119,6 +119,10 @@ config NETDUINOPLUS2 bool select STM32F405_SOC +config OLIMEX_STM32_H405 + bool + select STM32F405_SOC + config NSERIES bool select OMAPhw/arm/meson.build +1
-0@@ -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 +69
-1@@ -0,0 +1,69 @@ +/* +* 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" +#include "hw/arm/boot.h" + +/* olimex-stm32-h405 implementation is derived from netduinoplus2 */ + +/* Main SYSCLK frequency in Hz (168MHz) */ +#define SYSCLK_FRQ 168000000ULL + +static void olimex_stm32_h405_init (MachineState *machine) +{ +DeviceState *dev; +Clock *sysclk; + +/* 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); + +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; + mc->default_cpu_type =ARM_CPU_TYPE_NAME ("cortex-m4" ); + +/* SRAM pre-allocated as part of the SoC instantiation */ + mc->default_ram_size =0 ; +} + +DEFINE_MACHINE ("olimex-stm32-h405" , olimex_stm32_h405_machine_init) --2.39.0
Peter Maydell
AppliedQuoted 9 lines · Felipe Balbi
Hi,
The following patches pass checkpatch.pl and have been tested against
55745005e90a.Felipe Balbi (2):
hw/arm/stm32f405: correctly describe the memory layout hw/arm: Add Olimex H405
Applied to target-arm.next, thanks.
-- PMM