1 | v2: drop pvpanic-pci patches. | 1 | v1->v2: fix format-string errors on 32-bit hosts in xilinx csu dma model. |
---|---|---|---|
2 | 2 | ||
3 | The following changes since commit f1fcb6851aba6dd9838886dc179717a11e344a1c: | 3 | -- PMM |
4 | 4 | ||
5 | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2021-01-19' into staging (2021-01-19 11:57:07 +0000) | 5 | The following changes since commit 0436c55edf6b357ff56e2a5bf688df8636f83456: |
6 | |||
7 | Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging (2021-03-08 13:51:41 +0000) | ||
6 | 8 | ||
7 | are available in the Git repository at: | 9 | are available in the Git repository at: |
8 | 10 | ||
9 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210119-1 | 11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210310 |
10 | 12 | ||
11 | for you to fetch changes up to b93f4fbdc48283a39089469c44a5529d79dc40a8: | 13 | for you to fetch changes up to 81b3ddaf8772ec6f88d372e52f9b433cfa46bc46: |
12 | 14 | ||
13 | docs: Build and install all the docs in a single manual (2021-01-19 15:45:14 +0000) | 15 | hw/timer/renesas_tmr: Fix use of uninitialized data in read_tcnt() (2021-03-10 13:54:51 +0000) |
14 | 16 | ||
15 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
16 | target-arm queue: | 18 | target-arm queue: |
17 | * Implement IMPDEF pauth algorithm | 19 | * Add new mps3-an547 board |
18 | * Support ARMv8.4-SEL2 | 20 | * target/arm: Restrict v7A TCG cpus to TCG accel |
19 | * Fix bug where we were truncating predicate vector lengths in SVE insns | 21 | * Implement a Xilinx CSU DMA model |
20 | * npcm7xx_adc-test: Fix memleak in adc_qom_set | 22 | * hw/timer/renesas_tmr: Fix use of uninitialized data in read_tcnt() |
21 | * target/arm/m_helper: Silence GCC 10 maybe-uninitialized error | ||
22 | * docs: Build and install all the docs in a single manual | ||
23 | 23 | ||
24 | ---------------------------------------------------------------- | 24 | ---------------------------------------------------------------- |
25 | Gan Qixin (1): | 25 | Peter Maydell (48): |
26 | npcm7xx_adc-test: Fix memleak in adc_qom_set | 26 | clock: Add ClockEvent parameter to callbacks |
27 | 27 | clock: Add ClockPreUpdate callback event type | |
28 | Peter Maydell (1): | 28 | clock: Add clock_ns_to_ticks() function |
29 | docs: Build and install all the docs in a single manual | 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() | ||
30 | 74 | ||
31 | Philippe Mathieu-Daudé (1): | 75 | Philippe Mathieu-Daudé (1): |
32 | target/arm/m_helper: Silence GCC 10 maybe-uninitialized error | 76 | target/arm: Restrict v7A TCG cpus to TCG accel |
33 | 77 | ||
34 | Richard Henderson (7): | 78 | Xuzhou Cheng (5): |
35 | target/arm: Implement an IMPDEF pauth algorithm | 79 | hw/dma: Implement a Xilinx CSU DMA model |
36 | target/arm: Add cpu properties to control pauth | 80 | hw/arm: xlnx-zynqmp: Clean up coding convention issues |
37 | target/arm: Use object_property_add_bool for "sve" property | 81 | hw/arm: xlnx-zynqmp: Connect a Xilinx CSU DMA module for QSPI |
38 | target/arm: Introduce PREDDESC field definitions | 82 | hw/ssi: xilinx_spips: Clean up coding convention issues |
39 | target/arm: Update PFIRST, PNEXT for pred_desc | 83 | hw/ssi: xilinx_spips: Remove DMA related dead codes from zynqmp_spips |
40 | target/arm: Update ZIP, UZP, TRN for pred_desc | ||
41 | target/arm: Update REV, PUNPK for pred_desc | ||
42 | 84 | ||
43 | Rémi Denis-Courmont (19): | 85 | docs/devel/clocks.rst | 71 ++- |
44 | target/arm: remove redundant tests | 86 | docs/system/arm/mps2.rst | 6 +- |
45 | target/arm: add arm_is_el2_enabled() helper | 87 | include/hw/arm/armsse-version.h | 42 ++ |
46 | target/arm: use arm_is_el2_enabled() where applicable | 88 | include/hw/arm/armsse.h | 40 +- |
47 | target/arm: use arm_hcr_el2_eff() where applicable | 89 | include/hw/arm/xlnx-zynqmp.h | 5 +- |
48 | target/arm: factor MDCR_EL2 common handling | 90 | include/hw/clock.h | 63 ++- |
49 | target/arm: Define isar_feature function to test for presence of SEL2 | 91 | include/hw/dma/xlnx_csu_dma.h | 52 ++ |
50 | target/arm: add 64-bit S-EL2 to EL exception table | 92 | include/hw/misc/armsse-cpu-pwrctrl.h | 40 ++ |
51 | target/arm: add MMU stage 1 for Secure EL2 | 93 | include/hw/misc/iotkit-secctl.h | 2 + |
52 | target/arm: add ARMv8.4-SEL2 system registers | 94 | include/hw/misc/iotkit-sysctl.h | 13 +- |
53 | target/arm: handle VMID change in secure state | 95 | include/hw/misc/iotkit-sysinfo.h | 2 + |
54 | target/arm: do S1_ptw_translate() before address space lookup | 96 | include/hw/misc/mps2-fpgaio.h | 2 + |
55 | target/arm: translate NS bit in page-walks | 97 | include/hw/qdev-clock.h | 17 +- |
56 | target/arm: generalize 2-stage page-walk condition | 98 | include/hw/ssi/xilinx_spips.h | 2 +- |
57 | target/arm: secure stage 2 translation regime | 99 | include/hw/timer/sse-counter.h | 105 ++++ |
58 | target/arm: set HPFAR_EL2.NS on secure stage 2 faults | 100 | include/hw/timer/sse-timer.h | 53 ++ |
59 | target/arm: revector to run-time pick target EL | 101 | hw/adc/npcm7xx_adc.c | 2 +- |
60 | target/arm: Implement SCR_EL2.EEL2 | 102 | hw/arm/armsse.c | 1008 +++++++++++++++++++++++++--------- |
61 | target/arm: enable Secure EL2 in max CPU | 103 | hw/arm/mps2-tz.c | 168 +++++- |
62 | target/arm: refactor vae1_tlbmask() | 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 | ||
63 | 156 | ||
64 | docs/conf.py | 46 ++++- | ||
65 | docs/devel/conf.py | 15 -- | ||
66 | docs/index.html.in | 17 -- | ||
67 | docs/interop/conf.py | 28 --- | ||
68 | docs/meson.build | 64 +++--- | ||
69 | docs/specs/conf.py | 16 -- | ||
70 | docs/system/arm/cpu-features.rst | 21 ++ | ||
71 | docs/system/conf.py | 28 --- | ||
72 | docs/tools/conf.py | 37 ---- | ||
73 | docs/user/conf.py | 15 -- | ||
74 | include/qemu/xxhash.h | 98 +++++++++ | ||
75 | target/arm/cpu-param.h | 2 +- | ||
76 | target/arm/cpu.h | 107 ++++++++-- | ||
77 | target/arm/internals.h | 45 +++++ | ||
78 | target/arm/cpu.c | 23 ++- | ||
79 | target/arm/cpu64.c | 65 ++++-- | ||
80 | target/arm/helper-a64.c | 8 +- | ||
81 | target/arm/helper.c | 414 ++++++++++++++++++++++++++------------- | ||
82 | target/arm/m_helper.c | 2 +- | ||
83 | target/arm/monitor.c | 1 + | ||
84 | target/arm/op_helper.c | 4 +- | ||
85 | target/arm/pauth_helper.c | 27 ++- | ||
86 | target/arm/sve_helper.c | 33 ++-- | ||
87 | target/arm/tlb_helper.c | 3 + | ||
88 | target/arm/translate-a64.c | 4 + | ||
89 | target/arm/translate-sve.c | 31 ++- | ||
90 | target/arm/translate.c | 36 +++- | ||
91 | tests/qtest/arm-cpu-features.c | 13 ++ | ||
92 | tests/qtest/npcm7xx_adc-test.c | 1 + | ||
93 | .gitlab-ci.yml | 4 +- | ||
94 | 30 files changed, 770 insertions(+), 438 deletions(-) | ||
95 | delete mode 100644 docs/devel/conf.py | ||
96 | delete mode 100644 docs/index.html.in | ||
97 | delete mode 100644 docs/interop/conf.py | ||
98 | delete mode 100644 docs/specs/conf.py | ||
99 | delete mode 100644 docs/system/conf.py | ||
100 | delete mode 100644 docs/tools/conf.py | ||
101 | delete mode 100644 docs/user/conf.py | ||
102 | diff view generated by jsdifflib |