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 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
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 | 46 +++--- 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 | 213 ++++++++++++++++++++++++++ hw/misc/Makefile.objs | 1 + hw/misc/stm32f205_syscfg.c | 160 +++++++++++++++++++ hw/timer/Makefile.objs | 1 + hw/timer/stm32f205_timer.c | 305 +++++++++++++++++++++++++++++++++++++ include/hw/arm/arm.h | 2 +- include/hw/arm/stm32f205_soc.h | 69 +++++++++ include/hw/char/stm32f205_usart.h | 67 ++++++++ include/hw/misc/stm32f205_syscfg.h | 61 ++++++++ include/hw/timer/stm32f205_timer.h | 97 ++++++++++++ 17 files changed, 1236 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 1/8 stm32f205_timer: Add the stm32f205 Timer
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
---
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 | 1 + hw/timer/stm32f205_timer.c | 305 +++++++++++++++++++++++++++++++++++++ include/hw/timer/stm32f205_timer.h | 97 ++++++++++++ 4 files changed, 404 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 +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_STM32F205_TIMER) += stm32f205_timer.o obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.o
hw/timer/stm32f205_timer.c new file +305 -0
305 lines not on this page · raw message
include/hw/timer/stm32f205_timer.h new file +97 -0
97 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH 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).
---
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 | 213 ++++++++++++++++++++++++++++++++++++++ include/hw/char/stm32f205_usart.h | 67 ++++++++++++ 4 files changed, 282 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 +213 -0
213 lines not on this page · raw message
include/hw/char/stm32f205_usart.h new file +67 -0
67 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH 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 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
--- 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 ,"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); + + 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 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 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.
--- hw/arm/armv7m.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)
hw/arm/armv7m.c +19 -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;if (cpu_model ==NULL ) { cpu_model ="cortex-m3" ;
@@ -247,7 +256,12 @@ 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, +g_memdup (&reset_args,sizeof (reset_args)));return pic; }
Signature · 1 line
1.9.1
PATCH 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 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 v1 1/8] stm32f205_timer: Add the stm32f205 Timer
In reply to Alistair FrancisQuoted 35 lines · Alistair Francis
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
Signed-off-by Alistair Francis <[email protected]>---
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 | 1 + hw/timer/stm32f205_timer.c | 305 +++++++++++++++++++++++++++++++++++++ include/hw/timer/stm32f205_timer.h | 97 ++++++++++++ 4 files changed, 404 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 +0
-0
hw/timer/Makefile.objs common-obj-$(CONFIG_IMX) += imx_epit.o · line 21
Quoted 5 lines
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_STM32F205_TIMER) += stm32f205_timer.o
The grouping of this with the random SoC configs is a little strange. I suggest just creating your own blank-line separated grouping like with allwinner currently at the bottom.
Quoted 55 lines
hw/timer/Makefile.objs +0
-0obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.ohw/timer/stm32f205_timer.c new file +47
-0@@ -0,0 +1,305 @@ +/* +* 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_interrupt (void *opaque) +{ +STM32f205TimerState *s = opaque; + +DB_PRINT ("Interrupt in: %s\n" , __func__); + +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 57
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ } +} + +static void stm32f205_timer_set_alarm (STM32f205TimerState *s) +{ +uint32_t ticks; +int64_t now; + +DB_PRINT ("Alarm raised in: %s at 0x%x\n" , __func__, s->tim_cr1); +
You already %s __func__ as part of the DB_PRINT so no need for the dup.
hw/timer/stm32f205_timer.c line 60
Quoted 3 lines
hw/timer/stm32f205_timer.c new file +3
-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 );
I'm having trouble with the dimensional analysis of this. tim_arr is in terms of counter cycles but ticks must be in terms of ns (with it's addition to now below). So you have equating of cycles to time implying fixed frequency scaling. However you attempt to model the prescaling with your use of tim_psc?
hw/timer/stm32f205_timer.c line 69
Quoted 9 lines
hw/timer/stm32f205_timer.c new file +9
-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)); +DB_PRINT ("Wait Time: %u\n" , (uint32_t ) (now + ticks));
Better to use a PRId64 and drop the cast so the debug messages still look good after now rolls over 4G.
Quoted 95 lines
hw/timer/stm32f205_timer.c new file +95
-0+ } +} + +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 : +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 %x\n" , (int ) 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 :
hw/timer/stm32f205_timer.c line 174
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-0+ 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;
Took some getting my head around the &= but TRM does say set by hardware and cleared by software. Worth a comment?
hw/timer/stm32f205_timer.c line 175
Quoted 1 line
hw/timer/stm32f205_timer.c new file +1
-0+stm32f205_timer_set_alarm (s);
This doesn't look right. I think you might be trying to implement periodic timing by reloading when the guest clears the ISR. This is guest dependent and will also lose time - unless the TRM says that timer halts based on ISR? (which I would find quite strange).
The reload logic should probably happen from the timer callback itself.
You may need to look into some of the other timers and how they implement accurate periodic timing. You can look at ptimer based implementations of which there a fair few. I recently did some work on arm_mptimer which is a periodic capable timer that uses regular QEMU timers which I consider a good simple example of a QEMU timer that doesn't use ptimer.
Quoted 42 lines
hw/timer/stm32f205_timer.c new file +42
-0+return ; +case TIM_EGR : + s->tim_egr = value; +if (s->tim_egr &1 ) { +/* Re-init the counter */ +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 227
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 %x\n" , (int ) offset);
Missed a HWADDR_PRIx.
Quoted 14 lines
hw/timer/stm32f205_timer.c new file +14
-0+ } +} + +static const MemoryRegionOps stm32f205_timer_ops = { + .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; +
hw/timer/stm32f205_timer.c line 251
Quoted 10 lines
hw/timer/stm32f205_timer.c new file +10
-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 =mktimegm (&tm) - +qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) /get_ticks_per_sec (); +
This is still trying to be an RTC of sorts. You don't need the mktimegm stuff. I think you need to refactor tick_offset as according to this it is in terms of seconds, but that doesn't make a lot of sense for this timer which should trade in high frequency clock cycles or ns I think.
Regards,
Peter
Quoted 161 lines
hw/timer/stm32f205_timer.c new file +54
-0+ s->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , stm32f205_timer_interrupt, s); +} + +static const VMStateDescription vmstate_stm32f205_timer = { + .name ="stm32f205_timer" , + .version_id =1 , + .minimum_version_id =1 , + .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 stm32f205_timer_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->vmsd = &vmstate_stm32f205_timer; + dc->reset = stm32f205_timer_reset; +} + +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 +97
-1@@ -0,0 +1,97 @@ +/* +* 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_CCER_CC2E (1 << 4) +#define TIM_CCMR1_OC2M2 (1 << 14) +#define TIM_CCMR1_OC2M1 (1 << 13) + +#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; + +/* <public> */ +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 ; + +#endif --1.9.1
Re: [Qemu-devel] [Patch v1 2/8] stm32f205_USART: Add the stm32f205 USART Controller
In reply to Alistair FrancisQuoted 81 lines · Alistair Francis
This patch adds the stm32f205 USART controller
(UART also uses the same controller).Signed-off-by Alistair Francis <[email protected]>---
Changes from RFC:
- Small changes thanks to Peter C
- USART now implements QEMU blocking functions
- Split the config settings to device leveldefault-configs/arm-softmmu.mak | 1 + hw/char/Makefile.objs | 1 + hw/char/stm32f205_usart.c | 213 ++++++++++++++++++++++++++++++++++++++ include/hw/char/stm32f205_usart.h | 67 ++++++++++++ 4 files changed, 282 insertions(+) create mode 100644 hw/char/stm32f205_usart.c create mode 100644 include/hw/char/stm32f205_usart.hdefault-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=yhw/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.ohw/char/stm32f205_usart.c new file +33
-0@@ -0,0 +1,213 @@ +/* +* STM32F205 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) { \ + qemu_log("stm32f205_usart: %s:" fmt, __func__, ## args); \
hw/char/stm32f205_usart.c line 43
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+ } \ +}while (0 ); + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +static int stm32f205_usart_can_receive (void *opaque) +{ +STM32f205UsartState *s = opaque; + + if (s->usart_cr1 & USART_CR1_UE && s->usart_cr1 & USART_CR1_RE &&
So this is still gating based on the master enable. I think these first two terms in the && need to be dropped ...
hw/char/stm32f205_usart.c line 56
Quoted 13 lines
hw/char/stm32f205_usart.c new file +13
-0+ !(s->usart_sr & USART_SR_RXNE)) { +return 1 ; + } + +return 0 ; +} + +static void stm32f205_usart_receive (void *opaque,const uint8_t *buf,int size) +{ +STM32f205UsartState *s = opaque; + + s->usart_dr = *buf; +
and here:
if (!s->usart_cr1 & USART_CR1_UE && s->usart_cr1 & USART_CR1_RE) {
return; /* not enabled - drop chars */
}
This means the UART will drop chars when its disabled, which would be consistent with real HW (there is no buffering when the sender sends chars to a disabled UART).
Quoted 4 lines
hw/char/stm32f205_usart.c new file +4
-0+ s->usart_sr |=USART_SR_RXNE ; + +if (s->usart_cr1 &USART_CR1_RXNEIE ) { +qemu_set_irq (s->irq,1 );
hw/char/stm32f205_usart.c line 70
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+ } + +DB_PRINT ("Receiving: %c\n" , s->usart_dr); +} + +static void stm32f205_usart_reset (DeviceState *dev) +{ +STM32f205UsartState *s =STM32F205_USART (dev); + + s->usart_sr =0x00C00000 ;
Just define a macro for this field and set it for self documentation.
Quoted 16 lines
hw/char/stm32f205_usart.c new file +16
-0+ 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 stm32f205_usart_read (void *opaque,hwaddr addr, +unsigned int size) +{ +STM32f205UsartState *s = opaque; +uint64_t retvalue; + +DB_PRINT ("Read 0x%" HWADDR_PRIx"\n" , addr); +
hw/char/stm32f205_usart.c line 96
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+switch (addr) { +case USART_SR : + retvalue = s->usart_sr; + s->usart_sr &= ~USART_SR_TC ; +if (s->chr) { +qemu_chr_accept_input (s->chr); + } +return retvalue; +case USART_DR : +DB_PRINT ("Value: 0x%x, %c\n" , s->usart_dr, (char ) s->usart_dr);
PRIx32 to match type of usart_dr.
Quoted 22 lines
hw/char/stm32f205_usart.c new file +22
-0+ s->usart_sr |=USART_SR_TXE ; + s->usart_sr &= ~USART_SR_RXNE ; +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 , +"STM32F205_usart_read: Bad offset " \ +"0x%" HWADDR_PRIx"\n" , addr); +return 0 ; + } + +return 0 ; +}
hw/char/stm32f205_usart.c line 128
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+ +static void stm32f205_usart_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +STM32f205UsartState *s = opaque; +uint32_t value = val64; +unsigned char ch; + +DB_PRINT ("Write 0x%x, 0x%" HWADDR_PRIx"\n" , value, addr); +
PRIx64 for value.
Regards,
Peter
Re: [Qemu-devel] [Patch v1 4/8] target_arm: Remove memory region init from armv7m_init
In reply to Alistair FrancisQuoted 62 lines · Alistair Francis
This patch moves the memory region init code from the
armv7m_initfunction to thestellaris_initfunctionSigned-off-by Alistair Francis <[email protected]>--- 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 +0
-3@@ -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(),
hw/arm/stellaris.c static void stellaris_init(const char *kernel_filename, const char *cpu_model, · line 1231
Quoted 10 lines
hw/arm/stellaris.c +9
-1- 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 ,"armv7m.flash" , flash_size);
You can give this a better name, such as "stellaris.flash" now that we are not in armv7m anymore.
Paolo, do you have any advice as to whether we should attempt to parent this MR to the machine or something or just stay NULL (considering we are in non-qdevified code?).
hw/arm/stellaris.c static void stellaris_init(const char *kernel_filename, const char *cpu_model, · line 1236
Quoted 5 lines
hw/arm/stellaris.c +5
-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 ,"armv7m.sram" , sram_size);
Ditto.
hw/arm/stellaris.c static void stellaris_init(const char *kernel_filename, const char *cpu_model, · line 1242
Quoted 6 lines
hw/arm/stellaris.c +5
-0+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);
Can you drop the flash_size and sram_size args to armv7m? They should be dead now.
Regards,
Peter
Quoted 6 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 v1 5/8] target_arm: Parameterise the irq lines for armv7m_init
In reply to Alistair FrancisQuoted 15 lines · Alistair Francis
This patch allows the board to specifiy the number of NVIC interrupt lines when using
armv7m_init.Signed-off-by Alistair Francis <[email protected]>--- 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 +0
-0
hw/arm/armv7m.c static void armv7m_reset(void *opaque) · line 170
Quoted 5 lines
hw/arm/armv7m.c +1
-1@@ -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,
This will change slightly based on previous patch comment, but otherwise.
Quoted 12 lines
hw/arm/armv7m.c +1
-1const 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;
hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 210
Quoted 4 lines
hw/arm/armv7m.c +1
-0@@ -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);
Curious, was this previously relying on the default for nvic being 64? (hence this is appearing as purely additive).
Regards,
Peter
Quoted 48 lines
hw/arm/armv7m.c +1
-1env->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
-2@@ -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 */ --1.9.1
Re: [Qemu-devel] [Patch v1 6/8] target_arm: Change the reset values based on the ELF entry
In reply to Alistair FrancisQuoted 4 lines · Alistair Francis
The Netduino 2 machine won't run unless the
reset_pcis based on the ELF entry point.Signed-off-by Alistair Francis <[email protected]>
Looks based on one of my early attempts at same problem so:
Quoted 33 lines
--- hw/arm/armv7m.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)hw/arm/armv7m.c +12
-4@@ -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.
hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 192
Quoted 4 lines
hw/arm/armv7m.c +1
-0@@ -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;
Malloc straight away rather than the gmemdup.
ARMV7MResetArgs *reset_args = g_new0(ARMV7MResetArgs, 1);
Quoted 4 lines
hw/arm/armv7m.c +0
-0if (cpu_model ==NULL ) { cpu_model ="cortex-m3" ;
hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 264
Quoted 10 lines
hw/arm/armv7m.c +6
-1@@ -247,7 +256,12 @@ 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, +g_memdup (&reset_args,sizeof (reset_args)));
Regards,
Peter
Quoted 7 lines
hw/arm/armv7m.c +0
-1return pic; } --1.9.1
Re: [Qemu-devel] [Patch v1 4/8] target_arm: Remove memory region init from armv7m_init
In reply to Peter CrosthwaiteIl 15/09/2014 17:20, Peter Crosthwaite ha scritto:
Quoted 8 lines
Quoted 2 lines
hw/arm/stellaris.c static void stellaris_init(const char *kernel_filename, const char *cpu_model, · line 1231
Quoted 2 lines
hw/arm/stellaris.c +2
-0+/* Flash programming is done via the SCU, so pretend it is ROM. */ +memory_region_init_ram (flash,NULL ,"armv7m.flash" , flash_size);You can give this a better name, such as "stellaris.flash" now that we are not in armv7m anymore.
Paolo, do you have any advice as to whether we should attempt to parent this MR to the machine or something or just stay NULL (considering we are in non-qdevified code?).
The machine is the default owner anyway.
Paolo
Re: [Qemu-devel] [Patch v1 4/8] target_arm: Remove memory region init from armv7m_init
In reply to Peter CrosthwaiteQuoted 60 lines · Peter Crosthwaite
Quoted 59 lines · Alistair Francis
This patch moves the memory region init code from the
armv7m_initfunction to thestellaris_initfunctionSigned-off-by Alistair Francis <[email protected]>--- 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 +0
-0@@ -1220,10 +1220,25 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,int i;int j;
Quoted 16 lines
hw/arm/stellaris.c static void stellaris_init(const char *kernel_filename, const char *cpu_model, · line 1231
Quoted 13 lines
hw/arm/stellaris.c +9
-4- 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 ,"armv7m.flash" , flash_size);You can give this a better name, such as "stellaris.flash" now that we are not in armv7m anymore.
Will fix
Quoted 20 lines
Paolo, do you have any advice as to whether we should attempt to parent this MR to the machine or something or just stay NULL (considering we are in non-qdevified code?).
hw/arm/stellaris.c static void stellaris_init(const char *kernel_filename, const char *cpu_model, · line 1236
Quoted 5 lines
hw/arm/stellaris.c +5
-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 ,"armv7m.sram" , sram_size);Ditto.
hw/arm/stellaris.c static void stellaris_init(const char *kernel_filename, const char *cpu_model, · line 1242
Quoted 6 lines
hw/arm/stellaris.c +5
-0+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);
Quoted 2 lines
Can you drop the
flash_sizeandsram_sizeargs to armv7m? They should be dead now.
Both are still required. The load_image_targphys() requires the flash size and there is some code that uses sram_size, although it is constantly #if disabled. I'm not sure why it's there, but it would have to be removed if the sram_size is.
It's something to do with greater then 32MB of SRAM overwriting the bitband area.
Quoted 10 lines
Regards,
PeterQuoted 6 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 v1 6/8] target_arm: Change the reset values based on the ELF entry
In reply to Peter CrosthwaiteQuoted 10 lines · Peter Crosthwaite
Quoted 4 lines · Alistair Francis
The Netduino 2 machine won't run unless the
reset_pcis based on the ELF entry point.Signed-off-by Alistair Francis <[email protected]>Looks based on one of my early attempts at same problem so:
Signed-off-by Peter Crosthwaite <[email protected]>
Sorry, I forgot about that
Quoted 39 lines
Quoted 33 lines
--- hw/arm/armv7m.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)hw/arm/armv7m.c +12
-4@@ -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. hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 192
Quoted 4 lines
hw/arm/armv7m.c +1
-0@@ -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;Malloc straight away rather than the gmemdup.
Quoted 2 lines
ARMV7MResetArgs
*reset_args=g_new0(ARMV7MResetArgs, 1);
Will fix
Thanks,
Alistair
Quoted 26 lines
Quoted 4 lines
hw/arm/armv7m.c +0
-0if (cpu_model ==NULL ) { cpu_model ="cortex-m3" ;hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 264
Quoted 10 lines
hw/arm/armv7m.c +6
-1@@ -247,7 +256,12 @@ 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, +g_memdup (&reset_args,sizeof (reset_args)));Regards,
PeterQuoted 7 lines
hw/arm/armv7m.c +0
-1return pic; } --1.9.1
Re: [Qemu-devel] [Patch v1 5/8] target_arm: Parameterise the irq lines for armv7m_init
In reply to Peter CrosthwaiteQuoted 18 lines · Peter Crosthwaite
Quoted 17 lines · Alistair Francis
This patch allows the board to specifiy the number of NVIC interrupt lines when using
armv7m_init.Signed-off-by Alistair Francis <[email protected]>--- 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 +0
-0@@ -167,14 +167,14 @@ static void armv7m_reset(void *opaque)Returns the NVIC array. */
Quoted 7 lines
hw/arm/armv7m.c static void armv7m_reset(void *opaque) · line 170
Quoted 3 lines
hw/arm/armv7m.c +1
-1qemu_irq *armv7m_init(MemoryRegion *system_memory, - int flash_size, int sram_size, + int flash_size, int sram_size, int num_irq,This will change slightly based on previous patch comment, but otherwise.
Reviewed-by Peter Crosthwaite <[email protected]>
Thanks, but they are both still required as I explained in the other reply
Quoted 15 lines
Quoted 15 lines
hw/arm/armv7m.c +1
-1const 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 ();
Quoted 5 lines
hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, · line 210
Quoted 2 lines
hw/arm/armv7m.c +1
-0nvic =qdev_create (NULL ,"armv7m_nvic" ); +qdev_prop_set_uint32 (nvic,"num-irq" , num_irq);Curious, was this previously relying on the default for nvic being 64? (hence this is appearing as purely additive).
Yep, it just used the default value
Thanks,
Alistair
Quoted 52 lines
Regards,
PeterQuoted 48 lines
hw/arm/armv7m.c +1
-1env->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
-2@@ -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 */ --1.9.1
Re: [Qemu-devel] [Patch v1 1/8] stm32f205_timer: Add the stm32f205 Timer
In reply to Peter CrosthwaiteQuoted 29 lines · Peter Crosthwaite
Quoted 28 lines · Alistair Francis
This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.
Signed-off-by Alistair Francis <[email protected]>---
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 | 1 + hw/timer/stm32f205_timer.c | 305 +++++++++++++++++++++++++++++++++++++ include/hw/timer/stm32f205_timer.h | 97 ++++++++++++ 4 files changed, 404 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
Quoted 17 lines
hw/timer/Makefile.objs common-obj-$(CONFIG_IMX) += imx_epit.o · line 21
Quoted 12 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_STM32F205_TIMER) += stm32f205_timer.oThe grouping of this with the random SoC configs is a little strange. I suggest just creating your own blank-line separated grouping like with allwinner currently at the bottom.
Will fix
Quoted 59 lines
Quoted 59 lines
hw/timer/Makefile.objs +0
-0obj-$(CONFIG_EXYNOS4) += exynos4210_mct.o obj-$(CONFIG_EXYNOS4) += exynos4210_pwm.ohw/timer/stm32f205_timer.c new file +51
-0@@ -0,0 +1,305 @@ +/* +* 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_interrupt (void *opaque) +{ +STM32f205TimerState *s = opaque; + +DB_PRINT ("Interrupt in: %s\n" , __func__); + +if (s->tim_dier &TIM_DIER_UIE && s->tim_cr1 &TIM_CR1_CEN ) { + s->tim_sr |=1 ; +qemu_irq_pulse (s->irq); + } +} + +static void stm32f205_timer_set_alarm (STM32f205TimerState *s)
Quoted 9 lines
hw/timer/stm32f205_timer.c line 57
Quoted 6 lines
hw/timer/stm32f205_timer.c new file +6
-0+{ +uint32_t ticks; +int64_t now; + +DB_PRINT ("Alarm raised in: %s at 0x%x\n" , __func__, s->tim_cr1); +You already %s
__func__as part of theDB_PRINTso no need for the dup.
Yep
Quoted 10 lines
hw/timer/stm32f205_timer.c line 60
Quoted 3 lines
hw/timer/stm32f205_timer.c new file +3
-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 );I'm having trouble with the dimensional analysis of this.
tim_arris in terms of counter cycles but ticks must be in terms of ns (with it's addition to now below). So you have equating of cycles to time implying fixed frequency scaling. However you attempt to model the prescaling with your use oftim_psc?
I think I have fixed it, will update in the respin.
Quoted 4 lines
Quoted 4 lines
hw/timer/stm32f205_timer.c new file +4
-0+ +DB_PRINT ("Alarm set in %d ticks\n" , ticks); + +if (ticks ==0 ) {
Quoted 8 lines
hw/timer/stm32f205_timer.c line 69
Quoted 5 lines
hw/timer/stm32f205_timer.c new file +5
-0+timer_del (s->timer); +stm32f205_timer_interrupt (s); + }else { +timer_mod (s->timer, (now + (int64_t ) ticks)); +DB_PRINT ("Wait Time: %u\n" , (uint32_t ) (now + ticks));Better to use a PRId64 and drop the cast so the debug messages still look good after now rolls over 4G.
Will fix
Quoted 101 lines
Quoted 101 lines
hw/timer/stm32f205_timer.c new file +100
-0+ } +} + +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 : +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 %x\n" , (int ) 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 ;
Quoted 8 lines
hw/timer/stm32f205_timer.c line 174
Quoted 5 lines
hw/timer/stm32f205_timer.c new file +5
-0+case TIM_DIER : + s->tim_dier = value; +return ; +case TIM_SR : + s->tim_sr &= value;Took some getting my head around the &= but TRM does say set by hardware and cleared by software. Worth a comment?
I'll add a comment.
Quoted 9 lines
hw/timer/stm32f205_timer.c line 175
Quoted 2 lines
hw/timer/stm32f205_timer.c new file +1
-0+stm32f205_timer_set_alarm (s);This doesn't look right. I think you might be trying to implement periodic timing by reloading when the guest clears the ISR. This is guest dependent and will also lose time - unless the TRM says that timer halts based on ISR? (which I would find quite strange).
The reload logic should probably happen from the timer callback itself.
Ok, I have moved it to the interrupt function.
Quoted 85 lines
You may need to look into some of the other timers and how they implement accurate periodic timing. You can look at ptimer based implementations of which there a fair few. I recently did some work on
arm_mptimerwhich is a periodic capable timer that uses regular QEMU timers which I consider a good simple example of a QEMU timer that doesn't use ptimer.Quoted 42 lines
hw/timer/stm32f205_timer.c new file +42
-0+return ; +case TIM_EGR : + s->tim_egr = value; +if (s->tim_egr &1 ) { +/* Re-init the counter */ +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 227
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 %x\n" , (int ) offset);Missed a
HWADDR_PRIx.Quoted 22 lines
hw/timer/stm32f205_timer.c new file +22
-0+ } +} + +static const MemoryRegionOps stm32f205_timer_ops = { + .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; + +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 = mktimegm(&tm) -
Quoted 8 lines
hw/timer/stm32f205_timer.c line 251
Quoted 2 lines
hw/timer/stm32f205_timer.c new file +2
-0+qemu_clock_get_ns (QEMU_CLOCK_VIRTUAL ) /get_ticks_per_sec (); +This is still trying to be an RTC of sorts. You don't need the mktimegm stuff. I think you need to refactor
tick_offsetas according to this it is in terms of seconds, but that doesn't make a lot of sense for this timer which should trade in high frequency clock cycles or ns I think.
I forgot to take that out, will removed.
Thanks,
Alistair
Quoted 165 lines
Regards,
PeterQuoted 161 lines
hw/timer/stm32f205_timer.c new file +54
-0+ s->timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , stm32f205_timer_interrupt, s); +} + +static const VMStateDescription vmstate_stm32f205_timer = { + .name ="stm32f205_timer" , + .version_id =1 , + .minimum_version_id =1 , + .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 stm32f205_timer_class_init (ObjectClass *klass,void *data) +{ +DeviceClass *dc =DEVICE_CLASS (klass); + + dc->vmsd = &vmstate_stm32f205_timer; + dc->reset = stm32f205_timer_reset; +} + +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 +97
-1@@ -0,0 +1,97 @@ +/* +* 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_CCER_CC2E (1 << 4) +#define TIM_CCMR1_OC2M2 (1 << 14) +#define TIM_CCMR1_OC2M1 (1 << 13) + +#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; + +/* <public> */ +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 ; + +#endif --1.9.1
Re: [Qemu-devel] [Patch v1 2/8] stm32f205_USART: Add the stm32f205 USART Controller
In reply to Peter CrosthwaiteQuoted 112 lines · Peter Crosthwaite
Quoted 81 lines · Alistair Francis
This patch adds the stm32f205 USART controller
(UART also uses the same controller).Signed-off-by Alistair Francis <[email protected]>---
Changes from RFC:
- Small changes thanks to Peter C
- USART now implements QEMU blocking functions
- Split the config settings to device leveldefault-configs/arm-softmmu.mak | 1 + hw/char/Makefile.objs | 1 + hw/char/stm32f205_usart.c | 213 ++++++++++++++++++++++++++++++++++++++ include/hw/char/stm32f205_usart.h | 67 ++++++++++++ 4 files changed, 282 insertions(+) create mode 100644 hw/char/stm32f205_usart.c create mode 100644 include/hw/char/stm32f205_usart.hdefault-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=yhw/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.ohw/char/stm32f205_usart.c new file +33
-0@@ -0,0 +1,213 @@ +/* +* STM32F205 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) { \ + qemu_log("stm32f205_usart: %s:" fmt, __func__, ## args); \hw/char/stm32f205_usart.c line 43
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+ } \ +}while (0 ); + +#define DB_PRINT(fmt, args...) DB_PRINT_L(1, fmt, ## args) + +static int stm32f205_usart_can_receive (void *opaque) +{ +STM32f205UsartState *s = opaque; + + if (s->usart_cr1 & USART_CR1_UE && s->usart_cr1 & USART_CR1_RE &&So this is still gating based on the master enable. I think these first two terms in the && need to be dropped ...
hw/char/stm32f205_usart.c line 56
Quoted 13 lines
hw/char/stm32f205_usart.c new file +13
-0+ !(s->usart_sr & USART_SR_RXNE)) { +return 1 ; + } + +return 0 ; +} + +static void stm32f205_usart_receive (void *opaque,const uint8_t *buf,int size) +{ +STM32f205UsartState *s = opaque; + + s->usart_dr = *buf; +and here:
Quoted 7 lines
if (!s->usart_cr1 &
USART_CR1_UE&&s->usart_cr1&USART_CR1_RE) {
return; /* not enabled - drop chars */
}This means the UART will drop chars when its disabled, which would be consistent with real HW (there is no buffering when the sender sends chars to a disabled UART).
This makes sense, will fix it
Thanks,
Alistair
Quoted 84 lines
Quoted 5 lines
hw/char/stm32f205_usart.c new file +4
-0+ s->usart_sr |=USART_SR_RXNE ; + +if (s->usart_cr1 &USART_CR1_RXNEIE ) { +qemu_set_irq (s->irq,1 );hw/char/stm32f205_usart.c line 70
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+ } + +DB_PRINT ("Receiving: %c\n" , s->usart_dr); +} + +static void stm32f205_usart_reset (DeviceState *dev) +{ +STM32f205UsartState *s =STM32F205_USART (dev); + + s->usart_sr =0x00C00000 ;Just define a macro for this field and set it for self documentation.
Quoted 16 lines
hw/char/stm32f205_usart.c new file +16
-0+ 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 stm32f205_usart_read (void *opaque,hwaddr addr, +unsigned int size) +{ +STM32f205UsartState *s = opaque; +uint64_t retvalue; + +DB_PRINT ("Read 0x%" HWADDR_PRIx"\n" , addr); +hw/char/stm32f205_usart.c line 96
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+switch (addr) { +case USART_SR : + retvalue = s->usart_sr; + s->usart_sr &= ~USART_SR_TC ; +if (s->chr) { +qemu_chr_accept_input (s->chr); + } +return retvalue; +case USART_DR : +DB_PRINT ("Value: 0x%x, %c\n" , s->usart_dr, (char ) s->usart_dr);PRIx32 to match type of
usart_dr.Quoted 22 lines
hw/char/stm32f205_usart.c new file +22
-0+ s->usart_sr |=USART_SR_TXE ; + s->usart_sr &= ~USART_SR_RXNE ; +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 , +"STM32F205_usart_read: Bad offset " \ +"0x%" HWADDR_PRIx"\n" , addr); +return 0 ; + } + +return 0 ; +}hw/char/stm32f205_usart.c line 128
Quoted 10 lines
hw/char/stm32f205_usart.c new file +10
-0+ +static void stm32f205_usart_write (void *opaque,hwaddr addr, +uint64_t val64,unsigned int size) +{ +STM32f205UsartState *s = opaque; +uint32_t value = val64; +unsigned char ch; + +DB_PRINT ("Write 0x%x, 0x%" HWADDR_PRIx"\n" , value, addr); +PRIx64 for value.
Regards,
Peter