1 | v2: dropped a couple of cadence_gem changes to ID regs that | 1 | v1->v2: fix format-string errors on 32-bit hosts in xilinx csu dma model. |
---|---|---|---|
2 | caused new clang sanitizer warnings. | ||
3 | 2 | ||
4 | -- PMM | 3 | -- PMM |
5 | 4 | ||
6 | The following changes since commit dddb37495b844270088e68e3bf30b764d48d863f: | 5 | The following changes since commit 0436c55edf6b357ff56e2a5bf688df8636f83456: |
7 | 6 | ||
8 | Merge remote-tracking branch 'remotes/awilliam/tags/vfio-updates-20181015.0' into staging (2018-10-15 18:44:04 +0100) | 7 | Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging (2021-03-08 13:51:41 +0000) |
9 | 8 | ||
10 | are available in the Git repository at: | 9 | are available in the Git repository at: |
11 | 10 | ||
12 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20181016-1 | 11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210310 |
13 | 12 | ||
14 | for you to fetch changes up to 2ef297af07196c29446556537861f8e7dfeeae7b: | 13 | for you to fetch changes up to 81b3ddaf8772ec6f88d372e52f9b433cfa46bc46: |
15 | 14 | ||
16 | coccinelle: new inplace-byteswaps.cocci to remove inplace-byteswapping calls (2018-10-16 17:14:55 +0100) | 15 | hw/timer/renesas_tmr: Fix use of uninitialized data in read_tcnt() (2021-03-10 13:54:51 +0000) |
17 | 16 | ||
18 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
19 | target-arm queue: | 18 | target-arm queue: |
20 | * hw/arm/virt: add DT property /secure-chosen/stdout-path indicating secure UART | 19 | * Add new mps3-an547 board |
21 | * target/arm: Fix aarch64_sve_change_el wrt EL0 | 20 | * target/arm: Restrict v7A TCG cpus to TCG accel |
22 | * target/arm: Define fields of ISAR registers | 21 | * Implement a Xilinx CSU DMA model |
23 | * target/arm: Align cortex-r5 id_isar0 | 22 | * hw/timer/renesas_tmr: Fix use of uninitialized data in read_tcnt() |
24 | * target/arm: Fix cortex-a7 id_isar0 | ||
25 | * net/cadence_gem: Fix various bugs, add support for new | ||
26 | features that will be used by the Xilinx Versal board | ||
27 | * target-arm: powerctl: Enable HVC when starting CPUs to EL2 | ||
28 | * target/arm: Add the Cortex-A72 | ||
29 | * target/arm: Mark PMINTENCLR and PMINTENCLR_EL1 accesses as possibly doing IO | ||
30 | * target/arm: Mask PMOVSR writes based on supported counters | ||
31 | * target/arm: Initialize ARMMMUFaultInfo in v7m_stack_read/write | ||
32 | * coccinelle: new inplace-byteswaps.cocci to remove inplace-byteswapping calls | ||
33 | 23 | ||
34 | ---------------------------------------------------------------- | 24 | ---------------------------------------------------------------- |
35 | Aaron Lindsay (2): | 25 | Peter Maydell (48): |
36 | target/arm: Mark PMINTENCLR and PMINTENCLR_EL1 accesses as possibly doing IO | 26 | clock: Add ClockEvent parameter to callbacks |
37 | target/arm: Mask PMOVSR writes based on supported counters | 27 | clock: Add ClockPreUpdate callback event type |
28 | clock: Add clock_ns_to_ticks() function | ||
29 | hw/timer/npcm7xx_timer: Use new clock_ns_to_ticks() | ||
30 | hw/arm/armsse: Introduce SSE subsystem version property | ||
31 | hw/misc/iotkit-sysctl: Remove is_sse200 flag | ||
32 | hw/misc/iotkit-secctl.c: Implement SSE-300 PID register values | ||
33 | hw/misc/iotkit-sysinfo.c: Implement SSE-300 PID register values | ||
34 | hw/arm/armsse.c: Use correct SYS_CONFIG0 register value for SSE-300 | ||
35 | hw/misc/iotkit-sysinfo.c: Implement SYS_CONFIG1 and IIDR | ||
36 | hw/timer/sse-counter: Model the SSE Subsystem System Counter | ||
37 | hw/timer/sse-timer: Model the SSE Subsystem System Timer | ||
38 | hw/misc/iotkit-sysctl: Add SSE-300 cases which match SSE-200 behaviour | ||
39 | hw/misc/iotkit-sysctl: Handle CPU_WAIT, NMI_ENABLE for SSE-300 | ||
40 | hw/misc/iotkit-sysctl: Handle INITSVTOR* for SSE-300 | ||
41 | hw/misc/iotkit-sysctl: Implement dummy version of SSE-300 PWRCTRL register | ||
42 | hw/misc/iotkit-sysctl: Handle SSE-300 changes to PDCM_PD_*_SENSE registers | ||
43 | hw/misc/iotkit-sysctl: Implement SSE-200 and SSE-300 PID register values | ||
44 | hw/arm/Kconfig: Move ARMSSE_CPUID and ARMSSE_MHU stanzas to hw/misc | ||
45 | hw/misc/sse-cpu-pwrctrl: Implement SSE-300 CPU<N>_PWRCTRL register block | ||
46 | hw/arm/armsse: Use an array for apb_ppc fields in the state structure | ||
47 | hw/arm/armsse: Add a define for number of IRQs used by the SSE itself | ||
48 | hw/arm/armsse: Add framework for data-driven device placement | ||
49 | hw/arm/armsse: Move dual-timer device into data-driven framework | ||
50 | hw/arm/armsse: Move watchdogs into data-driven framework | ||
51 | hw/arm/armsse: Move s32ktimer into data-driven framework | ||
52 | hw/arm/armsse: Move sysinfo register block into data-driven framework | ||
53 | hw/arm/armsse: Move sysctl register block into data-driven framework | ||
54 | hw/arm/armsse: Move PPUs into data-driven framework | ||
55 | hw/arm/armsse: Add missing SSE-200 SYS_PPU | ||
56 | hw/arm/armsse: Indirect irq_is_common[] through ARMSSEInfo | ||
57 | hw/arm/armsse: Add support for SSE variants with a system counter | ||
58 | hw/arm/armsse: Add support for TYPE_SSE_TIMER in ARMSSEDeviceInfo | ||
59 | hw/arm/armsse: Support variants with ARMSSE_CPU_PWRCTRL block | ||
60 | hw/arm/armsse: Add SSE-300 support | ||
61 | hw/arm/mps2-tz: Make UART overflow IRQ board-specific | ||
62 | hw/misc/mps2-fpgaio: Fold counters subsection into main vmstate | ||
63 | hw/misc/mps2-fpgaio: Support AN547 DBGCTRL register | ||
64 | hw/misc/mps2-scc: Implement changes for AN547 | ||
65 | hw/arm/mps2-tz: Support running APB peripherals on different clock | ||
66 | hw/arm/mps2-tz: Make initsvtor0 setting board-specific | ||
67 | hw/arm/mps2-tz: Add new mps3-an547 board | ||
68 | docs/system/arm/mps2.rst: Document the new mps3-an547 board | ||
69 | tests/qtest/sse-timer-test: Add simple test of the SSE counter | ||
70 | tests/qtest/sse-timer-test: Test the system timer | ||
71 | tests/qtest/sse-timer-test: Test counter scaling changes | ||
72 | hw/timer/renesas_tmr: Prefix constants for CSS values with CSS_ | ||
73 | hw/timer/renesas_tmr: Fix use of uninitialized data in read_tcnt() | ||
38 | 74 | ||
39 | Edgar E. Iglesias (8): | 75 | Philippe Mathieu-Daudé (1): |
40 | net: cadence_gem: Disable TSU feature bit | 76 | target/arm: Restrict v7A TCG cpus to TCG accel |
41 | net: cadence_gem: Use uint32_t for 32bit descriptor words | ||
42 | net: cadence_gem: Add macro with max number of descriptor words | ||
43 | net: cadence_gem: Add support for extended descriptors | ||
44 | net: cadence_gem: Add support for selecting the DMA MemoryRegion | ||
45 | net: cadence_gem: Implement support for 64bit descriptor addresses | ||
46 | target-arm: powerctl: Enable HVC when starting CPUs to EL2 | ||
47 | target/arm: Add the Cortex-A72 | ||
48 | 77 | ||
49 | Jerome Forissier (1): | 78 | Xuzhou Cheng (5): |
50 | hw/arm/virt: add DT property /secure-chosen/stdout-path indicating secure UART | 79 | hw/dma: Implement a Xilinx CSU DMA model |
80 | hw/arm: xlnx-zynqmp: Clean up coding convention issues | ||
81 | hw/arm: xlnx-zynqmp: Connect a Xilinx CSU DMA module for QSPI | ||
82 | hw/ssi: xilinx_spips: Clean up coding convention issues | ||
83 | hw/ssi: xilinx_spips: Remove DMA related dead codes from zynqmp_spips | ||
51 | 84 | ||
52 | Peter Maydell (2): | 85 | docs/devel/clocks.rst | 71 ++- |
53 | target/arm: Initialize ARMMMUFaultInfo in v7m_stack_read/write | 86 | docs/system/arm/mps2.rst | 6 +- |
54 | coccinelle: new inplace-byteswaps.cocci to remove inplace-byteswapping calls | 87 | include/hw/arm/armsse-version.h | 42 ++ |
88 | include/hw/arm/armsse.h | 40 +- | ||
89 | include/hw/arm/xlnx-zynqmp.h | 5 +- | ||
90 | include/hw/clock.h | 63 ++- | ||
91 | include/hw/dma/xlnx_csu_dma.h | 52 ++ | ||
92 | include/hw/misc/armsse-cpu-pwrctrl.h | 40 ++ | ||
93 | include/hw/misc/iotkit-secctl.h | 2 + | ||
94 | include/hw/misc/iotkit-sysctl.h | 13 +- | ||
95 | include/hw/misc/iotkit-sysinfo.h | 2 + | ||
96 | include/hw/misc/mps2-fpgaio.h | 2 + | ||
97 | include/hw/qdev-clock.h | 17 +- | ||
98 | include/hw/ssi/xilinx_spips.h | 2 +- | ||
99 | include/hw/timer/sse-counter.h | 105 ++++ | ||
100 | include/hw/timer/sse-timer.h | 53 ++ | ||
101 | hw/adc/npcm7xx_adc.c | 2 +- | ||
102 | hw/arm/armsse.c | 1008 +++++++++++++++++++++++++--------- | ||
103 | hw/arm/mps2-tz.c | 168 +++++- | ||
104 | hw/arm/xlnx-zynqmp.c | 21 +- | ||
105 | hw/char/cadence_uart.c | 4 +- | ||
106 | hw/char/ibex_uart.c | 4 +- | ||
107 | hw/char/pl011.c | 5 +- | ||
108 | hw/core/clock.c | 24 +- | ||
109 | hw/core/qdev-clock.c | 8 +- | ||
110 | hw/dma/xlnx_csu_dma.c | 745 +++++++++++++++++++++++++ | ||
111 | hw/mips/cps.c | 2 +- | ||
112 | hw/misc/armsse-cpu-pwrctrl.c | 149 +++++ | ||
113 | hw/misc/bcm2835_cprman.c | 23 +- | ||
114 | hw/misc/iotkit-secctl.c | 50 +- | ||
115 | hw/misc/iotkit-sysctl.c | 522 +++++++++++++++--- | ||
116 | hw/misc/iotkit-sysinfo.c | 51 +- | ||
117 | hw/misc/mps2-fpgaio.c | 52 +- | ||
118 | hw/misc/mps2-scc.c | 15 +- | ||
119 | hw/misc/npcm7xx_clk.c | 26 +- | ||
120 | hw/misc/npcm7xx_pwm.c | 2 +- | ||
121 | hw/misc/zynq_slcr.c | 5 +- | ||
122 | hw/ssi/xilinx_spips.c | 33 +- | ||
123 | hw/timer/cmsdk-apb-dualtimer.c | 5 +- | ||
124 | hw/timer/cmsdk-apb-timer.c | 4 +- | ||
125 | hw/timer/npcm7xx_timer.c | 6 +- | ||
126 | hw/timer/renesas_tmr.c | 33 +- | ||
127 | hw/timer/sse-counter.c | 474 ++++++++++++++++ | ||
128 | hw/timer/sse-timer.c | 470 ++++++++++++++++ | ||
129 | hw/watchdog/cmsdk-apb-watchdog.c | 5 +- | ||
130 | target/arm/cpu.c | 335 ----------- | ||
131 | target/arm/cpu_tcg.c | 318 +++++++++++ | ||
132 | target/mips/cpu.c | 2 +- | ||
133 | tests/qtest/sse-timer-test.c | 240 ++++++++ | ||
134 | MAINTAINERS | 7 + | ||
135 | hw/arm/Kconfig | 10 +- | ||
136 | hw/dma/Kconfig | 4 + | ||
137 | hw/dma/meson.build | 1 + | ||
138 | hw/misc/Kconfig | 9 + | ||
139 | hw/misc/meson.build | 1 + | ||
140 | hw/misc/trace-events | 4 + | ||
141 | hw/timer/Kconfig | 6 + | ||
142 | hw/timer/meson.build | 2 + | ||
143 | hw/timer/trace-events | 12 + | ||
144 | tests/qtest/meson.build | 1 + | ||
145 | 60 files changed, 4537 insertions(+), 846 deletions(-) | ||
146 | create mode 100644 include/hw/arm/armsse-version.h | ||
147 | create mode 100644 include/hw/dma/xlnx_csu_dma.h | ||
148 | create mode 100644 include/hw/misc/armsse-cpu-pwrctrl.h | ||
149 | create mode 100644 include/hw/timer/sse-counter.h | ||
150 | create mode 100644 include/hw/timer/sse-timer.h | ||
151 | create mode 100644 hw/dma/xlnx_csu_dma.c | ||
152 | create mode 100644 hw/misc/armsse-cpu-pwrctrl.c | ||
153 | create mode 100644 hw/timer/sse-counter.c | ||
154 | create mode 100644 hw/timer/sse-timer.c | ||
155 | create mode 100644 tests/qtest/sse-timer-test.c | ||
55 | 156 | ||
56 | Richard Henderson (4): | ||
57 | target/arm: Fix aarch64_sve_change_el wrt EL0 | ||
58 | target/arm: Define fields of ISAR registers | ||
59 | target/arm: Align cortex-r5 id_isar0 | ||
60 | target/arm: Fix cortex-a7 id_isar0 | ||
61 | |||
62 | include/hw/net/cadence_gem.h | 7 +- | ||
63 | target/arm/cpu.h | 95 ++++++++++++++- | ||
64 | hw/arm/virt.c | 4 + | ||
65 | hw/net/cadence_gem.c | 185 ++++++++++++++++++++--------- | ||
66 | target/arm/arm-powerctl.c | 10 ++ | ||
67 | target/arm/cpu.c | 7 +- | ||
68 | target/arm/cpu64.c | 66 +++++++++- | ||
69 | target/arm/helper.c | 27 +++-- | ||
70 | target/arm/op_helper.c | 6 +- | ||
71 | scripts/coccinelle/inplace-byteswaps.cocci | 65 ++++++++++ | ||
72 | 10 files changed, 402 insertions(+), 70 deletions(-) | ||
73 | create mode 100644 scripts/coccinelle/inplace-byteswaps.cocci | ||
74 | diff view generated by jsdifflib |