1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v2: minor tweak to fix format string issue on Windows hosts... |
---|---|---|---|
2 | 2 | ||
3 | Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000) | 3 | |
4 | The following changes since commit 6eeea6725a70e6fcb5abba0764496bdab07ddfb3: | ||
5 | |||
6 | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-10-06' into staging (2020-10-06 21:13:34 +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-20201008-1 |
8 | 11 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 12 | for you to fetch changes up to d1b6b7017572e8d82f26eb827a1dba0e8cf3cae6: |
10 | 13 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 14 | target/arm: Make '-cpu max' have a 48-bit PA (2020-10-08 21:40:01 +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 | * hw/ssi/npcm7xx_fiu: Fix handling of unsigned integer |
19 | * hw/arm/fsl-imx25: Fix a typo | ||
20 | * hw/arm/sbsa-ref : Fix SMMUv3 Initialisation | ||
21 | * hw/arm/sbsa-ref : allocate IRQs for SMMUv3 | ||
22 | * hw/char/bcm2835_aux: Allow less than 32-bit accesses | ||
23 | * hw/arm/virt: Implement kvm-steal-time | ||
24 | * target/arm: Make '-cpu max' have a 48-bit PA | ||
16 | 25 | ||
17 | ---------------------------------------------------------------- | 26 | ---------------------------------------------------------------- |
18 | Philippe Mathieu-Daudé (1): | 27 | Andrew Jones (6): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 28 | linux headers: sync to 5.9-rc7 |
29 | target/arm/kvm: Make uncalled stubs explicitly unreachable | ||
30 | hw/arm/virt: Move post cpu realize check into its own function | ||
31 | hw/arm/virt: Move kvm pmu setup to virt_cpu_post_init | ||
32 | tests/qtest: Restore aarch64 arm-cpu-features test | ||
33 | hw/arm/virt: Implement kvm-steal-time | ||
20 | 34 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 35 | Graeme Gregory (2): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 36 | hw/arm/sbsa-ref : Fix SMMUv3 Initialisation |
37 | hw/arm/sbsa-ref : allocate IRQs for SMMUv3 | ||
23 | 38 | ||
39 | Peter Maydell (1): | ||
40 | target/arm: Make '-cpu max' have a 48-bit PA | ||
41 | |||
42 | Philippe Mathieu-Daudé (3): | ||
43 | hw/ssi/npcm7xx_fiu: Fix handling of unsigned integer | ||
44 | hw/arm/fsl-imx25: Fix a typo | ||
45 | hw/char/bcm2835_aux: Allow less than 32-bit accesses | ||
46 | |||
47 | docs/system/arm/cpu-features.rst | 11 ++++ | ||
48 | include/hw/arm/fsl-imx25.h | 2 +- | ||
49 | include/hw/arm/virt.h | 5 ++ | ||
50 | linux-headers/linux/kvm.h | 6 ++- | ||
51 | target/arm/cpu.h | 4 ++ | ||
52 | target/arm/kvm_arm.h | 94 ++++++++++++++++++++++++++------- | ||
53 | hw/arm/sbsa-ref.c | 3 +- | ||
54 | hw/arm/virt.c | 111 ++++++++++++++++++++++++++++----------- | ||
55 | hw/char/bcm2835_aux.c | 4 +- | ||
56 | hw/ssi/npcm7xx_fiu.c | 12 ++--- | ||
57 | target/arm/cpu.c | 8 +++ | ||
58 | target/arm/cpu64.c | 4 ++ | ||
59 | target/arm/kvm.c | 16 ++++++ | ||
60 | target/arm/kvm64.c | 64 ++++++++++++++++++++-- | ||
61 | target/arm/monitor.c | 2 +- | ||
62 | tests/qtest/arm-cpu-features.c | 25 +++++++-- | ||
63 | hw/ssi/trace-events | 2 +- | ||
64 | tests/qtest/meson.build | 3 +- | ||
65 | 18 files changed, 304 insertions(+), 72 deletions(-) | ||
66 | 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 |