1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | For some reason the xilinx can bus patches built in my local config |
---|---|---|---|
2 | but not in the merge-test ones; dropped those. | ||
2 | 3 | ||
3 | Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000) | 4 | -- PMM |
5 | |||
6 | The following changes since commit a68694cd1f3e5448cca814ff39b871f9ebd71ed5: | ||
7 | |||
8 | Merge remote-tracking branch 'remotes/philmd-gitlab/tags/edk2-next-20200914' into staging (2020-09-14 12:18:58 +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-20200914-1 |
8 | 13 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 14 | for you to fetch changes up to 4fe986dd4480308ecf07200cfbd3c3d494a0f639: |
10 | 15 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 16 | tests/acceptance: console boot tests for quanta-gsj (2020-09-14 14:24:59 +0100) |
12 | 17 | ||
13 | ---------------------------------------------------------------- | 18 | ---------------------------------------------------------------- |
14 | target-arm queue: | 19 | * hw/misc/a9scu: Do not allow invalid CPU count |
15 | * fix part of the "TCG-disabled builds are broken" issue | 20 | * hw/misc/a9scu: Minor cleanups |
21 | * hw/timer/armv7m_systick: assert that board code set system_clock_scale | ||
22 | * decodetree: Improve identifier matching | ||
23 | * target/arm: Clean up neon fp insn size field decode | ||
24 | * target/arm: Remove KVM support for 32-bit Arm hosts | ||
25 | * hw/arm/mps2: New board models mps2-an386, mps2-an500 | ||
26 | * Deprecate Unicore32 port | ||
27 | * Deprecate lm32 port | ||
28 | * target/arm: Count PMU events when MDCR.SPME is set | ||
29 | * hw/arm: versal-virt: Correct the tx/rx GEM clocks | ||
30 | * New Nuvoton iBMC board models npcm750-evb, quanta-gsj | ||
16 | 31 | ||
17 | ---------------------------------------------------------------- | 32 | ---------------------------------------------------------------- |
18 | Philippe Mathieu-Daudé (1): | 33 | Aaron Lindsay (1): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 34 | target/arm: Count PMU events when MDCR.SPME is set |
20 | 35 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 36 | Edgar E. Iglesias (1): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 37 | hw/arm: versal-virt: Correct the tx/rx GEM clocks |
23 | 38 | ||
39 | Havard Skinnemoen (14): | ||
40 | hw/misc: Add NPCM7xx System Global Control Registers device model | ||
41 | hw/misc: Add NPCM7xx Clock Controller device model | ||
42 | hw/timer: Add NPCM7xx Timer device model | ||
43 | hw/arm: Add NPCM730 and NPCM750 SoC models | ||
44 | hw/arm: Add two NPCM7xx-based machines | ||
45 | roms: Add virtual Boot ROM for NPCM7xx SoCs | ||
46 | hw/arm: Load -bios image as a boot ROM for npcm7xx | ||
47 | hw/nvram: NPCM7xx OTP device model | ||
48 | hw/mem: Stubbed out NPCM7xx Memory Controller model | ||
49 | hw/ssi: NPCM7xx Flash Interface Unit device model | ||
50 | hw/arm: Wire up BMC boot flash for npcm750-evb and quanta-gsj | ||
51 | hw/arm/npcm7xx: add board setup stub for CPU and UART clocks | ||
52 | docs/system: Add Nuvoton machine documentation | ||
53 | tests/acceptance: console boot tests for quanta-gsj | ||
54 | |||
55 | Peter Maydell (11): | ||
56 | hw/timer/armv7m_systick: assert that board code set system_clock_scale | ||
57 | target/arm: Convert Neon 3-same-fp size field to MO_* in decode | ||
58 | target/arm: Convert Neon VCVT fp size field to MO_* in decode | ||
59 | target/arm: Convert VCMLA, VCADD size field to MO_* in decode | ||
60 | target/arm: Remove KVM support for 32-bit Arm hosts | ||
61 | target/arm: Remove no-longer-reachable 32-bit KVM code | ||
62 | hw/arm/mps2: New board model mps2-an386 | ||
63 | hw/arm/mps2: New board model mps2-an500 | ||
64 | docs/system/arm/mps2.rst: Make board list consistent | ||
65 | Deprecate Unicore32 port | ||
66 | Deprecate lm32 port | ||
67 | |||
68 | Philippe Mathieu-Daudé (4): | ||
69 | hw/misc/a9scu: Do not allow invalid CPU count | ||
70 | hw/misc/a9scu: Simplify setting MemoryRegionOps::valid fields | ||
71 | hw/misc/a9scu: Simplify setting MemoryRegionOps::impl fields | ||
72 | hw/misc/a9scu: Report unimplemented accesses with qemu_log_mask(UNIMP) | ||
73 | |||
74 | Richard Henderson (1): | ||
75 | decodetree: Improve identifier matching | ||
76 | |||
77 | docs/system/arm/mps2.rst | 20 +- | ||
78 | docs/system/arm/nuvoton.rst | 92 +++++ | ||
79 | docs/system/deprecated.rst | 32 +- | ||
80 | docs/system/target-arm.rst | 1 + | ||
81 | configure | 2 +- | ||
82 | default-configs/arm-softmmu.mak | 1 + | ||
83 | include/hw/arm/npcm7xx.h | 112 +++++++ | ||
84 | include/hw/mem/npcm7xx_mc.h | 36 ++ | ||
85 | include/hw/misc/npcm7xx_clk.h | 48 +++ | ||
86 | include/hw/misc/npcm7xx_gcr.h | 43 +++ | ||
87 | include/hw/nvram/npcm7xx_otp.h | 79 +++++ | ||
88 | include/hw/ssi/npcm7xx_fiu.h | 73 ++++ | ||
89 | include/hw/timer/npcm7xx_timer.h | 78 +++++ | ||
90 | target/arm/kvm-consts.h | 7 - | ||
91 | target/arm/kvm_arm.h | 6 - | ||
92 | target/arm/neon-dp.decode | 18 +- | ||
93 | target/arm/neon-shared.decode | 18 +- | ||
94 | tests/decode/succ_ident1.decode | 7 + | ||
95 | hw/arm/mps2.c | 97 +++++- | ||
96 | hw/arm/npcm7xx.c | 532 +++++++++++++++++++++++++++++ | ||
97 | hw/arm/npcm7xx_boards.c | 197 +++++++++++ | ||
98 | hw/arm/xlnx-versal-virt.c | 2 +- | ||
99 | hw/mem/npcm7xx_mc.c | 84 +++++ | ||
100 | hw/misc/a9scu.c | 59 ++-- | ||
101 | hw/misc/npcm7xx_clk.c | 266 +++++++++++++++ | ||
102 | hw/misc/npcm7xx_gcr.c | 269 +++++++++++++++ | ||
103 | hw/nvram/npcm7xx_otp.c | 440 ++++++++++++++++++++++++ | ||
104 | hw/ssi/npcm7xx_fiu.c | 572 +++++++++++++++++++++++++++++++ | ||
105 | hw/timer/armv7m_systick.c | 8 + | ||
106 | hw/timer/npcm7xx_timer.c | 543 ++++++++++++++++++++++++++++++ | ||
107 | target/arm/cpu.c | 101 +++--- | ||
108 | target/arm/helper.c | 2 +- | ||
109 | target/arm/kvm.c | 7 - | ||
110 | target/arm/kvm32.c | 595 --------------------------------- | ||
111 | .gitmodules | 3 + | ||
112 | MAINTAINERS | 10 + | ||
113 | hw/arm/Kconfig | 9 + | ||
114 | hw/arm/meson.build | 1 + | ||
115 | hw/mem/meson.build | 1 + | ||
116 | hw/misc/meson.build | 4 + | ||
117 | hw/misc/trace-events | 8 + | ||
118 | hw/nvram/meson.build | 1 + | ||
119 | hw/ssi/meson.build | 1 + | ||
120 | hw/ssi/trace-events | 11 + | ||
121 | hw/timer/meson.build | 1 + | ||
122 | hw/timer/trace-events | 5 + | ||
123 | pc-bios/README | 6 + | ||
124 | pc-bios/meson.build | 1 + | ||
125 | pc-bios/npcm7xx_bootrom.bin | Bin 0 -> 768 bytes | ||
126 | roms/Makefile | 7 + | ||
127 | roms/vbootrom | 1 + | ||
128 | scripts/decodetree.py | 46 ++- | ||
129 | target/arm/meson.build | 5 +- | ||
130 | target/arm/translate-neon.c.inc | 42 ++- | ||
131 | tests/acceptance/boot_linux_console.py | 83 +++++ | ||
132 | 55 files changed, 3910 insertions(+), 783 deletions(-) | ||
133 | create mode 100644 docs/system/arm/nuvoton.rst | ||
134 | create mode 100644 include/hw/arm/npcm7xx.h | ||
135 | create mode 100644 include/hw/mem/npcm7xx_mc.h | ||
136 | create mode 100644 include/hw/misc/npcm7xx_clk.h | ||
137 | create mode 100644 include/hw/misc/npcm7xx_gcr.h | ||
138 | create mode 100644 include/hw/nvram/npcm7xx_otp.h | ||
139 | create mode 100644 include/hw/ssi/npcm7xx_fiu.h | ||
140 | create mode 100644 include/hw/timer/npcm7xx_timer.h | ||
141 | create mode 100644 tests/decode/succ_ident1.decode | ||
142 | create mode 100644 hw/arm/npcm7xx.c | ||
143 | create mode 100644 hw/arm/npcm7xx_boards.c | ||
144 | create mode 100644 hw/mem/npcm7xx_mc.c | ||
145 | create mode 100644 hw/misc/npcm7xx_clk.c | ||
146 | create mode 100644 hw/misc/npcm7xx_gcr.c | ||
147 | create mode 100644 hw/nvram/npcm7xx_otp.c | ||
148 | create mode 100644 hw/ssi/npcm7xx_fiu.c | ||
149 | create mode 100644 hw/timer/npcm7xx_timer.c | ||
150 | delete mode 100644 target/arm/kvm32.c | ||
151 | create mode 100644 pc-bios/npcm7xx_bootrom.bin | ||
152 | create mode 160000 roms/vbootrom | ||
153 | 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 |