1 | v1->v2 changes: drop the sd card-reparenting patch | 1 | The following changes since commit e3debd5e7d0ce031356024878a0a18b9d109354a: |
---|---|---|---|
2 | and the 2 raspi2 patches that depend on it. | ||
3 | 2 | ||
4 | -- PMM | 3 | Merge tag 'pull-request-2023-03-24' of https://gitlab.com/thuth/qemu into staging (2023-03-24 16:08:46 +0000) |
5 | 4 | ||
6 | The following changes since commit 6181478f6395cdd9d6ffd99623d0c9f39ea53606: | 5 | are available in the Git repository at: |
7 | 6 | ||
8 | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-02-28 08:46:03 +0000) | 7 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230328 |
9 | 8 | ||
10 | are available in the git repository at: | 9 | for you to fetch changes up to 46e3b237c52e0c48bfd81bce020b51fbe300b23a: |
11 | 10 | ||
12 | git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20170228 | 11 | target/arm/gdbstub: Only advertise M-profile features if TCG available (2023-03-28 10:53:40 +0100) |
13 | |||
14 | for you to fetch changes up to f3a6339a5bbc160d327299c67bb68c6d07fa4a61: | ||
15 | |||
16 | hw/arm/exynos: Fix proper mapping of CPUs by providing real cluster ID (2017-02-28 12:08:20 +0000) | ||
17 | 12 | ||
18 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
19 | target-arm queue: | 14 | target-arm queue: |
20 | * raspi2: implement RNG module | 15 | * fix part of the "TCG-disabled builds are broken" issue |
21 | * raspi2: implement new SD card controller (but don't wire it up) | ||
22 | * sdhci: bugfixes for block transfers | ||
23 | * virt: fix cpu object reference leak | ||
24 | * Add missing fp_access_check() to aarch64 crypto instructions | ||
25 | * cputlb: Don't assume do_unassigned_access() never returns | ||
26 | * virt: Add a user option to disallow ITS instantiation | ||
27 | * i.MX timers: fix reset handling | ||
28 | * ARMv7M NVIC: rewrite to fix broken priority handling and masking | ||
29 | * exynos: Fix proper mapping of CPUs by providing real cluster ID | ||
30 | * exynos: Fix Linux kernel division by zero for PLLs | ||
31 | 16 | ||
32 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
33 | Clement Deschamps (1): | 18 | Philippe Mathieu-Daudé (1): |
34 | bcm2835_sdhost: add bcm2835 sdhost controller | 19 | target/arm/gdbstub: Only advertise M-profile features if TCG available |
35 | 20 | ||
36 | Eric Auger (1): | 21 | target/arm/gdbstub.c | 5 +++-- |
37 | hw/arm/virt: Add a user option to disallow ITS instantiation | 22 | 1 file changed, 3 insertions(+), 2 deletions(-) |
38 | 23 | ||
39 | Igor Mammedov (1): | ||
40 | hw/arm/virt: fix cpu object reference leak | ||
41 | |||
42 | Krzysztof Kozlowski (2): | ||
43 | hw/arm/exynos: Fix Linux kernel division by zero for PLLs | ||
44 | hw/arm/exynos: Fix proper mapping of CPUs by providing real cluster ID | ||
45 | |||
46 | Kurban Mallachiev (1): | ||
47 | ARM i.MX timers: fix reset handling | ||
48 | |||
49 | Marcin Chojnacki (1): | ||
50 | target-arm: Implement BCM2835 hardware RNG | ||
51 | |||
52 | Michael Davidsaver (5): | ||
53 | armv7m: Rewrite NVIC to not use any GIC code | ||
54 | arm: gic: Remove references to NVIC | ||
55 | armv7m: Escalate exceptions to HardFault if necessary | ||
56 | armv7m: Simpler and faster exception start | ||
57 | armv7m: VECTCLRACTIVE and VECTRESET are UNPREDICTABLE | ||
58 | |||
59 | Nick Reilly (1): | ||
60 | Add missing fp_access_check() to aarch64 crypto instructions | ||
61 | |||
62 | Peter Maydell (10): | ||
63 | bcm2835_rng: Use qcrypto_random_bytes() rather than rand() | ||
64 | cputlb: Don't assume do_unassigned_access() never returns | ||
65 | armv7m: Rename nvic_state to NVICState | ||
66 | armv7m: Implement reading and writing of PRIGROUP | ||
67 | armv7m: Fix condition check for taking exceptions | ||
68 | armv7m: Remove unused armv7m_nvic_acknowledge_irq() return value | ||
69 | armv7m: Extract "exception taken" code into functions | ||
70 | armv7m: Check exception return consistency | ||
71 | armv7m: Raise correct kind of UsageFault for attempts to execute ARM code | ||
72 | armv7m: Allow SHCSR writes to change pending and active bits | ||
73 | |||
74 | Prasad J Pandit (4): | ||
75 | sd: sdhci: mask transfer mode register value | ||
76 | sd: sdhci: check transfer mode register in multi block transfer | ||
77 | sd: sdhci: conditionally invoke multi block transfer | ||
78 | sd: sdhci: Remove block count enable check in single block transfers | ||
79 | |||
80 | hw/misc/Makefile.objs | 3 +- | ||
81 | hw/sd/Makefile.objs | 1 + | ||
82 | hw/intc/gic_internal.h | 7 +- | ||
83 | include/hw/arm/bcm2835_peripherals.h | 2 + | ||
84 | include/hw/arm/virt.h | 1 + | ||
85 | include/hw/misc/bcm2835_rng.h | 27 ++ | ||
86 | include/hw/sd/bcm2835_sdhost.h | 48 ++ | ||
87 | target/arm/cpu.h | 23 +- | ||
88 | cputlb.c | 15 +- | ||
89 | hw/arm/bcm2835_peripherals.c | 15 + | ||
90 | hw/arm/exynos4210.c | 18 + | ||
91 | hw/arm/virt.c | 32 +- | ||
92 | hw/intc/arm_gic.c | 31 +- | ||
93 | hw/intc/arm_gic_common.c | 23 +- | ||
94 | hw/intc/armv7m_nvic.c | 885 ++++++++++++++++++++++++++++------- | ||
95 | hw/misc/bcm2835_rng.c | 149 ++++++ | ||
96 | hw/misc/exynos4210_clk.c | 164 +++++++ | ||
97 | hw/sd/bcm2835_sdhost.c | 429 +++++++++++++++++ | ||
98 | hw/sd/sdhci.c | 25 +- | ||
99 | hw/timer/imx_gpt.c | 33 +- | ||
100 | linux-user/main.c | 1 + | ||
101 | target/arm/cpu.c | 16 +- | ||
102 | target/arm/helper.c | 245 +++++++--- | ||
103 | target/arm/translate-a64.c | 12 + | ||
104 | target/arm/translate.c | 8 +- | ||
105 | hw/intc/trace-events | 15 + | ||
106 | 26 files changed, 1897 insertions(+), 331 deletions(-) | ||
107 | create mode 100644 include/hw/misc/bcm2835_rng.h | ||
108 | create mode 100644 include/hw/sd/bcm2835_sdhost.h | ||
109 | create mode 100644 hw/misc/bcm2835_rng.c | ||
110 | create mode 100644 hw/misc/exynos4210_clk.c | ||
111 | create mode 100644 hw/sd/bcm2835_sdhost.c | ||
112 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | From: Philippe Mathieu-Daudé <philmd@linaro.org> | ||
1 | 2 | ||
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 |