Netduino 2 Machine Model
v9 cover Netduino 2 Machine Model
This patch series adds the Netduino 2 Machine to QEMU
Information on the board is avalible at:
http://www.netduino.com/netduino2/specs.htm
The git tree can be found at:
https://github.com/alistair23/qemu/tree/netduino2.9
This patch series makes some changes to the armv7m_init function that allows the code to be reused with the Netduino 2 and the Stellaris machines.
Some example code that runs on QEMU is avaliable at:
at: https://github.com/alistair23/CSSE3010-QEMU-Examples
There are more devices in the works, I figured I would just start with these three
V9:
- Correct timer device based on Peter C's comments
V8:
- Update the timer device based on Peter C's comments
- Update the USART device based on Peter C's comments
V7:
- Rebase to QEMU 2.2
V6:
- Rename the three devices to STM32FXX*
- Correct the timer to use ns
- Correct the number of devices that are inited
- Rename memory regions
V5:
- Remove the reset changes based on the ELF entry
V4:
- Rebase
- Correct timer units
V3:
- Correct the timer interrupts
- Update debug printing
- Remove the sram_size argument from armv7m_init
Alistair Francis (7):
stm32f2xx_timer: Add the stm32f2xx Timer
stm32f2xx_USART: Add the stm32f2xx USART Controller
stm32f2xx_SYSCFG: Add the stm32f2xx SYSCFG
target_arm: Remove memory region init from armv7m_init
target_arm: Parameterise the irq lines for armv7m_init
stm32f205: Add the stm32f205 SoC
netduino2: Add the Netduino 2 Machine
default-configs/arm-softmmu.mak | 4 + hw/arm/Makefile.objs | 2 + hw/arm/armv7m.c | 38 +---- hw/arm/netduino2.c | 54 ++++++ hw/arm/stellaris.c | 27 ++- hw/arm/stm32f205_soc.c | 157 ++++++++++++++++++ hw/char/Makefile.objs | 1 + hw/char/stm32f2xx_usart.c | 229 +++++++++++++++++++++++++ hw/misc/Makefile.objs | 1 + hw/misc/stm32f2xx_syscfg.c | 160 ++++++++++++++++++ hw/timer/Makefile.objs | 2 + hw/timer/stm32f2xx_timer.c | 330 +++++++++++++++++++++++++++++++++++++ include/hw/arm/arm.h | 3 +- include/hw/arm/stm32f205_soc.h | 69 ++++++++ include/hw/char/stm32f2xx_usart.h | 69 ++++++++ include/hw/misc/stm32f2xx_syscfg.h | 61 +++++++ include/hw/timer/stm32f2xx_timer.h | 101 ++++++++++++ 17 files changed, 1270 insertions(+), 38 deletions(-) create mode 100644 hw/arm/netduino2.c create mode 100644 hw/arm/stm32f205_soc.c create mode 100644 hw/char/stm32f2xx_usart.c create mode 100644 hw/misc/stm32f2xx_syscfg.c create mode 100644 hw/timer/stm32f2xx_timer.c create mode 100644 include/hw/arm/stm32f205_soc.h create mode 100644 include/hw/char/stm32f2xx_usart.h create mode 100644 include/hw/misc/stm32f2xx_syscfg.h create mode 100644 include/hw/timer/stm32f2xx_timer.h
Signature · 1 line
2.1.0
PATCH v9 1/7 stm32f2xx_timer: Add the stm32f2xx Timer
This patch adds the stm32f2xx timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
---
V9:
- Convert tick_offset to now be updated on more events
- This is similar to what I did with the ARM PCCNT regiseter
V8:
- Fix tick_offset to allow now to wrap around
- Remove the calls to get_ticks_per_sec()
- Pre-scale the guest visable time
V6:
- Rename to STM32F2XX
- Change the timer calculations to use ns
- Update the value to timer_mod to ensure it is in ns
- Account for reloadable/resetable timer
- Thanks to Peter C for pointing this out
V4:
- Update timer units again
- Thanks to Peter C
V3:
- Update debug statements
- Correct the units for timer_mod
- Correctly set timer_offset from resets
V2:
- Reorder the Makefile config
- Fix up the debug printing
- Correct the timer event trigger
default-configs/arm-softmmu.mak | 1 + hw/timer/Makefile.objs | 2 + hw/timer/stm32f2xx_timer.c | 330 +++++++++++++++++++++++++++++++++++++ include/hw/timer/stm32f2xx_timer.h | 101 ++++++++++++ 4 files changed, 434 insertions(+) create mode 100644 hw/timer/stm32f2xx_timer.c create mode 100644 include/hw/timer/stm32f2xx_timer.h
default-configs/arm-softmmu.mak +1 -0
@@ -78,6 +78,7 @@ CONFIG_NSERIES=y CONFIG_REALVIEW=y CONFIG_ZAURUS=y CONFIG_ZYNQ=y +CONFIG_STM32F2XX_TIMER=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y
hw/timer/Makefile.objs +2 -0
@@ -31,3 +31,5 @@ obj-$(CONFIG_DIGIC) += digic-timer.o obj-$(CONFIG_MC146818RTC) += mc146818rtc.o obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o + +common-obj-$(CONFIG_STM32F2XX_TIMER) += stm32f2xx_timer.o
hw/timer/stm32f2xx_timer.c new file +330 -0
330 lines not on this page · raw message
include/hw/timer/stm32f2xx_timer.h new file +101 -0
101 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH v9 2/7 stm32f2xx_USART: Add the stm32f2xx USART Controller
In reply to Alistair FrancisThis patch adds the stm32f2xx USART controller
(UART also uses the same controller).
---
V8:
- Clear IRQ on reset
- Lower IRQ on data read/status clear
- Set IRQ if enabled while data is avaliable
V6:
- Rename to STM32F2XX
- Fix up unimplemented printing
- Add a qemu_chr_accept()
V3:
- Update debug printing
V2:
- Drop charecters if the device is not enabled
- Thanks to Peter C
default-configs/arm-softmmu.mak | 1 + hw/char/Makefile.objs | 1 + hw/char/stm32f2xx_usart.c | 229 ++++++++++++++++++++++++++++++++++++++ include/hw/char/stm32f2xx_usart.h | 69 ++++++++++++ 4 files changed, 300 insertions(+) create mode 100644 hw/char/stm32f2xx_usart.c create mode 100644 include/hw/char/stm32f2xx_usart.h
default-configs/arm-softmmu.mak +1 -0
@@ -79,6 +79,7 @@ CONFIG_REALVIEW=y CONFIG_ZAURUS=y CONFIG_ZYNQ=y CONFIG_STM32F2XX_TIMER=y +CONFIG_STM32F2XX_USART=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y
hw/char/Makefile.objs +1 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_OMAP) += omap_uart.o obj-$(CONFIG_SH4) += sh_serial.o obj-$(CONFIG_PSERIES) += spapr_vty.o obj-$(CONFIG_DIGIC) += digic-uart.o +obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o common-obj-$(CONFIG_ISA_DEBUG) += debugcon.o
hw/char/stm32f2xx_usart.c new file +229 -0
229 lines not on this page · raw message
include/hw/char/stm32f2xx_usart.h new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH v9 3/7 stm32f2xx_SYSCFG: Add the stm32f2xx SYSCFG
In reply to Alistair FrancisThis patch adds the stm32f2xx System Configuration Controller. This is used to configure what memory is mapped at address 0 (although that is not supported) as well as configure how the EXTI interrupts work (also not supported at the moment).
This device is not required for basic examples, but more complex systems will require it (as well as the EXTI device)
---
V6:
- Rename to STM32F2XX
- Remove all casts from debug printing
V5:
- Correct the masks used for writing
V3:
- Update debug printing
default-configs/arm-softmmu.mak | 1 + hw/misc/Makefile.objs | 1 + hw/misc/stm32f2xx_syscfg.c | 160 +++++++++++++++++++++++++++++++++++++ include/hw/misc/stm32f2xx_syscfg.h | 61 ++++++++++++++ 4 files changed, 223 insertions(+) create mode 100644 hw/misc/stm32f2xx_syscfg.c create mode 100644 include/hw/misc/stm32f2xx_syscfg.h
default-configs/arm-softmmu.mak +1 -0
@@ -80,6 +80,7 @@ CONFIG_ZAURUS=y CONFIG_ZYNQ=y CONFIG_STM32F2XX_TIMER=y CONFIG_STM32F2XX_USART=y +CONFIG_STM32F2XX_SYSCFG=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y
hw/misc/Makefile.objs +1 -0
@@ -38,5 +38,6 @@ obj-$(CONFIG_OMAP) += omap_sdrc.o obj-$(CONFIG_OMAP) += omap_tap.o obj-$(CONFIG_SLAVIO) += slavio_misc.o obj-$(CONFIG_ZYNQ) += zynq_slcr.o +obj-$(CONFIG_STM32F2XX_SYSCFG) += stm32f2xx_syscfg.o obj-$(CONFIG_PVPANIC) += pvpanic.o
hw/misc/stm32f2xx_syscfg.c new file +160 -0
160 lines not on this page · raw message
include/hw/misc/stm32f2xx_syscfg.h new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH v9 4/7 target_arm: Remove memory region init from armv7m_init
In reply to Alistair FrancisThis patch moves the memory region init code from the armv7m_init function to the stellaris_init function
---
V3:
- Rename the flash_size argument to mem_size
- Remove the sram_size and related code
- Thanks to Peter C
V2:
- Change the memory region names to match the machine
hw/arm/armv7m.c | 33 +++------------------------------ hw/arm/stellaris.c | 24 ++++++++++++++++++++---- include/hw/arm/arm.h | 3 +-- 3 files changed, 24 insertions(+), 36 deletions(-)
hw/arm/armv7m.c +3 -30
@@ -163,11 +163,10 @@ static void armv7m_reset(void *opaque) }/* Init CPU and memory for a v7-M based board. -flash_size and sram_size are in kb. +mem_size is in bytes. Returns the NVIC array. */ -qemu_irq *armv7m_init (MemoryRegion *system_memory, -int flash_size,int sram_size, +qemu_irq *armv7m_init (MemoryRegion *system_memory,int mem_size,const char *kernel_filename,const char *cpu_model) {ARMCPU *cpu;
@@ -180,13 +179,8 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,uint64_t lowaddr;int i;int big_endian; -MemoryRegion *sram =g_new (MemoryRegion,1 ); -MemoryRegion *flash =g_new (MemoryRegion,1 );MemoryRegion *hack =g_new (MemoryRegion,1 ); - flash_size *=1024 ; - sram_size *=1024 ; -if (cpu_model ==NULL ) { cpu_model ="cortex-m3" ; }
@@ -197,27 +191,6 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, } env = &cpu->env; -#if 0 -/* > 32Mb SRAM gets complicated because it overlaps the bitband area. -We don't have proper commandline options, so allocate half of memory -as SRAM, up to a maximum of 32Mb, and the rest as code. */ -if (ram_size > (512 +32 ) *1024 *1024 ) - ram_size = (512 +32 ) *1024 *1024 ; - sram_size = (ram_size /2 ) &TARGET_PAGE_MASK ; -if (sram_size >32 *1024 *1024 ) - sram_size =32 *1024 *1024 ; - code_size = ram_size - sram_size; -#endif - -/* Flash programming is done via the SCU, so pretend it is ROM. */ -memory_region_init_ram (flash,NULL ,"armv7m.flash" , flash_size, - &error_abort); -vmstate_register_ram_global (flash); -memory_region_set_readonly (flash, true); -memory_region_add_subregion (system_memory,0 , flash); -memory_region_init_ram (sram,NULL ,"armv7m.sram" , sram_size, &error_abort); -vmstate_register_ram_global (sram); -memory_region_add_subregion (system_memory,0x20000000 , sram);armv7m_bitband_init (); nvic =qdev_create (NULL ,"armv7m_nvic" );
@@ -244,7 +217,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, image_size =load_elf (kernel_filename,NULL ,NULL , &entry, &lowaddr,NULL , big_endian,ELF_MACHINE ,1 );if (image_size <0 ) { - image_size =load_image_targphys (kernel_filename,0 , flash_size); + image_size =load_image_targphys (kernel_filename,0 , mem_size); lowaddr =0 ; }if (image_size <0 ) {
hw/arm/stellaris.c +20 -4
@@ -1220,10 +1220,26 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,int i;int j; - flash_size = ((board->dc0 &0xffff ) +1 ) <<1 ; - sram_size = (board->dc0 >>18 ) +1 ; - pic =armv7m_init (get_system_memory (), - flash_size, sram_size, kernel_filename, cpu_model); +MemoryRegion *sram =g_new (MemoryRegion,1 ); +MemoryRegion *flash =g_new (MemoryRegion,1 ); +MemoryRegion *system_memory =get_system_memory (); + + flash_size = (((board->dc0 &0xffff ) +1 ) <<1 ) *1024 ; + sram_size = ((board->dc0 >>18 ) +1 ) *1024 ; + +/* Flash programming is done via the SCU, so pretend it is ROM. */ +memory_region_init_ram (flash,NULL ,"stellaris.flash" , flash_size, + &error_abort); +vmstate_register_ram_global (flash); +memory_region_set_readonly (flash, true); +memory_region_add_subregion (system_memory,0 , flash); + +memory_region_init_ram (sram,NULL ,"stellaris.sram" , sram_size, + &error_abort); +vmstate_register_ram_global (sram); +memory_region_add_subregion (system_memory,0x20000000 , sram); + + pic =armv7m_init (system_memory, flash_size, kernel_filename, cpu_model);if (board->dc1 & (1 <<16 )) { dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,
include/hw/arm/arm.h +1 -2
@@ -15,8 +15,7 @@#include "hw/irq.h" /* armv7m.c */ -qemu_irq *armv7m_init (MemoryRegion *system_memory, -int flash_size,int sram_size, +qemu_irq *armv7m_init (MemoryRegion *system_memory,int mem_size,const char *kernel_filename,const char *cpu_model);/* arm_boot.c */
Signature · 1 line
2.1.0
PATCH v9 5/7 target_arm: Parameterise the irq lines for armv7m_init
In reply to Alistair FrancisThis patch allows the board to specifiy the number of NVIC interrupt lines when using armv7m_init.
---
hw/arm/armv7m.c | 7 ++++--- hw/arm/stellaris.c | 5 ++++- include/hw/arm/arm.h | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-)
hw/arm/armv7m.c +4 -3
@@ -166,14 +166,14 @@ static void armv7m_reset(void *opaque)mem_size is in bytes. Returns the NVIC array. */ -qemu_irq *armv7m_init (MemoryRegion *system_memory,int mem_size, +qemu_irq *armv7m_init (MemoryRegion *system_memory,int mem_size,int num_irq,const char *kernel_filename,const char *cpu_model) {ARMCPU *cpu;CPUARMState *env;DeviceState *nvic;/* FIXME: make this local state. */ -static qemu_irq pic[64 ]; +qemu_irq *pic =g_new (qemu_irq, num_irq);int image_size;uint64_t entry;uint64_t lowaddr;
@@ -194,11 +194,12 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size,armv7m_bitband_init (); nvic =qdev_create (NULL ,"armv7m_nvic" ); +qdev_prop_set_uint32 (nvic,"num-irq" , num_irq); env->nvic = nvic;qdev_init_nofail (nvic);sysbus_connect_irq (SYS_BUS_DEVICE (nvic),0 ,qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_IRQ )); -for (i =0 ; i <64 ; i++) { +for (i =0 ; i < num_irq; i++) { pic[i] =qdev_get_gpio_in (nvic, i); }
hw/arm/stellaris.c +4 -1
@@ -29,6 +29,8 @@#define BP_OLED_SSI 0x02#define BP_GAMEPAD 0x04 +#define NUM_IRQ_LINES 64 + typedef const struct { const char *name; uint32_t did0;
@@ -1239,7 +1241,8 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,vmstate_register_ram_global (sram);memory_region_add_subregion (system_memory,0x20000000 , sram); - pic =armv7m_init (system_memory, flash_size, kernel_filename, cpu_model); + pic =armv7m_init (system_memory, flash_size,NUM_IRQ_LINES , + kernel_filename, cpu_model);if (board->dc1 & (1 <<16 )) { dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,
include/hw/arm/arm.h +1 -1
@@ -15,7 +15,7 @@#include "hw/irq.h" /* armv7m.c */ -qemu_irq *armv7m_init (MemoryRegion *system_memory,int mem_size, +qemu_irq *armv7m_init (MemoryRegion *system_memory,int mem_size,int num_irq,const char *kernel_filename,const char *cpu_model);/* arm_boot.c */
Signature · 1 line
2.1.0
PATCH v9 6/7 stm32f205: Add the stm32f205 SoC
In reply to Alistair FrancisThis patch adds the stm32f205 SoC. This will be used by the Netduino 2 to create a machine.
---
V6:
- Correct the number of USART/UART devices
- Use macros to define how many devices are inited
- Update the memory regions name from netduino.* to STM32F205.*
default-configs/arm-softmmu.mak | 1 + hw/arm/Makefile.objs | 1 + hw/arm/stm32f205_soc.c | 157 ++++++++++++++++++++++++++++++++++++++++ include/hw/arm/stm32f205_soc.h | 69 ++++++++++++++++++ 4 files changed, 228 insertions(+) create mode 100644 hw/arm/stm32f205_soc.c create mode 100644 include/hw/arm/stm32f205_soc.h
default-configs/arm-softmmu.mak +1 -0
@@ -81,6 +81,7 @@ CONFIG_ZYNQ=y CONFIG_STM32F2XX_TIMER=y CONFIG_STM32F2XX_USART=y CONFIG_STM32F2XX_SYSCFG=y +CONFIG_STM32F205_SOC=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y
hw/arm/Makefile.objs +1 -0
@@ -8,3 +8,4 @@ obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.o obj-y += omap1.o omap2.o strongarm.o obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o +obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
hw/arm/stm32f205_soc.c new file +157 -0
157 lines not on this page · raw message
include/hw/arm/stm32f205_soc.h new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
2.1.0
PATCH v9 7/7 netduino2: Add the Netduino 2 Machine
In reply to Alistair FrancisThis patch adds the Netduino 2 Machine.
This is a Cortex-M3 based machine. Information can be found at:
http://www.netduino.com/netduino2/specs.htm
---
hw/arm/Makefile.objs | 1 + hw/arm/netduino2.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 hw/arm/netduino2.c
hw/arm/Makefile.objs +1 -0
@@ -3,6 +3,7 @@ obj-$(CONFIG_DIGIC) += digic_boards.o obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o +obj-y += netduino2.o obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.o
hw/arm/netduino2.c new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
2.1.0
Quoted 12 lines · Alistair Francis
This patch series adds the Netduino 2 Machine to QEMU
Information on the board is avalible at:
http://www.netduino.com/netduino2/specs.htmThe git tree can be found at:
https://github.com/alistair23/qemu/tree/netduino2.9This patch series makes some changes to the
armv7m_initfunction that allows the code to be reused with the Netduino 2 and the Stellaris machines.
Quoted 5 lines
Some example code that runs on QEMU is avaliable at:
at: https://github.com/alistair23/CSSE3010-QEMU-ExamplesThere are more devices in the works, I figured I would just start with these three
Just a note that I'm again assuming Peter C will be reviewing the remaining patches in this series. Peter: let me know if you won't have time for that and I should put them on my todo list...
thanks
-- PMM
Quoted 16 lines · Peter Maydell
Quoted 15 lines · Alistair Francis
This patch series adds the Netduino 2 Machine to QEMU
Information on the board is avalible at:
http://www.netduino.com/netduino2/specs.htmThe git tree can be found at:
https://github.com/alistair23/qemu/tree/netduino2.9This patch series makes some changes to the
armv7m_initfunction that allows the code to be reused with the Netduino 2 and the Stellaris machines.Some example code that runs on QEMU is avaliable at:
at: https://github.com/alistair23/CSSE3010-QEMU-Examples
Quoted 7 lines
Quoted 2 lines
There are more devices in the works, I figured I would just start with these three
Just a note that I'm again assuming Peter C will be reviewing the remaining patches in this series. Peter: let me know if you won't have time for that and I should put them on my todo list...
Peter C is reviewing them. They are all ready to be accepted, except for the timer which I am still having problems with. I am going to split the series up as someone has requested that my armv7m init changes get upsteramed as soon as possible. I will send that through later today
Thanks,
Alistair
Quoted 2 lines
thanks
-- PMM