Netduino 2 Machine Model
v2 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.2
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
It is also based on my RFC patches, which can be seen at:
https://lists.nongnu.org/archive/html/qemu-devel/2014-09/msg01638.html
This patch series makes some changes to the armv7m_init function that allows the code to be reused with the Netduino 2 and the Stellaris machines.
Some example code that runs on QEMU is avaliable at:
at: https://github.com/alistair23/CSSE3010-QEMU-Examples
I have more devices in the works, I figured I would just start with these three
V2:
- Fix up the Timer device
- Fix up the USART device
- Change the memory region names to match the Stellaris board
Changes from RFC:
- Code cleanup thanks to Peter C's comments
- Split the Makefile configs to device level
- Changes to armv7m_init with interupt and memory passing
- See the individual patches for more details
Alistair Francis (8):
stm32f205_timer: Add the stm32f205 Timer
stm32f205_USART: Add the stm32f205 USART Controller
stm32f205_SYSCFG: Add the stm32f205 SYSCFG
target_arm: Remove memory region init from armv7m_init
target_arm: Parameterise the irq lines for armv7m_init
target_arm: Change the reset values based on the ELF entry
stm32f205: Add the stm32f205 SoC
netduino2: Add the Netduino 2 Machine
default-configs/arm-softmmu.mak | 4 + hw/arm/Makefile.objs | 2 + hw/arm/armv7m.c | 45 +++--- hw/arm/netduino2.c | 54 +++++++ hw/arm/stellaris.c | 25 +++- hw/arm/stm32f205_soc.c | 155 +++++++++++++++++++++ hw/char/Makefile.objs | 1 + hw/char/stm32f205_usart.c | 218 +++++++++++++++++++++++++++++ hw/misc/Makefile.objs | 1 + hw/misc/stm32f205_syscfg.c | 160 +++++++++++++++++++++ hw/timer/Makefile.objs | 2 + hw/timer/stm32f205_timer.c | 279 +++++++++++++++++++++++++++++++++++++ include/hw/arm/arm.h | 2 +- include/hw/arm/stm32f205_soc.h | 69 +++++++++ include/hw/char/stm32f205_usart.h | 69 +++++++++ include/hw/misc/stm32f205_syscfg.h | 61 ++++++++ include/hw/timer/stm32f205_timer.h | 101 ++++++++++++++ 17 files changed, 1221 insertions(+), 27 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
PATCH v2 1/8 stm32f205_timer: Add the stm32f205 Timer
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
---
PUBLIC
V2:
- Reorder the Makefile config
- Fix up the debug printing
- Correct the timer event trigger
Changes from RFC:
- Small changes to functionality and style. Thanks to Peter C
- Rename to make the timer more generic
- Split the config settings to device level
default-configs/arm-softmmu.mak | 1 + hw/timer/Makefile.objs | 2 + hw/timer/stm32f205_timer.c | 279 +++++++++++++++++++++++++++++++++++++ include/hw/timer/stm32f205_timer.h | 101 ++++++++++++++ 4 files changed, 383 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_STM32F205_TIMER=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y
hw/timer/Makefile.objs +2 -0
@@ -31,3 +31,5 @@ obj-$(CONFIG_DIGIC) += digic-timer.o obj-$(CONFIG_MC146818RTC) += mc146818rtc.o obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o + +common-obj-$(CONFIG_STM32F205_TIMER) += stm32f205_timer.o
hw/timer/stm32f205_timer.c new file +279 -0
279 lines not on this page · raw message
include/hw/timer/stm32f205_timer.h new file +101 -0
101 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 2/8 stm32f205_USART: Add the stm32f205 USART Controller
In reply to Alistair FrancisThis patch adds the stm32f205 USART controller
(UART also uses the same controller).
---
V2:
- Drop charecters if the device is not enabled
- Thanks to Peter C
Changes from RFC:
- Small changes thanks to Peter C
- USART now implements QEMU blocking functions
- Split the config settings to device level
default-configs/arm-softmmu.mak | 1 + hw/char/Makefile.objs | 1 + hw/char/stm32f205_usart.c | 218 ++++++++++++++++++++++++++++++++++++++ include/hw/char/stm32f205_usart.h | 69 ++++++++++++ 4 files changed, 289 insertions(+) create mode 100644 hw/char/stm32f205_usart.c create mode 100644 include/hw/char/stm32f205_usart.h
default-configs/arm-softmmu.mak +1 -0
@@ -79,6 +79,7 @@ CONFIG_REALVIEW=y CONFIG_ZAURUS=y CONFIG_ZYNQ=y CONFIG_STM32F205_TIMER=y +CONFIG_STM32F205_USART=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y
hw/char/Makefile.objs +1 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_OMAP) += omap_uart.o obj-$(CONFIG_SH4) += sh_serial.o obj-$(CONFIG_PSERIES) += spapr_vty.o obj-$(CONFIG_DIGIC) += digic-uart.o +obj-$(CONFIG_STM32F205_USART) += stm32f205_usart.o common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o common-obj-$(CONFIG_ISA_DEBUG) += debugcon.o
hw/char/stm32f205_usart.c new file +218 -0
218 lines not on this page · raw message
include/hw/char/stm32f205_usart.h new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 3/8 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)
---
Changes from RFC:
- Split the config settings to device level
default-configs/arm-softmmu.mak | 1 + hw/misc/Makefile.objs | 1 + hw/misc/stm32f205_syscfg.c | 160 +++++++++++++++++++++++++++++++++++++ include/hw/misc/stm32f205_syscfg.h | 61 ++++++++++++++ 4 files changed, 223 insertions(+) create mode 100644 hw/misc/stm32f205_syscfg.c create mode 100644 include/hw/misc/stm32f205_syscfg.h
default-configs/arm-softmmu.mak +1 -0
@@ -80,6 +80,7 @@ CONFIG_ZAURUS=y CONFIG_ZYNQ=y CONFIG_STM32F205_TIMER=y CONFIG_STM32F205_USART=y +CONFIG_STM32F205_SYSCFG=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y
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_STM32F205_SYSCFG) += 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 +61 -0
61 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 4/8 target_arm: Remove memory region init from armv7m_init
In reply to Alistair FrancisThis patch moves the memory region init code from the armv7m_init function to the stellaris_init function
---
V2:
- Change the memory region names to match the machine
hw/arm/armv7m.c | 15 +-------------- hw/arm/stellaris.c | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 18 deletions(-)
hw/arm/armv7m.c +1 -14
@@ -163,7 +163,7 @@ static void armv7m_reset(void *opaque) }/* Init CPU and memory for a v7-M based board. -flash_size and sram_size are in kb. +flash_size and sram_size are in bytes. Returns the NVIC array. */ qemu_irq *armv7m_init(MemoryRegion *system_memory,
@@ -180,13 +180,8 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,uint64_t lowaddr;int i;int big_endian; -MemoryRegion *sram =g_new (MemoryRegion,1 ); -MemoryRegion *flash =g_new (MemoryRegion,1 );MemoryRegion *hack =g_new (MemoryRegion,1 ); - flash_size *=1024 ; - sram_size *=1024 ; -if (cpu_model ==NULL ) { cpu_model ="cortex-m3" ; }
@@ -209,14 +204,6 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, code_size = ram_size - sram_size;#endif -/* Flash programming is done via the SCU, so pretend it is ROM. */ -memory_region_init_ram (flash,NULL ,"armv7m.flash" , flash_size); -vmstate_register_ram_global (flash); -memory_region_set_readonly (flash, true); -memory_region_add_subregion (system_memory,0 , flash); -memory_region_init_ram (sram,NULL ,"armv7m.sram" , sram_size); -vmstate_register_ram_global (sram); -memory_region_add_subregion (system_memory,0x20000000 , sram);armv7m_bitband_init (); nvic =qdev_create (NULL ,"armv7m_nvic" );
hw/arm/stellaris.c +19 -4
@@ -1220,10 +1220,25 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,int i;int j; - flash_size = ((board->dc0 &0xffff ) +1 ) <<1 ; - sram_size = (board->dc0 >>18 ) +1 ; - pic =armv7m_init (get_system_memory (), - flash_size, sram_size, kernel_filename, cpu_model); +MemoryRegion *sram =g_new (MemoryRegion,1 ); +MemoryRegion *flash =g_new (MemoryRegion,1 ); +MemoryRegion *system_memory =get_system_memory (); + + flash_size = (((board->dc0 &0xffff ) +1 ) <<1 ) *1024 ; + sram_size = ((board->dc0 >>18 ) +1 ) *1024 ; + +/* Flash programming is done via the SCU, so pretend it is ROM. */ +memory_region_init_ram (flash,NULL ,"stellaris.flash" , flash_size); +vmstate_register_ram_global (flash); +memory_region_set_readonly (flash, true); +memory_region_add_subregion (system_memory,0 , flash); + +memory_region_init_ram (sram,NULL ,"stellaris.sram" , sram_size); +vmstate_register_ram_global (sram); +memory_region_add_subregion (system_memory,0x20000000 , sram); + + pic =armv7m_init (system_memory, flash_size, sram_size, + kernel_filename, cpu_model);if (board->dc1 & (1 <<16 )) { dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,
Signature · 1 line
1.9.1
PATCH v2 5/8 target_arm: Parameterise the irq lines for armv7m_init
In reply to Alistair FrancisThis patch allows the board to specifiy the number of NVIC interrupt lines when using armv7m_init.
--- hw/arm/armv7m.c | 7 ++++--- hw/arm/stellaris.c | 4 +++- include/hw/arm/arm.h | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-)
hw/arm/armv7m.c +4 -3
@@ -167,14 +167,14 @@ 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,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;
@@ -207,11 +207,12 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,armv7m_bitband_init (); nvic =qdev_create (NULL ,"armv7m_nvic" ); +qdev_prop_set_uint32 (nvic,"num-irq" , num_irq); env->nvic = nvic;qdev_init_nofail (nvic);sysbus_connect_irq (SYS_BUS_DEVICE (nvic),0 ,qdev_get_gpio_in (DEVICE (cpu),ARM_CPU_IRQ )); -for (i =0 ; i <64 ; i++) { +for (i =0 ; i < num_irq; i++) { pic[i] =qdev_get_gpio_in (nvic, i); }
hw/arm/stellaris.c +3 -1
@@ -29,6 +29,8 @@#define BP_OLED_SSI 0x02#define BP_GAMEPAD 0x04 +#define NUM_IRQ_LINES 64 + typedef const struct { const char *name; uint32_t did0;
@@ -1238,7 +1240,7 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,memory_region_add_subregion (system_memory,0x20000000 , sram); pic =armv7m_init (system_memory, flash_size, sram_size, - kernel_filename, cpu_model); +NUM_IRQ_LINES , kernel_filename, cpu_model);if (board->dc1 & (1 <<16 )) { dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,
include/hw/arm/arm.h +1 -1
@@ -16,7 +16,7 @@/* armv7m.c */ qemu_irq *armv7m_init (MemoryRegion *system_memory, -int flash_size,int sram_size, +int flash_size,int sram_size,int num_irq,const char *kernel_filename,const char *cpu_model);/* arm_boot.c */
Signature · 1 line
1.9.1
PATCH v2 7/8 stm32f205: Add the stm32f205 SoC
In reply to Alistair FrancisThis patch adds the stm32f205 SoC. This will be used by the Netduino 2 to create a machine.
---
Changes from RFC:
- Small changes thanks to Peter C
- Split the config settings to device level
default-configs/arm-softmmu.mak | 1 + hw/arm/Makefile.objs | 1 + hw/arm/stm32f205_soc.c | 155 ++++++++++++++++++++++++++++++++++++++++ include/hw/arm/stm32f205_soc.h | 69 ++++++++++++++++++ 4 files changed, 226 insertions(+) create mode 100644 hw/arm/stm32f205_soc.c create mode 100644 include/hw/arm/stm32f205_soc.h
default-configs/arm-softmmu.mak +1 -0
@@ -81,6 +81,7 @@ CONFIG_ZYNQ=y CONFIG_STM32F205_TIMER=y CONFIG_STM32F205_USART=y CONFIG_STM32F205_SYSCFG=y +CONFIG_STM32F205_SOC=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=y
hw/arm/Makefile.objs +1 -0
@@ -8,3 +8,4 @@ obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.o obj-y += omap1.o omap2.o strongarm.o obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o +obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
hw/arm/stm32f205_soc.c new file +155 -0
155 lines not on this page · raw message
include/hw/arm/stm32f205_soc.h new file +69 -0
69 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v2 6/8 target_arm: Change the reset values based on the ELF entry
In reply to Alistair FrancisThe Netduino 2 machine won't run unless the reset_pc is based on the ELF entry point.
---
V2:
- Malloc straight away, thanks to Peter C
hw/arm/armv7m.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-)
hw/arm/armv7m.c +18 -5
@@ -155,11 +155,19 @@ static void armv7m_bitband_init(void)/* Board init. */ -static void armv7m_reset (void *opaque) -{ -ARMCPU *cpu = opaque; +typedef struct ARMV7MResetArgs { +ARMCPU *cpu; +uint32_t reset_pc; +}ARMV7MResetArgs ; + +static void armv7m_reset (void *opaque) + { +ARMV7MResetArgs *args = opaque; + +cpu_reset (CPU (args->cpu)); -cpu_reset (CPU (cpu)); + 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.
@@ -181,6 +189,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,int i;int big_endian;MemoryRegion *hack =g_new (MemoryRegion,1 ); +ARMV7MResetArgs *reset_args =g_new0 (ARMV7MResetArgs,1 );if (cpu_model ==NULL ) { cpu_model ="cortex-m3" ;
@@ -247,7 +256,11 @@ 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, + }; +qemu_register_reset (armv7m_reset, reset_args);return pic; }
Signature · 1 line
1.9.1
PATCH v2 8/8 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
---
Changes from RFC:
- Remove CPU passthrough
hw/arm/Makefile.objs | 1 + hw/arm/netduino2.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 hw/arm/netduino2.c
hw/arm/Makefile.objs +1 -0
@@ -3,6 +3,7 @@ obj-$(CONFIG_DIGIC) += digic_boards.o obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o obj-y += omap_sx1.o palm.o realview.o spitz.o stellaris.o obj-y += tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o +obj-y += netduino2.o obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) += digic.o
hw/arm/netduino2.c new file +54 -0
54 lines not on this page · raw message
Signature · 1 line
1.9.1
Re: [Qemu-devel] [Patch v2 1/8] stm32f205_timer: Add the stm32f205 Timer
In reply to Alistair FrancisQuoted 100 lines · Alistair Francis
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
Signed-off-by Alistair Francis <[email protected]>---
PUBLIC
V2:
- Reorder theMakefileconfig
- Fix up the debug printing
- Correct the timer event trigger
Changes from RFC:
- Small changes to functionality and style. Thanks to Peter C
- Rename to make the timer more generic
- Split the config settings to device leveldefault-configs/arm-softmmu.mak | 1 + hw/timer/Makefile.objs | 2 + hw/timer/stm32f205_timer.c | 279 +++++++++++++++++++++++++++++++++++++ include/hw/timer/stm32f205_timer.h | 101 ++++++++++++++ 4 files changed, 383 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_STM32F205_TIMER=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=yhw/timer/Makefile.objs +2
-0@@ -31,3 +31,5 @@ obj-$(CONFIG_DIGIC) += digic-timer.o obj-$(CONFIG_MC146818RTC) += mc146818rtc.o obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o + +common-obj-$(CONFIG_STM32F205_TIMER) += stm32f205_timer.ohw/timer/stm32f205_timer.c new file +49
-0@@ -0,0 +1,279 @@ +/* +* STM32F205 Timer +* +* 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 STM_TIMER_ERR_DEBUG +#define STM_TIMER_ERR_DEBUG 0 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do { \ + if (STM_TIMER_ERR_DEBUG >= lvl) { \ + qemu_log("stm32f205_timer: %s:" fmt, __func__, ## args); \ + } \ +} while (0); + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +static void stm32f205_timer_set_alarm (STM32f205TimerState *s); + +static void stm32f205_timer_interrupt (void *opaque) +{ +STM32f205TimerState *s = opaque; + +DB_PRINT ("Interrupt\n" ); + +if (s->tim_dier &TIM_DIER_UIE && s->tim_cr1 &TIM_CR1_CEN ) { + s->tim_sr |=1 ; +qemu_irq_pulse (s->irq);
hw/timer/stm32f205_timer.c line 59
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+stm32f205_timer_set_alarm (s); + } +} + +static void stm32f205_timer_set_alarm (STM32f205TimerState *s) +{ +uint32_t ticks; +int64_t now; + +DB_PRINT ("Alarm raised at: 0x%x\n" , s->tim_cr1);
"alarm set at". The callback would be the alarm raising.
hw/timer/stm32f205_timer.c line 63
Quoted 4 lines
hw/timer/stm32f205_timer.c new file +4
-0+ + now =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ); + ticks = s->tim_arr - (s->tick_offset + (now *get_ticks_per_sec ())) * + (s->tim_psc +1 );
Still doesn't add up just yet. You have:
ticks = s->tim_arr - ....
Implying ticks and s->tim_arr must be the same physical quantity which must be timer ticks. However ...
hw/timer/stm32f205_timer.c line 71
Quoted 8 lines
hw/timer/stm32f205_timer.c new file +8
-0+ +DB_PRINT ("Alarm set in %d ticks\n" , ticks); + +if (ticks ==0 ) { +timer_del (s->timer); +stm32f205_timer_interrupt (s); + }else { +timer_mod (s->timer, (now + (int64_t ) ticks));
... you add ticks to now with is terms of ns, effectively adding cycles and ns together. A frequency scaling factor is missing somewhere.
Quoted 104 lines
hw/timer/stm32f205_timer.c new file +104
-0+DB_PRINT ("Wait Time: %" PRId64"\n" , now + (int64_t ) ticks); + } +} + +static void stm32f205_timer_reset (DeviceState *dev) +{ +STM32f205TimerState *s =STM32F205TIMER (dev); + + 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 ; + s->tim_dcr =0 ; + s->tim_dmar =0 ; + s->tim_or =0 ; +} + +static uint64_t stm32f205_timer_read (void *opaque,hwaddr offset, +unsigned size) +{ +STM32f205TimerState *s = opaque; + +DB_PRINT ("Read 0x%" HWADDR_PRIx"\n" , offset); + +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 : + s->tim_cnt = s->tick_offset + (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) / +get_ticks_per_sec ()); +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; +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 , +"STM32F205_timer_write: Bad offset 0x%" HWADDR_PRIx"\n" , offset); + } + +return 0 ; +} + +static void stm32f205_timer_write (void *opaque,hwaddr offset, +uint64_t val64,unsigned size) +{ +STM32f205TimerState *s = opaque; +uint32_t value = val64; + +DB_PRINT ("Write 0x%x, 0x%" HWADDR_PRIx"\n" , value, 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 :
hw/timer/stm32f205_timer.c line 185
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ s->tim_dier = value; +return ; +case TIM_SR : +/* This is set by hardware and cleared by software */ + s->tim_sr &= value; +return ; +case TIM_EGR : + s->tim_egr = value; +if (s->tim_egr &TIM_EGR_UG ) { +/* Re-init the counter */
Do you just mean reset? Is this supposed to be a software reset?
Quoted 37 lines
hw/timer/stm32f205_timer.c new file +37
-0+stm32f205_timer_reset (DEVICE (s)); + } +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; +stm32f205_timer_set_alarm (s); +return ; +case TIM_PSC : + s->tim_psc = value; +return ; +case TIM_ARR : + s->tim_arr = value; +stm32f205_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;
hw/timer/stm32f205_timer.c line 232
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+return ; +case TIM_DMAR : + s->tim_dmar = value; +return ; +case TIM_OR : + s->tim_or = value; +return ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"STM32F205_timer_write: Bad offset 0x%" HWADDR_PRIx"\n" , offset);
If you _ seperate words it should match the fn name exactly. You can use plain english with:
STM32F205 timer write
or symbolic naming with:
stm32f205_timer_write
but my suggestion is the latter implemented with %s __func__.
Quoted 4 lines
hw/timer/stm32f205_timer.c new file +4
-0+ } +} + +static const MemoryRegionOps stm32f205_timer_ops = {
hw/timer/stm32f205_timer.c line 246
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ .read = stm32f205_timer_read, + .write = stm32f205_timer_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + +static void stm32f205_timer_init (Object *obj) +{ +STM32f205TimerState *s =STM32F205TIMER (obj); +struct tm tm; +
tm is unused. It passes compile testing as it's address is take to a fn arg.
hw/timer/stm32f205_timer.c line 255
Quoted 9 lines
hw/timer/stm32f205_timer.c new file +9
-0+sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irq); + +memory_region_init_io (&s->iomem, obj, &stm32f205_timer_ops, s, +"stm32f205_timer" ,0x2000 ); +sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->iomem); + +qemu_get_timedate (&tm,0 ); + s->tick_offset =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) /get_ticks_per_sec (); +
This is the only code that sets tick_offset. What's the exact semantic you are looking for with tick_offset? The fact that this happens at init only suggest that tick offset will always be 0 or trivially small. Did you mean to do this in the reset? I can't see any offset affecting code in reset and something probably should be there.
hw/timer/stm32f205_timer.c line 263
Quoted 8 lines
hw/timer/stm32f205_timer.c new file +8
-0+ s->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , stm32f205_timer_interrupt, s); +} + +static void stm32f205_timer_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = stm32f205_timer_reset;
missing VMSD?
Quoted 89 lines
hw/timer/stm32f205_timer.c new file +16
-0+} + +static const TypeInfo stm32f205_timer_info = { + .name =TYPE_STM32F205_TIMER , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (STM32f205TimerState), + .instance_init = stm32f205_timer_init, + .class_init = stm32f205_timer_class_init, +}; + +static void stm32f205_timer_register_types (void ) +{ +type_register_static (&stm32f205_timer_info); +} + +type_init (stm32f205_timer_register_types)include/hw/timer/stm32f205_timer.h new file +67
-0@@ -0,0 +1,101 @@ +/* +* STM32F205 Timer +* +* 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_STM_TIMER_H +#define HW_STM_TIMER_H + +#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 +#define TIM_DMAR 0x4C +#define TIM_OR 0x50 + +#define TIM_CR1_CEN 1 + +#define TIM_EGR_UG 1 + +#define TIM_CCER_CC2E (1 << 4) +#define TIM_CCMR1_OC2M2 (1 << 14) +#define TIM_CCMR1_OC2M1 (1 << 13) +#define TIM_CCMR1_OC2M0 (1 << 12) +#define TIM_CCMR1_OC2PE (1 << 11) + +#define TIM_DIER_UIE 1 + +#define TYPE_STM32F205_TIMER "stm32f205-timer" +#define STM32F205TIMER (obj) OBJECT_CHECK(STM32f205TimerState, \ + (obj), TYPE_STM32F205_TIMER) +
include/hw/timer/stm32f205_timer.h line 77
Quoted 10 lines
include/hw/timer/stm32f205_timer.h new file +10
-0+typedef struct STM32f205TimerState { + /* <private> */ + SysBusDevice parent_obj; + + /* <public> */ + MemoryRegion iomem; + QEMUTimer *timer; + qemu_irq irq; + + uint32_t tick_offset_vmstate;
copy_paste hangover.
Regards,
Peter
Quoted 28 lines
include/hw/timer/stm32f205_timer.h new file +24
-1+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; + +#endif --1.9.1
Re: [Qemu-devel] [Patch v2 4/8] target_arm: Remove memory region init from armv7m_init
In reply to Alistair FrancisQuoted 75 lines · Alistair Francis
This patch moves the memory region init code from the
armv7m_initfunction to thestellaris_initfunctionSigned-off-by Alistair Francis <[email protected]>---
V2:
- Change the memory region names to match the machinehw/arm/armv7m.c | 15 +-------------- hw/arm/stellaris.c | 23 +++++++++++++++++++---- 2 files changed, 20 insertions(+), 18 deletions(-)hw/arm/armv7m.c +1
-14@@ -163,7 +163,7 @@ static void armv7m_reset(void *opaque) }/* Init CPU and memory for a v7-M based board. -flash_size and sram_size are in kb. +flash_size and sram_size are in bytes. Returns the NVIC array. */ qemu_irq *armv7m_init(MemoryRegion *system_memory,@@ -180,13 +180,8 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,uint64_t lowaddr;int i;int big_endian; -MemoryRegion *sram =g_new (MemoryRegion,1 ); -MemoryRegion *flash =g_new (MemoryRegion,1 );MemoryRegion *hack =g_new (MemoryRegion,1 ); - flash_size *=1024 ; - sram_size *=1024 ; -if (cpu_model ==NULL ) { cpu_model ="cortex-m3" ; }@@ -209,14 +204,6 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, code_size = ram_size - sram_size;#endif -/* Flash programming is done via the SCU, so pretend it is ROM. */ -memory_region_init_ram (flash,NULL ,"armv7m.flash" , flash_size); -vmstate_register_ram_global (flash); -memory_region_set_readonly (flash, true); -memory_region_add_subregion (system_memory,0 , flash); -memory_region_init_ram (sram,NULL ,"armv7m.sram" , sram_size); -vmstate_register_ram_global (sram); -memory_region_add_subregion (system_memory,0x20000000 , sram);armv7m_bitband_init (); nvic =qdev_create (NULL ,"armv7m_nvic" );hw/arm/stellaris.c +9
-4@@ -1220,10 +1220,25 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,int i;int j; - flash_size = ((board->dc0 &0xffff ) +1 ) <<1 ; - sram_size = (board->dc0 >>18 ) +1 ; - pic =armv7m_init (get_system_memory (), - flash_size, sram_size, kernel_filename, cpu_model); +MemoryRegion *sram =g_new (MemoryRegion,1 ); +MemoryRegion *flash =g_new (MemoryRegion,1 ); +MemoryRegion *system_memory =get_system_memory (); + + flash_size = (((board->dc0 &0xffff ) +1 ) <<1 ) *1024 ; + sram_size = ((board->dc0 >>18 ) +1 ) *1024 ; + +/* Flash programming is done via the SCU, so pretend it is ROM. */ +memory_region_init_ram (flash,NULL ,"stellaris.flash" , flash_size);
hw/arm/stellaris.c static void stellaris_init(const char *kernel_filename, const char *cpu_model, · line 1241
Quoted 10 lines
hw/arm/stellaris.c +10
-0+vmstate_register_ram_global (flash); +memory_region_set_readonly (flash, true); +memory_region_add_subregion (system_memory,0 , flash); + +memory_region_init_ram (sram,NULL ,"stellaris.sram" , sram_size); +vmstate_register_ram_global (sram); +memory_region_add_subregion (system_memory,0x20000000 , sram); + + pic =armv7m_init (system_memory, flash_size, sram_size, + kernel_filename, cpu_model);
So I can see why flash_size is needed by armv7m_init for the sake of capping the loaded image size. While touching the code you could change this to a better name "mem_size" or something to indicate that the arg is now the size of an implementation independent memory region at 0.
sram_size should be unneeded. There some ancient (pre 2007) #if 0 code that refs it aside from the stuff you delete but I think we can safely ignore that (or patch to delete it).
Regards,
Peter
Quoted 7 lines
hw/arm/stellaris.c +0
-1if (board->dc1 & (1 <<16 )) { dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000, --1.9.1
Re: [Qemu-devel] [Patch v2 1/8] stm32f205_timer: Add the stm32f205 Timer
In reply to Peter CrosthwaiteQuoted 126 lines · Peter Crosthwaite
Quoted 100 lines · Alistair Francis
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
Signed-off-by Alistair Francis <[email protected]>---
PUBLIC
V2:
- Reorder theMakefileconfig
- Fix up the debug printing
- Correct the timer event trigger
Changes from RFC:
- Small changes to functionality and style. Thanks to Peter C
- Rename to make the timer more generic
- Split the config settings to device leveldefault-configs/arm-softmmu.mak | 1 + hw/timer/Makefile.objs | 2 + hw/timer/stm32f205_timer.c | 279 +++++++++++++++++++++++++++++++++++++ include/hw/timer/stm32f205_timer.h | 101 ++++++++++++++ 4 files changed, 383 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_STM32F205_TIMER=y CONFIG_VERSATILE_PCI=y CONFIG_VERSATILE_I2C=yhw/timer/Makefile.objs +2
-0@@ -31,3 +31,5 @@ obj-$(CONFIG_DIGIC) += digic-timer.o obj-$(CONFIG_MC146818RTC) += mc146818rtc.o obj-$(CONFIG_ALLWINNER_A10_PIT) += allwinner-a10-pit.o + +common-obj-$(CONFIG_STM32F205_TIMER) += stm32f205_timer.ohw/timer/stm32f205_timer.c new file +49
-0@@ -0,0 +1,279 @@ +/* +* STM32F205 Timer +* +* 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 STM_TIMER_ERR_DEBUG +#define STM_TIMER_ERR_DEBUG 0 +#endif + +#define DB_PRINT_L(lvl, fmt, args...) do { \ + if (STM_TIMER_ERR_DEBUG >= lvl) { \ + qemu_log("stm32f205_timer: %s:" fmt, __func__, ## args); \ + } \ +} while (0); + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +static void stm32f205_timer_set_alarm (STM32f205TimerState *s); + +static void stm32f205_timer_interrupt (void *opaque) +{ +STM32f205TimerState *s = opaque; + +DB_PRINT ("Interrupt\n" ); + +if (s->tim_dier &TIM_DIER_UIE && s->tim_cr1 &TIM_CR1_CEN ) { + s->tim_sr |=1 ; +qemu_irq_pulse (s->irq);hw/timer/stm32f205_timer.c line 59
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+stm32f205_timer_set_alarm (s); + } +} + +static void stm32f205_timer_set_alarm (STM32f205TimerState *s) +{ +uint32_t ticks; +int64_t now; + +DB_PRINT ("Alarm raised at: 0x%x\n" , s->tim_cr1);"alarm set at". The callback would be the alarm raising.
hw/timer/stm32f205_timer.c line 63
Quoted 4 lines
hw/timer/stm32f205_timer.c new file +4
-0+ + now =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ); + ticks = s->tim_arr - (s->tick_offset + (now *get_ticks_per_sec ())) * + (s->tim_psc +1 );Still doesn't add up just yet. You have:
ticks =
s->tim_arr- ....Implying ticks and
s->tim_arrmust be the same physical quantity which must be timer ticks. However ...
Quoted 13 lines
hw/timer/stm32f205_timer.c line 71
Quoted 8 lines
hw/timer/stm32f205_timer.c new file +8
-0+ +DB_PRINT ("Alarm set in %d ticks\n" , ticks); + +if (ticks ==0 ) { +timer_del (s->timer); +stm32f205_timer_interrupt (s); + }else { +timer_mod (s->timer, (now + (int64_t ) ticks));... you add ticks to now with is terms of ns, effectively adding cycles and ns together. A frequency scaling factor is missing somewhere.
Yep, will fix
Quoted 108 lines
Quoted 108 lines
hw/timer/stm32f205_timer.c new file +108
-0+DB_PRINT ("Wait Time: %" PRId64"\n" , now + (int64_t ) ticks); + } +} + +static void stm32f205_timer_reset (DeviceState *dev) +{ +STM32f205TimerState *s =STM32F205TIMER (dev); + + 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 ; + s->tim_dcr =0 ; + s->tim_dmar =0 ; + s->tim_or =0 ; +} + +static uint64_t stm32f205_timer_read (void *opaque,hwaddr offset, +unsigned size) +{ +STM32f205TimerState *s = opaque; + +DB_PRINT ("Read 0x%" HWADDR_PRIx"\n" , offset); + +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 : + s->tim_cnt = s->tick_offset + (qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) / +get_ticks_per_sec ()); +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; +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 , +"STM32F205_timer_write: Bad offset 0x%" HWADDR_PRIx"\n" , offset); + } + +return 0 ; +} + +static void stm32f205_timer_write (void *opaque,hwaddr offset, +uint64_t val64,unsigned size) +{ +STM32f205TimerState *s = opaque; +uint32_t value = val64; + +DB_PRINT ("Write 0x%x, 0x%" HWADDR_PRIx"\n" , value, 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 : +/* This is set by hardware and cleared by software */
Quoted 9 lines
hw/timer/stm32f205_timer.c line 185
Quoted 6 lines
hw/timer/stm32f205_timer.c new file +6
-0+ s->tim_sr &= value; +return ; +case TIM_EGR : + s->tim_egr = value; +if (s->tim_egr &TIM_EGR_UG ) { +/* Re-init the counter */ Do you just mean reset? Is this supposed to be a software reset?
The datasheet says "re-initialize the counter". It's basically a reset unless the timer is up counting, which isn't supported
Quoted 51 lines
Quoted 37 lines
hw/timer/stm32f205_timer.c new file +37
-0+stm32f205_timer_reset (DEVICE (s)); + } +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; +stm32f205_timer_set_alarm (s); +return ; +case TIM_PSC : + s->tim_psc = value; +return ; +case TIM_ARR : + s->tim_arr = value; +stm32f205_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;hw/timer/stm32f205_timer.c line 232
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+return ; +case TIM_DMAR : + s->tim_dmar = value; +return ; +case TIM_OR : + s->tim_or = value; +return ; +default : +qemu_log_mask (LOG_GUEST_ERROR , +"STM32F205_timer_write: Bad offset 0x%" HWADDR_PRIx"\n" , offset);If you _ seperate words it should match the fn name exactly. You can use plain english with:
Quoted 8 lines
STM32F205 timer write
or symbolic naming with:
stm32f205_timer_writebut my suggestion is the latter implemented with %s
__func__.
That's a good idea. Will update
Quoted 17 lines
Quoted 4 lines
hw/timer/stm32f205_timer.c new file +4
-0+ } +} + +static const MemoryRegionOps stm32f205_timer_ops = {hw/timer/stm32f205_timer.c line 246
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ .read = stm32f205_timer_read, + .write = stm32f205_timer_write, + .endianness = DEVICE_NATIVE_ENDIAN, +}; + +static void stm32f205_timer_init (Object *obj) +{ +STM32f205TimerState *s =STM32F205TIMER (obj); +struct tm tm; +tm is unused. It passes compile testing as it's address is take to a fn arg.
Quoted 16 lines
hw/timer/stm32f205_timer.c line 255
Quoted 9 lines
hw/timer/stm32f205_timer.c new file +9
-0+sysbus_init_irq (SYS_BUS_DEVICE (obj), &s->irq); + +memory_region_init_io (&s->iomem, obj, &stm32f205_timer_ops, s, +"stm32f205_timer" ,0x2000 ); +sysbus_init_mmio (SYS_BUS_DEVICE (obj), &s->iomem); + +qemu_get_timedate (&tm,0 ); + s->tick_offset =qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) /get_ticks_per_sec (); +This is the only code that sets
tick_offset. What's the exact semantic you are looking for withtick_offset? The fact that this happens at init only suggest that tick offset will always be 0 or trivially small. Did you mean to do this in the reset? I can't see any offset affecting code in reset and something probably should be there.
That's a good point, I will add it to the reset
Quoted 11 lines
hw/timer/stm32f205_timer.c line 263
Quoted 8 lines
hw/timer/stm32f205_timer.c new file +8
-0+ s->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , stm32f205_timer_interrupt, s); +} + +static void stm32f205_timer_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->reset = stm32f205_timer_reset;missing VMSD?
Will add
Quoted 93 lines
Quoted 93 lines
hw/timer/stm32f205_timer.c new file +16
-0+} + +static const TypeInfo stm32f205_timer_info = { + .name =TYPE_STM32F205_TIMER , + .parent =TYPE_SYS_BUS_DEVICE , + .instance_size =sizeof (STM32f205TimerState), + .instance_init = stm32f205_timer_init, + .class_init = stm32f205_timer_class_init, +}; + +static void stm32f205_timer_register_types (void ) +{ +type_register_static (&stm32f205_timer_info); +} + +type_init (stm32f205_timer_register_types)include/hw/timer/stm32f205_timer.h new file +71
-0@@ -0,0 +1,101 @@ +/* +* STM32F205 Timer +* +* 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_STM_TIMER_H +#define HW_STM_TIMER_H + +#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 +#define TIM_DMAR 0x4C +#define TIM_OR 0x50 + +#define TIM_CR1_CEN 1 + +#define TIM_EGR_UG 1 + +#define TIM_CCER_CC2E (1 << 4) +#define TIM_CCMR1_OC2M2 (1 << 14) +#define TIM_CCMR1_OC2M1 (1 << 13) +#define TIM_CCMR1_OC2M0 (1 << 12) +#define TIM_CCMR1_OC2PE (1 << 11) + +#define TIM_DIER_UIE 1 + +#define TYPE_STM32F205_TIMER "stm32f205-timer" +#define STM32F205TIMER(obj) OBJECT_CHECK(STM32f205TimerState, \ + (obj), TYPE_STM32F205_TIMER) + +typedef struct STM32f205TimerState { + /* <private> */ + SysBusDevice parent_obj; +
Quoted 8 lines
include/hw/timer/stm32f205_timer.h line 77
Quoted 6 lines
include/hw/timer/stm32f205_timer.h new file +6
-0+/* <public> */ +MemoryRegion iomem; +QEMUTimer *timer; +qemu_irq irq; + +uint32_t tick_offset_vmstate;
copy_pastehangover.
Yeah, will remove
Thanks,
Alistair
Quoted 32 lines
Regards,
PeterQuoted 28 lines
include/hw/timer/stm32f205_timer.h new file +24
-1+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; + +#endif --1.9.1