1 | Massively slimmed down v2: MemTag broke bsd-user, and the npcm7xx | 1 | v3: fix test failure on 32-bit hosts due to new board defaulting to 2GB RAM. |
---|---|---|---|
2 | ethernet device failed 'make check' on big-endian hosts. | ||
3 | 2 | ||
4 | -- PMM | 3 | -- PMM |
5 | 4 | ||
6 | The following changes since commit 83339e21d05c824ebc9131d644f25c23d0e41ecf: | 5 | The following changes since commit 9a7beaad3dbba982f7a461d676b55a5c3851d312: |
7 | 6 | ||
8 | Merge remote-tracking branch 'remotes/stefanha-gitlab/tags/block-pull-request' into staging (2021-02-10 15:42:20 +0000) | 7 | Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20210304' into staging (2021-03-05 10:47:46 +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-20210211-1 | 11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210308 |
13 | 12 | ||
14 | for you to fetch changes up to d3c1183ffeb71ca3a783eae3d7e1c51e71e8a621: | 13 | for you to fetch changes up to 50b52b18cdb9294ce83dd49bb60b8e55a6526ea0: |
15 | 14 | ||
16 | target/arm: Correctly initialize MDCR_EL2.HPMN (2021-02-11 19:48:09 +0000) | 15 | hw/arm/mps2: Update old infocenter.arm.com URLs (2021-03-08 11:54:16 +0000) |
17 | 16 | ||
18 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
19 | target-arm queue: | 18 | target-arm queue: |
20 | * Correctly initialize MDCR_EL2.HPMN | 19 | * sbsa-ref: remove cortex-a53 from list of supported cpus |
21 | * versal: Use nr_apu_cpus in favor of hard coding 2 | 20 | * sbsa-ref: add 'max' to list of allowed cpus |
22 | * accel/tcg: Add URL of clang bug to comment about our workaround | 21 | * target/arm: Add support for FEAT_SSBS, Speculative Store Bypass Safe |
23 | * Add support for FEAT_DIT, Data Independent Timing | 22 | * npcm7xx: add EMC model |
24 | * Remove GPIO from unimplemented NPCM7XX | 23 | * xlnx-zynqmp: Remove obsolete 'has_rpu' property |
25 | * Fix SCR RES1 handling | 24 | * target/arm: Speed up aarch64 TBL/TBX |
26 | * Don't migrate CPUARMState.features | 25 | * virtio-mmio: improve virtio-mmio get_dev_path alog |
26 | * target/arm: Use TCF0 and TFSRE0 for unprivileged tag checks | ||
27 | * target/arm: Restrict v8M IDAU to TCG | ||
28 | * target/arm/cpu: Update coding style to make checkpatch.pl happy | ||
29 | * musicpal, tc6393xb, omap_lcdc, tcx: drop dead code for non-32-bit-RGB surfaces | ||
30 | * Add new board: mps3-an524 | ||
27 | 31 | ||
28 | ---------------------------------------------------------------- | 32 | ---------------------------------------------------------------- |
29 | Aaron Lindsay (1): | 33 | Doug Evans (3): |
30 | target/arm: Don't migrate CPUARMState.features | 34 | hw/net: Add npcm7xx emc model |
35 | hw/arm: Add npcm7xx emc model | ||
36 | tests/qtests: Add npcm7xx emc model test | ||
31 | 37 | ||
32 | Daniel Müller (1): | 38 | Marcin Juszkiewicz (2): |
33 | target/arm: Correctly initialize MDCR_EL2.HPMN | 39 | sbsa-ref: remove cortex-a53 from list of supported cpus |
40 | sbsa-ref: add 'max' to list of allowed cpus | ||
34 | 41 | ||
35 | Edgar E. Iglesias (1): | 42 | Peter Collingbourne (1): |
36 | hw/arm: versal: Use nr_apu_cpus in favor of hard coding 2 | 43 | target/arm: Use TCF0 and TFSRE0 for unprivileged tag checks |
37 | 44 | ||
38 | Hao Wu (1): | 45 | Peter Maydell (34): |
39 | hw/arm: Remove GPIO from unimplemented NPCM7XX | 46 | hw/arm/musicpal: Remove dead code for non-32-bit-RGB surfaces |
47 | hw/display/tc6393xb: Remove dead code for handling non-32bpp surfaces | ||
48 | hw/display/tc6393xb: Expand out macros in template header | ||
49 | hw/display/tc6393xb: Inline tc6393xb_draw_graphic32() at its callsite | ||
50 | hw/display/omap_lcdc: Expand out macros in template header | ||
51 | hw/display/omap_lcdc: Drop broken bigendian ifdef | ||
52 | hw/display/omap_lcdc: Fix coding style issues in template header | ||
53 | hw/display/omap_lcdc: Inline template header into C file | ||
54 | hw/display/omap_lcdc: Delete unnecessary macro | ||
55 | hw/display/tcx: Drop unnecessary code for handling BGR format outputs | ||
56 | hw/arm/mps2-tz: Make SYSCLK frequency board-specific | ||
57 | hw/misc/mps2-scc: Support configurable number of OSCCLK values | ||
58 | hw/arm/mps2-tz: Correct the OSCCLK settings for mps2-an505 and mps2-an511 | ||
59 | hw/arm/mps2-tz: Make the OSCCLK settings be configurable per-board | ||
60 | hw/misc/mps2-fpgaio: Make number of LEDs configurable by board | ||
61 | hw/misc/mps2-fpgaio: Support SWITCH register | ||
62 | hw/arm/mps2-tz: Make FPGAIO switch and LED config per-board | ||
63 | hw/arm/mps2-tz: Condition IRQ splitting on number of CPUs, not board type | ||
64 | hw/arm/mps2-tz: Make number of IRQs board-specific | ||
65 | hw/misc/mps2-scc: Implement CFG_REG5 and CFG_REG6 for MPS3 AN524 | ||
66 | hw/arm/mps2-tz: Correct wrong interrupt numbers for DMA and SPI | ||
67 | hw/arm/mps2-tz: Allow PPCPortInfo structures to specify device interrupts | ||
68 | hw/arm/mps2-tz: Move device IRQ info to data structures | ||
69 | hw/arm/mps2-tz: Size the uart-irq-orgate based on the number of UARTs | ||
70 | hw/arm/mps2-tz: Allow boards to have different PPCInfo data | ||
71 | hw/arm/mps2-tz: Make RAM arrangement board-specific | ||
72 | hw/arm/mps2-tz: Set MachineClass default_ram info from RAMInfo data | ||
73 | hw/arm/mps2-tz: Support ROMs as well as RAMs | ||
74 | hw/arm/mps2-tz: Get armv7m_load_kernel() size argument from RAMInfo | ||
75 | hw/arm/mps2-tz: Add new mps3-an524 board | ||
76 | hw/arm/mps2-tz: Stub out USB controller for mps3-an524 | ||
77 | hw/arm/mps2-tz: Provide PL031 RTC on mps3-an524 | ||
78 | docs/system/arm/mps2.rst: Document the new mps3-an524 board | ||
79 | hw/arm/mps2: Update old infocenter.arm.com URLs | ||
40 | 80 | ||
41 | Mike Nawrocki (1): | 81 | Philippe Mathieu-Daudé (4): |
42 | target/arm: Fix SCR RES1 handling | 82 | hw/arm/xlnx-zynqmp: Remove obsolete 'has_rpu' property |
83 | hw/i2c/npcm7xx_smbus: Simplify npcm7xx_smbus_init() | ||
84 | target/arm: Restrict v8M IDAU to TCG | ||
85 | target/arm/cpu: Update coding style to make checkpatch.pl happy | ||
43 | 86 | ||
44 | Peter Maydell (2): | 87 | Rebecca Cran (3): |
45 | arm: Update infocenter.arm.com URLs | 88 | target/arm: Add support for FEAT_SSBS, Speculative Store Bypass Safe |
46 | accel/tcg: Add URL of clang bug to comment about our workaround | 89 | target/arm: Enable FEAT_SSBS for "max" AARCH64 CPU |
90 | target/arm: Set ID_PFR2.SSBS to 1 for "max" 32-bit CPU | ||
47 | 91 | ||
48 | Rebecca Cran (4): | 92 | Richard Henderson (1): |
49 | target/arm: Add support for FEAT_DIT, Data Independent Timing | 93 | target/arm: Speed up aarch64 TBL/TBX |
50 | target/arm: Support AA32 DIT by moving PSTATE_SS from cpsr into env->pstate | ||
51 | target/arm: Set ID_AA64PFR0.DIT and ID_PFR0.DIT to 1 for "max" AA64 CPU | ||
52 | target/arm: Set ID_PFR0.DIT to 1 for "max" 32-bit CPU | ||
53 | 94 | ||
54 | include/hw/dma/pl080.h | 7 ++-- | 95 | schspa (1): |
55 | include/hw/misc/arm_integrator_debug.h | 2 +- | 96 | virtio-mmio: improve virtio-mmio get_dev_path alog |
56 | include/hw/ssi/pl022.h | 5 ++- | ||
57 | target/arm/cpu.h | 17 ++++++++ | ||
58 | target/arm/internals.h | 6 +++ | ||
59 | accel/tcg/cpu-exec.c | 25 +++++++++--- | ||
60 | hw/arm/aspeed_ast2600.c | 2 +- | ||
61 | hw/arm/musca.c | 4 +- | ||
62 | hw/arm/npcm7xx.c | 8 ---- | ||
63 | hw/arm/xlnx-versal.c | 4 +- | ||
64 | hw/misc/arm_integrator_debug.c | 2 +- | ||
65 | hw/timer/arm_timer.c | 7 ++-- | ||
66 | target/arm/cpu.c | 4 ++ | ||
67 | target/arm/cpu64.c | 5 +++ | ||
68 | target/arm/helper-a64.c | 27 +++++++++++-- | ||
69 | target/arm/helper.c | 71 +++++++++++++++++++++++++++------- | ||
70 | target/arm/machine.c | 2 +- | ||
71 | target/arm/op_helper.c | 9 +---- | ||
72 | target/arm/translate-a64.c | 12 ++++++ | ||
73 | 19 files changed, 164 insertions(+), 55 deletions(-) | ||
74 | 97 | ||
98 | docs/system/arm/mps2.rst | 24 +- | ||
99 | docs/system/arm/nuvoton.rst | 3 +- | ||
100 | hw/display/omap_lcd_template.h | 169 -------- | ||
101 | hw/display/tc6393xb_template.h | 72 ---- | ||
102 | include/hw/arm/armsse.h | 4 +- | ||
103 | include/hw/arm/npcm7xx.h | 2 + | ||
104 | include/hw/arm/xlnx-zynqmp.h | 2 - | ||
105 | include/hw/misc/armsse-cpuid.h | 2 +- | ||
106 | include/hw/misc/armsse-mhu.h | 2 +- | ||
107 | include/hw/misc/iotkit-secctl.h | 2 +- | ||
108 | include/hw/misc/iotkit-sysctl.h | 2 +- | ||
109 | include/hw/misc/iotkit-sysinfo.h | 2 +- | ||
110 | include/hw/misc/mps2-fpgaio.h | 8 +- | ||
111 | include/hw/misc/mps2-scc.h | 10 +- | ||
112 | include/hw/net/npcm7xx_emc.h | 286 +++++++++++++ | ||
113 | target/arm/cpu.h | 15 +- | ||
114 | target/arm/helper-a64.h | 2 +- | ||
115 | target/arm/internals.h | 6 + | ||
116 | hw/arm/mps2-tz.c | 642 ++++++++++++++++++++++++----- | ||
117 | hw/arm/mps2.c | 5 + | ||
118 | hw/arm/musicpal.c | 64 ++- | ||
119 | hw/arm/npcm7xx.c | 50 ++- | ||
120 | hw/arm/sbsa-ref.c | 2 +- | ||
121 | hw/arm/xlnx-zynqmp.c | 6 - | ||
122 | hw/display/omap_lcdc.c | 129 +++++- | ||
123 | hw/display/tc6393xb.c | 48 +-- | ||
124 | hw/display/tcx.c | 31 +- | ||
125 | hw/i2c/npcm7xx_smbus.c | 1 - | ||
126 | hw/misc/armsse-cpuid.c | 2 +- | ||
127 | hw/misc/armsse-mhu.c | 2 +- | ||
128 | hw/misc/iotkit-sysctl.c | 2 +- | ||
129 | hw/misc/iotkit-sysinfo.c | 2 +- | ||
130 | hw/misc/mps2-fpgaio.c | 43 +- | ||
131 | hw/misc/mps2-scc.c | 93 ++++- | ||
132 | hw/net/npcm7xx_emc.c | 857 ++++++++++++++++++++++++++++++++++++++ | ||
133 | hw/virtio/virtio-mmio.c | 13 +- | ||
134 | target/arm/cpu.c | 23 +- | ||
135 | target/arm/cpu64.c | 5 + | ||
136 | target/arm/cpu_tcg.c | 8 + | ||
137 | target/arm/helper-a64.c | 32 -- | ||
138 | target/arm/helper.c | 39 +- | ||
139 | target/arm/mte_helper.c | 13 +- | ||
140 | target/arm/translate-a64.c | 70 +--- | ||
141 | target/arm/vec_helper.c | 48 +++ | ||
142 | tests/qtest/npcm7xx_emc-test.c | 862 +++++++++++++++++++++++++++++++++++++++ | ||
143 | hw/net/meson.build | 1 + | ||
144 | hw/net/trace-events | 17 + | ||
145 | tests/qtest/meson.build | 3 +- | ||
146 | 48 files changed, 3108 insertions(+), 618 deletions(-) | ||
147 | delete mode 100644 hw/display/omap_lcd_template.h | ||
148 | delete mode 100644 hw/display/tc6393xb_template.h | ||
149 | create mode 100644 include/hw/net/npcm7xx_emc.h | ||
150 | create mode 100644 hw/net/npcm7xx_emc.c | ||
151 | create mode 100644 tests/qtest/npcm7xx_emc-test.c | ||
152 | diff view generated by jsdifflib |