1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | Changes v1->v2: dropped rth's patchset as it causes an |
---|---|---|---|
2 | assert with the qemu-armeb binary. | ||
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 | I expect I'll do another pullreq at the end of the week. |
5 | |||
6 | thanks | ||
7 | -- PMM | ||
8 | |||
9 | The following changes since commit f9bec781379dd7ccf9d01b4b6a79a9ec82c192e5: | ||
10 | |||
11 | Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20191022' into staging (2019-10-22 13:45:09 +0100) | ||
4 | 12 | ||
5 | are available in the Git repository at: | 13 | are available in the Git repository at: |
6 | 14 | ||
7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 | 15 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20191022-1 |
8 | 16 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 17 | for you to fetch changes up to f9c1fe62a16f32c3d6fe34c2856475052b7efdaf: |
10 | 18 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 19 | hw/arm/digic4: Inline digic4_board_setup_ram() function (2019-10-22 16:50:38 +0100) |
12 | 20 | ||
13 | ---------------------------------------------------------------- | 21 | ---------------------------------------------------------------- |
14 | target-arm queue: | 22 | target-arm queue: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 23 | * Fix sign-extension for SMLAL* instructions |
24 | * aspeed: Add an AST2600 eval board | ||
25 | * Various ptimer device conversions to new transaction API | ||
26 | * Add a dummy Samsung SDHCI controller model to exynos4 boards | ||
27 | * Minor refactorings of RAM creation for some arm boards | ||
16 | 28 | ||
17 | ---------------------------------------------------------------- | 29 | ---------------------------------------------------------------- |
18 | Philippe Mathieu-Daudé (1): | 30 | Cédric Le Goater (1): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 31 | aspeed: Add an AST2600 eval board |
20 | 32 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 33 | Guenter Roeck (1): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 34 | hw/timer/exynos4210_mct: Initialize ptimer before starting it |
23 | 35 | ||
36 | Peter Maydell (7): | ||
37 | hw/timer/arm_mptimer.c: Undo accidental rename of arm_mptimer_init() | ||
38 | hw/timer/puv3_ost.c: Switch to transaction-based ptimer API | ||
39 | hw/timer/sh_timer: Switch to transaction-based ptimer API | ||
40 | hw/timer/lm32_timer: Switch to transaction-based ptimer API | ||
41 | hw/timer/altera_timer.c: Switch to transaction-based ptimer API | ||
42 | hw/watchdog/etraxfs_timer.c: Switch to transaction-based ptimer API | ||
43 | hw/m68k/mcf5208.c: Switch to transaction-based ptimer API | ||
44 | |||
45 | Philippe Mathieu-Daudé (9): | ||
46 | hw/sd/sdhci: Add a comment to distinct the i.MX eSDHC functions | ||
47 | hw/sd/sdhci: Add dummy Samsung SDHCI controller | ||
48 | hw/arm/exynos4210: Use the Samsung s3c SDHCI controller | ||
49 | hw/arm/xilinx_zynq: Use the IEC binary prefix definitions | ||
50 | hw/arm/mps2: Use the IEC binary prefix definitions | ||
51 | hw/arm/collie: Create the RAM in the board | ||
52 | hw/arm/omap2: Create the RAM in the board | ||
53 | hw/arm/omap1: Create the RAM in the board | ||
54 | hw/arm/digic4: Inline digic4_board_setup_ram() function | ||
55 | |||
56 | Richard Henderson (1): | ||
57 | target/arm: Fix sign-extension for SMLAL* | ||
58 | |||
59 | hw/arm/strongarm.h | 4 +-- | ||
60 | include/hw/arm/aspeed.h | 1 + | ||
61 | include/hw/arm/omap.h | 10 +++---- | ||
62 | include/hw/sd/sdhci.h | 2 ++ | ||
63 | hw/arm/aspeed.c | 23 ++++++++++++++++ | ||
64 | hw/arm/collie.c | 8 ++++-- | ||
65 | hw/arm/digic_boards.c | 9 ++----- | ||
66 | hw/arm/exynos4210.c | 2 +- | ||
67 | hw/arm/mps2-tz.c | 3 ++- | ||
68 | hw/arm/mps2.c | 3 ++- | ||
69 | hw/arm/nseries.c | 10 ++++--- | ||
70 | hw/arm/omap1.c | 12 ++++----- | ||
71 | hw/arm/omap2.c | 13 ++++----- | ||
72 | hw/arm/omap_sx1.c | 8 ++++-- | ||
73 | hw/arm/palm.c | 8 ++++-- | ||
74 | hw/arm/strongarm.c | 7 +---- | ||
75 | hw/arm/xilinx_zynq.c | 3 ++- | ||
76 | hw/m68k/mcf5208.c | 9 ++++--- | ||
77 | hw/sd/sdhci.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++- | ||
78 | hw/timer/altera_timer.c | 13 ++++++--- | ||
79 | hw/timer/arm_mptimer.c | 4 +-- | ||
80 | hw/timer/etraxfs_timer.c | 23 +++++++++------- | ||
81 | hw/timer/exynos4210_mct.c | 2 +- | ||
82 | hw/timer/lm32_timer.c | 13 ++++++--- | ||
83 | hw/timer/puv3_ost.c | 9 ++++--- | ||
84 | hw/timer/sh_timer.c | 13 ++++++--- | ||
85 | target/arm/translate.c | 4 ++- | ||
86 | 27 files changed, 198 insertions(+), 86 deletions(-) | ||
87 | 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 |