1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v2 update: fix memory leaks in pvpanic-pci test case spotted by |
---|---|---|---|
2 | oss-fuzz gitlab CI run. | ||
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 | -- PMM |
5 | |||
6 | The following changes since commit 7e7eb9f852a46b51a71ae9d82590b2e4d28827ee: | ||
7 | |||
8 | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-01-28' into staging (2021-01-28 22:43:18 +0000) | ||
4 | 9 | ||
5 | are available in the Git repository at: | 10 | are available in the Git repository at: |
6 | 11 | ||
7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 | 12 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210129-1 |
8 | 13 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 14 | for you to fetch changes up to 14711b6f54708b9583796db02b12ee7bd0331502: |
10 | 15 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 16 | hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS (2021-01-29 15:54:44 +0000) |
12 | 17 | ||
13 | ---------------------------------------------------------------- | 18 | ---------------------------------------------------------------- |
14 | target-arm queue: | 19 | target-arm queue: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 20 | * Implement ID_PFR2 |
21 | * Conditionalize DBGDIDR | ||
22 | * rename xlnx-zcu102.canbusN properties | ||
23 | * provide powerdown/reset mechanism for secure firmware on 'virt' board | ||
24 | * hw/misc: Fix arith overflow in NPCM7XX PWM module | ||
25 | * target/arm: Replace magic value by MMU_DATA_LOAD definition | ||
26 | * configure: fix preadv errors on Catalina macOS with new XCode | ||
27 | * Various configure and other cleanups in preparation for iOS support | ||
28 | * hvf: Add hypervisor entitlement to output binaries (needed for Big Sur) | ||
29 | * Implement pvpanic-pci device | ||
30 | * Convert the CMSDK timer devices to the Clock framework | ||
16 | 31 | ||
17 | ---------------------------------------------------------------- | 32 | ---------------------------------------------------------------- |
33 | Alexander Graf (1): | ||
34 | hvf: Add hypervisor entitlement to output binaries | ||
35 | |||
36 | Hao Wu (1): | ||
37 | hw/misc: Fix arith overflow in NPCM7XX PWM module | ||
38 | |||
39 | Joelle van Dyne (7): | ||
40 | configure: cross-compiling with empty cross_prefix | ||
41 | osdep: build with non-working system() function | ||
42 | darwin: remove redundant dependency declaration | ||
43 | darwin: fix cross-compiling for Darwin | ||
44 | configure: cross compile should use x86_64 cpu_family | ||
45 | darwin: detect CoreAudio for build | ||
46 | darwin: remove 64-bit build detection on 32-bit OS | ||
47 | |||
48 | Maxim Uvarov (3): | ||
49 | hw: gpio: implement gpio-pwr driver for qemu reset/poweroff | ||
50 | arm-virt: refactor gpios creation | ||
51 | arm-virt: add secure pl061 for reset/power down | ||
52 | |||
53 | Mihai Carabas (4): | ||
54 | hw/misc/pvpanic: split-out generic and bus dependent code | ||
55 | hw/misc/pvpanic: add PCI interface support | ||
56 | pvpanic : update pvpanic spec document | ||
57 | tests/qtest: add a test case for pvpanic-pci | ||
58 | |||
59 | Paolo Bonzini (1): | ||
60 | arm: rename xlnx-zcu102.canbusN properties | ||
61 | |||
62 | Peter Maydell (26): | ||
63 | configure: Move preadv check to meson.build | ||
64 | ptimer: Add new ptimer_set_period_from_clock() function | ||
65 | clock: Add new clock_has_source() function | ||
66 | tests: Add a simple test of the CMSDK APB timer | ||
67 | tests: Add a simple test of the CMSDK APB watchdog | ||
68 | tests: Add a simple test of the CMSDK APB dual timer | ||
69 | hw/timer/cmsdk-apb-timer: Rename CMSDKAPBTIMER struct to CMSDKAPBTimer | ||
70 | hw/timer/cmsdk-apb-timer: Add Clock input | ||
71 | hw/timer/cmsdk-apb-dualtimer: Add Clock input | ||
72 | hw/watchdog/cmsdk-apb-watchdog: Add Clock input | ||
73 | hw/arm/armsse: Rename "MAINCLK" property to "MAINCLK_FRQ" | ||
74 | hw/arm/armsse: Wire up clocks | ||
75 | hw/arm/mps2: Inline CMSDK_APB_TIMER creation | ||
76 | hw/arm/mps2: Create and connect SYSCLK Clock | ||
77 | hw/arm/mps2-tz: Create and connect ARMSSE Clocks | ||
78 | hw/arm/musca: Create and connect ARMSSE Clocks | ||
79 | hw/arm/stellaris: Convert SSYS to QOM device | ||
80 | hw/arm/stellaris: Create Clock input for watchdog | ||
81 | hw/timer/cmsdk-apb-timer: Convert to use Clock input | ||
82 | hw/timer/cmsdk-apb-dualtimer: Convert to use Clock input | ||
83 | hw/watchdog/cmsdk-apb-watchdog: Convert to use Clock input | ||
84 | tests/qtest/cmsdk-apb-watchdog-test: Test clock changes | ||
85 | hw/arm/armsse: Use Clock to set system_clock_scale | ||
86 | arm: Don't set freq properties on CMSDK timer, dualtimer, watchdog, ARMSSE | ||
87 | arm: Remove frq properties on CMSDK timer, dualtimer, watchdog, ARMSSE | ||
88 | hw/arm/stellaris: Remove board-creation reset of STELLARIS_SYS | ||
89 | |||
18 | Philippe Mathieu-Daudé (1): | 90 | Philippe Mathieu-Daudé (1): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 91 | target/arm: Replace magic value by MMU_DATA_LOAD definition |
20 | 92 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 93 | Richard Henderson (2): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 94 | target/arm: Implement ID_PFR2 |
95 | target/arm: Conditionalize DBGDIDR | ||
23 | 96 | ||
97 | docs/devel/clocks.rst | 16 +++ | ||
98 | docs/specs/pci-ids.txt | 1 + | ||
99 | docs/specs/pvpanic.txt | 13 ++- | ||
100 | docs/system/arm/virt.rst | 2 + | ||
101 | configure | 78 ++++++++------ | ||
102 | meson.build | 34 ++++++- | ||
103 | include/hw/arm/armsse.h | 14 ++- | ||
104 | include/hw/arm/virt.h | 2 + | ||
105 | include/hw/clock.h | 15 +++ | ||
106 | include/hw/misc/pvpanic.h | 24 ++++- | ||
107 | include/hw/pci/pci.h | 1 + | ||
108 | include/hw/ptimer.h | 22 ++++ | ||
109 | include/hw/timer/cmsdk-apb-dualtimer.h | 5 +- | ||
110 | include/hw/timer/cmsdk-apb-timer.h | 34 ++----- | ||
111 | include/hw/watchdog/cmsdk-apb-watchdog.h | 5 +- | ||
112 | include/qemu/osdep.h | 12 +++ | ||
113 | include/qemu/typedefs.h | 1 + | ||
114 | target/arm/cpu.h | 1 + | ||
115 | hw/arm/armsse.c | 48 ++++++--- | ||
116 | hw/arm/mps2-tz.c | 14 ++- | ||
117 | hw/arm/mps2.c | 28 ++++- | ||
118 | hw/arm/musca.c | 13 ++- | ||
119 | hw/arm/stellaris.c | 170 +++++++++++++++++++++++-------- | ||
120 | hw/arm/virt.c | 111 ++++++++++++++++---- | ||
121 | hw/arm/xlnx-zcu102.c | 4 +- | ||
122 | hw/core/ptimer.c | 34 +++++++ | ||
123 | hw/gpio/gpio_pwr.c | 70 +++++++++++++ | ||
124 | hw/misc/npcm7xx_pwm.c | 23 ++++- | ||
125 | hw/misc/pvpanic-isa.c | 94 +++++++++++++++++ | ||
126 | hw/misc/pvpanic-pci.c | 94 +++++++++++++++++ | ||
127 | hw/misc/pvpanic.c | 85 ++-------------- | ||
128 | hw/timer/cmsdk-apb-dualtimer.c | 53 +++++++--- | ||
129 | hw/timer/cmsdk-apb-timer.c | 55 +++++----- | ||
130 | hw/watchdog/cmsdk-apb-watchdog.c | 29 ++++-- | ||
131 | target/arm/helper.c | 27 +++-- | ||
132 | target/arm/kvm64.c | 2 + | ||
133 | tests/qtest/cmsdk-apb-dualtimer-test.c | 130 +++++++++++++++++++++++ | ||
134 | tests/qtest/cmsdk-apb-timer-test.c | 75 ++++++++++++++ | ||
135 | tests/qtest/cmsdk-apb-watchdog-test.c | 131 ++++++++++++++++++++++++ | ||
136 | tests/qtest/npcm7xx_pwm-test.c | 4 +- | ||
137 | tests/qtest/pvpanic-pci-test.c | 98 ++++++++++++++++++ | ||
138 | tests/qtest/xlnx-can-test.c | 30 +++--- | ||
139 | MAINTAINERS | 3 + | ||
140 | accel/hvf/entitlements.plist | 8 ++ | ||
141 | hw/arm/Kconfig | 1 + | ||
142 | hw/gpio/Kconfig | 3 + | ||
143 | hw/gpio/meson.build | 1 + | ||
144 | hw/i386/Kconfig | 2 +- | ||
145 | hw/misc/Kconfig | 12 ++- | ||
146 | hw/misc/meson.build | 4 +- | ||
147 | scripts/entitlement.sh | 13 +++ | ||
148 | tests/qtest/meson.build | 6 +- | ||
149 | 52 files changed, 1436 insertions(+), 319 deletions(-) | ||
150 | create mode 100644 hw/gpio/gpio_pwr.c | ||
151 | create mode 100644 hw/misc/pvpanic-isa.c | ||
152 | create mode 100644 hw/misc/pvpanic-pci.c | ||
153 | create mode 100644 tests/qtest/cmsdk-apb-dualtimer-test.c | ||
154 | create mode 100644 tests/qtest/cmsdk-apb-timer-test.c | ||
155 | create mode 100644 tests/qtest/cmsdk-apb-watchdog-test.c | ||
156 | create mode 100644 tests/qtest/pvpanic-pci-test.c | ||
157 | create mode 100644 accel/hvf/entitlements.plist | ||
158 | create mode 100755 scripts/entitlement.sh | ||
159 | 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 |