Skip to contentSkip to conversation

Netduino 2 Machine Model

PATCH Superseded Alistair Francis 2 participants 11 messages Oct 7, 2014 – Oct 13, 2014 Arm STM32

v4 of 11 Superseded Latest is v11 →

lore
Share & tools
lore
#0 lore raw

v4 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.4

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

V4:
- Rebase
- Correct timer units
V3:
- Correct the timer interrupts
- Update debug printing
- Remove the sram_size argument from armv7m_init
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                    |  57 +++----
 hw/arm/netduino2.c                 |  54 +++++++
 hw/arm/stellaris.c                 |  27 +++-
 hw/arm/stm32f205_soc.c             | 157 ++++++++++++++++++
 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         | 318 +++++++++++++++++++++++++++++++++++++
 include/hw/arm/arm.h               |   3 +-
 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, 1263 insertions(+), 41 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
#1 lore raw

PATCH v4 1/8 stm32f205_timer: Add the stm32f205 Timer

This patch adds the stm32f205 timers: TIM2, TIM3, TIM4 and TIM5 to QEMU.

---
V4:
- Update timer units again
- Thanks to Peter C
V3:
- Update debug statements
- Correct the units for timer_mod
- Correctly set timer_offset from resets
V2:
- Reorder the Makefile config
- Fix up the debug printing
- Correct the timer event trigger
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         | 318 +++++++++++++++++++++++++++++++++++++
 include/hw/timer/stm32f205_timer.h | 101 ++++++++++++
 4 files changed, 422 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
index f3513fa..cf23b24 100644
@@ -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
index 2c86c3d..4bd9617 100644
@@ -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 +318 -0

318 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
#2 lore raw

PATCH v4 2/8 stm32f205_USART: Add the stm32f205 USART Controller

In reply to Alistair Francis

This patch adds the stm32f205 USART controller
(UART also uses the same controller).

---
V3:
- Update debug printing
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
index cf23b24..422dec0 100644
@@ -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
index 317385d..c7b3ce4 100644
@@ -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
#3 lore raw

PATCH v4 3/8 stm32f205_SYSCFG: Add the stm32f205 SYSCFG

In reply to Alistair Francis

This 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)

---
V3:
- Update debug printing
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
index 422dec0..a2ea8f7 100644
@@ -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
index 979e532..63f03bd 100644
@@ -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
#4 lore raw

PATCH v4 4/8 target_arm: Remove memory region init from armv7m_init

In reply to Alistair Francis

This patch moves the memory region init code from the armv7m_init function to the stellaris_init function

---
V3:
- Rename the flash_size argument to mem_size
- Remove the sram_size and related code
- Thanks to Peter C
V2:
- Change the memory region names to match the machine

 hw/arm/armv7m.c      | 33 +++------------------------------
 hw/arm/stellaris.c   | 24 ++++++++++++++++++++----
 include/hw/arm/arm.h |  3 +--
 3 files changed, 24 insertions(+), 36 deletions(-)
hw/arm/armv7m.c +3 -30
index ef24ca4..50281f7 100644
@@ -163,11 +163,10 @@ static void armv7m_reset(void *opaque)
 }
 
 /* Init CPU and memory for a v7-M based board.
-   flash_size and sram_size are in kb.
+   mem_size is in bytes.
    Returns the NVIC array.  */
 
-qemu_irq *armv7m_init(MemoryRegion *system_memory,
-                      int flash_size, int sram_size,
+qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size,
                       const char *kernel_filename, const char *cpu_model)
 {
     ARMCPU *cpu;
@@ -180,13 +179,8 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,
     uint64_t lowaddr;
     int i;
     int big_endian;
-    MemoryRegion *sram = g_new(MemoryRegion, 1);
-    MemoryRegion *flash = g_new(MemoryRegion, 1);
     MemoryRegion *hack = g_new(MemoryRegion, 1);
 
-    flash_size *= 1024;
-    sram_size *= 1024;
-
     if (cpu_model == NULL) {
 	cpu_model = "cortex-m3";
     }
@@ -197,27 +191,6 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,
     }
     env = &cpu->env;
 
-#if 0
-    /* > 32Mb SRAM gets complicated because it overlaps the bitband area.
-       We don't have proper commandline options, so allocate half of memory
-       as SRAM, up to a maximum of 32Mb, and the rest as code.  */
-    if (ram_size > (512 + 32) * 1024 * 1024)
-        ram_size = (512 + 32) * 1024 * 1024;
-    sram_size = (ram_size / 2) & TARGET_PAGE_MASK;
-    if (sram_size > 32 * 1024 * 1024)
-        sram_size = 32 * 1024 * 1024;
-    code_size = ram_size - sram_size;
-#endif
-
-    /* Flash programming is done via the SCU, so pretend it is ROM.  */
-    memory_region_init_ram(flash, NULL, "armv7m.flash", flash_size,
-                           &error_abort);
-    vmstate_register_ram_global(flash);
-    memory_region_set_readonly(flash, true);
-    memory_region_add_subregion(system_memory, 0, flash);
-    memory_region_init_ram(sram, NULL, "armv7m.sram", sram_size, &error_abort);
-    vmstate_register_ram_global(sram);
-    memory_region_add_subregion(system_memory, 0x20000000, sram);
     armv7m_bitband_init();
 
     nvic = qdev_create(NULL, "armv7m_nvic");
@@ -244,7 +217,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory,
         image_size = load_elf(kernel_filename, NULL, NULL, &entry, &lowaddr,
                               NULL, big_endian, ELF_MACHINE, 1);
         if (image_size < 0) {
-            image_size = load_image_targphys(kernel_filename, 0, flash_size);
+            image_size = load_image_targphys(kernel_filename, 0, mem_size);
             lowaddr = 0;
         }
         if (image_size < 0) {
hw/arm/stellaris.c +20 -4
index 64bd4b4..d0c61c5 100644
@@ -1220,10 +1220,26 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,
     int i;
     int j;
 
-    flash_size = ((board->dc0 & 0xffff) + 1) << 1;
-    sram_size = (board->dc0 >> 18) + 1;
-    pic = armv7m_init(get_system_memory(),
-                      flash_size, sram_size, kernel_filename, cpu_model);
+    MemoryRegion *sram = g_new(MemoryRegion, 1);
+    MemoryRegion *flash = g_new(MemoryRegion, 1);
+    MemoryRegion *system_memory = get_system_memory();
+
+    flash_size = (((board->dc0 & 0xffff) + 1) << 1) * 1024;
+    sram_size = ((board->dc0 >> 18) + 1) * 1024;
+
+    /* Flash programming is done via the SCU, so pretend it is ROM.  */
+    memory_region_init_ram(flash, NULL, "stellaris.flash", flash_size,
+                           &error_abort);
+    vmstate_register_ram_global(flash);
+    memory_region_set_readonly(flash, true);
+    memory_region_add_subregion(system_memory, 0, flash);
+
+    memory_region_init_ram(sram, NULL, "stellaris.sram", sram_size,
+                           &error_abort);
+    vmstate_register_ram_global(sram);
+    memory_region_add_subregion(system_memory, 0x20000000, sram);
+
+    pic = armv7m_init(system_memory, flash_size, kernel_filename, cpu_model);
 
     if (board->dc1 & (1 << 16)) {
         dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,
include/hw/arm/arm.h +1 -2
index cefc9e6..a112930 100644
@@ -15,8 +15,7 @@
 #include "hw/irq.h"
 
 /* armv7m.c */
-qemu_irq *armv7m_init(MemoryRegion *system_memory,
-                      int flash_size, int sram_size,
+qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size,
                       const char *kernel_filename, const char *cpu_model);
 
 /* arm_boot.c */
Signature · 1 line
1.9.1
#5 lore raw

PATCH v4 5/8 target_arm: Parameterise the irq lines for armv7m_init

In reply to Alistair Francis

This patch allows the board to specifiy the number of NVIC interrupt lines when using armv7m_init.

---

 hw/arm/armv7m.c      | 7 ++++---
 hw/arm/stellaris.c   | 5 ++++-
 include/hw/arm/arm.h | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)
hw/arm/armv7m.c +4 -3
index 50281f7..7169027 100644
@@ -166,14 +166,14 @@ static void armv7m_reset(void *opaque)
    mem_size is in bytes.
    Returns the NVIC array.  */
 
-qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size,
+qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
                       const char *kernel_filename, const char *cpu_model)
 {
     ARMCPU *cpu;
     CPUARMState *env;
     DeviceState *nvic;
     /* FIXME: make this local state.  */
-    static qemu_irq pic[64];
+    qemu_irq *pic = g_new(qemu_irq, num_irq);
     int image_size;
     uint64_t entry;
     uint64_t lowaddr;
@@ -194,11 +194,12 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size,
     armv7m_bitband_init();
 
     nvic = qdev_create(NULL, "armv7m_nvic");
+    qdev_prop_set_uint32(nvic, "num-irq", num_irq);
     env->nvic = nvic;
     qdev_init_nofail(nvic);
     sysbus_connect_irq(SYS_BUS_DEVICE(nvic), 0,
                        qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ));
-    for (i = 0; i < 64; i++) {
+    for (i = 0; i < num_irq; i++) {
         pic[i] = qdev_get_gpio_in(nvic, i);
     }
 
hw/arm/stellaris.c +4 -1
index d0c61c5..6fad10f 100644
@@ -29,6 +29,8 @@
 #define BP_OLED_SSI  0x02
 #define BP_GAMEPAD   0x04
 
+#define NUM_IRQ_LINES 64
+
 typedef const struct {
     const char *name;
     uint32_t did0;
@@ -1239,7 +1241,8 @@ static void stellaris_init(const char *kernel_filename, const char *cpu_model,
     vmstate_register_ram_global(sram);
     memory_region_add_subregion(system_memory, 0x20000000, sram);
 
-    pic = armv7m_init(system_memory, flash_size, kernel_filename, cpu_model);
+    pic = armv7m_init(system_memory, flash_size, NUM_IRQ_LINES,
+                      kernel_filename, cpu_model);
 
     if (board->dc1 & (1 << 16)) {
         dev = sysbus_create_varargs(TYPE_STELLARIS_ADC, 0x40038000,
include/hw/arm/arm.h +1 -1
index a112930..94e55a4 100644
@@ -15,7 +15,7 @@
 #include "hw/irq.h"
 
 /* armv7m.c */
-qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size,
+qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
                       const char *kernel_filename, const char *cpu_model);
 
 /* arm_boot.c */
Signature · 1 line
1.9.1
#6 lore raw

PATCH v4 6/8 target_arm: Change the reset values based on the ELF entry

In reply to Alistair Francis

The 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 | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
hw/arm/armv7m.c +16 -3
index 7169027..07b36e2 100644
@@ -155,11 +155,19 @@ static void armv7m_bitband_init(void)
 
 /* Board init.  */
 
+typedef struct ARMV7MResetArgs {
+    ARMCPU *cpu;
+    uint32_t reset_pc;
+} ARMV7MResetArgs;
+
 static void armv7m_reset(void *opaque)
 {
-    ARMCPU *cpu = opaque;
+    ARMV7MResetArgs *args = opaque;
+
+    cpu_reset(CPU(args->cpu));
 
-    cpu_reset(CPU(cpu));
+    args->cpu->env.thumb = args->reset_pc & 1;
+    args->cpu->env.regs[15] = args->reset_pc & ~1;
 }
 
 /* Init CPU and memory for a v7-M based board.
@@ -180,6 +188,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
     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";
@@ -234,7 +243,11 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
     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
#9 lore raw

PATCH v4 7/8 stm32f205: Add the stm32f205 SoC

In reply to Alistair Francis

This 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          | 157 ++++++++++++++++++++++++++++++++++++++++
 include/hw/arm/stm32f205_soc.h  |  69 ++++++++++++++++++
 4 files changed, 228 insertions(+)
 create mode 100644 hw/arm/stm32f205_soc.c
 create mode 100644 include/hw/arm/stm32f205_soc.h
default-configs/arm-softmmu.mak +1 -0
index a2ea8f7..8068100 100644
@@ -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
index 6088e53..9769317 100644
@@ -8,3 +8,4 @@ obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o
 obj-$(CONFIG_DIGIC) += digic.o
 obj-y += omap1.o omap2.o strongarm.o
 obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
+obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
hw/arm/stm32f205_soc.c new file +157 -0

157 lines not on this page · raw message

include/hw/arm/stm32f205_soc.h new file +69 -0

69 lines not on this page · raw message

Signature · 1 line
1.9.1
#10 lore raw

PATCH v4 8/8 netduino2: Add the Netduino 2 Machine

In reply to Alistair Francis

This 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
index 9769317..2577f68 100644
@@ -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
#7 lore raw

Re: [Qemu-devel] [Patch v4 6/8] target_arm: Change the reset values based on the ELF entry

In reply to Alistair Francis
Quoted 48 lines · Alistair Francis

The 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 | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
hw/arm/armv7m.c +11 -2
index 7169027..07b36e2 100644
@@ -155,11 +155,19 @@ static void armv7m_bitband_init(void)
 
 /* Board init.  */
 
+typedef struct ARMV7MResetArgs {
+    ARMCPU *cpu;
+    uint32_t reset_pc;
+} ARMV7MResetArgs;
+
 static void armv7m_reset(void *opaque)
 {
-    ARMCPU *cpu = opaque;
+    ARMV7MResetArgs *args = opaque;
+
+    cpu_reset(CPU(args->cpu));
 
-    cpu_reset(CPU(cpu));
+    args->cpu->env.thumb = args->reset_pc & 1;
+    args->cpu->env.regs[15] = args->reset_pc & ~1;
 }
 
 /* Init CPU and memory for a v7-M based board.
@@ -180,6 +188,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
     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";
@@ -234,7 +243,11 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
     vmstate_register_ram_global(hack);

hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq, · line 252

Quoted 10 lines
hw/arm/armv7m.c +5 -1
     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;
 }

How does this differ from what's being done in arm_cpu_reset for ARMv7-M? What about the initial MSP?

Signature · 12 lines
Martín Galván

Software Engineer

Taller Technologies Argentina


San Lorenzo 47, 3rd Floor, Office 5

Córdoba, Argentina

Phone: 54 351 4217888 / +54 351 4218211
#8 lore raw

Re: [Qemu-devel] [Patch v4 6/8] target_arm: Change the reset values based on the ELF entry

Quoted 51 lines · Martin Galvan
Quoted 50 lines · Alistair Francis

The 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 | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
hw/arm/armv7m.c +11 -2
index 7169027..07b36e2 100644
@@ -155,11 +155,19 @@ static void armv7m_bitband_init(void)
 
 /* Board init.  */
 
+typedef struct ARMV7MResetArgs {
+    ARMCPU *cpu;
+    uint32_t reset_pc;
+} ARMV7MResetArgs;
+
 static void armv7m_reset(void *opaque)
 {
-    ARMCPU *cpu = opaque;
+    ARMV7MResetArgs *args = opaque;
+
+    cpu_reset(CPU(args->cpu));
 
-    cpu_reset(CPU(cpu));
+    args->cpu->env.thumb = args->reset_pc & 1;
+    args->cpu->env.regs[15] = args->reset_pc & ~1;
 }
 
 /* Init CPU and memory for a v7-M based board.
@@ -180,6 +188,7 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
     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";
@@ -234,7 +243,11 @@ qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq,
     vmstate_register_ram_global(hack);
     memory_region_add_subregion(system_memory, 0xfffff000, hack);
 
Quoted 11 lines

hw/arm/armv7m.c qemu_irq *armv7m_init(MemoryRegion *system_memory, int mem_size, int num_irq, · line 252

Quoted 8 lines
hw/arm/armv7m.c +5 -1
-    qemu_register_reset(armv7m_reset, cpu);
+    *reset_args = (ARMV7MResetArgs) {
+        .cpu = cpu,
+        .reset_pc = entry,
+    };
+    qemu_register_reset(armv7m_reset, reset_args);
     return pic;
 }

How does this differ from what's being done in arm_cpu_reset for ARMv7-M? What about the initial MSP?

So the problem I was having is that the standard linker meant that the reset_handler wasn't being called. I have made some changes to the linker file so now it calls the reset_handler. This patch is no longer required. Sorry it took me so long to figure out what the problem was

Thanks,

Alistair

Quoted 15 lines

--

Martín Galván

Software Engineer

Taller Technologies Argentina

San Lorenzo 47, 3rd Floor, Office 5

Córdoba, Argentina

Phone: 54 351 4217888 / +54 351 4218211