1 | This bug seemed worth fixing for 8.0 since we need an rc4 anyway: | 1 | target-arm queue: this clears out a bunch of patches I'd sent over |
---|---|---|---|
2 | we were using uninitialized data for the guarded bit when | 2 | the last coupled of weeks that have now got reviewed. Mostly |
3 | combining stage 1 and stage 2 attrs. | 3 | this is MPS2 device support improvements, put there is also |
4 | more of the incremental work towards supporting AArch32 Hyp mode, | ||
5 | a floating point bugfix, and the raspi framebuffer viewport support. | ||
6 | |||
7 | v2 fixes a "variable used uninitialized" error in a15mpcore.c. | ||
4 | 8 | ||
5 | thanks | 9 | thanks |
6 | -- PMM | 10 | -- PMM |
7 | 11 | ||
8 | The following changes since commit 08dede07030973c1053868bc64de7e10bfa02ad6: | ||
9 | 12 | ||
10 | Merge tag 'pull-ppc-20230409' of https://github.com/legoater/qemu into staging (2023-04-10 11:47:52 +0100) | 13 | The following changes since commit 6b699ae1be9f257478d5eca7ef65dcea270a2796: |
14 | |||
15 | tests/vm: Increase timeout waiting for VM to boot to 5 minutes (2018-08-24 11:31:28 +0100) | ||
11 | 16 | ||
12 | are available in the Git repository at: | 17 | are available in the Git repository at: |
13 | 18 | ||
14 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230410 | 19 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20180824-1 |
15 | 20 | ||
16 | for you to fetch changes up to 8539dc00552e8ea60420856fc1262c8299bc6308: | 21 | for you to fetch changes up to 239cb6feb298a31faa40b7e97ced107bf9c2f2bf: |
17 | 22 | ||
18 | target/arm: Copy guarded bit in combine_cacheattrs (2023-04-10 14:31:40 +0100) | 23 | hw/arm/mps2: Fix ID register errors on AN511 and AN385 (2018-08-24 13:17:50 +0100) |
19 | 24 | ||
20 | ---------------------------------------------------------------- | 25 | ---------------------------------------------------------------- |
21 | target-arm: Fix bug where we weren't initializing | 26 | target-arm queue: |
22 | guarded bit state when combining S1/S2 attrs | 27 | * Fix rounding errors in scaling float-to-int and int-to-float operations |
28 | * Connect virtualization-related IRQs and memory regions of GICv2 | ||
29 | in boards that use Cortex-A7 or Cortex-A15 | ||
30 | * Support taking exceptions to AArch32 Hyp mode | ||
31 | * Clear CPSR.IL and CPSR.J on 32-bit exception entry | ||
32 | (a minor bug fix that won't affect non-buggy guest code) | ||
33 | * mps2-an505: Implement various missing devices: | ||
34 | dual timer, watchdogs, counters in the FPGAIO registers, | ||
35 | some missing ID/control registers, TrustZone Master Security | ||
36 | Controllers, PL081 DMA controllers, PL022 SPI controllers | ||
37 | * correct ID register values for mps2-an385, -an511, -an505 | ||
38 | * fix some hardcoded tabs in untouched backwaters of the | ||
39 | target/arm codebase | ||
40 | * raspi: Refactor framebuffer property handling code and implement | ||
41 | support for the virtual framebuffer/viewport | ||
23 | 42 | ||
24 | ---------------------------------------------------------------- | 43 | ---------------------------------------------------------------- |
25 | Richard Henderson (2): | 44 | Peter Maydell (48): |
26 | target/arm: PTE bit GP only applies to stage1 | 45 | hw/intc/arm_gic: Make per-cpu GICH memory regions 0x200 bytes large |
27 | target/arm: Copy guarded bit in combine_cacheattrs | 46 | hw/arm/vexpress: Connect VIRQ and VFIQ |
47 | hw/arm/highbank: Connect VIRQ and VFIQ | ||
48 | hw/arm/fsl-imx6ul: Connect VIRQ and VFIQ | ||
49 | hw/arm/fsl-imx6ul: Connect VIRQ and VFIQ | ||
50 | hw/cpu/a15mpcore: If CPU has EL2, enable it on the GIC and wire it up | ||
51 | hw/arm/vexpress: Don't set info->secure_boot if CPU doesn't have EL3 | ||
52 | hw/arm/vexpress: Add "virtualization" property controlling presence of EL2 | ||
53 | target/arm: Implement RAZ/WI HACTLR2 | ||
54 | target/arm: Implement AArch32 HCR and HCR2 | ||
55 | target/arm: Factor out code for taking an AArch32 exception | ||
56 | target/arm: Implement support for taking exceptions to Hyp mode | ||
57 | target/arm: Clear CPSR.IL and CPSR.J on 32-bit exception entry | ||
58 | hw/arm/boot: AArch32 kernels should be started in Hyp mode if available | ||
59 | hw/misc/mps2-fpgaio: Implement 1Hz and 100Hz counters | ||
60 | hw/misc/mps2-fpgaio: Implement PSCNTR and COUNTER | ||
61 | hw/timer/cmsdk-apb-dualtimer: Implement CMSDK dual timer module | ||
62 | hw/arm/iotkit: Wire up the dualtimer | ||
63 | hw/arm/mps2: Wire up dual-timer in mps2-an385 and mps2-an511 | ||
64 | hw/arm/iotkit: Wire up the watchdogs | ||
65 | hw/arm/iotkit: Wire up the S32KTIMER | ||
66 | hw/misc/iotkit-sysctl: Implement IoTKit system control element | ||
67 | hw/misc/iotkit-sysinfo: Implement IoTKit system information block | ||
68 | hw/misc/iotkit: Wire up the sysctl and sysinfo register blocks | ||
69 | hw/misc/tz-msc: Model TrustZone Master Security Controller | ||
70 | hw/misc/iotkit-secctl: Wire up registers for controlling MSCs | ||
71 | hw/arm/iotkit: Wire up the lines for MSCs | ||
72 | hw/arm/mps2-tz: Create PL081s and MSCs | ||
73 | hw/ssi/pl022: Allow use as embedded-struct device | ||
74 | hw/ssi/pl022: Set up reset function in class init | ||
75 | hw/ssi/pl022: Don't directly call vmstate_register() | ||
76 | hw/ssi/pl022: Use DeviceState::realize rather than SysBusDevice::init | ||
77 | hw/ssi/pl022: Correct wrong value for PL022_INT_RT | ||
78 | hw/ssi/pl022: Correct wrong DMACR and ICR handling | ||
79 | hw/arm/mps2-tz: Instantiate SPI controllers | ||
80 | hw/arm/mps2-tz: Fix MPS2 SCC config register values | ||
81 | target/arm: Untabify translate.c | ||
82 | target/arm: Untabify iwmmxt_helper.c | ||
83 | target/arm: Remove a handful of stray tabs | ||
84 | hw/misc/bcm2835_fb: Move config fields to their own struct | ||
85 | hw/misc/bcm2835_property: Track fb settings using BCM2835FBConfig | ||
86 | hw/display/bcm2835_fb: Drop unused size and pitch fields | ||
87 | hw/display/bcm2835_fb: Reset resolution, etc correctly | ||
88 | hw/display/bcm2835_fb: Abstract out calculation of pitch, size | ||
89 | hw/display/bcm2835_fb: Fix handling of virtual framebuffer | ||
90 | hw/display/bcm2835_fb: Validate config settings | ||
91 | hw/display/bcm2835_fb: Validate bcm2835_fb_mbox_push() config | ||
92 | hw/arm/mps2: Fix ID register errors on AN511 and AN385 | ||
28 | 93 | ||
29 | target/arm/ptw.c | 11 ++++++----- | 94 | Richard Henderson (4): |
30 | 1 file changed, 6 insertions(+), 5 deletions(-) | 95 | softfloat: Add scaling int-to-float routines |
96 | softfloat: Add scaling float-to-int routines | ||
97 | target/arm: Use the int-to-float-scale softfloat routines | ||
98 | target/arm: Use the float-to-int-scale softfloat routines | ||
99 | |||
100 | hw/misc/Makefile.objs | 3 + | ||
101 | hw/timer/Makefile.objs | 1 + | ||
102 | include/fpu/softfloat.h | 169 +++++++--- | ||
103 | include/hw/arm/iotkit.h | 25 +- | ||
104 | include/hw/display/bcm2835_fb.h | 59 +++- | ||
105 | include/hw/misc/iotkit-secctl.h | 14 + | ||
106 | include/hw/misc/iotkit-sysctl.h | 49 +++ | ||
107 | include/hw/misc/iotkit-sysinfo.h | 37 +++ | ||
108 | include/hw/misc/mps2-fpgaio.h | 10 + | ||
109 | include/hw/misc/tz-msc.h | 79 +++++ | ||
110 | include/hw/ssi/pl022.h | 51 +++ | ||
111 | include/hw/timer/cmsdk-apb-dualtimer.h | 72 ++++ | ||
112 | target/arm/cpu.h | 16 +- | ||
113 | fpu/softfloat.c | 579 ++++++++++++++++++++++++++------- | ||
114 | hw/arm/boot.c | 11 + | ||
115 | hw/arm/fsl-imx6ul.c | 4 + | ||
116 | hw/arm/fsl-imx7.c | 4 + | ||
117 | hw/arm/highbank.c | 6 + | ||
118 | hw/arm/iotkit.c | 114 ++++++- | ||
119 | hw/arm/mps2-tz.c | 142 +++++++- | ||
120 | hw/arm/mps2.c | 17 +- | ||
121 | hw/arm/vexpress.c | 64 +++- | ||
122 | hw/cpu/a15mpcore.c | 31 +- | ||
123 | hw/display/bcm2835_fb.c | 218 ++++++++----- | ||
124 | hw/intc/arm_gic.c | 2 +- | ||
125 | hw/misc/bcm2835_property.c | 123 ++++--- | ||
126 | hw/misc/iotkit-secctl.c | 73 ++++- | ||
127 | hw/misc/iotkit-sysctl.c | 261 +++++++++++++++ | ||
128 | hw/misc/iotkit-sysinfo.c | 128 ++++++++ | ||
129 | hw/misc/mps2-fpgaio.c | 146 ++++++++- | ||
130 | hw/misc/tz-msc.c | 308 ++++++++++++++++++ | ||
131 | hw/ssi/pl022.c | 57 ++-- | ||
132 | hw/timer/cmsdk-apb-dualtimer.c | 515 +++++++++++++++++++++++++++++ | ||
133 | target/arm/arm-semi.c | 2 +- | ||
134 | target/arm/helper.c | 342 +++++++++++++------ | ||
135 | target/arm/iwmmxt_helper.c | 234 ++++++------- | ||
136 | target/arm/translate.c | 122 +++---- | ||
137 | MAINTAINERS | 10 + | ||
138 | default-configs/arm-softmmu.mak | 4 + | ||
139 | hw/misc/trace-events | 16 + | ||
140 | hw/timer/trace-events | 5 + | ||
141 | 41 files changed, 3405 insertions(+), 718 deletions(-) | ||
142 | create mode 100644 include/hw/misc/iotkit-sysctl.h | ||
143 | create mode 100644 include/hw/misc/iotkit-sysinfo.h | ||
144 | create mode 100644 include/hw/misc/tz-msc.h | ||
145 | create mode 100644 include/hw/ssi/pl022.h | ||
146 | create mode 100644 include/hw/timer/cmsdk-apb-dualtimer.h | ||
147 | create mode 100644 hw/misc/iotkit-sysctl.c | ||
148 | create mode 100644 hw/misc/iotkit-sysinfo.c | ||
149 | create mode 100644 hw/misc/tz-msc.c | ||
150 | create mode 100644 hw/timer/cmsdk-apb-dualtimer.c | ||
151 | diff view generated by jsdifflib |
Deleted patch | |||
---|---|---|---|
1 | From: Richard Henderson <richard.henderson@linaro.org> | ||
2 | 1 | ||
3 | Only perform the extract of GP during the stage1 walk. | ||
4 | |||
5 | Reported-by: Peter Maydell <peter.maydell@linaro.org> | ||
6 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
7 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
8 | Message-id: 20230407185149.3253946-2-richard.henderson@linaro.org | ||
9 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
10 | --- | ||
11 | target/arm/ptw.c | 10 +++++----- | ||
12 | 1 file changed, 5 insertions(+), 5 deletions(-) | ||
13 | |||
14 | diff --git a/target/arm/ptw.c b/target/arm/ptw.c | ||
15 | index XXXXXXX..XXXXXXX 100644 | ||
16 | --- a/target/arm/ptw.c | ||
17 | +++ b/target/arm/ptw.c | ||
18 | @@ -XXX,XX +XXX,XX @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw, | ||
19 | result->f.attrs.secure = false; | ||
20 | } | ||
21 | |||
22 | - /* When in aarch64 mode, and BTI is enabled, remember GP in the TLB. */ | ||
23 | - if (aarch64 && cpu_isar_feature(aa64_bti, cpu)) { | ||
24 | - result->f.guarded = extract64(attrs, 50, 1); /* GP */ | ||
25 | - } | ||
26 | - | ||
27 | if (regime_is_stage2(mmu_idx)) { | ||
28 | result->cacheattrs.is_s2_format = true; | ||
29 | result->cacheattrs.attrs = extract32(attrs, 2, 4); | ||
30 | @@ -XXX,XX +XXX,XX @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw, | ||
31 | assert(attrindx <= 7); | ||
32 | result->cacheattrs.is_s2_format = false; | ||
33 | result->cacheattrs.attrs = extract64(mair, attrindx * 8, 8); | ||
34 | + | ||
35 | + /* When in aarch64 mode, and BTI is enabled, remember GP in the TLB. */ | ||
36 | + if (aarch64 && cpu_isar_feature(aa64_bti, cpu)) { | ||
37 | + result->f.guarded = extract64(attrs, 50, 1); /* GP */ | ||
38 | + } | ||
39 | } | ||
40 | |||
41 | /* | ||
42 | -- | ||
43 | 2.34.1 | diff view generated by jsdifflib |
Deleted patch | |||
---|---|---|---|
1 | From: Richard Henderson <richard.henderson@linaro.org> | ||
2 | 1 | ||
3 | The guarded bit comes from the stage1 walk. | ||
4 | |||
5 | Fixes: Coverity CID 1507929 | ||
6 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
7 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
8 | Message-id: 20230407185149.3253946-3-richard.henderson@linaro.org | ||
9 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
10 | --- | ||
11 | target/arm/ptw.c | 1 + | ||
12 | 1 file changed, 1 insertion(+) | ||
13 | |||
14 | diff --git a/target/arm/ptw.c b/target/arm/ptw.c | ||
15 | index XXXXXXX..XXXXXXX 100644 | ||
16 | --- a/target/arm/ptw.c | ||
17 | +++ b/target/arm/ptw.c | ||
18 | @@ -XXX,XX +XXX,XX @@ static ARMCacheAttrs combine_cacheattrs(uint64_t hcr, | ||
19 | |||
20 | assert(!s1.is_s2_format); | ||
21 | ret.is_s2_format = false; | ||
22 | + ret.guarded = s1.guarded; | ||
23 | |||
24 | if (s1.attrs == 0xf0) { | ||
25 | tagged = true; | ||
26 | -- | ||
27 | 2.34.1 | diff view generated by jsdifflib |