1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v2: |
---|---|---|---|
2 | * dropped target/arm/cpu: Use ARRAY_SIZE() to iterate over ARMCPUInfo[] | ||
3 | * renamed CLOCK_SECOND to CLOCK_PERIOD_1SEC | ||
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 | |
6 | The following changes since commit 648db19685b7030aa558a4ddbd3a8e53d8c9a062: | ||
7 | |||
8 | Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2020-04-29' into staging (2020-04-29 15:07:33 +0100) | ||
4 | 9 | ||
5 | are available in the Git repository at: | 10 | are available in the Git repository at: |
6 | 11 | ||
7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 | 12 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20200430-1 |
8 | 13 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 14 | for you to fetch changes up to 6f7b6947a6639fff15c6a0956adf0f5ec004b789: |
10 | 15 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 16 | hw/arm: xlnx-zcu102: Disable unsupported FDT firmware nodes (2020-04-30 15:35:41 +0100) |
12 | 17 | ||
13 | ---------------------------------------------------------------- | 18 | ---------------------------------------------------------------- |
14 | target-arm queue: | 19 | target-arm queue: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 20 | * xlnx-zdma: Fix endianness handling of descriptor loading |
21 | * nrf51: Fix last GPIO CNF address | ||
22 | * gicv3: Use gicr_typer in arm_gicv3_icc_reset | ||
23 | * msf2: Add EMAC block to SmartFusion2 SoC | ||
24 | * New clock modelling framework | ||
25 | * hw/arm: versal: Setup the ADMA with 128bit bus-width | ||
26 | * Cadence: gem: fix wraparound in 64bit descriptors | ||
27 | * cadence_gem: clear RX control descriptor | ||
28 | * target/arm: Vectorize integer comparison vs zero | ||
29 | * hw/arm/virt: dt: add kaslr-seed property | ||
30 | * hw/arm: xlnx-zcu102: Disable unsupported FDT firmware nodes | ||
16 | 31 | ||
17 | ---------------------------------------------------------------- | 32 | ---------------------------------------------------------------- |
18 | Philippe Mathieu-Daudé (1): | 33 | Cameron Esfahani (1): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 34 | nrf51: Fix last GPIO CNF address |
20 | 35 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 36 | Damien Hedde (7): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 37 | hw/core/clock-vmstate: define a vmstate entry for clock state |
38 | qdev: add clock input&output support to devices. | ||
39 | qdev-clock: introduce an init array to ease the device construction | ||
40 | hw/misc/zynq_slcr: add clock generation for uarts | ||
41 | hw/char/cadence_uart: add clock support | ||
42 | hw/arm/xilinx_zynq: connect uart clocks to slcr | ||
43 | qdev-monitor: print the device's clock with info qtree | ||
23 | 44 | ||
45 | Edgar E. Iglesias (7): | ||
46 | dma/xlnx-zdma: Fix descriptor loading (MEM) wrt endianness | ||
47 | dma/xlnx-zdma: Fix descriptor loading (REG) wrt endianness | ||
48 | hw/arm: versal: Setup the ADMA with 128bit bus-width | ||
49 | device_tree: Allow name wildcards in qemu_fdt_node_path() | ||
50 | device_tree: Constify compat in qemu_fdt_node_path() | ||
51 | hw/arm: xlnx-zcu102: Move arm_boot_info into XlnxZCU102 | ||
52 | hw/arm: xlnx-zcu102: Disable unsupported FDT firmware nodes | ||
53 | |||
54 | Jerome Forissier (2): | ||
55 | hw/arm/virt: dt: move creation of /secure-chosen to create_fdt() | ||
56 | hw/arm/virt: dt: add kaslr-seed property | ||
57 | |||
58 | Keqian Zhu (2): | ||
59 | bugfix: Use gicr_typer in arm_gicv3_icc_reset | ||
60 | Typo: Correct the name of CPU hotplug memory region | ||
61 | |||
62 | Peter Maydell (2): | ||
63 | hw/core/clock: introduce clock object | ||
64 | docs/clocks: add device's clock documentation | ||
65 | |||
66 | Philippe Mathieu-Daudé (2): | ||
67 | target/arm: Restrict the Address Translate write operation to TCG accel | ||
68 | target/arm/cpu: Update coding style to make checkpatch.pl happy | ||
69 | |||
70 | Ramon Fried (2): | ||
71 | Cadence: gem: fix wraparound in 64bit descriptors | ||
72 | net: cadence_gem: clear RX control descriptor | ||
73 | |||
74 | Richard Henderson (1): | ||
75 | target/arm: Vectorize integer comparison vs zero | ||
76 | |||
77 | Subbaraya Sundeep (3): | ||
78 | hw/net: Add Smartfusion2 emac block | ||
79 | msf2: Add EMAC block to SmartFusion2 SoC | ||
80 | tests/boot_linux_console: Add ethernet test to SmartFusion2 | ||
81 | |||
82 | Thomas Huth (1): | ||
83 | target/arm: Make cpu_register() available for other files | ||
84 | |||
85 | hw/core/Makefile.objs | 2 + | ||
86 | hw/net/Makefile.objs | 1 + | ||
87 | tests/Makefile.include | 1 + | ||
88 | include/hw/arm/msf2-soc.h | 2 + | ||
89 | include/hw/char/cadence_uart.h | 1 + | ||
90 | include/hw/clock.h | 225 +++++++++++++ | ||
91 | include/hw/gpio/nrf51_gpio.h | 2 +- | ||
92 | include/hw/net/msf2-emac.h | 53 +++ | ||
93 | include/hw/qdev-clock.h | 159 +++++++++ | ||
94 | include/hw/qdev-core.h | 12 + | ||
95 | include/sysemu/device_tree.h | 5 +- | ||
96 | target/arm/cpu-qom.h | 9 +- | ||
97 | target/arm/helper.h | 27 +- | ||
98 | target/arm/translate.h | 5 + | ||
99 | device_tree.c | 4 +- | ||
100 | hw/acpi/cpu.c | 2 +- | ||
101 | hw/arm/msf2-soc.c | 26 +- | ||
102 | hw/arm/virt.c | 20 +- | ||
103 | hw/arm/xilinx_zynq.c | 57 +++- | ||
104 | hw/arm/xlnx-versal.c | 2 + | ||
105 | hw/arm/xlnx-zcu102.c | 39 ++- | ||
106 | hw/char/cadence_uart.c | 73 +++- | ||
107 | hw/core/clock-vmstate.c | 25 ++ | ||
108 | hw/core/clock.c | 130 ++++++++ | ||
109 | hw/core/qdev-clock.c | 185 +++++++++++ | ||
110 | hw/core/qdev.c | 12 + | ||
111 | hw/dma/xlnx-zdma.c | 25 +- | ||
112 | hw/intc/arm_gicv3_kvm.c | 4 +- | ||
113 | hw/misc/zynq_slcr.c | 172 +++++++++- | ||
114 | hw/net/cadence_gem.c | 16 +- | ||
115 | hw/net/msf2-emac.c | 589 +++++++++++++++++++++++++++++++++ | ||
116 | qdev-monitor.c | 9 + | ||
117 | target/arm/cpu.c | 19 +- | ||
118 | target/arm/cpu64.c | 8 +- | ||
119 | target/arm/helper.c | 17 + | ||
120 | target/arm/neon_helper.c | 24 -- | ||
121 | target/arm/translate-a64.c | 64 +--- | ||
122 | target/arm/translate.c | 256 ++++++++++++-- | ||
123 | target/arm/vec_helper.c | 25 ++ | ||
124 | MAINTAINERS | 2 + | ||
125 | docs/devel/clocks.rst | 391 ++++++++++++++++++++++ | ||
126 | docs/devel/index.rst | 1 + | ||
127 | hw/char/trace-events | 3 + | ||
128 | hw/core/trace-events | 7 + | ||
129 | tests/acceptance/boot_linux_console.py | 15 +- | ||
130 | 45 files changed, 2533 insertions(+), 193 deletions(-) | ||
131 | create mode 100644 include/hw/clock.h | ||
132 | create mode 100644 include/hw/net/msf2-emac.h | ||
133 | create mode 100644 include/hw/qdev-clock.h | ||
134 | create mode 100644 hw/core/clock-vmstate.c | ||
135 | create mode 100644 hw/core/clock.c | ||
136 | create mode 100644 hw/core/qdev-clock.c | ||
137 | create mode 100644 hw/net/msf2-emac.c | ||
138 | create mode 100644 docs/devel/clocks.rst | ||
139 | 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 |