1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: | 1 | v2: dropped the npcm7xx ethernet device, whose test case |
---|---|---|---|
2 | fails weirdly on the 'build-disabled' gitlab CI job: | ||
3 | https://gitlab.com/qemu-project/qemu/-/jobs/1034174731#L12 | ||
2 | 4 | ||
3 | Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000) | 5 | The following changes since commit 8ba4bca570ace1e60614a0808631a517cf5df67a: |
6 | |||
7 | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2021-02-15 17:13:57 +0000) | ||
4 | 8 | ||
5 | are available in the Git repository at: | 9 | are available in the Git repository at: |
6 | 10 | ||
7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 | 11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210217 |
8 | 12 | ||
9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: | 13 | for you to fetch changes up to 59c7a187dd8bd8ef675768dd8af9de11528ea7e2: |
10 | 14 | ||
11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) | 15 | MAINTAINERS: add myself maintainer for the clock framework (2021-02-16 14:16:17 +0000) |
12 | 16 | ||
13 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
14 | target-arm queue: | 18 | target-arm queue: |
15 | * fix part of the "TCG-disabled builds are broken" issue | 19 | * Support ARMv8.5-MemTag for linux-user |
20 | * ncpm7xx: Support SMBus | ||
21 | * MAINTAINERS: add section for Clock framework | ||
16 | 22 | ||
17 | ---------------------------------------------------------------- | 23 | ---------------------------------------------------------------- |
18 | Philippe Mathieu-Daudé (1): | 24 | Hao Wu (5): |
19 | target/arm/gdbstub: Only advertise M-profile features if TCG available | 25 | hw/i2c: Implement NPCM7XX SMBus Module Single Mode |
26 | hw/arm: Add I2C sensors for NPCM750 eval board | ||
27 | hw/arm: Add I2C sensors and EEPROM for GSJ machine | ||
28 | hw/i2c: Add a QTest for NPCM7XX SMBus Device | ||
29 | hw/i2c: Implement NPCM7XX SMBus Module FIFO Mode | ||
20 | 30 | ||
21 | target/arm/gdbstub.c | 5 +++-- | 31 | Luc Michel (1): |
22 | 1 file changed, 3 insertions(+), 2 deletions(-) | 32 | MAINTAINERS: add myself maintainer for the clock framework |
23 | 33 | ||
34 | Richard Henderson (31): | ||
35 | tcg: Introduce target-specific page data for user-only | ||
36 | linux-user: Introduce PAGE_ANON | ||
37 | exec: Use uintptr_t for guest_base | ||
38 | exec: Use uintptr_t in cpu_ldst.h | ||
39 | exec: Improve types for guest_addr_valid | ||
40 | linux-user: Check for overflow in access_ok | ||
41 | linux-user: Tidy VERIFY_READ/VERIFY_WRITE | ||
42 | bsd-user: Tidy VERIFY_READ/VERIFY_WRITE | ||
43 | linux-user: Do not use guest_addr_valid for h2g_valid | ||
44 | linux-user: Fix guest_addr_valid vs reserved_va | ||
45 | exec: Introduce cpu_untagged_addr | ||
46 | exec: Use cpu_untagged_addr in g2h; split out g2h_untagged | ||
47 | linux-user: Explicitly untag memory management syscalls | ||
48 | linux-user: Use guest_range_valid in access_ok | ||
49 | exec: Rename guest_{addr,range}_valid to *_untagged | ||
50 | linux-user: Use cpu_untagged_addr in access_ok; split out *_untagged | ||
51 | linux-user: Move lock_user et al out of line | ||
52 | linux-user: Fix types in uaccess.c | ||
53 | linux-user: Handle tags in lock_user/unlock_user | ||
54 | linux-user/aarch64: Implement PR_TAGGED_ADDR_ENABLE | ||
55 | target/arm: Improve gen_top_byte_ignore | ||
56 | target/arm: Use the proper TBI settings for linux-user | ||
57 | linux-user/aarch64: Implement PR_MTE_TCF and PR_MTE_TAG | ||
58 | linux-user/aarch64: Implement PROT_MTE | ||
59 | target/arm: Split out syndrome.h from internals.h | ||
60 | linux-user/aarch64: Pass syndrome to EXC_*_ABORT | ||
61 | linux-user/aarch64: Signal SEGV_MTESERR for sync tag check fault | ||
62 | linux-user/aarch64: Signal SEGV_MTEAERR for async tag check error | ||
63 | target/arm: Add allocation tag storage for user mode | ||
64 | target/arm: Enable MTE for user-only | ||
65 | tests/tcg/aarch64: Add mte smoke tests | ||
66 | |||
67 | docs/system/arm/nuvoton.rst | 2 +- | ||
68 | bsd-user/qemu.h | 17 +- | ||
69 | include/exec/cpu-all.h | 47 +- | ||
70 | include/exec/cpu_ldst.h | 39 +- | ||
71 | include/exec/exec-all.h | 2 +- | ||
72 | include/hw/arm/npcm7xx.h | 2 + | ||
73 | include/hw/i2c/npcm7xx_smbus.h | 113 ++++ | ||
74 | linux-user/aarch64/target_signal.h | 3 + | ||
75 | linux-user/aarch64/target_syscall.h | 13 + | ||
76 | linux-user/qemu.h | 76 +-- | ||
77 | linux-user/syscall_defs.h | 1 + | ||
78 | target/arm/cpu-param.h | 3 + | ||
79 | target/arm/cpu.h | 32 + | ||
80 | target/arm/internals.h | 249 +------- | ||
81 | target/arm/syndrome.h | 273 +++++++++ | ||
82 | tests/tcg/aarch64/mte.h | 60 ++ | ||
83 | accel/tcg/translate-all.c | 32 +- | ||
84 | accel/tcg/user-exec.c | 51 +- | ||
85 | bsd-user/elfload.c | 2 +- | ||
86 | bsd-user/main.c | 8 +- | ||
87 | bsd-user/mmap.c | 23 +- | ||
88 | hw/arm/npcm7xx.c | 68 ++- | ||
89 | hw/arm/npcm7xx_boards.c | 46 ++ | ||
90 | hw/i2c/npcm7xx_smbus.c | 1099 +++++++++++++++++++++++++++++++++++ | ||
91 | linux-user/aarch64/cpu_loop.c | 38 +- | ||
92 | linux-user/elfload.c | 18 +- | ||
93 | linux-user/flatload.c | 2 +- | ||
94 | linux-user/hppa/cpu_loop.c | 39 +- | ||
95 | linux-user/i386/cpu_loop.c | 6 +- | ||
96 | linux-user/i386/signal.c | 5 +- | ||
97 | linux-user/main.c | 4 +- | ||
98 | linux-user/mmap.c | 88 +-- | ||
99 | linux-user/ppc/signal.c | 4 +- | ||
100 | linux-user/syscall.c | 165 ++++-- | ||
101 | linux-user/uaccess.c | 82 ++- | ||
102 | target/arm/cpu.c | 25 +- | ||
103 | target/arm/helper-a64.c | 4 +- | ||
104 | target/arm/mte_helper.c | 39 +- | ||
105 | target/arm/tlb_helper.c | 15 +- | ||
106 | target/arm/translate-a64.c | 25 +- | ||
107 | target/hppa/op_helper.c | 2 +- | ||
108 | target/i386/tcg/mem_helper.c | 2 +- | ||
109 | target/s390x/mem_helper.c | 4 +- | ||
110 | tests/qtest/npcm7xx_smbus-test.c | 495 ++++++++++++++++ | ||
111 | tests/tcg/aarch64/mte-1.c | 28 + | ||
112 | tests/tcg/aarch64/mte-2.c | 45 ++ | ||
113 | tests/tcg/aarch64/mte-3.c | 51 ++ | ||
114 | tests/tcg/aarch64/mte-4.c | 45 ++ | ||
115 | tests/tcg/aarch64/pauth-2.c | 1 - | ||
116 | MAINTAINERS | 11 + | ||
117 | hw/arm/Kconfig | 1 + | ||
118 | hw/i2c/meson.build | 1 + | ||
119 | hw/i2c/trace-events | 12 + | ||
120 | tests/qtest/meson.build | 1 + | ||
121 | tests/tcg/aarch64/Makefile.target | 6 + | ||
122 | tests/tcg/configure.sh | 4 + | ||
123 | 56 files changed, 2976 insertions(+), 553 deletions(-) | ||
124 | create mode 100644 include/hw/i2c/npcm7xx_smbus.h | ||
125 | create mode 100644 target/arm/syndrome.h | ||
126 | create mode 100644 tests/tcg/aarch64/mte.h | ||
127 | create mode 100644 hw/i2c/npcm7xx_smbus.c | ||
128 | create mode 100644 tests/qtest/npcm7xx_smbus-test.c | ||
129 | create mode 100644 tests/tcg/aarch64/mte-1.c | ||
130 | create mode 100644 tests/tcg/aarch64/mte-2.c | ||
131 | create mode 100644 tests/tcg/aarch64/mte-3.c | ||
132 | create mode 100644 tests/tcg/aarch64/mte-4.c | ||
133 | 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 |