1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v1->v2: fix up format string issues in aspeed_i3c.c |
---|---|---|---|
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 | -- PMM |
4 | |||
5 | The following changes since commit b10d00d8811fa4eed4862963273d7353ce310c82: | ||
6 | |||
7 | Merge remote-tracking branch 'remotes/kraxel/tags/seabios-20220118-pull-request' into staging (2022-01-19 18:46:28 +0000) | ||
4 | 8 | ||
5 | are available in the Git repository at: | 9 | are available in the Git repository at: |
6 | 10 | ||
7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 | 11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220120-1 |
8 | 12 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 13 | for you to fetch changes up to b9d383ab797f54ae5fa8746117770709921dc529: |
10 | 14 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 15 | hw/intc/arm_gicv3: Check for !MEMTX_OK instead of MEMTX_ERROR (2022-01-20 16:04:58 +0000) |
12 | 16 | ||
13 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
14 | target-arm queue: | 18 | target-arm: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 19 | * hw/intc/arm_gicv3_its: Fix various minor bugs |
20 | * hw/arm/aspeed: Add the i3c device to the AST2600 SoC | ||
21 | * hw/arm: kudo: add lm75s behind bus 1 switch at 75 | ||
22 | * hw/arm/virt: Fix support for running guests on hosts | ||
23 | with restricted IPA ranges | ||
24 | * hw/intc/arm_gic: Allow reset of the running priority | ||
25 | * hw/intc/arm_gic: Implement read of GICC_IIDR | ||
26 | * hw/arm/virt: Support for virtio-mem-pci | ||
27 | * hw/arm/virt: Support CPU cluster on ARM virt machine | ||
28 | * docs/can: convert to restructuredText | ||
29 | * hw/net: Move MV88W8618 network device out of hw/arm/ directory | ||
30 | * hw/arm/virt: KVM: Enable PAuth when supported by the host | ||
16 | 31 | ||
17 | ---------------------------------------------------------------- | 32 | ---------------------------------------------------------------- |
18 | Philippe Mathieu-Daudé (1): | 33 | Gavin Shan (2): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 34 | virtio-mem: Correct default THP size for ARM64 |
35 | hw/arm/virt: Support for virtio-mem-pci | ||
20 | 36 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 37 | Lucas Ramage (1): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 38 | docs/can: convert to restructuredText |
23 | 39 | ||
40 | Marc Zyngier (7): | ||
41 | hw/arm/virt: KVM: Enable PAuth when supported by the host | ||
42 | hw/arm/virt: Add a control for the the highmem PCIe MMIO | ||
43 | hw/arm/virt: Add a control for the the highmem redistributors | ||
44 | hw/arm/virt: Honor highmem setting when computing the memory map | ||
45 | hw/arm/virt: Use the PA range to compute the memory map | ||
46 | hw/arm/virt: Disable highmem devices that don't fit in the PA range | ||
47 | hw/arm/virt: Drop superfluous checks against highmem | ||
48 | |||
49 | Patrick Venture (1): | ||
50 | hw/arm: kudo add lm75s behind bus 1 switch at 75 | ||
51 | |||
52 | Peter Maydell (13): | ||
53 | hw/intc/arm_gicv3_its: Fix event ID bounds checks | ||
54 | hw/intc/arm_gicv3_its: Convert int ID check to num_intids convention | ||
55 | hw/intc/arm_gicv3_its: Fix handling of process_its_cmd() return value | ||
56 | hw/intc/arm_gicv3_its: Don't use data if reading command failed | ||
57 | hw/intc/arm_gicv3_its: Use enum for return value of process_* functions | ||
58 | hw/intc/arm_gicv3_its: Fix return codes in process_its_cmd() | ||
59 | hw/intc/arm_gicv3_its: Refactor process_its_cmd() to reduce nesting | ||
60 | hw/intc/arm_gicv3_its: Fix return codes in process_mapti() | ||
61 | hw/intc/arm_gicv3_its: Fix return codes in process_mapc() | ||
62 | hw/intc/arm_gicv3_its: Fix return codes in process_mapd() | ||
63 | hw/intc/arm_gicv3_its: Factor out "find address of table entry" code | ||
64 | hw/intc/arm_gicv3_its: Check indexes before use, not after | ||
65 | hw/intc/arm_gicv3_its: Range-check ICID before indexing into collection table | ||
66 | |||
67 | Petr Pavlu (2): | ||
68 | hw/intc/arm_gic: Implement read of GICC_IIDR | ||
69 | hw/intc/arm_gic: Allow reset of the running priority | ||
70 | |||
71 | Philippe Mathieu-Daudé (4): | ||
72 | hw: Move MARVELL_88W8618 Kconfig from audio/ to arm/ | ||
73 | hw/arm/musicpal: Fix coding style of code related to MV88W8618 device | ||
74 | hw/net: Move MV88W8618 network device out of hw/arm/ directory | ||
75 | hw/intc/arm_gicv3: Check for !MEMTX_OK instead of MEMTX_ERROR | ||
76 | |||
77 | Troy Lee (2): | ||
78 | hw/misc/aspeed_i3c.c: Introduce a dummy AST2600 I3C model. | ||
79 | hw/arm/aspeed: Add the i3c device to the AST2600 SoC | ||
80 | |||
81 | Yanan Wang (6): | ||
82 | hw/arm/virt: Support CPU cluster on ARM virt machine | ||
83 | hw/arm/virt: Support cluster level in DT cpu-map | ||
84 | hw/acpi/aml-build: Improve scalability of PPTT generation | ||
85 | tests/acpi/bios-tables-test: Allow changes to virt/PPTT file | ||
86 | hw/acpi/aml-build: Support cluster level in PPTT generation | ||
87 | tests/acpi/bios-table-test: Update expected virt/PPTT file | ||
88 | |||
89 | docs/system/arm/cpu-features.rst | 4 - | ||
90 | docs/system/device-emulation.rst | 1 + | ||
91 | docs/{can.txt => system/devices/can.rst} | 90 +++--- | ||
92 | include/hw/arm/aspeed_soc.h | 3 + | ||
93 | include/hw/arm/virt.h | 5 +- | ||
94 | include/hw/misc/aspeed_i3c.h | 48 +++ | ||
95 | include/hw/net/mv88w8618_eth.h | 12 + | ||
96 | target/arm/cpu.h | 1 + | ||
97 | hw/acpi/aml-build.c | 68 +++-- | ||
98 | hw/arm/aspeed_ast2600.c | 16 + | ||
99 | hw/arm/musicpal.c | 381 +----------------------- | ||
100 | hw/arm/npcm7xx_boards.c | 10 +- | ||
101 | hw/arm/virt-acpi-build.c | 10 +- | ||
102 | hw/arm/virt.c | 184 ++++++++++-- | ||
103 | hw/intc/arm_gic.c | 11 + | ||
104 | hw/intc/arm_gicv3_its.c | 492 ++++++++++++++----------------- | ||
105 | hw/intc/arm_gicv3_redist.c | 4 +- | ||
106 | hw/misc/aspeed_i3c.c | 384 ++++++++++++++++++++++++ | ||
107 | hw/net/mv88w8618_eth.c | 403 +++++++++++++++++++++++++ | ||
108 | hw/virtio/virtio-mem.c | 36 ++- | ||
109 | target/arm/cpu.c | 16 +- | ||
110 | target/arm/cpu64.c | 31 +- | ||
111 | target/arm/kvm64.c | 21 ++ | ||
112 | MAINTAINERS | 2 + | ||
113 | hw/arm/Kconfig | 4 + | ||
114 | hw/audio/Kconfig | 3 - | ||
115 | hw/misc/meson.build | 1 + | ||
116 | hw/misc/trace-events | 6 + | ||
117 | hw/net/meson.build | 1 + | ||
118 | qemu-options.hx | 10 + | ||
119 | tests/data/acpi/virt/PPTT | Bin 76 -> 96 bytes | ||
120 | 31 files changed, 1476 insertions(+), 782 deletions(-) | ||
121 | rename docs/{can.txt => system/devices/can.rst} (68%) | ||
122 | create mode 100644 include/hw/misc/aspeed_i3c.h | ||
123 | create mode 100644 include/hw/net/mv88w8618_eth.h | ||
124 | create mode 100644 hw/misc/aspeed_i3c.c | ||
125 | create mode 100644 hw/net/mv88w8618_eth.c | ||
126 | 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 |