1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v1->v2: add system/index to docs/index.rst |
---|---|---|---|
2 | v2->v3: fix format string issues for OSX | ||
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 b7c359c748a2e3ccb97a184b9739feb2cd48de2f: |
5 | |||
6 | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0-pull-request' into staging (2020-01-23 14:38:43 +0000) | ||
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-20200123-3 |
8 | 11 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 12 | for you to fetch changes up to 9805a6b7d03a23e16d6499d16882094db490683a: |
10 | 13 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 14 | hw/arm/exynos4210: Connect serial port DMA busy signals with pl330 (2020-01-23 15:52:34 +0000) |
12 | 15 | ||
13 | ---------------------------------------------------------------- | 16 | ---------------------------------------------------------------- |
14 | target-arm queue: | 17 | target-arm queue: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 18 | * fix bug in PAuth emulation |
19 | * add PMU to Cortex-R5, Cortex-R5F | ||
20 | * qemu-nbd: Convert documentation to rST | ||
21 | * qemu-block-drivers: Convert documentation to rST | ||
22 | * Fix Exynos4210 UART DMA support | ||
23 | * Various minor code cleanups | ||
16 | 24 | ||
17 | ---------------------------------------------------------------- | 25 | ---------------------------------------------------------------- |
26 | Andrew Jones (1): | ||
27 | target/arm/arch_dump: Add SVE notes | ||
28 | |||
29 | Clement Deschamps (1): | ||
30 | target/arm: add PMU feature to cortex-r5 and cortex-r5f | ||
31 | |||
32 | Guenter Roeck (8): | ||
33 | dma/pl330: Convert to support tracing | ||
34 | hw/core/or-irq: Increase limit of or-lines to 48 | ||
35 | hw/arm/exynos4210: Fix DMA initialization | ||
36 | hw/char/exynos4210_uart: Convert to support tracing | ||
37 | hw/char/exynos4210_uart: Implement post_load function | ||
38 | hw/char/exynos4210_uart: Implement Rx FIFO level triggers and timeouts | ||
39 | hw/char/exynos4210_uart: Add receive DMA support | ||
40 | hw/arm/exynos4210: Connect serial port DMA busy signals with pl330 | ||
41 | |||
42 | Keqian Zhu (2): | ||
43 | hw/acpi: Remove extra indent in ACPI GED hotplug cb | ||
44 | hw/arm: Use helper function to trigger hotplug handler plug | ||
45 | |||
46 | Peter Maydell (3): | ||
47 | qemu-nbd: Convert invocation documentation to rST | ||
48 | docs: Create stub system manual | ||
49 | qemu-block-drivers: Convert to rST | ||
50 | |||
18 | Philippe Mathieu-Daudé (1): | 51 | Philippe Mathieu-Daudé (1): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 52 | hw/misc/stm32f4xx_syscfg: Fix copy/paste error |
20 | 53 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 54 | Richard Henderson (3): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 55 | tests/tcg/aarch64: Fix compilation parameters for pauth-% |
56 | tests/tcg/aarch64: Add pauth-3 | ||
57 | tests/tcg/aarch64: Add pauth-4 | ||
23 | 58 | ||
59 | Vincent Dehors (1): | ||
60 | target/arm: Fix PAuth sbox functions | ||
61 | |||
62 | Makefile | 37 +- | ||
63 | tests/tcg/aarch64/Makefile.softmmu-target | 5 +- | ||
64 | tests/tcg/aarch64/Makefile.target | 3 +- | ||
65 | include/elf.h | 1 + | ||
66 | include/hw/arm/exynos4210.h | 4 + | ||
67 | include/hw/or-irq.h | 2 +- | ||
68 | target/arm/cpu.h | 25 + | ||
69 | hw/acpi/generic_event_device.c | 2 +- | ||
70 | hw/arm/exynos4210.c | 77 ++- | ||
71 | hw/arm/virt.c | 6 +- | ||
72 | hw/char/exynos4210_uart.c | 245 +++++--- | ||
73 | hw/dma/pl330.c | 88 +-- | ||
74 | hw/misc/stm32f4xx_syscfg.c | 2 +- | ||
75 | target/arm/arch_dump.c | 124 +++- | ||
76 | target/arm/cpu.c | 1 + | ||
77 | target/arm/kvm64.c | 24 - | ||
78 | target/arm/pauth_helper.c | 4 +- | ||
79 | tests/tcg/aarch64/pauth-1.c | 2 - | ||
80 | tests/tcg/aarch64/pauth-2.c | 2 - | ||
81 | tests/tcg/aarch64/pauth-4.c | 25 + | ||
82 | tests/tcg/aarch64/system/pauth-3.c | 40 ++ | ||
83 | MAINTAINERS | 1 + | ||
84 | docs/index.html.in | 1 + | ||
85 | docs/index.rst | 2 +- | ||
86 | docs/interop/conf.py | 4 +- | ||
87 | docs/interop/index.rst | 1 + | ||
88 | docs/interop/qemu-nbd.rst | 263 ++++++++ | ||
89 | docs/interop/qemu-option-trace.rst.inc | 30 + | ||
90 | docs/qemu-block-drivers.texi | 889 --------------------------- | ||
91 | docs/system/conf.py | 22 + | ||
92 | docs/system/index.rst | 17 + | ||
93 | docs/system/qemu-block-drivers.rst | 985 ++++++++++++++++++++++++++++++ | ||
94 | hw/char/trace-events | 20 + | ||
95 | hw/dma/trace-events | 24 + | ||
96 | qemu-doc.texi | 18 - | ||
97 | qemu-nbd.texi | 214 ------- | ||
98 | qemu-option-trace.texi | 4 + | ||
99 | qemu-options.hx | 2 +- | ||
100 | 38 files changed, 1898 insertions(+), 1318 deletions(-) | ||
101 | create mode 100644 tests/tcg/aarch64/pauth-4.c | ||
102 | create mode 100644 tests/tcg/aarch64/system/pauth-3.c | ||
103 | create mode 100644 docs/interop/qemu-nbd.rst | ||
104 | create mode 100644 docs/interop/qemu-option-trace.rst.inc | ||
105 | delete mode 100644 docs/qemu-block-drivers.texi | ||
106 | create mode 100644 docs/system/conf.py | ||
107 | create mode 100644 docs/system/index.rst | ||
108 | create mode 100644 docs/system/qemu-block-drivers.rst | ||
109 | delete mode 100644 qemu-nbd.texi | ||
110 | 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 |