1
The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a:
1
v2: added Property array terminator (which caused crashes on
2
various non-x86 host architectures).
2
3
3
Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000)
4
The following changes since commit ae3aa5da96f4ccf0c2a28851449d92db9fcfad71:
5
6
Merge remote-tracking branch 'remotes/berrange/tags/socket-next-pull-request' into staging (2020-05-21 16:47:28 +0100)
4
7
5
are available in the Git repository at:
8
are available in the Git repository at:
6
9
7
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328
10
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20200521-1
8
11
9
for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a:
12
for you to fetch changes up to fafe7229272f39500c14845bc7ea60a8504a5a20:
10
13
11
target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100)
14
linux-user/arm/signal.c: Drop TARGET_CONFIG_CPU_32 (2020-05-21 22:05:27 +0100)
12
15
13
----------------------------------------------------------------
16
----------------------------------------------------------------
14
target-arm queue:
17
target-arm queue:
15
* fix part of the "TCG-disabled builds are broken" issue
18
* tests/acceptance: Add a test for the canon-a1100 machine
19
* docs/system: Document some of the Arm development boards
20
* linux-user: make BKPT insn cause SIGTRAP, not be a syscall
21
* target/arm: Remove unused GEN_NEON_INTEGER_OP macro
22
* fsl-imx25, fsl-imx31, fsl-imx6, fsl-imx6ul, fsl-imx7: implement watchdog
23
* hw/arm: Use qemu_log_mask() instead of hw_error() in various places
24
* ARM: PL061: Introduce N_GPIOS
25
* target/arm: Improve clear_vec_high() usage
26
* target/arm: Allow user-mode code to write CPSR.E via MSR
27
* linux-user/arm: Reset CPSR_E when entering a signal handler
28
* linux-user/arm/signal.c: Drop TARGET_CONFIG_CPU_32
16
29
17
----------------------------------------------------------------
30
----------------------------------------------------------------
18
Philippe Mathieu-Daudé (1):
31
Amanieu d'Antras (1):
19
target/arm/gdbstub: Only advertise M-profile features if TCG available
32
linux-user/arm: Reset CPSR_E when entering a signal handler
20
33
21
target/arm/gdbstub.c | 5 +++--
34
Geert Uytterhoeven (1):
22
1 file changed, 3 insertions(+), 2 deletions(-)
35
ARM: PL061: Introduce N_GPIOS
23
36
37
Guenter Roeck (8):
38
hw: Move i.MX watchdog driver to hw/watchdog
39
hw/watchdog: Implement full i.MX watchdog support
40
hw/arm/fsl-imx25: Wire up watchdog
41
hw/arm/fsl-imx31: Wire up watchdog
42
hw/arm/fsl-imx6: Connect watchdog interrupts
43
hw/arm/fsl-imx6ul: Connect watchdog interrupts
44
hw/arm/fsl-imx7: Instantiate various unimplemented devices
45
hw/arm/fsl-imx7: Connect watchdog interrupts
46
47
Peter Maydell (12):
48
docs/system: Add 'Arm' to the Integrator/CP document title
49
docs/system: Sort Arm board index into alphabetical order
50
docs/system: Document Arm Versatile Express boards
51
docs/system: Document the various MPS2 models
52
docs/system: Document Musca boards
53
linux-user/arm: BKPT should cause SIGTRAP, not be a syscall
54
linux-user/arm: Remove bogus SVC 0xf0002 handling
55
linux-user/arm: Handle invalid arm-specific syscalls correctly
56
linux-user/arm: Fix identification of syscall numbers
57
target/arm: Remove unused GEN_NEON_INTEGER_OP macro
58
target/arm: Allow user-mode code to write CPSR.E via MSR
59
linux-user/arm/signal.c: Drop TARGET_CONFIG_CPU_32
60
61
Philippe Mathieu-Daudé (4):
62
hw/arm/integratorcp: Replace hw_error() by qemu_log_mask()
63
hw/arm/pxa2xx: Replace hw_error() by qemu_log_mask()
64
hw/char/xilinx_uartlite: Replace hw_error() by qemu_log_mask()
65
hw/timer/exynos4210_mct: Replace hw_error() by qemu_log_mask()
66
67
Richard Henderson (2):
68
target/arm: Use tcg_gen_gvec_mov for clear_vec_high
69
target/arm: Use clear_vec_high more effectively
70
71
Thomas Huth (1):
72
tests/acceptance: Add a test for the canon-a1100 machine
73
74
docs/system/arm/integratorcp.rst | 4 +-
75
docs/system/arm/mps2.rst | 29 +++
76
docs/system/arm/musca.rst | 31 +++
77
docs/system/arm/vexpress.rst | 60 ++++++
78
docs/system/target-arm.rst | 20 +-
79
include/hw/arm/fsl-imx25.h | 5 +
80
include/hw/arm/fsl-imx31.h | 4 +
81
include/hw/arm/fsl-imx6.h | 2 +-
82
include/hw/arm/fsl-imx6ul.h | 2 +-
83
include/hw/arm/fsl-imx7.h | 23 ++-
84
include/hw/misc/imx2_wdt.h | 33 ----
85
include/hw/watchdog/wdt_imx2.h | 90 +++++++++
86
target/arm/cpu.h | 2 +-
87
hw/arm/fsl-imx25.c | 10 +
88
hw/arm/fsl-imx31.c | 6 +
89
hw/arm/fsl-imx6.c | 9 +
90
hw/arm/fsl-imx6ul.c | 10 +
91
hw/arm/fsl-imx7.c | 35 ++++
92
hw/arm/integratorcp.c | 23 ++-
93
hw/arm/pxa2xx_gpio.c | 7 +-
94
hw/char/xilinx_uartlite.c | 5 +-
95
hw/display/pxa2xx_lcd.c | 8 +-
96
hw/dma/pxa2xx_dma.c | 14 +-
97
hw/gpio/pl061.c | 12 +-
98
hw/misc/imx2_wdt.c | 90 ---------
99
hw/timer/exynos4210_mct.c | 12 +-
100
hw/watchdog/wdt_imx2.c | 304 +++++++++++++++++++++++++++++
101
linux-user/arm/cpu_loop.c | 145 ++++++++------
102
linux-user/arm/signal.c | 15 +-
103
target/arm/translate-a64.c | 63 +++---
104
target/arm/translate.c | 23 ---
105
MAINTAINERS | 6 +
106
hw/arm/Kconfig | 5 +
107
hw/misc/Makefile.objs | 1 -
108
hw/watchdog/Kconfig | 3 +
109
hw/watchdog/Makefile.objs | 1 +
110
tests/acceptance/machine_arm_canona1100.py | 35 ++++
111
37 files changed, 855 insertions(+), 292 deletions(-)
112
create mode 100644 docs/system/arm/mps2.rst
113
create mode 100644 docs/system/arm/musca.rst
114
create mode 100644 docs/system/arm/vexpress.rst
115
delete mode 100644 include/hw/misc/imx2_wdt.h
116
create mode 100644 include/hw/watchdog/wdt_imx2.h
117
delete mode 100644 hw/misc/imx2_wdt.c
118
create mode 100644 hw/watchdog/wdt_imx2.c
119
create mode 100644 tests/acceptance/machine_arm_canona1100.py
120
diff view generated by jsdifflib
Deleted patch
1
From: Philippe Mathieu-Daudé <philmd@linaro.org>
2
1
3
Cortex-M profile is only emulable from TCG accelerator. Restrict
4
the GDBstub features to its availability in order to avoid a link
5
error when TCG is not enabled:
6
7
Undefined symbols for architecture arm64:
8
"_arm_v7m_get_sp_ptr", referenced from:
9
_m_sysreg_get in target_arm_gdbstub.c.o
10
"_arm_v7m_mrs_control", referenced from:
11
_arm_gdb_get_m_systemreg in target_arm_gdbstub.c.o
12
ld: symbol(s) not found for architecture arm64
13
clang: error: linker command failed with exit code 1 (use -v to see invocation)
14
15
Fixes: 7d8b28b8b5 ("target/arm: Implement gdbstub m-profile systemreg and secext")
16
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
17
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
18
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
19
Message-id: 20230322142902.69511-3-philmd@linaro.org
20
[PMM: add #include since I cherry-picked this patch from the series]
21
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
22
---
23
target/arm/gdbstub.c | 5 +++--
24
1 file changed, 3 insertions(+), 2 deletions(-)
25
26
diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c
27
index XXXXXXX..XXXXXXX 100644
28
--- a/target/arm/gdbstub.c
29
+++ b/target/arm/gdbstub.c
30
@@ -XXX,XX +XXX,XX @@
31
#include "cpu.h"
32
#include "exec/gdbstub.h"
33
#include "gdbstub/helpers.h"
34
+#include "sysemu/tcg.h"
35
#include "internals.h"
36
#include "cpregs.h"
37
38
@@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
39
2, "arm-vfp-sysregs.xml", 0);
40
}
41
}
42
- if (cpu_isar_feature(aa32_mve, cpu)) {
43
+ if (cpu_isar_feature(aa32_mve, cpu) && tcg_enabled()) {
44
gdb_register_coprocessor(cs, mve_gdb_get_reg, mve_gdb_set_reg,
45
1, "arm-m-profile-mve.xml", 0);
46
}
47
@@ -XXX,XX +XXX,XX @@ void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
48
arm_gen_dynamic_sysreg_xml(cs, cs->gdb_num_regs),
49
"system-registers.xml", 0);
50
51
- if (arm_feature(env, ARM_FEATURE_M)) {
52
+ if (arm_feature(env, ARM_FEATURE_M) && tcg_enabled()) {
53
gdb_register_coprocessor(cs,
54
arm_gdb_get_m_systemreg, arm_gdb_set_m_systemreg,
55
arm_gen_dynamic_m_systemreg_xml(cs, cs->gdb_num_regs),
56
--
57
2.34.1
58
59
diff view generated by jsdifflib