Netduino 2 Machine Model
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.1
This is a fully implemented machine, except for the hack changes that have been made to armv7_init. See that individual patch for more information
This is based on my original patch series to add the Netduino Plus 2 Machine to QEMU. This can be seen at:
http://lists.nongnu.org/archive/html/qemu-devel/2014-08/msg04026.html
As this is a completly different machine I have decided to restart the version numbers
Some example code that runs on QEMU is avaliable at:
at: https://github.com/alistair23/CSSE3010-QEMU-Examples
I have more devices in the works, I figured I would just start with these three
Alistair Francis (6):
stm32f205_timer: Add the stm32f205 SoC Timer2 to 5
stm32f205_USART: Add the stm32f205 SoC USART Controller
stm32f205_SYSCFG: Add the stm32f205 SYSCFG
target_arm: Update armv7_init to support more parameters
stm32f205: Add the SoC
netduino2: Add the Netduino 2 Machine
default-configs/arm-softmmu.mak | 1 + hw/arm/Makefile.objs | 2 +- hw/arm/armv7m.c | 33 +++- hw/arm/netduino2.c | 60 +++++++ hw/arm/stellaris.c | 2 +- hw/arm/stm32f205_soc.c | 140 ++++++++++++++++ hw/char/Makefile.objs | 1 + hw/char/stm32f205_usart.c | 205 +++++++++++++++++++++++ hw/misc/Makefile.objs | 1 + hw/misc/stm32f205_syscfg.c | 160 ++++++++++++++++++ hw/timer/Makefile.objs | 1 + hw/timer/stm32f205_timer.c | 334 +++++++++++++++++++++++++++++++++++++ include/hw/arm/arm.h | 3 +- include/hw/arm/stm32f205_soc.h | 61 +++++++ include/hw/char/stm32f205_usart.h | 64 +++++++ include/hw/misc/stm32f205_syscfg.h | 59 +++++++ include/hw/timer/stm32f205_timer.h | 84 ++++++++++ 17 files changed, 1201 insertions(+), 10 deletions(-) create mode 100644 hw/arm/netduino2.c create mode 100644 hw/arm/stm32f205_soc.c create mode 100644 hw/char/stm32f205_usart.c create mode 100644 hw/misc/stm32f205_syscfg.c create mode 100644 hw/timer/stm32f205_timer.c create mode 100644 include/hw/arm/stm32f205_soc.h create mode 100644 include/hw/char/stm32f205_usart.h create mode 100644 include/hw/misc/stm32f205_syscfg.h create mode 100644 include/hw/timer/stm32f205_timer.h
Signature · 1 line
1.9.1
RFC 1/6 stm32f205_timer: Add the stm32f205 SoC Timer2 to 5
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
---
V2:
- Small changes to functionality and style. Thanks to Peter C
- Rename for the Netduino 2 and it's SoC
default-configs/arm-softmmu.mak | 1 + hw/timer/Makefile.objs | 1 + hw/timer/stm32f205_timer.c | 334 +++++++++++++++++++++++++++++++++++++ include/hw/timer/stm32f205_timer.h | 84 ++++++++++ 4 files changed, 420 insertions(+) create mode 100644 hw/timer/stm32f205_timer.c create mode 100644 include/hw/timer/stm32f205_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_NETDUINO2=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y
hw/timer/Makefile.objs +1 -0
@@ -17,6 +17,7 @@ common-obj-$(CONFIG_IMX) += imx_epit.o common-obj-$(CONFIG_IMX) += imx_gpt.o common-obj-$(CONFIG_LM32) += lm32_timer.o common-obj-$(CONFIG_MILKYMIST) += milkymist-sysctl.o +common-obj-$(CONFIG_NETDUINO2) += stm32f205_timer.o obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o
hw/timer/stm32f205_timer.c new file +334 -0
334 lines not on this page · raw message
include/hw/timer/stm32f205_timer.h new file +84 -0
84 lines not on this page · raw message
Signature · 1 line
1.9.1
RFC 2/6 stm32f205_USART: Add the stm32f205 SoC USART Controller
In reply to Alistair FrancisThis patch adds the stm32f205 USART controller
(UART also uses the same controller).
---
V2:
- Small changes thanks to Peter C
- Rename for the Netduino 2 and it's SoC
hw/char/Makefile.objs | 1 + hw/char/stm32f205_usart.c | 205 ++++++++++++++++++++++++++++++++++++++ include/hw/char/stm32f205_usart.h | 64 ++++++++++++ 3 files changed, 270 insertions(+) create mode 100644 hw/char/stm32f205_usart.c create mode 100644 include/hw/char/stm32f205_usart.h
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_NETDUINO2) += stm32f205_usart.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o common-obj-$(CONFIG_ISA_DEBUG) += debugcon.o
hw/char/stm32f205_usart.c new file +205 -0
205 lines not on this page · raw message
include/hw/char/stm32f205_usart.h new file +64 -0
64 lines not on this page · raw message
Signature · 1 line
1.9.1
RFC 3/6 stm32f205_SYSCFG: Add the stm32f205 SYSCFG
In reply to Alistair FrancisThis patch adds the stm32f205 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)
---
V2:
- Update the commit message
- Small changes thanks to Peter C
- Rename for the Netduino 2 and it's SoC
hw/misc/Makefile.objs | 1 + hw/misc/stm32f205_syscfg.c | 160 +++++++++++++++++++++++++++++++++++++ include/hw/misc/stm32f205_syscfg.h | 59 ++++++++++++++ 3 files changed, 220 insertions(+) create mode 100644 hw/misc/stm32f205_syscfg.c create mode 100644 include/hw/misc/stm32f205_syscfg.h
hw/misc/Makefile.objs +1 -0
@@ -39,5 +39,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_NETDUINO2) += stm32f205_syscfg.o obj-$(CONFIG_PVPANIC) += pvpanic.o
hw/misc/stm32f205_syscfg.c new file +160 -0
160 lines not on this page · raw message
include/hw/misc/stm32f205_syscfg.h new file +59 -0
59 lines not on this page · raw message
Signature · 1 line
1.9.1
RFC 5/6 stm32f205: Add the SoC
In reply to Alistair FrancisThis patch adds the stm32f205 SoC. This will be used by the Netduino 2 to create a machine
---
hw/arm/Makefile.objs | 2 +- hw/arm/stm32f205_soc.c | 140 +++++++++++++++++++++++++++++++++++++++++ include/hw/arm/stm32f205_soc.h | 61 ++++++++++++++++++ 3 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 hw/arm/stm32f205_soc.c create mode 100644 include/hw/arm/stm32f205_soc.h
hw/arm/Makefile.objs +1 -1
@@ -2,7 +2,7 @@ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o 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 += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o stm32f205_soc.o obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.o
hw/arm/stm32f205_soc.c new file +140 -0
140 lines not on this page · raw message
include/hw/arm/stm32f205_soc.h new file +61 -0
61 lines not on this page · raw message
Signature · 1 line
1.9.1
RFC 4/6 target_arm: Update armv7_init to support more parameters
In reply to Alistair FrancisThis patch is a hack
This patch makes the smallest number of changes possible to extend armv7m_init() so that it can be used to init the Netduino 2.
---
I understand that this is probably not the way that everyone would like this done. What I do want to know though, is what the prefered method for extending this function would be? I am expecting that it will have to be a QOM device that can be attached.
hw/arm/armv7m.c | 33 ++++++++++++++++++++++++++------- hw/arm/stellaris.c | 2 +- include/hw/arm/arm.h | 3 ++- 3 files changed, 29 insertions(+), 9 deletions(-)
hw/arm/armv7m.c +26 -7
@@ -155,11 +155,21 @@ static void armv7m_bitband_init(void)/* Board init. */ +typedef struct ARMV7MResetArgs { +ARMCPU *cpu; +uint32_t reset_sp; +uint32_t reset_pc; +}ARMV7MResetArgs ; +static void armv7m_reset (void *opaque) { -ARMCPU *cpu = opaque; +ARMV7MResetArgs *args = opaque; + +cpu_reset (CPU (args->cpu)); -cpu_reset (CPU (cpu)); + args->cpu->env.regs[13 ] = args->reset_sp &0xFFFFFFFC ; + args->cpu->env.thumb = args->reset_pc &1 ; + args->cpu->env.regs[15 ] = args->reset_pc & ~1 ; }/* Init CPU and memory for a v7-M based board.
@@ -167,14 +177,15 @@ static void armv7m_reset(void *opaque)Returns the NVIC array. */ qemu_irq *armv7m_init (MemoryRegion *system_memory, -int flash_size,int sram_size, +int flash_size,uint64_t flash_base, +int sram_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;
@@ -183,6 +194,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,MemoryRegion *sram =g_new (MemoryRegion,1 );MemoryRegion *flash =g_new (MemoryRegion,1 );MemoryRegion *hack =g_new (MemoryRegion,1 ); +ARMV7MResetArgs reset_args; flash_size *=1024 ; sram_size *=1024 ;
@@ -213,18 +225,19 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,memory_region_init_ram (flash,NULL ,"armv7m.flash" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true); -memory_region_add_subregion (system_memory,0 , flash); +memory_region_add_subregion (system_memory, flash_base, flash);memory_region_init_ram (sram,NULL ,"armv7m.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (system_memory,0x20000000 , sram);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); }
@@ -259,7 +272,13 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,vmstate_register_ram_global (hack);memory_region_add_subregion (system_memory,0xfffff000 , hack); -qemu_register_reset (armv7m_reset, cpu); + reset_args = (ARMV7MResetArgs ) { + .cpu = cpu, + .reset_pc = entry, + .reset_sp = (0x20000000 + ((192 *1024 ) *2 )/3 ), + }; +qemu_register_reset (armv7m_reset, +g_memdup (&reset_args,sizeof (reset_args)));return pic; }
hw/arm/stellaris.c +1 -1
@@ -1223,7 +1223,7 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, 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); + flash_size,0 , sram_size,64 , kernel_filename, cpu_model);if (board->dc1 & (1 <<16 )) { dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,
include/hw/arm/arm.h +2 -1
@@ -16,7 +16,8 @@/* armv7m.c */ qemu_irq *armv7m_init (MemoryRegion *system_memory, -int flash_size,int sram_size, +int flash_size,uint64_t flash_base, +int sram_size,int num_irq,const char *kernel_filename,const char *cpu_model);/* arm_boot.c */
Signature · 1 line
1.9.1
RFC 6/6 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 | 2 +- hw/arm/netduino2.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 hw/arm/netduino2.c
hw/arm/Makefile.objs +1 -1
@@ -2,7 +2,7 @@ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o 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 stm32f205_soc.o +obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o netduino2.o stm32f205_soc.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 +60 -0
60 lines not on this page · raw message
Signature · 1 line
1.9.1
Re: [Qemu-devel] [RFC v1 1/6] stm32f205_timer: Add the stm32f205 SoC Timer2 to 5
In reply to Alistair FrancisQuoted 22 lines · Alistair Francis
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
Signed-off-by Alistair Francis <[email protected]>---
V2:
- Small changes to functionality and style. Thanks to Peter C
- Rename for the Netduino 2 and it's SoCdefault-configs/arm-softmmu.mak | 1 + hw/timer/Makefile.objs | 1 + hw/timer/stm32f205_timer.c | 334 +++++++++++++++++++++++++++++++++++++ include/hw/timer/stm32f205_timer.h | 84 ++++++++++ 4 files changed, 420 insertions(+) create mode 100644 hw/timer/stm32f205_timer.c create mode 100644 include/hw/timer/stm32f205_timer.hdefault-configs/arm-softmmu.mak +0
-0
default-configs/arm-softmmu.mak CONFIG_NSERIES=y · line 82
Quoted 5 lines
default-configs/arm-softmmu.mak +1
-0@@ -78,6 +78,7 @@ CONFIG_NSERIES=y CONFIG_REALVIEW=y CONFIG_ZAURUS=y CONFIG_ZYNQ=y +CONFIG_NETDUINO2=y
I think we were moving aware from SoC level shared configs, i.e. it's ok to have a confing per-dev in the arm-softmmu defconfig. You also want to avoid tying the device (and the SoC) to netduino as much as possible so even if CONFIG_NETDUINO existed it would simply set another config for STM etc. Easiest to just go flat with one config per dev (the ZYNQ example right above does do it wrong too :( ).
Quoted 20 lines
default-configs/arm-softmmu.mak +0
-0CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=yhw/timer/Makefile.objs +1
-0@@ -17,6 +17,7 @@ common-obj-$(CONFIG_IMX) += imx_epit.o common-obj-$(CONFIG_IMX) += imx_gpt.o common-obj-$(CONFIG_LM32) += lm32_timer.o common-obj-$(CONFIG_MILKYMIST) += milkymist-sysctl.o +common-obj-$(CONFIG_NETDUINO2) += stm32f205_timer.o obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.ohw/timer/stm32f205_timer.c new file +0
-0
hw/timer/stm32f205_timer.c line 3
Quoted 3 lines
hw/timer/stm32f205_timer.c new file +3
-0@@ -0,0 +1,334 @@ +/* +* STM32F205xx Timer 2 to 5 +*
Looking at the TRM i notice some of the other timers may be similar. Are TIM9-14 potentially modellable with a slight parameterisation of this?
I think its ok in first series to limit functionality to TIM2-5 but you should soften the naming, probably just to stm32f205_timer throughout (removing all ref to TIM2-5) and leave this 2-5 1/8 9-13 configury to the SoC level.
Quoted 20 lines
hw/timer/stm32f205_timer.c new file +20
-0+* Copyright (c) 2014 Alistair Francis <[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. +*/
hw/timer/stm32f205_timer.c line 33
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ +#include "hw/timer/stm32f205_timer.h" + +#ifndef ST_TIM2_5_ERR_DEBUG +#define ST_TIM2_5_ERR_DEBUG 0 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do { \ + if (ST_TIM2_5_ERR_DEBUG >= lvl) { \ + fprintf(stderr, "stm32f205xx_timer: %s:" fmt, __func__, ## args); \
qemu_log()
hw/timer/stm32f205_timer.c line 43
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ } \ +}while (0 ); + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +static void stm32f205xx_timer_update (Stm32f205TimerState *s) +{ + s->tim_sr |=1 ; +qemu_irq_pulse (s->irq); +}
This only serves the purpose of interrupt assertion on the timer callback below and is single use. Just inline it.
hw/timer/stm32f205_timer.c line 48
Quoted 5 lines
hw/timer/stm32f205_timer.c new file +5
-0+ +static void stm32f205xx_timer_interrupt (void *opaque) +{ +Stm32f205TimerState *s = (Stm32f205TimerState *)opaque; +
No explicit cast needed.
hw/timer/stm32f205_timer.c line 51
Quoted 3 lines
hw/timer/stm32f205_timer.c new file +3
-0+DB_PRINT ("Interrupt in: %s\n" , __func__); + +if (s->tim_dier ==0x01 && s->tim_cr1 &TIM_CR1_CEN ) {
The UIE bit of dier is only a single bit so you should use a mask and macro (just like with & TIM_CR1_CEN).
hw/timer/stm32f205_timer.c line 58
Quoted 7 lines
hw/timer/stm32f205_timer.c new file +7
-0+stm32f205xx_timer_update (s); + } +} + +static uint32_t stm32f205xx_timer_get_count (Stm32f205TimerState *s) +{ +int64_t now =qemu_clock_get_ns (rtc_clock);
Why use the RTC rather than the virtual clock? Most timer use the virtual unless they are explicitly an RTC device (does TIMx have RTC capability?)
Quoted 8 lines
hw/timer/stm32f205_timer.c new file +8
-0+return s->tick_offset + now /get_ticks_per_sec (); +} + +static void stm32f205xx_timer_set_alarm (Stm32f205TimerState *s) +{ +uint32_t ticks; + +DB_PRINT ("Alarm raised in: %s at 0x%x\n" , __func__, s->tim_cr1);
hw/timer/stm32f205_timer.c line 76
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ + ticks = s->tim_arr -stm32f205xx_timer_get_count (s)/ + (s->tim_psc +1 ); +DB_PRINT ("Alarm set in %u ticks\n" , ticks); + +if (ticks ==0 ) { +timer_del (s->timer); +stm32f205xx_timer_interrupt (s); + }else { +int64_t now =qemu_clock_get_ns (rtc_clock) /get_ticks_per_sec ();
You should avoid two now calculations in the one callback. You have already crunched a now in timer_get_count() above and you do it again here. As timer_get_count is low (single?) use you can just inline to get now as a calculate-once local var.
hw/timer/stm32f205_timer.c line 85
Quoted 9 lines
hw/timer/stm32f205_timer.c new file +9
-0+timer_mod (s->timer, now + (int64_t )ticks); +DB_PRINT ("Wait Time: 0x%x\n" , (uint32_t ) (now + ticks)); + } +} + +static void stm32f205xx_timer_reset (DeviceState *dev) +{ +struct Stm32f205TimerState *s =STM32F205xxTIMER (dev); +
No struct needed.
Quoted 16 lines
hw/timer/stm32f205_timer.c new file +16
-0+ s->tim_cr1 =0 ; + s->tim_cr2 =0 ; + s->tim_smcr =0 ; + s->tim_dier =0 ; + s->tim_sr =0 ; + s->tim_egr =0 ; + s->tim_ccmr1 =0 ; + s->tim_ccmr2 =0 ; + s->tim_ccer =0 ; + s->tim_cnt =0 ; + s->tim_psc =0 ; + s->tim_arr =0 ; + s->tim_ccr1 =0 ; + s->tim_ccr2 =0 ; + s->tim_ccr3 =0 ; + s->tim_ccr4 =0 ;
hw/timer/stm32f205_timer.c line 111
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ s->tim_dcr =0 ; + s->tim_dmar =0 ; + s->tim_or =0 ; +} + +static uint64_t stm32f205xx_timer_read (void *opaque,hwaddr offset, +unsigned size) +{ +Stm32f205TimerState *s = (Stm32f205TimerState *)opaque; +
No explicit cast.
hw/timer/stm32f205_timer.c line 112
Quoted 1 line
hw/timer/stm32f205_timer.c new file +1
-0+DB_PRINT ("Read 0x%x\n" , (uint ) offset);
HWADDR_PRIx instead of cast.
Quoted 34 lines
hw/timer/stm32f205_timer.c new file +34
-0+ +switch (offset) { +case TIM_CR1 : +return s->tim_cr1; +case TIM_CR2 : +return s->tim_cr2; +case TIM_SMCR : +return s->tim_smcr; +case TIM_DIER : +return s->tim_dier; +case TIM_SR : +return s->tim_sr; +case TIM_EGR : +return s->tim_egr; +case TIM_CCMR1 : +return s->tim_ccmr1; +case TIM_CCMR2 : +return s->tim_ccmr2; +case TIM_CCER : +return s->tim_ccer; +case TIM_CNT : +return s->tim_cnt; +case TIM_PSC : +return s->tim_psc; +case TIM_ARR : +return s->tim_arr; +case TIM_CCR1 : +return s->tim_ccr1; +case TIM_CCR2 : +return s->tim_ccr2; +case TIM_CCR3 : +return s->tim_ccr3; +case TIM_CCR4 : +return s->tim_ccr4;
hw/timer/stm32f205_timer.c line 156
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+case TIM_DCR : +return s->tim_dcr; +case TIM_DMAR : +return s->tim_dmar; +case TIM_OR : +return s->tim_or; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"STM32F205xx_timer2_5_write: Bad offset %x\n" , + (int ) offset);
same.
hw/timer/stm32f205_timer.c line 166
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ } + +return 0 ; +} + +static void stm32f205xx_timer_write (void *opaque,hwaddr offset, +uint64_t val64,unsigned size) +{ +Stm32f205TimerState *s = (Stm32f205TimerState *)opaque; +uint32_t value = (uint32_t ) val64;
Casts not needed.
Quoted 91 lines
hw/timer/stm32f205_timer.c new file +91
-0+ +DB_PRINT ("Write 0x%x, 0x%x\n" , value, (uint ) offset); + +switch (offset) { +case TIM_CR1 : + s->tim_cr1 = value; +return ; +case TIM_CR2 : + s->tim_cr2 = value; +return ; +case TIM_SMCR : + s->tim_smcr = value; +return ; +case TIM_DIER : + s->tim_dier = value; +return ; +case TIM_SR : + s->tim_sr &= value; +stm32f205xx_timer_set_alarm (s); +return ; +case TIM_EGR : + s->tim_egr = value; +return ; +case TIM_CCMR1 : + s->tim_ccmr1 = value; +return ; +case TIM_CCMR2 : + s->tim_ccmr2 = value; +return ; +case TIM_CCER : + s->tim_ccer = value; +return ; +case TIM_CNT : + s->tim_cnt = value; +stm32f205xx_timer_set_alarm (s); +return ; +case TIM_PSC : + s->tim_psc = value; +return ; +case TIM_ARR : + s->tim_arr = value; +stm32f205xx_timer_set_alarm (s); +return ; +case TIM_CCR1 : + s->tim_ccr1 = value; +return ; +case TIM_CCR2 : + s->tim_ccr2 = value; +return ; +case TIM_CCR3 : + s->tim_ccr3 = value; +return ; +case TIM_CCR4 : + s->tim_ccr4 = value; +return ; +case TIM_DCR : + s->tim_dcr = value; +return ; +case TIM_DMAR : + s->tim_dmar = value; +return ; +case TIM_OR : + s->tim_or = value; +return ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"STM32F205xx_timer2_5_write: Bad offset %x\n" , + (int ) offset); + } +} + +static const MemoryRegionOps stm32f205xx_timer_ops = { + .read = stm32f205xx_timer_read, + .write = stm32f205xx_timer_write, + .endianness =DEVICE_NATIVE_ENDIAN , +}; + +static void stm32f205xx_timer_init (Object *obj) +{ +Stm32f205TimerState *s =STM32F205xxTIMER (obj); +struct tm tm; + +sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irq); + +memory_region_init_io (&s->iomem, obj, &stm32f205xx_timer_ops, s, +"stm32f205xx_timer" ,0x2000 ); +sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->iomem); + +qemu_get_timedate (&tm,0 ); + s->tick_offset =mktimegm (&tm) - +qemu_clock_get_ns (rtc_clock) /get_ticks_per_sec ();
hw/timer/stm32f205_timer.c line 267
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ + s->timer =timer_new_ns (rtc_clock, stm32f205xx_timer_interrupt, s); +} + +static void stm32f205xx_timer_pre_save (void *opaque) +{ +Stm32f205TimerState *s = (Stm32f205TimerState *)opaque; + +int64_t delta =qemu_clock_get_ns (rtc_clock) - +qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL );
Blank line here.
hw/timer/stm32f205_timer.c line 276
Quoted 9 lines
hw/timer/stm32f205_timer.c new file +9
-0+ s->tick_offset_vmstate = s->tick_offset + delta /get_ticks_per_sec (); +} + +static int stm32f205xx_timer_post_load (void *opaque,int version_id) +{ +Stm32f205TimerState *s = (Stm32f205TimerState *)opaque; + +int64_t delta =qemu_clock_get_ns (rtc_clock) - +qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL );
Blank line here.
Quoted 109 lines
hw/timer/stm32f205_timer.c new file +58
-0+ s->tick_offset = s->tick_offset_vmstate - delta /get_ticks_per_sec (); +stm32f205xx_timer_set_alarm (s); +return 0 ; +} + +static const VMStateDescription vmstate_stm32f205xx_timer = { + .name ="stm32f205xx_timer" , + .version_id =1 , + .minimum_version_id =1 , + .pre_save = stm32f205xx_timer_pre_save, + .post_load = stm32f205xx_timer_post_load, + .fields = (VMStateField []) { +VMSTATE_UINT32 (tick_offset_vmstate, Stm32f205TimerState), +VMSTATE_UINT32 (tim_cr1, Stm32f205TimerState), +VMSTATE_UINT32 (tim_cr2, Stm32f205TimerState), +VMSTATE_UINT32 (tim_smcr, Stm32f205TimerState), +VMSTATE_UINT32 (tim_dier, Stm32f205TimerState), +VMSTATE_UINT32 (tim_sr, Stm32f205TimerState), +VMSTATE_UINT32 (tim_egr, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccmr1, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccmr1, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccer, Stm32f205TimerState), +VMSTATE_UINT32 (tim_cnt, Stm32f205TimerState), +VMSTATE_UINT32 (tim_psc, Stm32f205TimerState), +VMSTATE_UINT32 (tim_arr, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccr1, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccr2, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccr3, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccr4, Stm32f205TimerState), +VMSTATE_UINT32 (tim_dcr, Stm32f205TimerState), +VMSTATE_UINT32 (tim_dmar, Stm32f205TimerState), +VMSTATE_UINT32 (tim_or, Stm32f205TimerState), +VMSTATE_END_OF_LIST () + } +}; + +static void stm32f205xx_timer_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->vmsd = &vmstate_stm32f205xx_timer; + dc->reset = stm32f205xx_timer_reset; +} + +static const TypeInfo stm32f205xx_timer_info = { + .name =TYPE_STM32F205_TIMER , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (Stm32f205TimerState), + .instance_init = stm32f205xx_timer_init, + .class_init = stm32f205xx_timer_class_init, +}; + +static void stm32f205xx_timer_register_types (void ) +{ +type_register_static (&stm32f205xx_timer_info); +} + +type_init (stm32f205xx_timer_register_types)include/hw/timer/stm32f205_timer.h new file +45
-0@@ -0,0 +1,84 @@ +/* +* STM32F205xx Timer 2 to 5 +* +* Copyright (c) 2014 Alistair Francis <[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 "hw/sysbus.h" +#include "qemu/timer.h" +#include "sysemu/sysemu.h" + +#define TIM_CR1 0x00 +#define TIM_CR2 0x04 +#define TIM_SMCR 0x08 +#define TIM_DIER 0x0C +#define TIM_SR 0x10 +#define TIM_EGR 0x14 +#define TIM_CCMR1 0x18 +#define TIM_CCMR2 0x1C +#define TIM_CCER 0x20 +#define TIM_CNT 0x24 +#define TIM_PSC 0x28 +#define TIM_ARR 0x2C +#define TIM_CCR1 0x34 +#define TIM_CCR2 0x38 +#define TIM_CCR3 0x3C +#define TIM_CCR4 0x40 +#define TIM_DCR 0x48
include/hw/timer/stm32f205_timer.h line 55
Quoted 10 lines
include/hw/timer/stm32f205_timer.h new file +10
-0+#define TIM_DMAR 0x4C +#define TIM_OR 0x50 + +#define TIM_CR1_CEN 1 + +#define TYPE_STM32F205_TIMER "stm32f205xx-timer" +#define STM32F205xxTIMER (obj) OBJECT_CHECK(Stm32f205TimerState, (obj), \ + TYPE_STM32F205_TIMER) + +typedef struct Stm32f205TimerState {
STM
/*< private >*/
include/hw/timer/stm32f205_timer.h line 57
Quoted 2 lines
include/hw/timer/stm32f205_timer.h new file +2
-0+SysBusDevice parent_obj; +
/*< public >*/
Regards,
Peter
Quoted 31 lines
include/hw/timer/stm32f205_timer.h new file +27
-1+MemoryRegion iomem; +QEMUTimer *timer; +qemu_irq irq; + +uint32_t tick_offset_vmstate; +uint32_t tick_offset; + +uint32_t tim_cr1; +uint32_t tim_cr2; +uint32_t tim_smcr; +uint32_t tim_dier; +uint32_t tim_sr; +uint32_t tim_egr; +uint32_t tim_ccmr1; +uint32_t tim_ccmr2; +uint32_t tim_ccer; +uint32_t tim_cnt; +uint32_t tim_psc; +uint32_t tim_arr; +uint32_t tim_ccr1; +uint32_t tim_ccr2; +uint32_t tim_ccr3; +uint32_t tim_ccr4; +uint32_t tim_dcr; +uint32_t tim_dmar; +uint32_t tim_or; +} Stm32f205TimerState; --1.9.1
Re: [Qemu-devel] [RFC v1 2/6] stm32f205_USART: Add the stm32f205 SoC USART Controller
In reply to Alistair FrancisQuoted 69 lines · Alistair Francis
This patch adds the stm32f205 USART controller
(UART also uses the same controller).Signed-off-by Alistair Francis <[email protected]>---
V2:
- Small changes thanks to Peter C
- Rename for the Netduino 2 and it's SoChw/char/Makefile.objs | 1 + hw/char/stm32f205_usart.c | 205 ++++++++++++++++++++++++++++++++++++++ include/hw/char/stm32f205_usart.h | 64 ++++++++++++ 3 files changed, 270 insertions(+) create mode 100644 hw/char/stm32f205_usart.c create mode 100644 include/hw/char/stm32f205_usart.hhw/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_NETDUINO2) += stm32f205_usart.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o common-obj-$(CONFIG_ISA_DEBUG) += debugcon.ohw/char/stm32f205_usart.c new file +35
-0@@ -0,0 +1,205 @@ +/* +* STM32F205xx USART +* +* Copyright (c) 2014 Alistair Francis <[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 "hw/char/stm32f205_usart.h" + +#ifndef STM_USART_ERR_DEBUG +#define STM_USART_ERR_DEBUG 0 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do { \ + if (STM_USART_ERR_DEBUG >= lvl) { \ + fprintf(stderr, "stm32f205xx_usart: %s:" fmt, __func__, ## args); \ + } \ +} while (0);
hw/char/stm32f205_usart.c line 45
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+ +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +static int usart_can_receive (void *opaque) +{ +Stm32f205UsartState *s = opaque; + +if (s->usart_cr1 &USART_CR1_UE && s->usart_cr1 &USART_CR1_TE ) { +return 1 ; + }
So it's usual to block a UART on the fifo filling rather than the master enable switches. Corking the fifo on the master enable means QEMU will buffer UART input long-term until the guest turns the fifo on, where in reality the hardware should just drop the chars. We should do something similar.
The reason (as far as I know anyways) for can_recieve and giving qemu serial false closed-loop implementation (network has it too) is to deal with large amounts of instantaneous data in situations where the real-time delays on real-hardware would give natural bandwidth limiting. Thus the main app of can-recieve 0-return is 'your pumping serial data way too fast such that my fifo is full and real hardware would never go that fast'.
Also, did you me the RE bit rather than the TE bit?
hw/char/stm32f205_usart.c line 57
Quoted 12 lines
hw/char/stm32f205_usart.c new file +12
-0+ +return 0 ; +} + +static void usart_receive (void *opaque,const uint8_t *buf,int size) +{ +Stm32f205UsartState *s = opaque; + + s->usart_dr = *buf; + + s->usart_sr |=USART_SR_RXNE ; +
This might be a good condition to block can_recieve on - the USART_SR_RXNE. And if the enables are off, just drop the char.
hw/char/stm32f205_usart.c line 65
Quoted 8 lines
hw/char/stm32f205_usart.c new file +8
-0+if (s->usart_cr1 &USART_CR1_RXNEIE ) { +qemu_set_irq (s->irq,1 ); + } + +DB_PRINT ("Receiving: %c\n" , s->usart_dr); +} + +static void usart_reset (DeviceState *dev)
stm32f..._ prefix to function name. For consistency and makes gdb breakpoints slightly easier if function names are globally unique.
Quoted 14 lines
hw/char/stm32f205_usart.c new file +14
-0+{ +Stm32f205UsartState *s =STM32F205xx_USART (dev); + + s->usart_sr =0x00C00000 ; + s->usart_dr =0x00000000 ; + s->usart_brr =0x00000000 ; + s->usart_cr1 =0x00000000 ; + s->usart_cr2 =0x00000000 ; + s->usart_cr3 =0x00000000 ; + s->usart_gtpr =0x00000000 ; +} + +static uint64_t stm32f205xx_usart_read (void *opaque,hwaddr addr, +unsigned int size)
hw/char/stm32f205_usart.c line 89
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+{ +Stm32f205UsartState *s = opaque; +uint64_t retvalue; + +DB_PRINT ("Read 0x%x\n" , (uint ) addr); + +switch (addr) { +case USART_SR : + retvalue = s->usart_sr; + s->usart_sr &= (USART_SR_TC ^0xFFFF );
This register seems to be a mix of clear-to-read, read-only and rsvd. Just use &= ~MASK to implement clear on read which look to be the intention here. I don't see the significance of bits 15 downto 0 and why they behave different to 31 downto 16 here?
This is probably also where you need to repoll for can_receive blocked chars as well (assuming you make condition change I recommended above.
qemu_chr_accept_input(s->chr)
Quoted 36 lines
hw/char/stm32f205_usart.c new file +36
-0+return retvalue; +case USART_DR : +DB_PRINT ("Value: 0x%x, %c\n" , s->usart_dr, (char ) s->usart_dr); + s->usart_sr |=USART_SR_TXE ; +return s->usart_dr &0x3FF ; +case USART_BRR : +return s->usart_brr; +case USART_CR1 : +return s->usart_cr1; +case USART_CR2 : +return s->usart_cr2; +case USART_CR3 : +return s->usart_cr3; +case USART_GTPR : +return s->usart_gtpr; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"STM32F205xx_usart_read: Bad offset %x\n" , (int )addr); +return 0 ; + } + +return 0 ; +} + +static void stm32f205xx_usart_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +Stm32f205UsartState *s = opaque; +uint32_t value = (uint32_t ) val64; +unsigned char ch; + +DB_PRINT ("Write 0x%x, 0x%x\n" , value, (uint ) addr); + +switch (addr) { +case USART_SR : +if (value <=0x3FF ) {
hw/char/stm32f205_usart.c line 135
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+ s->usart_sr = value; + }else { + s->usart_sr &= value; + } +return ; +case USART_DR : +if (value <0xF000 ) { + ch = value; +if (s->chr) { +qemu_chr_fe_write (s->chr, &ch,1 );
If the backend gets busy this will drop chars. You can either implement the closed loop callbacks (kinda hard - check serial.c) or use qemu_chr_fe_write all to get a blocking implementation.
Quoted 115 lines
hw/char/stm32f205_usart.c new file +70
-0+ } + s->usart_sr |=USART_SR_TC ; + } +return ; +case USART_BRR : + s->usart_brr = value; +return ; +case USART_CR1 : + s->usart_cr1 = value; +return ; +case USART_CR2 : + s->usart_cr2 = value; +return ; +case USART_CR3 : + s->usart_cr3 = value; +return ; +case USART_GTPR : + s->usart_gtpr = value; +return ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"STM32F205xx_usart_write: Bad offset %x\n" , (int )addr); + } +} + +static const MemoryRegionOps stm32f205xx_usart_ops = { + .read = stm32f205xx_usart_read, + .write = stm32f205xx_usart_write, + .endianness =DEVICE_NATIVE_ENDIAN , +}; + +static void stm32f205xx_usart_init (Object *obj) +{ +Stm32f205UsartState *s =STM32F205xx_USART (obj); + +sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irq); + +memory_region_init_io (&s->mmio, obj, &stm32f205xx_usart_ops, s, +TYPE_STM32F205_USART ,0x2000 ); +sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->mmio); + + s->chr =qemu_char_get_next_serial (); + +if (s->chr) { +qemu_chr_add_handlers (s->chr, usart_can_receive, usart_receive, +NULL , s); + } +} + +static void stm32f205xx_usart_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = usart_reset; +} + +static const TypeInfo stm32f205xx_usart_info = { + .name =TYPE_STM32F205_USART , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (Stm32f205UsartState), + .instance_init = stm32f205xx_usart_init, + .class_init = stm32f205xx_usart_class_init, +}; + +static void stm32f205xx_usart_register_types (void ) +{ +type_register_static (&stm32f205xx_usart_info); +} + +type_init (stm32f205xx_usart_register_types)include/hw/char/stm32f205_usart.h new file +39
-0@@ -0,0 +1,64 @@ +/* +* STM32F205xx USART +* +* Copyright (c) 2014 Alistair Francis <[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 "hw/sysbus.h" +#include "sysemu/char.h" +#include "hw/hw.h" + +#define USART_SR 0x00 +#define USART_DR 0x04 +#define USART_BRR 0x08 +#define USART_CR1 0x0C +#define USART_CR2 0x10 +#define USART_CR3 0x14 +#define USART_GTPR 0x18 + +#define USART_SR_TXE (1 << 7) +#define USART_SR_TC (1 << 6) +#define USART_SR_RXNE (1 << 5)
include/hw/char/stm32f205_usart.h line 49
Quoted 10 lines
include/hw/char/stm32f205_usart.h new file +10
-0+ +#define USART_CR1_UE (1 << 13) +#define USART_CR1_RXNEIE (1 << 5) +#define USART_CR1_TE (1 << 3) + +#define TYPE_STM32F205_USART "stm32f205xx-usart" +#define STM32F205xx_USART (obj) \ + OBJECT_CHECK(Stm32f205UsartState, (obj), TYPE_STM32F205_USART) + +typedef struct {
/*< private >*/
include/hw/char/stm32f205_usart.h line 51
Quoted 2 lines
include/hw/char/stm32f205_usart.h new file +2
-0+SysBusDevice parent_obj; +
/*< public >*/
include/hw/char/stm32f205_usart.h line 64
Quoted 13 lines
include/hw/char/stm32f205_usart.h new file +13
-0+MemoryRegion mmio; + +uint32_t usart_sr; +uint32_t usart_dr; +uint32_t usart_brr; +uint32_t usart_cr1; +uint32_t usart_cr2; +uint32_t usart_cr3; +uint32_t usart_gtpr; + +CharDriverState *chr; +qemu_irq irq; +} Stm32f205UsartState;
STM
A few general styling comments from prev patch (mainly a few casts) apply here as well.
Regards,
Peter
Quoted 4 lines
--
1.9.1
Re: [Qemu-devel] [RFC v1 4/6] target_arm: Update armv7_init to support more parameters
In reply to Alistair FrancisQuoted 5 lines · Alistair Francis
This patch is a hack
This patch makes the smallest number of changes possible to extend
armv7m_init()so that it can be used to init the Netduino 2.
s/Netduino/STM
Quoted 8 lines
Signed-off-by Alistair Francis <[email protected]>---
I understand that this is probably not the way that everyone would like this done. What I do want to know though, is what the prefered method for extending this function would be? I am expecting that it will have to be a QOM device that can be attached.
That would be nice, but we might get there a shorter way first. A bigger question to me is what is the content of this device supposed to be?
Quoted 34 lines
hw/arm/armv7m.c | 33 ++++++++++++++++++++++++++------- hw/arm/stellaris.c | 2 +- include/hw/arm/arm.h | 3 ++- 3 files changed, 29 insertions(+), 9 deletions(-)hw/arm/armv7m.c +12
-2@@ -155,11 +155,21 @@ static void armv7m_bitband_init(void)/* Board init. */ +typedef struct ARMV7MResetArgs { +ARMCPU *cpu; +uint32_t reset_sp; +uint32_t reset_pc; +}ARMV7MResetArgs ; +static void armv7m_reset (void *opaque) { -ARMCPU *cpu = opaque; +ARMV7MResetArgs *args = opaque; + +cpu_reset (CPU (args->cpu)); -cpu_reset (CPU (cpu)); + args->cpu->env.regs[13 ] = args->reset_sp &0xFFFFFFFC ; + args->cpu->env.thumb = args->reset_pc &1 ; + args->cpu->env.regs[15 ] = args->reset_pc & ~1 ; }/* Init CPU and memory for a v7-M based board.
hw/arm/armv7m.c static void armv7m_reset(void *opaque) · line 180
Quoted 5 lines
hw/arm/armv7m.c +1
-1@@ -167,14 +177,15 @@ static void armv7m_reset(void *opaque)Returns the NVIC array. */ qemu_irq *armv7m_init(MemoryRegion *system_memory, - int flash_size, int sram_size, + int flash_size, uint64_t flash_base,
Does ARMv7M actually mandate the existence of RAM and flash like this at all? Given the complex setup of STM (with the memory aliases etc) I'm now of the belief that all RAM and FLASH init should be handled by the SoC level.
Can we just remove flash and RAM from this fn completely and push the memory_region_init calls up to stellaris?
Quoted 43 lines
hw/arm/armv7m.c +6
-3+ int sram_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;@@ -183,6 +194,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,MemoryRegion *sram =g_new (MemoryRegion,1 );MemoryRegion *flash =g_new (MemoryRegion,1 );MemoryRegion *hack =g_new (MemoryRegion,1 ); +ARMV7MResetArgs reset_args; flash_size *=1024 ; sram_size *=1024 ;@@ -213,18 +225,19 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,memory_region_init_ram (flash,NULL ,"armv7m.flash" , flash_size);vmstate_register_ram_global (flash);memory_region_set_readonly (flash, true); -memory_region_add_subregion (system_memory,0 , flash); +memory_region_add_subregion (system_memory, flash_base, flash);memory_region_init_ram (sram,NULL ,"armv7m.sram" , sram_size);vmstate_register_ram_global (sram);memory_region_add_subregion (system_memory,0x20000000 , sram);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/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 278
Quoted 8 lines
hw/arm/armv7m.c +4
-1@@ -259,7 +272,13 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,vmstate_register_ram_global (hack);memory_region_add_subregion (system_memory,0xfffff000 , hack); -qemu_register_reset (armv7m_reset, cpu); + reset_args = (ARMV7MResetArgs ) { + .cpu = cpu, + .reset_pc = entry, + .reset_sp = (0x20000000 + ((192 *1024 ) *2 )/3 ),
Why is the manual sp setting needed? I thought the V7M specific CPU reset code handled this? Does Martins ARMv7M ROM reset patch help by any chance?
Regards,
Peter
Quoted 37 lines
hw/arm/armv7m.c +3
-0+ }; +qemu_register_reset (armv7m_reset, +g_memdup (&reset_args,sizeof (reset_args)));return pic; }hw/arm/stellaris.c +1
-1@@ -1223,7 +1223,7 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model, 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); + flash_size,0 , sram_size,64 , kernel_filename, cpu_model);if (board->dc1 & (1 <<16 )) { dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,include/hw/arm/arm.h +2
-2@@ -16,7 +16,8 @@/* armv7m.c */ qemu_irq *armv7m_init (MemoryRegion *system_memory, -int flash_size,int sram_size, +int flash_size,uint64_t flash_base, +int sram_size,int num_irq,const char *kernel_filename,const char *cpu_model);/* arm_boot.c */ --1.9.1
Re: [Qemu-devel] [RFC v1 4/6] target_arm: Update armv7_init to support more parameters
Quoted 2 lines · Peter Crosthwaite
Does ARMv7M actually mandate the existence of RAM and flash like this at all?
No. It does have a well defined address map that pretty strongly suggests that you ought to have flash and RAM at certain addresses, but the flash and RAM are not part of the CPU core itself.
(Bitbanding, on the other hand, is part of the CPU core and the memory region setup for it should stay in this function.)
Quoted 3 lines
Given the complex setup of STM (with the memory aliases etc) I'm now of the belief that all RAM and FLASH init should be handled by the SoC level.
Agreed.
-- PMM
Re: [Qemu-devel] [RFC v1 4/6] target_arm: Update armv7_init to support more parameters
In reply to Peter CrosthwaiteQuoted 14 lines
hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 278
Quoted 9 lines
hw/arm/armv7m.c +4
-1@@ -259,7 +272,13 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,vmstate_register_ram_global (hack);memory_region_add_subregion (system_memory,0xfffff000 , hack); -qemu_register_reset (armv7m_reset, cpu); + reset_args = (ARMV7MResetArgs ) { + .cpu = cpu, + .reset_pc = entry, + .reset_sp = (0x20000000 + ((192 *1024 ) *2 )/3 ),Why is the manual sp setting needed? I thought the V7M specific CPU reset code handled this? Does Martins ARMv7M ROM reset patch help by any chance?
Quoted 2 lines
Regards,
Peter
Indeed, I don't think that would be necessary with my patch. What are those hardcoded magic numbers?
Signature · 12 lines
Martín Galván Software Engineer Taller Technologies Argentina San Lorenzo 47, 3rd Floor, Office 5 Córdoba, Argentina Phone: 54 351 4217888 / +54 351 4218211
Re: [Qemu-devel] [RFC v1 5/6] stm32f205: Add the SoC
In reply to Alistair FrancisQuoted 18 lines · Alistair Francis
This patch adds the stm32f205 SoC. This will be used by the Netduino 2 to create a machine
Signed-off-by Alistair Francis <[email protected]>---
hw/arm/Makefile.objs | 2 +- hw/arm/stm32f205_soc.c | 140 +++++++++++++++++++++++++++++++++++++++++ include/hw/arm/stm32f205_soc.h | 61 ++++++++++++++++++ 3 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 hw/arm/stm32f205_soc.c create mode 100644 include/hw/arm/stm32f205_soc.hhw/arm/Makefile.objs +0
-0
hw/arm/Makefile.objs obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o · line 5
Quoted 5 lines
hw/arm/Makefile.objs +1
-1@@ -2,7 +2,7 @@ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o 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 += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o stm32f205_soc.o
New obj-y line.
Quoted 55 lines
hw/arm/Makefile.objs +0
-0obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.ohw/arm/stm32f205_soc.c new file +46
-0@@ -0,0 +1,140 @@ +/* +* STM32F205xx SoC +* +* Copyright (c) 2014 Alistair Francis <[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 "hw/arm/stm32f205_soc.h" + +#define FLASH_BASE_ADDRESS 0x08000000 +#define FLASH_SIZE 1024 +#define SRAM_BASE_ADDRESS 0x20000000 +#define SRAM_SIZE 192 + +static void stm32f205_soc_initfn (Object *obj) +{ +STM32F205State *s =STM32F205_SOC (obj); +int i; + +object_initialize (&s->syscfg,sizeof (s->syscfg),TYPE_STM32F205_SYSCFG ); +qdev_set_parent_bus (DEVICE (&s->syscfg),sysbus_get_default ()); + +for (i =0 ; i <5 ; i++) { +object_initialize (&s->usart[i],sizeof (s->usart[i]), +TYPE_STM32F205_USART ); +qdev_set_parent_bus (DEVICE (&s->usart[i]),sysbus_get_default ()); + } + +for (i =0 ; i <4 ; i++) {
hw/arm/stm32f205_soc.c line 56
Quoted 10 lines
hw/arm/stm32f205_soc.c new file +10
-0+object_initialize (&s->timer[i],sizeof (s->timer[i]), +TYPE_STM32F205_TIMER ); +qdev_set_parent_bus (DEVICE (&s->timer[i]),sysbus_get_default ()); + } +} + +static void stm32f205_soc_realize (DeviceState *dev_soc,Error **errp) +{ +static const uint32_t timer_addr[] = {0x40000000 ,0x40000400 , +0x40000800 ,0x40000C00 };
You should add a comment about how you only model TIM2-5. This list is to grow significantly in a fuller implementation.
hw/arm/stm32f205_soc.c line 59
Quoted 3 lines
hw/arm/stm32f205_soc.c new file +3
-0+static const uint32_t usart_addr[] = {0x40011000 ,0x40004400 , +0x40004800 ,0x40004C00 ,0x40005000 ,0x40011400 }; +
Just put the static consts up top of the file so the are easily spotted as self documentation.
Quoted 7 lines
hw/arm/stm32f205_soc.c new file +7
-0+static const int timer_irq[] = {28 ,29 ,30 ,50 }; +static const int usart_irq[] = {37 ,38 ,39 ,52 ,53 ,71 ,82 ,83 }; + +STM32F205State *s =STM32F205_SOC (dev_soc); +DeviceState *syscfgdev, *usartdev, *timerdev; +SysBusDevice *syscfgbusdev, *usartbusdev, *timerbusdev; +qemu_irq *pic;;
hw/arm/stm32f205_soc.c line 76
Quoted 10 lines
hw/arm/stm32f205_soc.c new file +10
-0+Error *err =NULL ; +int i; + + pic =armv7m_init (get_system_memory (), +FLASH_SIZE ,FLASH_BASE_ADDRESS ,SRAM_SIZE ,96 , + s->kernel_filename, s->cpu_model); + +/* System configuration controller */ + syscfgdev =DEVICE (&s->syscfg); + syscfgdev->id ="stm32f205xx-syscfg" ;
Why you need to set the legacy qdev id string? If its needed I would expect this to be init stage rather than realize.
Quoted 29 lines
hw/arm/stm32f205_soc.c new file +29
-0+object_property_set_bool (OBJECT (&s->syscfg), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ; + } + syscfgbusdev =SYS_BUS_DEVICE (syscfgdev); +sysbus_mmio_map (syscfgbusdev,0 ,0x40013800 ); +sysbus_connect_irq (syscfgbusdev,0 , pic[71 ]); + +/* Attach a UART (uses USART registers) and USART controllers */ +for (i =0 ; i <5 ; i++) { + usartdev =DEVICE (&(s->usart[i])); +object_property_set_bool (OBJECT (&s->usart[i]), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ; + } + usartbusdev =SYS_BUS_DEVICE (usartdev); +sysbus_mmio_map (usartbusdev,0 , usart_addr[i]); +sysbus_connect_irq (usartbusdev,0 , pic[usart_irq[i]]); + } + +/* Timer 2 to 5 */ +for (i =0 ; i <4 ; i++) { + timerdev =DEVICE (&(s->timer[i])); +object_property_set_bool (OBJECT (&s->timer[i]), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ;
hw/arm/stm32f205_soc.c line 115
Quoted 10 lines
hw/arm/stm32f205_soc.c new file +10
-0+ } + timerbusdev =SYS_BUS_DEVICE (timerdev); +sysbus_mmio_map (timerbusdev,0 , timer_addr[i]); +sysbus_connect_irq (timerbusdev,0 , pic[timer_irq[i]]); + } +} + +static Property stm32f205_soc_properties[] = { +DEFINE_PROP_STRING ("kernel-filename" , STM32F205State, kernel_filename), +DEFINE_PROP_STRING ("cpu-model" , STM32F205State, cpu_model),
Is it really configurable? You can drop cpu-model parameterisation unless STM have similar socs with different processor you are targetting?
Quoted 79 lines
hw/arm/stm32f205_soc.c new file +25
-0+ DEFINE_PROP_END_OF_LIST(), +}; + +static void stm32f205_soc_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = stm32f205_soc_realize; + dc->props = stm32f205_soc_properties; +} + +static const TypeInfo stm32f205_soc_info = { + .name =TYPE_STM32F205_SOC , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (STM32F205State), + .instance_init = stm32f205_soc_initfn, + .class_init = stm32f205_soc_class_init, +}; + +static void stm32f205_soc_types (void ) +{ +type_register_static (&stm32f205_soc_info); +} + +type_init (stm32f205_soc_types)include/hw/arm/stm32f205_soc.h new file +48
-0@@ -0,0 +1,61 @@ +/* +* STM32F205xx SoC +* +* Copyright (c) 2014 Alistair Francis <[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. +*/ + +#ifndef HW_ARM_STM32F205SOC_H +#define HW_ARM_STM32F205SOC_H + +#include "hw/sysbus.h" +#include "hw/arm/arm.h" +#include "hw/ssi.h" +#include "hw/devices.h" +#include "qemu/timer.h" +#include "net/net.h" +#include "elf.h" +#include "hw/loader.h" +#include "hw/boards.h" +#include "exec/address-spaces.h" +#include "qemu/error-report.h" +#include "sysemu/qtest.h" +#include "hw/misc/stm32f205_syscfg.h" +#include "hw/timer/stm32f205_timer.h" +#include "hw/char/stm32f205_usart.h" + +#define TYPE_STM32F205_SOC "stm32f205_soc" +#define STM32F205_SOC(obj) \ + OBJECT_CHECK(STM32F205State, (obj), TYPE_STM32F205_SOC) + +typedef struct STM32F205State {
include/hw/arm/stm32f205_soc.h line 58
Quoted 10 lines
include/hw/arm/stm32f205_soc.h new file +10
-0+/*< private >*/ +SysBusDevice parent_obj; +/*< public >*/ + +char *kernel_filename; +char *cpu_model; + +Stm32f205SyscfgState syscfg; +Stm32f205UsartState usart[5 ]; +Stm32f205TimerState timer[5 ];
You can macrofiy these magic "5"s. STM_NUM_UARTS etc.
Regards,
Peter
Quoted 7 lines
include/hw/arm/stm32f205_soc.h new file +3
-1+} STM32F205State; + +#endif --1.9.1
Quoted 11 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.1This is a fully implemented machine, except for the hack changes that have been made to
armv7_init. See that individual patch for more information
Most significantly, this is Cortex-M3 based, which sidesteps the awkward questions about whether we need to implement the M4 floating point. Cool.
thanks
-- PMM
Quoted 9 lines · Peter Maydell
Quoted 8 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.1
Quoted 7 lines
Quoted 3 lines
This is a fully implemented machine, except for the hack changes that have been made to
armv7_init. See that individual patch for more informationMost significantly, this is Cortex-M3 based, which sidesteps the awkward questions about whether we need to implement the M4 floating point. Cool.
Yeah and it is almost exactly the same, at least for what I'm interested in
Thanks,
Alistair
Quoted 3 lines
thanks
-- PMM
Re: [Qemu-devel] [RFC v1 4/6] target_arm: Update armv7_init to support more parameters
In reply to Peter MaydellQuoted 14 lines · Peter Maydell
Quoted 2 lines · Peter Crosthwaite
Does ARMv7M actually mandate the existence of RAM and flash like this at all?
No. It does have a well defined address map that pretty strongly suggests that you ought to have flash and RAM at certain addresses, but the flash and RAM are not part of the CPU core itself.
(Bitbanding, on the other hand, is part of the CPU core and the memory region setup for it should stay in this function.)
Quoted 5 lines
Quoted 3 lines
Given the complex setup of STM (with the memory aliases etc) I'm now of the belief that all RAM and FLASH init should be handled by the SoC level.
Agreed.
That makes everything so much easier. I was stuck at how to do the memory aliasing.
I will move the memory region inits out of the function and put them into the SoC level.
Is everyone happy enough with then using the armv7_init function as I have in this
patch (except with out the Flash and SRAM parts)? So both Stellaris and STM32F205
call the function. The only change from the current implementation would be the number
of interrupt lines, which would become a parameter.
Thanks,
Alistair
Quoted 2 lines
-- PMM
Re: [Qemu-devel] [RFC v1 4/6] target_arm: Update armv7_init to support more parameters
In reply to Martin GalvanQuoted 14 lines · Martin Galvan
Quoted 14 lines
hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 278
Quoted 9 lines
hw/arm/armv7m.c +4
-1@@ -259,7 +272,13 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,vmstate_register_ram_global (hack);memory_region_add_subregion (system_memory,0xfffff000 , hack); -qemu_register_reset (armv7m_reset, cpu); + reset_args = (ARMV7MResetArgs ) { + .cpu = cpu, + .reset_pc = entry, + .reset_sp = (0x20000000 + ((192 *1024 ) *2 )/3 ),Why is the manual sp setting needed? I thought the V7M specific CPU reset code handled this? Does Martins ARMv7M ROM reset patch help by any chance?
Quoted 5 lines
Quoted 2 lines
Regards,
PeterIndeed, I don't think that would be necessary with my patch. What are those hardcoded magic numbers?
The hard coded numbers are there basically there because they worked at one point and I haven't removed them yet. There is also no memory aliasing, so this gets around out of memory access errors from QEMU.
I haven't had to chance to try your patch yet Martin, but hopefully it removes the need for any of the reset changes I made.
Thanks,
Alistair
Quoted 16 lines
--
Martín Galván
Software Engineer
Taller Technologies Argentina
San Lorenzo 47, 3rd Floor, Office 5
Córdoba, Argentina
Phone: 54 351 4217888 / +54 351 4218211
Re: [Qemu-devel] [RFC v1 1/6] stm32f205_timer: Add the stm32f205 SoC Timer2 to 5
In reply to Peter CrosthwaiteQuoted 27 lines · Peter Crosthwaite
Quoted 26 lines · Alistair Francis
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
Signed-off-by Alistair Francis <[email protected]>---
V2:
- Small changes to functionality and style. Thanks to Peter C
- Rename for the Netduino 2 and it's SoCdefault-configs/arm-softmmu.mak | 1 + hw/timer/Makefile.objs | 1 + hw/timer/stm32f205_timer.c | 334 +++++++++++++++++++++++++++++++++++++ include/hw/timer/stm32f205_timer.h | 84 ++++++++++ 4 files changed, 420 insertions(+) create mode 100644 hw/timer/stm32f205_timer.c create mode 100644 include/hw/timer/stm32f205_timer.hdefault-configs/arm-softmmu.mak +1
-0@@ -78,6 +78,7 @@ CONFIG_NSERIES=y CONFIG_REALVIEW=y CONFIG_ZAURUS=y CONFIG_ZYNQ=y +CONFIG_NETDUINO2=y
Quoted 8 lines
Quoted 1 line
I think we were moving aware from SoC level shared configs, i.e. it's ok to have a confing per-dev in the arm-softmmu defconfig. You also want to avoid tying the device (and the SoC) to netduino as much as possible so even if
CONFIG_NETDUINOexisted it would simply set another config for STM etc. Easiest to just go flat with one config per dev (the ZYNQ example right above does do it wrong too :( ).
Ok, I will add a config for each device
Quoted 29 lines
Quoted 21 lines
CONFIG_VERSATILE_PCI=y
CONFIG_VERSATILE_I2C=yhw/timer/Makefile.objs +1
-0@@ -17,6 +17,7 @@ common-obj-$(CONFIG_IMX) += imx_epit.o common-obj-$(CONFIG_IMX) += imx_gpt.o common-obj-$(CONFIG_LM32) += lm32_timer.o common-obj-$(CONFIG_MILKYMIST) += milkymist-sysctl.o +common-obj-$(CONFIG_NETDUINO2) += stm32f205_timer.o obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.ohw/timer/stm32f205_timer.c new file +0
-0hw/timer/stm32f205_timer.c line 3
Quoted 3 lines
hw/timer/stm32f205_timer.c new file +3
-0@@ -0,0 +1,334 @@ +/* +* STM32F205xx Timer 2 to 5 +* Looking at the TRM i notice some of the other timers may be similar. Are TIM9-14 potentially modellable with a slight parameterisation of this?
Quoted 4 lines
I think its ok in first series to limit functionality to TIM2-5 but you should soften the naming, probably just to
stm32f205_timerthroughout (removing all ref to TIM2-5) and leave this 2-5 1/8 9-13 configury to the SoC level.
I haven't looked at the other timers yet, I think they are all very similar. Ok, I will soften the naming
Quoted 25 lines
Quoted 25 lines
hw/timer/stm32f205_timer.c new file +24
-0+* Copyright (c) 2014 Alistair Francis <[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 "hw/timer/stm32f205_timer.h" + +#ifndef ST_TIM2_5_ERR_DEBUG
Quoted 8 lines
hw/timer/stm32f205_timer.c line 33
Quoted 6 lines
hw/timer/stm32f205_timer.c new file +6
-0+#define ST_TIM2_5_ERR_DEBUG 0 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do { \ + if (ST_TIM2_5_ERR_DEBUG >= lvl) { \ + fprintf(stderr, "stm32f205xx_timer: %s:" fmt, __func__, ## args); \
qemu_log()
Yep
Quoted 14 lines
hw/timer/stm32f205_timer.c line 43
Quoted 11 lines
hw/timer/stm32f205_timer.c new file +10
-0+ } \ +}while (0 ); + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +static void stm32f205xx_timer_update (Stm32f205TimerState *s) +{ + s->tim_sr |=1 ; +qemu_irq_pulse (s->irq); +}This only serves the purpose of interrupt assertion on the timer callback below and is single use. Just inline it.
Ok, will do
Quoted 8 lines
hw/timer/stm32f205_timer.c line 48
Quoted 6 lines
hw/timer/stm32f205_timer.c new file +5
-0+ +static void stm32f205xx_timer_interrupt (void *opaque) +{ +Stm32f205TimerState *s = (Stm32f205TimerState *)opaque; +No explicit cast needed.
Will fix all
Quoted 7 lines
hw/timer/stm32f205_timer.c line 51
Quoted 4 lines
hw/timer/stm32f205_timer.c new file +3
-0+DB_PRINT ("Interrupt in: %s\n" , __func__); + +if (s->tim_dier ==0x01 && s->tim_cr1 &TIM_CR1_CEN ) {The UIE bit of dier is only a single bit so you should use a mask and macro (just like with &
TIM_CR1_CEN).
Yep, I don't know why that isn't
Quoted 12 lines
hw/timer/stm32f205_timer.c line 58
Quoted 8 lines
hw/timer/stm32f205_timer.c new file +7
-0+stm32f205xx_timer_update (s); + } +} + +static uint32_t stm32f205xx_timer_get_count (Stm32f205TimerState *s) +{ +int64_t now =qemu_clock_get_ns (rtc_clock);Why use the RTC rather than the virtual clock? Most timer use the virtual unless they are explicitly an RTC device (does TIMx have RTC capability?)
The timer I used as an example did this. I'll check the data sheet and see if I can change it to virtual
Quoted 16 lines
Quoted 16 lines
hw/timer/stm32f205_timer.c new file +15
-0+return s->tick_offset + now /get_ticks_per_sec (); +} + +static void stm32f205xx_timer_set_alarm (Stm32f205TimerState *s) +{ +uint32_t ticks; + +DB_PRINT ("Alarm raised in: %s at 0x%x\n" , __func__, s->tim_cr1); + + ticks = s->tim_arr -stm32f205xx_timer_get_count (s)/ + (s->tim_psc +1 ); +DB_PRINT ("Alarm set in %u ticks\n" , ticks); + +if (ticks ==0 ) { +timer_del (s->timer);
Quoted 8 lines
hw/timer/stm32f205_timer.c line 76
Quoted 3 lines
hw/timer/stm32f205_timer.c new file +3
-0+stm32f205xx_timer_interrupt (s); + }else { +int64_t now =qemu_clock_get_ns (rtc_clock) /get_ticks_per_sec ();You should avoid two now calculations in the one callback. You have already crunched a now in
timer_get_count()above and you do it again here. Astimer_get_countis low (single?) use you can just inline to get now as a calculate-once local var.
Will fix
Quoted 12 lines
hw/timer/stm32f205_timer.c line 85
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +9
-0+timer_mod (s->timer, now + (int64_t )ticks); +DB_PRINT ("Wait Time: 0x%x\n" , (uint32_t ) (now + ticks)); + } +} + +static void stm32f205xx_timer_reset (DeviceState *dev) +{ +struct Stm32f205TimerState *s =STM32F205xxTIMER (dev); +No struct needed.
Will fix
Quoted 30 lines
Quoted 17 lines
hw/timer/stm32f205_timer.c new file +16
-0+ s->tim_cr1 =0 ; + s->tim_cr2 =0 ; + s->tim_smcr =0 ; + s->tim_dier =0 ; + s->tim_sr =0 ; + s->tim_egr =0 ; + s->tim_ccmr1 =0 ; + s->tim_ccmr2 =0 ; + s->tim_ccer =0 ; + s->tim_cnt =0 ; + s->tim_psc =0 ; + s->tim_arr =0 ; + s->tim_ccr1 =0 ; + s->tim_ccr2 =0 ; + s->tim_ccr3 =0 ; + s->tim_ccr4 =0 ;hw/timer/stm32f205_timer.c line 111
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ s->tim_dcr =0 ; + s->tim_dmar =0 ; + s->tim_or =0 ; +} + +static uint64_t stm32f205xx_timer_read (void *opaque,hwaddr offset, +unsigned size) +{ +Stm32f205TimerState *s = (Stm32f205TimerState *)opaque; +No explicit cast.
Quoted 3 lines
hw/timer/stm32f205_timer.c line 112
Quoted 1 line
hw/timer/stm32f205_timer.c new file +1
-0+DB_PRINT ("Read 0x%x\n" , (uint ) offset);
HWADDR_PRIxinstead of cast.
What do you mean by HWADDR_PRIx?
Quoted 299 lines
Quoted 35 lines
hw/timer/stm32f205_timer.c new file +34
-0+ +switch (offset) { +case TIM_CR1 : +return s->tim_cr1; +case TIM_CR2 : +return s->tim_cr2; +case TIM_SMCR : +return s->tim_smcr; +case TIM_DIER : +return s->tim_dier; +case TIM_SR : +return s->tim_sr; +case TIM_EGR : +return s->tim_egr; +case TIM_CCMR1 : +return s->tim_ccmr1; +case TIM_CCMR2 : +return s->tim_ccmr2; +case TIM_CCER : +return s->tim_ccer; +case TIM_CNT : +return s->tim_cnt; +case TIM_PSC : +return s->tim_psc; +case TIM_ARR : +return s->tim_arr; +case TIM_CCR1 : +return s->tim_ccr1; +case TIM_CCR2 : +return s->tim_ccr2; +case TIM_CCR3 : +return s->tim_ccr3; +case TIM_CCR4 : +return s->tim_ccr4;hw/timer/stm32f205_timer.c line 156
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+case TIM_DCR : +return s->tim_dcr; +case TIM_DMAR : +return s->tim_dmar; +case TIM_OR : +return s->tim_or; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"STM32F205xx_timer2_5_write: Bad offset %x\n" , + (int ) offset);same.
hw/timer/stm32f205_timer.c line 166
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ } + +return 0 ; +} + +static void stm32f205xx_timer_write (void *opaque,hwaddr offset, +uint64_t val64,unsigned size) +{ +Stm32f205TimerState *s = (Stm32f205TimerState *)opaque; +uint32_t value = (uint32_t ) val64;Casts not needed.
Quoted 91 lines
hw/timer/stm32f205_timer.c new file +91
-0+ +DB_PRINT ("Write 0x%x, 0x%x\n" , value, (uint ) offset); + +switch (offset) { +case TIM_CR1 : + s->tim_cr1 = value; +return ; +case TIM_CR2 : + s->tim_cr2 = value; +return ; +case TIM_SMCR : + s->tim_smcr = value; +return ; +case TIM_DIER : + s->tim_dier = value; +return ; +case TIM_SR : + s->tim_sr &= value; +stm32f205xx_timer_set_alarm (s); +return ; +case TIM_EGR : + s->tim_egr = value; +return ; +case TIM_CCMR1 : + s->tim_ccmr1 = value; +return ; +case TIM_CCMR2 : + s->tim_ccmr2 = value; +return ; +case TIM_CCER : + s->tim_ccer = value; +return ; +case TIM_CNT : + s->tim_cnt = value; +stm32f205xx_timer_set_alarm (s); +return ; +case TIM_PSC : + s->tim_psc = value; +return ; +case TIM_ARR : + s->tim_arr = value; +stm32f205xx_timer_set_alarm (s); +return ; +case TIM_CCR1 : + s->tim_ccr1 = value; +return ; +case TIM_CCR2 : + s->tim_ccr2 = value; +return ; +case TIM_CCR3 : + s->tim_ccr3 = value; +return ; +case TIM_CCR4 : + s->tim_ccr4 = value; +return ; +case TIM_DCR : + s->tim_dcr = value; +return ; +case TIM_DMAR : + s->tim_dmar = value; +return ; +case TIM_OR : + s->tim_or = value; +return ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"STM32F205xx_timer2_5_write: Bad offset %x\n" , + (int ) offset); + } +} + +static const MemoryRegionOps stm32f205xx_timer_ops = { + .read = stm32f205xx_timer_read, + .write = stm32f205xx_timer_write, + .endianness =DEVICE_NATIVE_ENDIAN , +}; + +static void stm32f205xx_timer_init (Object *obj) +{ +Stm32f205TimerState *s =STM32F205xxTIMER (obj); +struct tm tm; + +sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irq); + +memory_region_init_io (&s->iomem, obj, &stm32f205xx_timer_ops, s, +"stm32f205xx_timer" ,0x2000 ); +sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->iomem); + +qemu_get_timedate (&tm,0 ); + s->tick_offset =mktimegm (&tm) - +qemu_clock_get_ns (rtc_clock) /get_ticks_per_sec ();hw/timer/stm32f205_timer.c line 267
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ + s->timer =timer_new_ns (rtc_clock, stm32f205xx_timer_interrupt, s); +} + +static void stm32f205xx_timer_pre_save (void *opaque) +{ +Stm32f205TimerState *s = (Stm32f205TimerState *)opaque; + +int64_t delta =qemu_clock_get_ns (rtc_clock) - +qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL );Blank line here.
hw/timer/stm32f205_timer.c line 276
Quoted 9 lines
hw/timer/stm32f205_timer.c new file +9
-0+ s->tick_offset_vmstate = s->tick_offset + delta /get_ticks_per_sec (); +} + +static int stm32f205xx_timer_post_load (void *opaque,int version_id) +{ +Stm32f205TimerState *s = (Stm32f205TimerState *)opaque; + +int64_t delta =qemu_clock_get_ns (rtc_clock) - +qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL );Blank line here.
Quoted 109 lines
hw/timer/stm32f205_timer.c new file +58
-0+ s->tick_offset = s->tick_offset_vmstate - delta /get_ticks_per_sec (); +stm32f205xx_timer_set_alarm (s); +return 0 ; +} + +static const VMStateDescription vmstate_stm32f205xx_timer = { + .name ="stm32f205xx_timer" , + .version_id =1 , + .minimum_version_id =1 , + .pre_save = stm32f205xx_timer_pre_save, + .post_load = stm32f205xx_timer_post_load, + .fields = (VMStateField []) { +VMSTATE_UINT32 (tick_offset_vmstate, Stm32f205TimerState), +VMSTATE_UINT32 (tim_cr1, Stm32f205TimerState), +VMSTATE_UINT32 (tim_cr2, Stm32f205TimerState), +VMSTATE_UINT32 (tim_smcr, Stm32f205TimerState), +VMSTATE_UINT32 (tim_dier, Stm32f205TimerState), +VMSTATE_UINT32 (tim_sr, Stm32f205TimerState), +VMSTATE_UINT32 (tim_egr, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccmr1, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccmr1, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccer, Stm32f205TimerState), +VMSTATE_UINT32 (tim_cnt, Stm32f205TimerState), +VMSTATE_UINT32 (tim_psc, Stm32f205TimerState), +VMSTATE_UINT32 (tim_arr, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccr1, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccr2, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccr3, Stm32f205TimerState), +VMSTATE_UINT32 (tim_ccr4, Stm32f205TimerState), +VMSTATE_UINT32 (tim_dcr, Stm32f205TimerState), +VMSTATE_UINT32 (tim_dmar, Stm32f205TimerState), +VMSTATE_UINT32 (tim_or, Stm32f205TimerState), +VMSTATE_END_OF_LIST () + } +}; + +static void stm32f205xx_timer_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->vmsd = &vmstate_stm32f205xx_timer; + dc->reset = stm32f205xx_timer_reset; +} + +static const TypeInfo stm32f205xx_timer_info = { + .name =TYPE_STM32F205_TIMER , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (Stm32f205TimerState), + .instance_init = stm32f205xx_timer_init, + .class_init = stm32f205xx_timer_class_init, +}; + +static void stm32f205xx_timer_register_types (void ) +{ +type_register_static (&stm32f205xx_timer_info); +} + +type_init (stm32f205xx_timer_register_types)include/hw/timer/stm32f205_timer.h new file +45
-0@@ -0,0 +1,84 @@ +/* +* STM32F205xx Timer 2 to 5 +* +* Copyright (c) 2014 Alistair Francis <[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 "hw/sysbus.h" +#include "qemu/timer.h" +#include "sysemu/sysemu.h" + +#define TIM_CR1 0x00 +#define TIM_CR2 0x04 +#define TIM_SMCR 0x08 +#define TIM_DIER 0x0C +#define TIM_SR 0x10 +#define TIM_EGR 0x14 +#define TIM_CCMR1 0x18 +#define TIM_CCMR2 0x1C +#define TIM_CCER 0x20 +#define TIM_CNT 0x24 +#define TIM_PSC 0x28 +#define TIM_ARR 0x2C +#define TIM_CCR1 0x34 +#define TIM_CCR2 0x38 +#define TIM_CCR3 0x3C +#define TIM_CCR4 0x40 +#define TIM_DCR 0x48include/hw/timer/stm32f205_timer.h line 55
Quoted 10 lines
include/hw/timer/stm32f205_timer.h new file +10
-0+#define TIM_DMAR 0x4C +#define TIM_OR 0x50 + +#define TIM_CR1_CEN 1 + +#define TYPE_STM32F205_TIMER "stm32f205xx-timer" +#define STM32F205xxTIMER (obj) OBJECT_CHECK(Stm32f205TimerState, (obj), \ + TYPE_STM32F205_TIMER) + +typedef struct Stm32f205TimerState {STM
Quoted 7 lines
/*< private >*/
include/hw/timer/stm32f205_timer.h line 57
Quoted 2 lines
include/hw/timer/stm32f205_timer.h new file +2
-0+SysBusDevice parent_obj; +/*< public >*/
Will do
Thanks,
Alistair
Quoted 34 lines
Regards,
PeterQuoted 31 lines
include/hw/timer/stm32f205_timer.h new file +27
-1+MemoryRegion iomem; +QEMUTimer *timer; +qemu_irq irq; + +uint32_t tick_offset_vmstate; +uint32_t tick_offset; + +uint32_t tim_cr1; +uint32_t tim_cr2; +uint32_t tim_smcr; +uint32_t tim_dier; +uint32_t tim_sr; +uint32_t tim_egr; +uint32_t tim_ccmr1; +uint32_t tim_ccmr2; +uint32_t tim_ccer; +uint32_t tim_cnt; +uint32_t tim_psc; +uint32_t tim_arr; +uint32_t tim_ccr1; +uint32_t tim_ccr2; +uint32_t tim_ccr3; +uint32_t tim_ccr4; +uint32_t tim_dcr; +uint32_t tim_dmar; +uint32_t tim_or; +} Stm32f205TimerState; --1.9.1
Re: [Qemu-devel] [RFC v1 5/6] stm32f205: Add the SoC
In reply to Peter CrosthwaiteQuoted 115 lines · Peter Crosthwaite
Quoted 18 lines · Alistair Francis
This patch adds the stm32f205 SoC. This will be used by the Netduino 2 to create a machine
Signed-off-by Alistair Francis <[email protected]>---
hw/arm/Makefile.objs | 2 +- hw/arm/stm32f205_soc.c | 140 +++++++++++++++++++++++++++++++++++++++++ include/hw/arm/stm32f205_soc.h | 61 ++++++++++++++++++ 3 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 hw/arm/stm32f205_soc.c create mode 100644 include/hw/arm/stm32f205_soc.hhw/arm/Makefile.objs +0
-0hw/arm/Makefile.objs obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o · line 5
Quoted 5 lines
hw/arm/Makefile.objs +1
-1@@ -2,7 +2,7 @@ obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o 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 += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o stm32f205_soc.oNew obj-y line.
Quoted 55 lines
hw/arm/Makefile.objs +0
-0obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.ohw/arm/stm32f205_soc.c new file +46
-0@@ -0,0 +1,140 @@ +/* +* STM32F205xx SoC +* +* Copyright (c) 2014 Alistair Francis <[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 "hw/arm/stm32f205_soc.h" + +#define FLASH_BASE_ADDRESS 0x08000000 +#define FLASH_SIZE 1024 +#define SRAM_BASE_ADDRESS 0x20000000 +#define SRAM_SIZE 192 + +static void stm32f205_soc_initfn (Object *obj) +{ +STM32F205State *s =STM32F205_SOC (obj); +int i; + +object_initialize (&s->syscfg,sizeof (s->syscfg),TYPE_STM32F205_SYSCFG ); +qdev_set_parent_bus (DEVICE (&s->syscfg),sysbus_get_default ()); + +for (i =0 ; i <5 ; i++) { +object_initialize (&s->usart[i],sizeof (s->usart[i]), +TYPE_STM32F205_USART ); +qdev_set_parent_bus (DEVICE (&s->usart[i]),sysbus_get_default ()); + } + +for (i =0 ; i <4 ; i++) {hw/arm/stm32f205_soc.c line 56
Quoted 10 lines
hw/arm/stm32f205_soc.c new file +10
-0+object_initialize (&s->timer[i],sizeof (s->timer[i]), +TYPE_STM32F205_TIMER ); +qdev_set_parent_bus (DEVICE (&s->timer[i]),sysbus_get_default ()); + } +} + +static void stm32f205_soc_realize (DeviceState *dev_soc,Error **errp) +{ +static const uint32_t timer_addr[] = {0x40000000 ,0x40000400 , +0x40000800 ,0x40000C00 };You should add a comment about how you only model TIM2-5. This list is to grow significantly in a fuller implementation.
hw/arm/stm32f205_soc.c line 59
Quoted 3 lines
hw/arm/stm32f205_soc.c new file +3
-0+static const uint32_t usart_addr[] = {0x40011000 ,0x40004400 , +0x40004800 ,0x40004C00 ,0x40005000 ,0x40011400 }; +Just put the static consts up top of the file so the are easily spotted as self documentation.
Quoted 12 lines
hw/arm/stm32f205_soc.c new file +12
-0+static const int timer_irq[] = {28 ,29 ,30 ,50 }; +static const int usart_irq[] = {37 ,38 ,39 ,52 ,53 ,71 ,82 ,83 }; + +STM32F205State *s =STM32F205_SOC (dev_soc); +DeviceState *syscfgdev, *usartdev, *timerdev; +SysBusDevice *syscfgbusdev, *usartbusdev, *timerbusdev; +qemu_irq *pic;; +Error *err =NULL ; +int i; + + pic = armv7m_init(get_system_memory(), + FLASH_SIZE, FLASH_BASE_ADDRESS, SRAM_SIZE, 96,
Quoted 8 lines
hw/arm/stm32f205_soc.c line 76
Quoted 5 lines
hw/arm/stm32f205_soc.c new file +5
-0+ s->kernel_filename, s->cpu_model); + +/* System configuration controller */ + syscfgdev =DEVICE (&s->syscfg); + syscfgdev->id ="stm32f205xx-syscfg" ;Why you need to set the legacy qdev id string? If its needed I would expect this to be init stage rather than realize.
That was just left it from testing, will remove.
Quoted 36 lines
Quoted 36 lines
hw/arm/stm32f205_soc.c new file +35
-0+object_property_set_bool (OBJECT (&s->syscfg), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ; + } + syscfgbusdev =SYS_BUS_DEVICE (syscfgdev); +sysbus_mmio_map (syscfgbusdev,0 ,0x40013800 ); +sysbus_connect_irq (syscfgbusdev,0 , pic[71 ]); + +/* Attach a UART (uses USART registers) and USART controllers */ +for (i =0 ; i <5 ; i++) { + usartdev =DEVICE (&(s->usart[i])); +object_property_set_bool (OBJECT (&s->usart[i]), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ; + } + usartbusdev =SYS_BUS_DEVICE (usartdev); +sysbus_mmio_map (usartbusdev,0 , usart_addr[i]); +sysbus_connect_irq (usartbusdev,0 , pic[usart_irq[i]]); + } + +/* Timer 2 to 5 */ +for (i =0 ; i <4 ; i++) { + timerdev =DEVICE (&(s->timer[i])); +object_property_set_bool (OBJECT (&s->timer[i]), true,"realized" , &err); +if (err !=NULL ) { +error_propagate (errp, err); +return ; + } + timerbusdev =SYS_BUS_DEVICE (timerdev); +sysbus_mmio_map (timerbusdev,0 , timer_addr[i]); +sysbus_connect_irq (timerbusdev,0 , pic[timer_irq[i]]); + } +}
Quoted 8 lines
hw/arm/stm32f205_soc.c line 115
Quoted 4 lines
hw/arm/stm32f205_soc.c new file +4
-0+ +static Property stm32f205_soc_properties[] = { +DEFINE_PROP_STRING ("kernel-filename" , STM32F205State, kernel_filename), +DEFINE_PROP_STRING ("cpu-model" , STM32F205State, cpu_model),Is it really configurable? You can drop cpu-model parameterisation unless STM have similar socs with different processor you are targetting?
It's not configurable, I just thought QEMU allowed the CPU to be specified
Thanks,
Alistair
Quoted 103 lines
Quoted 80 lines
hw/arm/stm32f205_soc.c new file +25
-0+ DEFINE_PROP_END_OF_LIST(), +}; + +static void stm32f205_soc_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->realize = stm32f205_soc_realize; + dc->props = stm32f205_soc_properties; +} + +static const TypeInfo stm32f205_soc_info = { + .name =TYPE_STM32F205_SOC , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (STM32F205State), + .instance_init = stm32f205_soc_initfn, + .class_init = stm32f205_soc_class_init, +}; + +static void stm32f205_soc_types (void ) +{ +type_register_static (&stm32f205_soc_info); +} + +type_init (stm32f205_soc_types)include/hw/arm/stm32f205_soc.h new file +48
-0@@ -0,0 +1,61 @@ +/* +* STM32F205xx SoC +* +* Copyright (c) 2014 Alistair Francis <[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. +*/ + +#ifndef HW_ARM_STM32F205SOC_H +#define HW_ARM_STM32F205SOC_H + +#include "hw/sysbus.h" +#include "hw/arm/arm.h" +#include "hw/ssi.h" +#include "hw/devices.h" +#include "qemu/timer.h" +#include "net/net.h" +#include "elf.h" +#include "hw/loader.h" +#include "hw/boards.h" +#include "exec/address-spaces.h" +#include "qemu/error-report.h" +#include "sysemu/qtest.h" +#include "hw/misc/stm32f205_syscfg.h" +#include "hw/timer/stm32f205_timer.h" +#include "hw/char/stm32f205_usart.h" + +#define TYPE_STM32F205_SOC "stm32f205_soc" +#define STM32F205_SOC(obj) \ + OBJECT_CHECK(STM32F205State, (obj), TYPE_STM32F205_SOC) + +typedef struct STM32F205State {include/hw/arm/stm32f205_soc.h line 58
Quoted 10 lines
include/hw/arm/stm32f205_soc.h new file +10
-0+/*< private >*/ +SysBusDevice parent_obj; +/*< public >*/ + +char *kernel_filename; +char *cpu_model; + +Stm32f205SyscfgState syscfg; +Stm32f205UsartState usart[5 ]; +Stm32f205TimerState timer[5 ];You can macrofiy these magic "5"s.
STM_NUM_UARTSetc.Regards,
PeterQuoted 7 lines
include/hw/arm/stm32f205_soc.h new file +3
-1+} STM32F205State; + +#endif --1.9.1
Re: [Qemu-devel] [RFC v1 2/6] stm32f205_USART: Add the stm32f205 SoC USART Controller
In reply to Peter CrosthwaiteQuoted 87 lines · Peter Crosthwaite
Quoted 69 lines · Alistair Francis
This patch adds the stm32f205 USART controller
(UART also uses the same controller).Signed-off-by Alistair Francis <[email protected]>---
V2:
- Small changes thanks to Peter C
- Rename for the Netduino 2 and it's SoChw/char/Makefile.objs | 1 + hw/char/stm32f205_usart.c | 205 ++++++++++++++++++++++++++++++++++++++ include/hw/char/stm32f205_usart.h | 64 ++++++++++++ 3 files changed, 270 insertions(+) create mode 100644 hw/char/stm32f205_usart.c create mode 100644 include/hw/char/stm32f205_usart.hhw/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_NETDUINO2) += stm32f205_usart.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o common-obj-$(CONFIG_ISA_DEBUG) += debugcon.ohw/char/stm32f205_usart.c new file +35
-0@@ -0,0 +1,205 @@ +/* +* STM32F205xx USART +* +* Copyright (c) 2014 Alistair Francis <[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 "hw/char/stm32f205_usart.h" + +#ifndef STM_USART_ERR_DEBUG +#define STM_USART_ERR_DEBUG 0 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do { \ + if (STM_USART_ERR_DEBUG >= lvl) { \ + fprintf(stderr, "stm32f205xx_usart: %s:" fmt, __func__, ## args); \ + } \ +} while (0);hw/char/stm32f205_usart.c line 45
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+ +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +static int usart_can_receive (void *opaque) +{ +Stm32f205UsartState *s = opaque; + +if (s->usart_cr1 &USART_CR1_UE && s->usart_cr1 &USART_CR1_TE ) { +return 1 ; + }So it's usual to block a UART on the fifo filling rather than the master enable switches. Corking the fifo on the master enable means QEMU will buffer UART input long-term until the guest turns the fifo on, where in reality the hardware should just drop the chars. We should do something similar.
Quoted 7 lines
The reason (as far as I know anyways) for
can_recieveand giving qemu serial false closed-loop implementation (network has it too) is to deal with large amounts of instantaneous data in situations where the real-time delays on real-hardware would give natural bandwidth limiting. Thus the main app of can-recieve 0-return is 'your pumping serial data way too fast such that my fifo is full and real hardware would never go that fast'.
Ok, that makes sense. I can add blocking based on the USART_SR_RXNE bit
Quoted 2 lines
Also, did you me the RE bit rather than the TE bit?
Yes, good spot
Quoted 17 lines
hw/char/stm32f205_usart.c line 57
Quoted 13 lines
hw/char/stm32f205_usart.c new file +12
-0+ +return 0 ; +} + +static void usart_receive (void *opaque,const uint8_t *buf,int size) +{ +Stm32f205UsartState *s = opaque; + + s->usart_dr = *buf; + + s->usart_sr |=USART_SR_RXNE ; +This might be a good condition to block
can_recieveon - theUSART_SR_RXNE. And if the enables are off, just drop the char.
Quoted 11 lines
hw/char/stm32f205_usart.c line 65
Quoted 8 lines
hw/char/stm32f205_usart.c new file +8
-0+if (s->usart_cr1 &USART_CR1_RXNEIE ) { +qemu_set_irq (s->irq,1 ); + } + +DB_PRINT ("Receiving: %c\n" , s->usart_dr); +} + +static void usart_reset (DeviceState *dev)stm32f..._ prefix to function name. For consistency and makes gdb breakpoints slightly easier if function names are globally unique.
Yep, will fix in all patches
Quoted 22 lines
Quoted 22 lines
hw/char/stm32f205_usart.c new file +21
-0+{ +Stm32f205UsartState *s =STM32F205xx_USART (dev); + + s->usart_sr =0x00C00000 ; + s->usart_dr =0x00000000 ; + s->usart_brr =0x00000000 ; + s->usart_cr1 =0x00000000 ; + s->usart_cr2 =0x00000000 ; + s->usart_cr3 =0x00000000 ; + s->usart_gtpr =0x00000000 ; +} + +static uint64_t stm32f205xx_usart_read (void *opaque,hwaddr addr, +unsigned int size) +{ +Stm32f205UsartState *s = opaque; +uint64_t retvalue; + +DB_PRINT ("Read 0x%x\n" , (uint ) addr); + +switch (addr) {
Quoted 8 lines
hw/char/stm32f205_usart.c line 89
Quoted 3 lines
hw/char/stm32f205_usart.c new file +3
-0+case USART_SR : + retvalue = s->usart_sr; + s->usart_sr &= (USART_SR_TC ^0xFFFF );This register seems to be a mix of clear-to-read, read-only and rsvd. Just use &= ~MASK to implement clear on read which look to be the intention here. I don't see the significance of bits 15 downto 0 and why they behave different to 31 downto 16 here?
Fixed
Quoted 6 lines
This is probably also where you need to repoll for
can_receiveblocked chars as well (assuming you make condition change I recommended above.
qemu_chr_accept_input(s->chr)
Yep, will do
Quoted 42 lines
Quoted 42 lines
hw/char/stm32f205_usart.c new file +42
-0+return retvalue; +case USART_DR : +DB_PRINT ("Value: 0x%x, %c\n" , s->usart_dr, (char ) s->usart_dr); + s->usart_sr |=USART_SR_TXE ; +return s->usart_dr &0x3FF ; +case USART_BRR : +return s->usart_brr; +case USART_CR1 : +return s->usart_cr1; +case USART_CR2 : +return s->usart_cr2; +case USART_CR3 : +return s->usart_cr3; +case USART_GTPR : +return s->usart_gtpr; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"STM32F205xx_usart_read: Bad offset %x\n" , (int )addr); +return 0 ; + } + +return 0 ; +} + +static void stm32f205xx_usart_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +Stm32f205UsartState *s = opaque; +uint32_t value = (uint32_t ) val64; +unsigned char ch; + +DB_PRINT ("Write 0x%x, 0x%x\n" , value, (uint ) addr); + +switch (addr) { +case USART_SR : +if (value <=0x3FF ) { + s->usart_sr = value; + }else { + s->usart_sr &= value; + } +return ; +case USART_DR :
Quoted 9 lines
hw/char/stm32f205_usart.c line 135
Quoted 4 lines
hw/char/stm32f205_usart.c new file +4
-0+if (value <0xF000 ) { + ch = value; +if (s->chr) { +qemu_chr_fe_write (s->chr, &ch,1 );If the backend gets busy this will drop chars. You can either implement the closed loop callbacks (kinda hard - check
serial.c) or useqemu_chr_fe_writeall to get a blocking implementation.
Thanks, I didn't know about that function
Quoted 149 lines
Quoted 115 lines
hw/char/stm32f205_usart.c new file +70
-0+ } + s->usart_sr |=USART_SR_TC ; + } +return ; +case USART_BRR : + s->usart_brr = value; +return ; +case USART_CR1 : + s->usart_cr1 = value; +return ; +case USART_CR2 : + s->usart_cr2 = value; +return ; +case USART_CR3 : + s->usart_cr3 = value; +return ; +case USART_GTPR : + s->usart_gtpr = value; +return ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"STM32F205xx_usart_write: Bad offset %x\n" , (int )addr); + } +} + +static const MemoryRegionOps stm32f205xx_usart_ops = { + .read = stm32f205xx_usart_read, + .write = stm32f205xx_usart_write, + .endianness =DEVICE_NATIVE_ENDIAN , +}; + +static void stm32f205xx_usart_init (Object *obj) +{ +Stm32f205UsartState *s =STM32F205xx_USART (obj); + +sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irq); + +memory_region_init_io (&s->mmio, obj, &stm32f205xx_usart_ops, s, +TYPE_STM32F205_USART ,0x2000 ); +sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->mmio); + + s->chr =qemu_char_get_next_serial (); + +if (s->chr) { +qemu_chr_add_handlers (s->chr, usart_can_receive, usart_receive, +NULL , s); + } +} + +static void stm32f205xx_usart_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = usart_reset; +} + +static const TypeInfo stm32f205xx_usart_info = { + .name =TYPE_STM32F205_USART , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (Stm32f205UsartState), + .instance_init = stm32f205xx_usart_init, + .class_init = stm32f205xx_usart_class_init, +}; + +static void stm32f205xx_usart_register_types (void ) +{ +type_register_static (&stm32f205xx_usart_info); +} + +type_init (stm32f205xx_usart_register_types)include/hw/char/stm32f205_usart.h new file +39
-0@@ -0,0 +1,64 @@ +/* +* STM32F205xx USART +* +* Copyright (c) 2014 Alistair Francis <[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 "hw/sysbus.h" +#include "sysemu/char.h" +#include "hw/hw.h" + +#define USART_SR 0x00 +#define USART_DR 0x04 +#define USART_BRR 0x08 +#define USART_CR1 0x0C +#define USART_CR2 0x10 +#define USART_CR3 0x14 +#define USART_GTPR 0x18 + +#define USART_SR_TXE (1 << 7) +#define USART_SR_TC (1 << 6) +#define USART_SR_RXNE (1 << 5)include/hw/char/stm32f205_usart.h line 49
Quoted 10 lines
include/hw/char/stm32f205_usart.h new file +10
-0+ +#define USART_CR1_UE (1 << 13) +#define USART_CR1_RXNEIE (1 << 5) +#define USART_CR1_TE (1 << 3) + +#define TYPE_STM32F205_USART "stm32f205xx-usart" +#define STM32F205xx_USART (obj) \ + OBJECT_CHECK(Stm32f205UsartState, (obj), TYPE_STM32F205_USART) + +typedef struct {/*< private >*/
include/hw/char/stm32f205_usart.h line 51
Quoted 2 lines
include/hw/char/stm32f205_usart.h new file +2
-0+SysBusDevice parent_obj; +/*< public >*/
include/hw/char/stm32f205_usart.h line 64
Quoted 13 lines
include/hw/char/stm32f205_usart.h new file +13
-0+MemoryRegion mmio; + +uint32_t usart_sr; +uint32_t usart_dr; +uint32_t usart_brr; +uint32_t usart_cr1; +uint32_t usart_cr2; +uint32_t usart_cr3; +uint32_t usart_gtpr; + +CharDriverState *chr; +qemu_irq irq; +} Stm32f205UsartState;STM
Quoted 2 lines
A few general styling comments from prev patch (mainly a few casts) apply here as well.
Thanks,
Alistair
Quoted 8 lines
Regards,
PeterQuoted 4 lines
--
1.9.1
Re: [Qemu-devel] [RFC v1 4/6] target_arm: Update armv7_init to support more parameters
In reply to Alistair FrancisQuoted 19 lines · Alistair Francis
Quoted 18 lines · Peter Maydell
Quoted 2 lines · Peter Crosthwaite
Does ARMv7M actually mandate the existence of RAM and flash like this at all?
No. It does have a well defined address map that pretty strongly suggests that you ought to have flash and RAM at certain addresses, but the flash and RAM are not part of the CPU core itself.
(Bitbanding, on the other hand, is part of the CPU core and the memory region setup for it should stay in this function.)
Quoted 3 lines
Given the complex setup of STM (with the memory aliases etc) I'm now of the belief that all RAM and FLASH init should be handled by the SoC level.
Quoted 7 lines
Quoted 1 line
Agreed.
That makes everything so much easier. I was stuck at how to do the memory aliasing.
I will move the memory region inits out of the function and put them into the SoC level.
Sounds ok to me.
Regards,
Peter
Quoted 15 lines
Is everyone happy enough with then using the
armv7_initfunction as I have in this
patch (except with out the Flash and SRAM parts)? So both Stellaris and STM32F205
call the function. The only change from the current implementation would be the number
of interrupt lines, which would become a parameter.Thanks,
Alistair
Quoted 2 lines
-- PMM
Re: [Qemu-devel] [RFC v1 1/6] stm32f205_timer: Add the stm32f205 SoC Timer2 to 5
In reply to Alistair FrancisQuoted 13 lines · Alistair Francis
Quoted 10 lines · Peter Crosthwaite
Quoted 9 lines · Alistair Francis
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
Signed-off-by Alistair Francis <[email protected]>---
V2:
- Small changes to functionality and style. Thanks to Peter C
- Rename for the Netduino 2 and it's SoC
Quoted 8 lines
Quoted 5 lines
hw/timer/stm32f205_timer.c line 112
Quoted 3 lines
hw/timer/stm32f205_timer.c new file +3
-0+#include "hw/timer/stm32f205_timer.h" + +DB_PRINT ("Read 0x%x\n" , (uint ) offset);
HWADDR_PRIxinstead of cast.What do you mean by
HWADDR_PRIx?
If you want to use a hwaddr in printfery there is a special % format for it. Here is an example:
hw/char/serial.c: DPRINTF("read addr=0x%" HWADDR_PRIx "
val=0x%02x\n", addr, ret);
Regards,
Peter
Re: [Qemu-devel] [RFC v1 4/6] target_arm: Update armv7_init to support more parameters
In reply to Alistair FrancisQuoted 22 lines · Alistair Francis
Quoted 14 lines · Martin Galvan
Quoted 14 lines
hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 278
Quoted 9 lines
hw/arm/armv7m.c +4
-1@@ -259,7 +272,13 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,vmstate_register_ram_global (hack);memory_region_add_subregion (system_memory,0xfffff000 , hack); -qemu_register_reset (armv7m_reset, cpu); + reset_args = (ARMV7MResetArgs ) { + .cpu = cpu, + .reset_pc = entry, + .reset_sp = (0x20000000 + ((192 *1024 ) *2 )/3 ),Why is the manual sp setting needed? I thought the V7M specific CPU reset code handled this? Does Martins ARMv7M ROM reset patch help by any chance?
Quoted 5 lines
Quoted 2 lines
Regards,
PeterIndeed, I don't think that would be necessary with my patch. What are those hardcoded magic numbers?
Quoted 6 lines
The hard coded numbers are there basically there because they worked at one point and I haven't removed them yet. There is also no memory aliasing, so this gets around out of memory access errors from QEMU.
I haven't had to chance to try your patch yet Martin, but hopefully it removes the need for any of the reset changes I made.
My patch deals with the initial MSP, PC and Thumb values not being set correctly on reset. I don't know if it's in the main tree yet, but you can see it here:
https://patchwork.ozlabs.org/patch/386497/
Signature · 12 lines
Martín Galván Software Engineer Taller Technologies Argentina San Lorenzo 47, 3rd Floor, Office 5 Córdoba, Argentina Phone: 54 351 4217888 / +54 351 4218211
Re: [Qemu-devel] [RFC v1 1/6] stm32f205_timer: Add the stm32f205 SoC Timer2 to 5
In reply to Peter CrosthwaiteQuoted 20 lines · Peter Crosthwaite
Quoted 19 lines · Alistair Francis
Quoted 16 lines · Peter Crosthwaite
hw/timer/stm32f205_timer.c line 112
Quoted 13 lines · Alistair Francis
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
Signed-off-by Alistair Francis <[email protected]>---
V2:
- Small changes to functionality and style. Thanks to Peter C
- Rename for the Netduino 2 and it's SoChw/timer/stm32f205_timer.c new file +3
-0+#include "hw/timer/stm32f205_timer.h" + +DB_PRINT ("Read 0x%x\n" , (uint ) offset);
HWADDR_PRIxinstead of cast.
Quoted 8 lines
Quoted 2 lines
What do you mean by
HWADDR_PRIx?If you want to use a hwaddr in printfery there is a special % format for it. Here is an example:
hw/char/serial.c: DPRINTF("read addr=0x%"HWADDR_PRIx"
val=0x%02x\n", addr, ret);
I never knew that was there
Thanks,
Alistair
Quoted 3 lines
Regards,
Peter
Re: [Qemu-devel] [RFC v1 4/6] target_arm: Update armv7_init to support more parameters
In reply to Martin GalvanQuoted 27 lines · Martin Galvan
Quoted 26 lines · Alistair Francis
Quoted 14 lines · Martin Galvan
Quoted 14 lines
hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 278
Quoted 9 lines
hw/arm/armv7m.c +4
-1@@ -259,7 +272,13 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,vmstate_register_ram_global (hack);memory_region_add_subregion (system_memory,0xfffff000 , hack); -qemu_register_reset (armv7m_reset, cpu); + reset_args = (ARMV7MResetArgs ) { + .cpu = cpu, + .reset_pc = entry, + .reset_sp = (0x20000000 + ((192 *1024 ) *2 )/3 ),Why is the manual sp setting needed? I thought the V7M specific CPU reset code handled this? Does Martins ARMv7M ROM reset patch help by any chance?
Quoted 5 lines
Quoted 2 lines
Regards,
PeterIndeed, I don't think that would be necessary with my patch. What are those hardcoded magic numbers?
The hard coded numbers are there basically there because they worked at one point and I haven't removed them yet. There is also no memory aliasing, so this gets around out of memory access errors from QEMU.
Quoted 8 lines
Quoted 2 lines
I haven't had to chance to try your patch yet Martin, but hopefully it removes the need for any of the reset changes I made.
My patch deals with the initial MSP, PC and Thumb values not being set correctly on reset. I don't know if it's in the main tree yet, but you can see it here:
Thanks for that. It doesn't seem to completely fix my problem though. I will continue to look into it tomorrow but it looks like rom_ptr() is returning NULL and then the PC address is set to 0 instead of 0x801328d (which is the ELF entry point). I can remove the hard coded values from this patch though, thanks to your patch.
Thanks,
Alistair
Quoted 15 lines
--
Martín Galván
Software Engineer
Taller Technologies Argentina
San Lorenzo 47, 3rd Floor, Office 5
Córdoba, Argentina
Phone: 54 351 4217888 / +54 351 4218211