1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v2: drop the 'merge the manuals' patch: it breaks the gitlab job which tries |
---|---|---|---|
2 | to publish the docs on gitlab, and I also realised I forgot to update the | ||
3 | Windows installer scripts. | ||
2 | 4 | ||
3 | Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000) | 5 | -- PMM |
6 | |||
7 | The following changes since commit b3f846c59d8405bb87c551187721fc92ff2f1b92: | ||
8 | |||
9 | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2021-01-11v2' into staging (2021-01-11 15:15:35 +0000) | ||
4 | 10 | ||
5 | are available in the Git repository at: | 11 | are available in the Git repository at: |
6 | 12 | ||
7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 | 13 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210112-1 |
8 | 14 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 15 | for you to fetch changes up to 1ff5a063d60c7737de11465516331b8ca8700865: |
10 | 16 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 17 | ui/cocoa: Fix openFile: deprecation on Big Sur (2021-01-12 21:19:02 +0000) |
12 | 18 | ||
13 | ---------------------------------------------------------------- | 19 | ---------------------------------------------------------------- |
14 | target-arm queue: | 20 | target-arm queue: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 21 | * arm: Support emulation of ARMv8.4-TTST extension |
22 | * arm: Update cpu.h ID register field definitions | ||
23 | * arm: Fix breakage of XScale instruction emulation | ||
24 | * hw/net/lan9118: Fix RX Status FIFO PEEK value | ||
25 | * npcm7xx: Add ADC and PWM emulation | ||
26 | * ui/cocoa: Make "open docs" help menu entry work again when binary | ||
27 | is run from the build tree | ||
28 | * ui/cocoa: Fix openFile: deprecation on Big Sur | ||
29 | * docs: Add qemu-storage-daemon(1) manpage to meson.build | ||
16 | 30 | ||
17 | ---------------------------------------------------------------- | 31 | ---------------------------------------------------------------- |
18 | Philippe Mathieu-Daudé (1): | 32 | Hao Wu (6): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 33 | hw/misc: Add clock converter in NPCM7XX CLK module |
34 | hw/timer: Refactor NPCM7XX Timer to use CLK clock | ||
35 | hw/adc: Add an ADC module for NPCM7XX | ||
36 | hw/misc: Add a PWM module for NPCM7XX | ||
37 | hw/misc: Add QTest for NPCM7XX PWM Module | ||
38 | hw/*: Use type casting for SysBusDevice in NPCM7XX | ||
20 | 39 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 40 | Leif Lindholm (6): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 41 | target/arm: fix typo in cpu.h ID_AA64PFR1 field name |
42 | target/arm: make ARMCPU.clidr 64-bit | ||
43 | target/arm: make ARMCPU.ctr 64-bit | ||
44 | target/arm: add descriptions of CLIDR_EL1, CCSIDR_EL1, CTR_EL0 to cpu.h | ||
45 | target/arm: add aarch64 ID register fields to cpu.h | ||
46 | target/arm: add aarch32 ID register fields to cpu.h | ||
23 | 47 | ||
48 | Peter Maydell (4): | ||
49 | docs: Add qemu-storage-daemon(1) manpage to meson.build | ||
50 | target/arm: Don't decode insns in the XScale/iWMMXt space as cp insns | ||
51 | hw/net/lan9118: Fix RX Status FIFO PEEK value | ||
52 | hw/net/lan9118: Add symbolic constants for register offsets | ||
53 | |||
54 | Roman Bolshakov (2): | ||
55 | ui/cocoa: Update path to docs in build tree | ||
56 | ui/cocoa: Fix openFile: deprecation on Big Sur | ||
57 | |||
58 | Rémi Denis-Courmont (2): | ||
59 | target/arm: ARMv8.4-TTST extension | ||
60 | target/arm: enable Small Translation tables in max CPU | ||
61 | |||
62 | docs/meson.build | 1 + | ||
63 | docs/system/arm/nuvoton.rst | 4 +- | ||
64 | meson.build | 1 + | ||
65 | hw/adc/trace.h | 1 + | ||
66 | include/hw/adc/npcm7xx_adc.h | 69 ++++ | ||
67 | include/hw/arm/npcm7xx.h | 4 + | ||
68 | include/hw/misc/npcm7xx_clk.h | 146 ++++++- | ||
69 | include/hw/misc/npcm7xx_pwm.h | 105 +++++ | ||
70 | include/hw/timer/npcm7xx_timer.h | 1 + | ||
71 | target/arm/cpu.h | 85 ++++- | ||
72 | hw/adc/npcm7xx_adc.c | 301 +++++++++++++++ | ||
73 | hw/arm/npcm7xx.c | 55 ++- | ||
74 | hw/arm/npcm7xx_boards.c | 2 +- | ||
75 | hw/mem/npcm7xx_mc.c | 2 +- | ||
76 | hw/misc/npcm7xx_clk.c | 807 ++++++++++++++++++++++++++++++++++++++- | ||
77 | hw/misc/npcm7xx_gcr.c | 2 +- | ||
78 | hw/misc/npcm7xx_pwm.c | 550 ++++++++++++++++++++++++++ | ||
79 | hw/misc/npcm7xx_rng.c | 2 +- | ||
80 | hw/net/lan9118.c | 26 +- | ||
81 | hw/nvram/npcm7xx_otp.c | 2 +- | ||
82 | hw/ssi/npcm7xx_fiu.c | 2 +- | ||
83 | hw/timer/npcm7xx_timer.c | 39 +- | ||
84 | target/arm/cpu64.c | 1 + | ||
85 | target/arm/helper.c | 15 +- | ||
86 | target/arm/translate.c | 7 + | ||
87 | tests/qtest/npcm7xx_adc-test.c | 377 ++++++++++++++++++ | ||
88 | tests/qtest/npcm7xx_pwm-test.c | 490 ++++++++++++++++++++++++ | ||
89 | hw/adc/meson.build | 1 + | ||
90 | hw/adc/trace-events | 5 + | ||
91 | hw/misc/meson.build | 1 + | ||
92 | hw/misc/trace-events | 6 + | ||
93 | tests/qtest/meson.build | 4 +- | ||
94 | ui/cocoa.m | 7 +- | ||
95 | 33 files changed, 3054 insertions(+), 67 deletions(-) | ||
96 | create mode 100644 hw/adc/trace.h | ||
97 | create mode 100644 include/hw/adc/npcm7xx_adc.h | ||
98 | create mode 100644 include/hw/misc/npcm7xx_pwm.h | ||
99 | create mode 100644 hw/adc/npcm7xx_adc.c | ||
100 | create mode 100644 hw/misc/npcm7xx_pwm.c | ||
101 | create mode 100644 tests/qtest/npcm7xx_adc-test.c | ||
102 | create mode 100644 tests/qtest/npcm7xx_pwm-test.c | ||
103 | create mode 100644 hw/adc/trace-events | ||
104 | 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 |