1 | Dropped the tmp421 patch and the following patch that | 1 | v3: fix test failure on 32-bit hosts due to new board defaulting to 2GB RAM. |
---|---|---|---|
2 | depended on it; no other changes. | ||
3 | 2 | ||
4 | thanks | ||
5 | -- PMM | 3 | -- PMM |
6 | 4 | ||
7 | The following changes since commit 43771d5d92312504305c19abe29ec5bfabd55f01: | 5 | The following changes since commit 9a7beaad3dbba982f7a461d676b55a5c3851d312: |
8 | 6 | ||
9 | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-05-31' into staging (2017-06-01 16:39:16 +0100) | 7 | Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20210304' into staging (2021-03-05 10:47:46 +0000) |
10 | 8 | ||
11 | are available in the git repository at: | 9 | are available in the Git repository at: |
12 | 10 | ||
13 | git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20170602 | 11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210308 |
14 | 12 | ||
15 | for you to fetch changes up to c7637c04be257968e6df30de961a6a23a0ac3dd8: | 13 | for you to fetch changes up to 50b52b18cdb9294ce83dd49bb60b8e55a6526ea0: |
16 | 14 | ||
17 | hw/arm/virt: fdt: generate distance-map when needed (2017-06-02 11:51:49 +0100) | 15 | hw/arm/mps2: Update old infocenter.arm.com URLs (2021-03-08 11:54:16 +0000) |
18 | 16 | ||
19 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
20 | target-arm queue: | 18 | target-arm queue: |
21 | * virt: numa: provide ACPI distance info when needed | 19 | * sbsa-ref: remove cortex-a53 from list of supported cpus |
22 | * aspeed: fix i2c controller bugs | 20 | * sbsa-ref: add 'max' to list of allowed cpus |
23 | * M profile: support MPU | 21 | * target/arm: Add support for FEAT_SSBS, Speculative Store Bypass Safe |
24 | * gicv3: fix mishandling of BPR1, VBPR1 | 22 | * npcm7xx: add EMC model |
25 | * load_uboot_image: don't assume a full header read | 23 | * xlnx-zynqmp: Remove obsolete 'has_rpu' property |
26 | * libvixl: Correct build failures on NetBSD | 24 | * target/arm: Speed up aarch64 TBL/TBX |
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 | Andrew Jones (3): | 33 | Doug Evans (3): |
30 | load_uboot_image: don't assume a full header read | 34 | hw/net: Add npcm7xx emc model |
31 | hw/arm/virt-acpi-build: build SLIT when needed | 35 | hw/arm: Add npcm7xx emc model |
32 | hw/arm/virt: fdt: generate distance-map when needed | 36 | tests/qtests: Add npcm7xx emc model test |
33 | 37 | ||
34 | Cédric Le Goater (4): | 38 | Marcin Juszkiewicz (2): |
35 | aspeed/i2c: improve command handling | 39 | sbsa-ref: remove cortex-a53 from list of supported cpus |
36 | aspeed/i2c: handle LAST command under the RX command | 40 | sbsa-ref: add 'max' to list of allowed cpus |
37 | aspeed/i2c: introduce a state machine | ||
38 | aspeed: add some I2C devices to the Aspeed machines | ||
39 | 41 | ||
40 | Kamil Rytarowski (1): | 42 | Peter Collingbourne (1): |
41 | libvixl: Correct build failures on NetBSD | 43 | target/arm: Use TCF0 and TFSRE0 for unprivileged tag checks |
42 | 44 | ||
43 | Michael Davidsaver (4): | 45 | Peter Maydell (34): |
44 | armv7m: Improve "-d mmu" tracing for PMSAv7 MPU | 46 | hw/arm/musicpal: Remove dead code for non-32-bit-RGB surfaces |
45 | armv7m: Implement M profile default memory map | 47 | hw/display/tc6393xb: Remove dead code for handling non-32bpp surfaces |
46 | armv7m: Classify faults as MemManage or BusFault | 48 | hw/display/tc6393xb: Expand out macros in template header |
47 | arm: add MPU support to M profile CPUs | 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 | ||
48 | 80 | ||
49 | Peter Maydell (12): | 81 | Philippe Mathieu-Daudé (4): |
50 | hw/intc/arm_gicv3_cpuif: Fix reset value for VMCR_EL2.VBPR1 | 82 | hw/arm/xlnx-zynqmp: Remove obsolete 'has_rpu' property |
51 | hw/intc/arm_gicv3_cpuif: Don't let BPR be set below its minimum | 83 | hw/i2c/npcm7xx_smbus: Simplify npcm7xx_smbus_init() |
52 | hw/intc/arm_gicv3_cpuif: Fix priority masking for NS BPR1 | 84 | target/arm: Restrict v8M IDAU to TCG |
53 | arm: Use the mmu_idx we're passed in arm_cpu_do_unaligned_access() | 85 | target/arm/cpu: Update coding style to make checkpatch.pl happy |
54 | arm: Add support for M profile CPUs having different MMU index semantics | ||
55 | arm: Use different ARMMMUIdx values for M profile | ||
56 | arm: Clean up handling of no-MPU PMSA CPUs | ||
57 | arm: Don't clear ARM_FEATURE_PMSA for no-mpu configs | ||
58 | arm: Don't let no-MPU PMSA cores write to SCTLR.M | ||
59 | arm: Remove unnecessary check on cpu->pmsav7_dregion | ||
60 | arm: All M profile cores are PMSA | ||
61 | arm: Implement HFNMIENA support for M profile MPU | ||
62 | 86 | ||
63 | Wei Huang (1): | 87 | Rebecca Cran (3): |
64 | target/arm: clear PMUVER field of AA64DFR0 when vPMU=off | 88 | target/arm: Add support for FEAT_SSBS, Speculative Store Bypass Safe |
89 | target/arm: Enable FEAT_SSBS for "max" AARCH64 CPU | ||
90 | target/arm: Set ID_PFR2.SSBS to 1 for "max" 32-bit CPU | ||
65 | 91 | ||
66 | disas/libvixl/Makefile.objs | 3 + | 92 | Richard Henderson (1): |
67 | target/arm/cpu.h | 118 ++++++++++++++-- | 93 | target/arm: Speed up aarch64 TBL/TBX |
68 | target/arm/translate.h | 2 +- | ||
69 | hw/arm/aspeed.c | 27 ++++ | ||
70 | hw/arm/virt-acpi-build.c | 4 + | ||
71 | hw/arm/virt.c | 21 +++ | ||
72 | hw/core/loader.c | 3 +- | ||
73 | hw/i2c/aspeed_i2c.c | 65 +++++++-- | ||
74 | hw/intc/arm_gicv3_cpuif.c | 50 ++++++- | ||
75 | hw/intc/armv7m_nvic.c | 104 ++++++++++++++ | ||
76 | target/arm/cpu.c | 28 +++- | ||
77 | target/arm/helper.c | 338 ++++++++++++++++++++++++++++++-------------- | ||
78 | target/arm/machine.c | 7 +- | ||
79 | target/arm/op_helper.c | 3 +- | ||
80 | target/arm/translate-a64.c | 18 ++- | ||
81 | target/arm/translate.c | 14 +- | ||
82 | 16 files changed, 648 insertions(+), 157 deletions(-) | ||
83 | 94 | ||
95 | schspa (1): | ||
96 | virtio-mmio: improve virtio-mmio get_dev_path alog | ||
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 |