1 | This bug seemed worth fixing for 8.0 since we need an rc4 anyway: | 1 | v1->v2: fix format string nit in ITS patches (%lu used when PRIu64 needed) |
---|---|---|---|
2 | we were using uninitialized data for the guarded bit when | ||
3 | combining stage 1 and stage 2 attrs. | ||
4 | 2 | ||
5 | thanks | 3 | The following changes since commit eae587e8e3694b1aceab23239493fb4c7e1a80f5: |
6 | -- PMM | ||
7 | 4 | ||
8 | The following changes since commit 08dede07030973c1053868bc64de7e10bfa02ad6: | 5 | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-09-13' into staging (2021-09-13 11:00:30 +0100) |
9 | |||
10 | Merge tag 'pull-ppc-20230409' of https://github.com/legoater/qemu into staging (2023-04-10 11:47:52 +0100) | ||
11 | 6 | ||
12 | are available in the Git repository at: | 7 | are available in the Git repository at: |
13 | 8 | ||
14 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20230410 | 9 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210913-1 |
15 | 10 | ||
16 | for you to fetch changes up to 8539dc00552e8ea60420856fc1262c8299bc6308: | 11 | for you to fetch changes up to 925e3b205bb17af52ac06c7bdd9d84b27345a4e9: |
17 | 12 | ||
18 | target/arm: Copy guarded bit in combine_cacheattrs (2023-04-10 14:31:40 +0100) | 13 | hw/arm/mps2.c: Mark internal-only I2C buses as 'full' (2021-09-13 19:36:50 +0100) |
19 | 14 | ||
20 | ---------------------------------------------------------------- | 15 | ---------------------------------------------------------------- |
21 | target-arm: Fix bug where we weren't initializing | 16 | target-arm queue: |
22 | guarded bit state when combining S1/S2 attrs | 17 | * mark MPS2/MPS3 board-internal i2c buses as 'full' so that command |
18 | line user-created devices are not plugged into them | ||
19 | * Take an exception if PSTATE.IL is set | ||
20 | * Support an emulated ITS in the virt board | ||
21 | * Add support for kudo-bmc board | ||
22 | * Probe for KVM_CAP_ARM_VM_IPA_SIZE when creating scratch VM | ||
23 | * cadence_uart: Fix clock handling issues that prevented | ||
24 | u-boot from running | ||
23 | 25 | ||
24 | ---------------------------------------------------------------- | 26 | ---------------------------------------------------------------- |
25 | Richard Henderson (2): | 27 | Bin Meng (6): |
26 | target/arm: PTE bit GP only applies to stage1 | 28 | hw/misc: zynq_slcr: Correctly compute output clocks in the reset exit phase |
27 | target/arm: Copy guarded bit in combine_cacheattrs | 29 | hw/char: cadence_uart: Disable transmit when input clock is disabled |
30 | hw/char: cadence_uart: Move clock/reset check to uart_can_receive() | ||
31 | hw/char: cadence_uart: Convert to memop_with_attrs() ops | ||
32 | hw/char: cadence_uart: Ignore access when unclocked or in reset for uart_{read, write}() | ||
33 | hw/char: cadence_uart: Log a guest error when device is unclocked or in reset | ||
28 | 34 | ||
29 | target/arm/ptw.c | 11 ++++++----- | 35 | Chris Rauer (1): |
30 | 1 file changed, 6 insertions(+), 5 deletions(-) | 36 | hw/arm: Add support for kudo-bmc board. |
37 | |||
38 | Marc Zyngier (1): | ||
39 | hw/arm/virt: KVM: Probe for KVM_CAP_ARM_VM_IPA_SIZE when creating scratch VM | ||
40 | |||
41 | Peter Maydell (5): | ||
42 | target/arm: Take an exception if PSTATE.IL is set | ||
43 | qdev: Support marking individual buses as 'full' | ||
44 | hw/arm/mps2-tz.c: Add extra data parameter to MakeDevFn | ||
45 | hw/arm/mps2-tz.c: Mark internal-only I2C buses as 'full' | ||
46 | hw/arm/mps2.c: Mark internal-only I2C buses as 'full' | ||
47 | |||
48 | Richard Henderson (1): | ||
49 | target/arm: Merge disas_a64_insn into aarch64_tr_translate_insn | ||
50 | |||
51 | Shashi Mallela (9): | ||
52 | hw/intc: GICv3 ITS initial framework | ||
53 | hw/intc: GICv3 ITS register definitions added | ||
54 | hw/intc: GICv3 ITS command queue framework | ||
55 | hw/intc: GICv3 ITS Command processing | ||
56 | hw/intc: GICv3 ITS Feature enablement | ||
57 | hw/intc: GICv3 redistributor ITS processing | ||
58 | tests/data/acpi/virt: Add IORT files for ITS | ||
59 | hw/arm/virt: add ITS support in virt GIC | ||
60 | tests/data/acpi/virt: Update IORT files for ITS | ||
61 | |||
62 | docs/system/arm/nuvoton.rst | 1 + | ||
63 | hw/intc/gicv3_internal.h | 188 ++++- | ||
64 | include/hw/arm/virt.h | 2 + | ||
65 | include/hw/intc/arm_gicv3_common.h | 13 + | ||
66 | include/hw/intc/arm_gicv3_its_common.h | 32 +- | ||
67 | include/hw/qdev-core.h | 24 + | ||
68 | target/arm/cpu.h | 1 + | ||
69 | target/arm/kvm_arm.h | 4 +- | ||
70 | target/arm/syndrome.h | 5 + | ||
71 | target/arm/translate.h | 2 + | ||
72 | hw/arm/mps2-tz.c | 92 ++- | ||
73 | hw/arm/mps2.c | 12 +- | ||
74 | hw/arm/npcm7xx_boards.c | 34 + | ||
75 | hw/arm/virt.c | 29 +- | ||
76 | hw/char/cadence_uart.c | 61 +- | ||
77 | hw/intc/arm_gicv3.c | 14 + | ||
78 | hw/intc/arm_gicv3_common.c | 13 + | ||
79 | hw/intc/arm_gicv3_cpuif.c | 7 +- | ||
80 | hw/intc/arm_gicv3_dist.c | 5 +- | ||
81 | hw/intc/arm_gicv3_its.c | 1322 ++++++++++++++++++++++++++++++++ | ||
82 | hw/intc/arm_gicv3_its_common.c | 7 +- | ||
83 | hw/intc/arm_gicv3_its_kvm.c | 2 +- | ||
84 | hw/intc/arm_gicv3_redist.c | 153 +++- | ||
85 | hw/misc/zynq_slcr.c | 31 +- | ||
86 | softmmu/qdev-monitor.c | 7 +- | ||
87 | target/arm/helper-a64.c | 1 + | ||
88 | target/arm/helper.c | 8 + | ||
89 | target/arm/kvm.c | 7 +- | ||
90 | target/arm/translate-a64.c | 255 +++--- | ||
91 | target/arm/translate.c | 21 + | ||
92 | hw/intc/meson.build | 1 + | ||
93 | tests/data/acpi/virt/IORT | Bin 0 -> 124 bytes | ||
94 | tests/data/acpi/virt/IORT.memhp | Bin 0 -> 124 bytes | ||
95 | tests/data/acpi/virt/IORT.numamem | Bin 0 -> 124 bytes | ||
96 | tests/data/acpi/virt/IORT.pxb | Bin 0 -> 124 bytes | ||
97 | 35 files changed, 2144 insertions(+), 210 deletions(-) | ||
98 | create mode 100644 hw/intc/arm_gicv3_its.c | ||
99 | create mode 100644 tests/data/acpi/virt/IORT | ||
100 | create mode 100644 tests/data/acpi/virt/IORT.memhp | ||
101 | create mode 100644 tests/data/acpi/virt/IORT.numamem | ||
102 | create mode 100644 tests/data/acpi/virt/IORT.pxb | ||
103 | 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 |