1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v2: fix format-string issue in a test case. |
---|---|---|---|
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 6f34661b6c97a37a5efc27d31c037ddeda4547e2: | ||
6 | |||
7 | Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.0-pull-request' into staging (2021-03-11 18:55:27 +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-20210314 |
8 | 12 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 13 | for you to fetch changes up to 6500ac13ff8e5c64ca69f5ef5d456028cfda6139: |
10 | 14 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 15 | hw/display/pxa2xx: Inline template header (2021-03-14 13:14:56 +0000) |
12 | 16 | ||
13 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
14 | target-arm queue: | 18 | target-arm queue: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 19 | * versal: Support XRAMs and XRAM controller |
20 | * smmu: Various minor bug fixes | ||
21 | * SVE emulation: fix bugs handling odd vector lengths | ||
22 | * allwinner-sun8i-emac: traverse transmit queue using TX_CUR_DESC register value | ||
23 | * tests/acceptance: fix orangepi-pc acceptance tests | ||
24 | * hw/timer/sse-timer: Propagate eventual error in sse_timer_realize() | ||
25 | * hw/arm/virt: KVM: The IPA lower bound is 32 | ||
26 | * npcm7xx: support MFT module | ||
27 | * pl110, pxa2xx_lcd: tidy up template headers | ||
16 | 28 | ||
17 | ---------------------------------------------------------------- | 29 | ---------------------------------------------------------------- |
30 | Andrew Jones (2): | ||
31 | accel: kvm: Fix kvm_type invocation | ||
32 | hw/arm/virt: KVM: The IPA lower bound is 32 | ||
33 | |||
34 | Edgar E. Iglesias (2): | ||
35 | hw/misc: versal: Add a model of the XRAM controller | ||
36 | hw/arm: versal: Add support for the XRAMs | ||
37 | |||
38 | Eric Auger (7): | ||
39 | intel_iommu: Fix mask may be uninitialized in vtd_context_device_invalidate | ||
40 | dma: Introduce dma_aligned_pow2_mask() | ||
41 | virtio-iommu: Handle non power of 2 range invalidations | ||
42 | hw/arm/smmu-common: Fix smmu_iotlb_inv_iova when asid is not set | ||
43 | hw/arm/smmuv3: Enforce invalidation on a power of two range | ||
44 | hw/arm/smmuv3: Fix SMMU_CMD_CFGI_STE_RANGE handling | ||
45 | hw/arm/smmuv3: Uniformize sid traces | ||
46 | |||
47 | Hao Wu (5): | ||
48 | hw/misc: Add GPIOs for duty in NPCM7xx PWM | ||
49 | hw/misc: Add NPCM7XX MFT Module | ||
50 | hw/arm: Add MFT device to NPCM7xx Soc | ||
51 | hw/arm: Connect PWM fans in NPCM7XX boards | ||
52 | tests/qtest: Test PWM fan RPM using MFT in PWM test | ||
53 | |||
54 | Niek Linnenbank (5): | ||
55 | hw/net/allwinner-sun8i-emac: traverse transmit queue using TX_CUR_DESC register value | ||
56 | tests/acceptance/boot_linux_console: remove Armbian 19.11.3 bionic test for orangepi-pc machine | ||
57 | tests/acceptance/boot_linux_console: change URL for test_arm_orangepi_bionic_20_08 | ||
58 | tests/acceptance: update sunxi kernel from armbian to 5.10.16 | ||
59 | tests/acceptance: drop ARMBIAN_ARTIFACTS_CACHED condition for orangepi-pc, cubieboard tests | ||
60 | |||
61 | Peter Maydell (9): | ||
62 | hw/display/pl110: Remove dead code for non-32-bpp surfaces | ||
63 | hw/display/pl110: Pull included-once parts of template header into pl110.c | ||
64 | hw/display/pl110: Remove use of BITS from pl110_template.h | ||
65 | hw/display/pxa2xx_lcd: Remove dead code for non-32-bpp surfaces | ||
66 | hw/display/pxa2xx_lcd: Remove dest_width state field | ||
67 | hw/display/pxa2xx: Remove use of BITS in pxa2xx_template.h | ||
68 | hw/display/pxa2xx: Apply brace-related coding style fixes to template header | ||
69 | hw/display/pxa2xx: Apply whitespace-only coding style fixes to template header | ||
70 | hw/display/pxa2xx: Inline template header | ||
71 | |||
18 | Philippe Mathieu-Daudé (1): | 72 | Philippe Mathieu-Daudé (1): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 73 | hw/timer/sse-timer: Propagate eventual error in sse_timer_realize() |
20 | 74 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 75 | Richard Henderson (8): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 76 | target/arm: Fix sve_uzp_p vs odd vector lengths |
77 | target/arm: Fix sve_zip_p vs odd vector lengths | ||
78 | target/arm: Fix sve_punpk_p vs odd vector lengths | ||
79 | target/arm: Update find_last_active for PREDDESC | ||
80 | target/arm: Update BRKA, BRKB, BRKN for PREDDESC | ||
81 | target/arm: Update CNTP for PREDDESC | ||
82 | target/arm: Update WHILE for PREDDESC | ||
83 | target/arm: Update sve reduction vs simd_desc | ||
23 | 84 | ||
85 | docs/system/arm/nuvoton.rst | 2 +- | ||
86 | docs/system/arm/xlnx-versal-virt.rst | 1 + | ||
87 | hw/arm/smmu-internal.h | 5 + | ||
88 | hw/display/pl110_template.h | 120 +------- | ||
89 | hw/display/pxa2xx_template.h | 447 --------------------------- | ||
90 | include/hw/arm/npcm7xx.h | 13 +- | ||
91 | include/hw/arm/xlnx-versal.h | 13 + | ||
92 | include/hw/boards.h | 1 + | ||
93 | include/hw/misc/npcm7xx_mft.h | 70 +++++ | ||
94 | include/hw/misc/npcm7xx_pwm.h | 4 +- | ||
95 | include/hw/misc/xlnx-versal-xramc.h | 97 ++++++ | ||
96 | include/sysemu/dma.h | 12 + | ||
97 | target/arm/kvm_arm.h | 6 +- | ||
98 | accel/kvm/kvm-all.c | 2 + | ||
99 | hw/arm/npcm7xx.c | 45 ++- | ||
100 | hw/arm/npcm7xx_boards.c | 99 ++++++ | ||
101 | hw/arm/smmu-common.c | 32 +- | ||
102 | hw/arm/smmuv3.c | 58 ++-- | ||
103 | hw/arm/virt.c | 23 +- | ||
104 | hw/arm/xlnx-versal.c | 36 +++ | ||
105 | hw/display/pl110.c | 123 +++++--- | ||
106 | hw/display/pxa2xx_lcd.c | 520 ++++++++++++++++++++++++++----- | ||
107 | hw/i386/intel_iommu.c | 32 +- | ||
108 | hw/misc/npcm7xx_mft.c | 540 +++++++++++++++++++++++++++++++++ | ||
109 | hw/misc/npcm7xx_pwm.c | 4 + | ||
110 | hw/misc/xlnx-versal-xramc.c | 253 +++++++++++++++ | ||
111 | hw/net/allwinner-sun8i-emac.c | 62 ++-- | ||
112 | hw/timer/sse-timer.c | 1 + | ||
113 | hw/virtio/virtio-iommu.c | 19 +- | ||
114 | softmmu/dma-helpers.c | 26 ++ | ||
115 | target/arm/kvm.c | 4 +- | ||
116 | target/arm/sve_helper.c | 107 ++++--- | ||
117 | target/arm/translate-sve.c | 26 +- | ||
118 | tests/qtest/npcm7xx_pwm-test.c | 205 ++++++++++++- | ||
119 | hw/arm/trace-events | 24 +- | ||
120 | hw/misc/meson.build | 2 + | ||
121 | hw/misc/trace-events | 8 + | ||
122 | tests/acceptance/boot_linux_console.py | 120 +++----- | ||
123 | tests/acceptance/replay_kernel.py | 10 +- | ||
124 | 39 files changed, 2235 insertions(+), 937 deletions(-) | ||
125 | delete mode 100644 hw/display/pxa2xx_template.h | ||
126 | create mode 100644 include/hw/misc/npcm7xx_mft.h | ||
127 | create mode 100644 include/hw/misc/xlnx-versal-xramc.h | ||
128 | create mode 100644 hw/misc/npcm7xx_mft.c | ||
129 | create mode 100644 hw/misc/xlnx-versal-xramc.c | ||
130 | 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 |