1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v3: really fix the format string nit (oops) |
---|---|---|---|
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 | The following changes since commit eae587e8e3694b1aceab23239493fb4c7e1a80f5: |
4 | |||
5 | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-09-13' into staging (2021-09-13 11:00:30 +0100) | ||
4 | 6 | ||
5 | are available in the Git repository at: | 7 | are available in the Git repository at: |
6 | 8 | ||
7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 | 9 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210913-2 |
8 | 10 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 11 | for you to fetch changes up to eec607843ca81eccab238fce86222be9c78b3675: |
10 | 12 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 13 | hw/arm/mps2.c: Mark internal-only I2C buses as 'full' (2021-09-13 19:45:02 +0100) |
12 | 14 | ||
13 | ---------------------------------------------------------------- | 15 | ---------------------------------------------------------------- |
14 | target-arm queue: | 16 | target-arm queue: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 17 | * mark MPS2/MPS3 board-internal i2c buses as 'full' so that command |
18 | line user-created devices are not plugged into them | ||
19 | * Take an exception if PSTATE.IL is set | ||
20 | * Support an emulated ITS in the virt board | ||
21 | * Add support for kudo-bmc board | ||
22 | * Probe for KVM_CAP_ARM_VM_IPA_SIZE when creating scratch VM | ||
23 | * cadence_uart: Fix clock handling issues that prevented | ||
24 | u-boot from running | ||
16 | 25 | ||
17 | ---------------------------------------------------------------- | 26 | ---------------------------------------------------------------- |
18 | Philippe Mathieu-Daudé (1): | 27 | Bin Meng (6): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 28 | hw/misc: zynq_slcr: Correctly compute output clocks in the reset exit phase |
29 | hw/char: cadence_uart: Disable transmit when input clock is disabled | ||
30 | hw/char: cadence_uart: Move clock/reset check to uart_can_receive() | ||
31 | hw/char: cadence_uart: Convert to memop_with_attrs() ops | ||
32 | hw/char: cadence_uart: Ignore access when unclocked or in reset for uart_{read, write}() | ||
33 | hw/char: cadence_uart: Log a guest error when device is unclocked or in reset | ||
20 | 34 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 35 | Chris Rauer (1): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 36 | hw/arm: Add support for kudo-bmc board. |
23 | 37 | ||
38 | Marc Zyngier (1): | ||
39 | hw/arm/virt: KVM: Probe for KVM_CAP_ARM_VM_IPA_SIZE when creating scratch VM | ||
40 | |||
41 | Peter Maydell (5): | ||
42 | target/arm: Take an exception if PSTATE.IL is set | ||
43 | qdev: Support marking individual buses as 'full' | ||
44 | hw/arm/mps2-tz.c: Add extra data parameter to MakeDevFn | ||
45 | hw/arm/mps2-tz.c: Mark internal-only I2C buses as 'full' | ||
46 | hw/arm/mps2.c: Mark internal-only I2C buses as 'full' | ||
47 | |||
48 | Richard Henderson (1): | ||
49 | target/arm: Merge disas_a64_insn into aarch64_tr_translate_insn | ||
50 | |||
51 | Shashi Mallela (9): | ||
52 | hw/intc: GICv3 ITS initial framework | ||
53 | hw/intc: GICv3 ITS register definitions added | ||
54 | hw/intc: GICv3 ITS command queue framework | ||
55 | hw/intc: GICv3 ITS Command processing | ||
56 | hw/intc: GICv3 ITS Feature enablement | ||
57 | hw/intc: GICv3 redistributor ITS processing | ||
58 | tests/data/acpi/virt: Add IORT files for ITS | ||
59 | hw/arm/virt: add ITS support in virt GIC | ||
60 | tests/data/acpi/virt: Update IORT files for ITS | ||
61 | |||
62 | docs/system/arm/nuvoton.rst | 1 + | ||
63 | hw/intc/gicv3_internal.h | 188 ++++- | ||
64 | include/hw/arm/virt.h | 2 + | ||
65 | include/hw/intc/arm_gicv3_common.h | 13 + | ||
66 | include/hw/intc/arm_gicv3_its_common.h | 32 +- | ||
67 | include/hw/qdev-core.h | 24 + | ||
68 | target/arm/cpu.h | 1 + | ||
69 | target/arm/kvm_arm.h | 4 +- | ||
70 | target/arm/syndrome.h | 5 + | ||
71 | target/arm/translate.h | 2 + | ||
72 | hw/arm/mps2-tz.c | 92 ++- | ||
73 | hw/arm/mps2.c | 12 +- | ||
74 | hw/arm/npcm7xx_boards.c | 34 + | ||
75 | hw/arm/virt.c | 29 +- | ||
76 | hw/char/cadence_uart.c | 61 +- | ||
77 | hw/intc/arm_gicv3.c | 14 + | ||
78 | hw/intc/arm_gicv3_common.c | 13 + | ||
79 | hw/intc/arm_gicv3_cpuif.c | 7 +- | ||
80 | hw/intc/arm_gicv3_dist.c | 5 +- | ||
81 | hw/intc/arm_gicv3_its.c | 1322 ++++++++++++++++++++++++++++++++ | ||
82 | hw/intc/arm_gicv3_its_common.c | 7 +- | ||
83 | hw/intc/arm_gicv3_its_kvm.c | 2 +- | ||
84 | hw/intc/arm_gicv3_redist.c | 153 +++- | ||
85 | hw/misc/zynq_slcr.c | 31 +- | ||
86 | softmmu/qdev-monitor.c | 7 +- | ||
87 | target/arm/helper-a64.c | 1 + | ||
88 | target/arm/helper.c | 8 + | ||
89 | target/arm/kvm.c | 7 +- | ||
90 | target/arm/translate-a64.c | 255 +++--- | ||
91 | target/arm/translate.c | 21 + | ||
92 | hw/intc/meson.build | 1 + | ||
93 | tests/data/acpi/virt/IORT | Bin 0 -> 124 bytes | ||
94 | tests/data/acpi/virt/IORT.memhp | Bin 0 -> 124 bytes | ||
95 | tests/data/acpi/virt/IORT.numamem | Bin 0 -> 124 bytes | ||
96 | tests/data/acpi/virt/IORT.pxb | Bin 0 -> 124 bytes | ||
97 | 35 files changed, 2144 insertions(+), 210 deletions(-) | ||
98 | create mode 100644 hw/intc/arm_gicv3_its.c | ||
99 | create mode 100644 tests/data/acpi/virt/IORT | ||
100 | create mode 100644 tests/data/acpi/virt/IORT.memhp | ||
101 | create mode 100644 tests/data/acpi/virt/IORT.numamem | ||
102 | create mode 100644 tests/data/acpi/virt/IORT.pxb | ||
103 | 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 |