1 | Only thing for Arm for rc1 is RTH's fix for the KVM SVE probe code. | 1 | v2: dropped USHL/SSHL patch |
---|---|---|---|
2 | 2 | ||
3 | -- PMM | 3 | The following changes since commit 785a602eae7ad97076b9794ebaba072ad4a9f74f: |
4 | 4 | ||
5 | The following changes since commit 4e06b3fc1b5e1ec03f22190eabe56891dc9c2236: | 5 | Merge remote-tracking branch 'remotes/kraxel/tags/vga-20190613-pull-request' into staging (2019-06-13 13:25:25 +0100) |
6 | |||
7 | Merge tag 'pull-hex-20220731' of https://github.com/quic/qemu into staging (2022-07-31 21:38:54 -0700) | ||
8 | 6 | ||
9 | are available in the Git repository at: | 7 | are available in the Git repository at: |
10 | 8 | ||
11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220801 | 9 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20190613-1 |
12 | 10 | ||
13 | for you to fetch changes up to 5265d24c981dfdda8d29b44f7e84a514da75eedc: | 11 | for you to fetch changes up to 18cf951af9a27ae573a6fa17f9d0c103f7b7679b: |
14 | 12 | ||
15 | target/arm: Move sve probe inside kvm >= 4.15 branch (2022-08-01 16:21:18 +0100) | 13 | target/arm: Fix short-vector increment behaviour (2019-06-13 15:14:06 +0100) |
16 | 14 | ||
17 | ---------------------------------------------------------------- | 15 | ---------------------------------------------------------------- |
18 | target-arm queue: | 16 | target-arm queue: |
19 | * Fix KVM SVE ID register probe code | 17 | * convert aarch32 VFP decoder to decodetree |
18 | (includes tightening up decode in a few places) | ||
19 | * fix minor bugs in VFP short-vector handling | ||
20 | * hw/core/bus.c: Only the main system bus can have no parent | ||
21 | * smmuv3: Fix decoding of ID register range | ||
22 | * Implement NSACR gating of floating point | ||
23 | * Use tcg_gen_gvec_bitsel | ||
20 | 24 | ||
21 | ---------------------------------------------------------------- | 25 | ---------------------------------------------------------------- |
26 | Peter Maydell (44): | ||
27 | target/arm: Implement NSACR gating of floating point | ||
28 | hw/arm/smmuv3: Fix decoding of ID register range | ||
29 | hw/core/bus.c: Only the main system bus can have no parent | ||
30 | target/arm: Add stubs for AArch32 VFP decodetree | ||
31 | target/arm: Factor out VFP access checking code | ||
32 | target/arm: Fix Cortex-R5F MVFR values | ||
33 | target/arm: Explicitly enable VFP short-vectors for aarch32 -cpu max | ||
34 | target/arm: Convert the VSEL instructions to decodetree | ||
35 | target/arm: Convert VMINNM, VMAXNM to decodetree | ||
36 | target/arm: Convert VRINTA/VRINTN/VRINTP/VRINTM to decodetree | ||
37 | target/arm: Convert VCVTA/VCVTN/VCVTP/VCVTM to decodetree | ||
38 | target/arm: Move the VFP trans_* functions to translate-vfp.inc.c | ||
39 | target/arm: Add helpers for VFP register loads and stores | ||
40 | target/arm: Convert "double-precision" register moves to decodetree | ||
41 | target/arm: Convert "single-precision" register moves to decodetree | ||
42 | target/arm: Convert VFP two-register transfer insns to decodetree | ||
43 | target/arm: Convert VFP VLDR and VSTR to decodetree | ||
44 | target/arm: Convert the VFP load/store multiple insns to decodetree | ||
45 | target/arm: Remove VLDR/VSTR/VLDM/VSTM use of cpu_F0s and cpu_F0d | ||
46 | target/arm: Convert VFP VMLA to decodetree | ||
47 | target/arm: Convert VFP VMLS to decodetree | ||
48 | target/arm: Convert VFP VNMLS to decodetree | ||
49 | target/arm: Convert VFP VNMLA to decodetree | ||
50 | target/arm: Convert VMUL to decodetree | ||
51 | target/arm: Convert VNMUL to decodetree | ||
52 | target/arm: Convert VADD to decodetree | ||
53 | target/arm: Convert VSUB to decodetree | ||
54 | target/arm: Convert VDIV to decodetree | ||
55 | target/arm: Convert VFP fused multiply-add insns to decodetree | ||
56 | target/arm: Convert VMOV (imm) to decodetree | ||
57 | target/arm: Convert VABS to decodetree | ||
58 | target/arm: Convert VNEG to decodetree | ||
59 | target/arm: Convert VSQRT to decodetree | ||
60 | target/arm: Convert VMOV (register) to decodetree | ||
61 | target/arm: Convert VFP comparison insns to decodetree | ||
62 | target/arm: Convert the VCVT-from-f16 insns to decodetree | ||
63 | target/arm: Convert the VCVT-to-f16 insns to decodetree | ||
64 | target/arm: Convert VFP round insns to decodetree | ||
65 | target/arm: Convert double-single precision conversion insns to decodetree | ||
66 | target/arm: Convert integer-to-float insns to decodetree | ||
67 | target/arm: Convert VJCVT to decodetree | ||
68 | target/arm: Convert VCVT fp/fixed-point conversion insns to decodetree | ||
69 | target/arm: Convert float-to-integer VCVT insns to decodetree | ||
70 | target/arm: Fix short-vector increment behaviour | ||
71 | |||
22 | Richard Henderson (3): | 72 | Richard Henderson (3): |
23 | target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features | 73 | target/arm: Use tcg_gen_gvec_bitsel |
24 | target/arm: Set KVM_ARM_VCPU_SVE while probing the host | 74 | target/arm: Fix output of PAuth Auth |
25 | target/arm: Move sve probe inside kvm >= 4.15 branch | 75 | decodetree: Fix comparison of Field |
26 | 76 | ||
27 | target/arm/kvm64.c | 45 ++++++++++++++++++++++----------------------- | 77 | target/arm/Makefile.objs | 13 + |
28 | 1 file changed, 22 insertions(+), 23 deletions(-) | 78 | tests/tcg/aarch64/Makefile.target | 2 +- |
79 | target/arm/cpu.h | 11 + | ||
80 | target/arm/translate-a64.h | 2 + | ||
81 | target/arm/translate.h | 3 - | ||
82 | hw/arm/smmuv3.c | 2 +- | ||
83 | hw/core/bus.c | 21 +- | ||
84 | target/arm/cpu.c | 6 + | ||
85 | target/arm/helper.c | 75 +- | ||
86 | target/arm/pauth_helper.c | 4 +- | ||
87 | target/arm/translate-a64.c | 15 +- | ||
88 | target/arm/translate-vfp.inc.c | 2672 +++++++++++++++++++++++++++++++++++++ | ||
89 | target/arm/translate.c | 1581 +--------------------- | ||
90 | tests/tcg/aarch64/pauth-2.c | 61 + | ||
91 | scripts/decodetree.py | 2 +- | ||
92 | target/arm/vfp-uncond.decode | 63 + | ||
93 | target/arm/vfp.decode | 242 ++++ | ||
94 | 17 files changed, 3203 insertions(+), 1572 deletions(-) | ||
95 | create mode 100644 target/arm/translate-vfp.inc.c | ||
96 | create mode 100644 tests/tcg/aarch64/pauth-2.c | ||
97 | create mode 100644 target/arm/vfp-uncond.decode | ||
98 | create mode 100644 target/arm/vfp.decode | ||
99 | diff view generated by jsdifflib |
Deleted patch | |||
---|---|---|---|
1 | From: Richard Henderson <richard.henderson@linaro.org> | ||
2 | 1 | ||
3 | Indication for support for SVE will not depend on whether we | ||
4 | perform the query on the main kvm_state or the temp vcpu. | ||
5 | |||
6 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
7 | Message-id: 20220726045828.53697-2-richard.henderson@linaro.org | ||
8 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
9 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
10 | --- | ||
11 | target/arm/kvm64.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c | ||
15 | index XXXXXXX..XXXXXXX 100644 | ||
16 | --- a/target/arm/kvm64.c | ||
17 | +++ b/target/arm/kvm64.c | ||
18 | @@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) | ||
19 | } | ||
20 | } | ||
21 | |||
22 | - sve_supported = ioctl(fdarray[0], KVM_CHECK_EXTENSION, KVM_CAP_ARM_SVE) > 0; | ||
23 | + sve_supported = kvm_arm_sve_supported(); | ||
24 | |||
25 | /* Add feature bits that can't appear until after VCPU init. */ | ||
26 | if (sve_supported) { | ||
27 | -- | ||
28 | 2.25.1 | diff view generated by jsdifflib |
Deleted patch | |||
---|---|---|---|
1 | From: Richard Henderson <richard.henderson@linaro.org> | ||
2 | 1 | ||
3 | Because we weren't setting this flag, our probe of ID_AA64ZFR0 | ||
4 | was always returning zero. This also obviates the adjustment | ||
5 | of ID_AA64PFR0, which had sanitized the SVE field. | ||
6 | |||
7 | The effects of the bug are not visible, because the only thing that | ||
8 | ID_AA64ZFR0 is used for within qemu at present is tcg translation. | ||
9 | The other tests for SVE within KVM are via ID_AA64PFR0.SVE. | ||
10 | |||
11 | Reported-by: Zenghui Yu <yuzenghui@huawei.com> | ||
12 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
13 | Message-id: 20220726045828.53697-3-richard.henderson@linaro.org | ||
14 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
15 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
16 | --- | ||
17 | target/arm/kvm64.c | 27 +++++++++++++-------------- | ||
18 | 1 file changed, 13 insertions(+), 14 deletions(-) | ||
19 | |||
20 | diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c | ||
21 | index XXXXXXX..XXXXXXX 100644 | ||
22 | --- a/target/arm/kvm64.c | ||
23 | +++ b/target/arm/kvm64.c | ||
24 | @@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) | ||
25 | bool sve_supported; | ||
26 | bool pmu_supported = false; | ||
27 | uint64_t features = 0; | ||
28 | - uint64_t t; | ||
29 | int err; | ||
30 | |||
31 | /* Old kernels may not know about the PREFERRED_TARGET ioctl: however | ||
32 | @@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) | ||
33 | struct kvm_vcpu_init init = { .target = -1, }; | ||
34 | |||
35 | /* | ||
36 | - * Ask for Pointer Authentication if supported. We can't play the | ||
37 | - * SVE trick of synthesising the ID reg as KVM won't tell us | ||
38 | - * whether we have the architected or IMPDEF version of PAuth, so | ||
39 | - * we have to use the actual ID regs. | ||
40 | + * Ask for SVE if supported, so that we can query ID_AA64ZFR0, | ||
41 | + * which is otherwise RAZ. | ||
42 | + */ | ||
43 | + sve_supported = kvm_arm_sve_supported(); | ||
44 | + if (sve_supported) { | ||
45 | + init.features[0] |= 1 << KVM_ARM_VCPU_SVE; | ||
46 | + } | ||
47 | + | ||
48 | + /* | ||
49 | + * Ask for Pointer Authentication if supported, so that we get | ||
50 | + * the unsanitized field values for AA64ISAR1_EL1. | ||
51 | */ | ||
52 | if (kvm_arm_pauth_supported()) { | ||
53 | init.features[0] |= (1 << KVM_ARM_VCPU_PTRAUTH_ADDRESS | | ||
54 | @@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) | ||
55 | } | ||
56 | } | ||
57 | |||
58 | - sve_supported = kvm_arm_sve_supported(); | ||
59 | - | ||
60 | - /* Add feature bits that can't appear until after VCPU init. */ | ||
61 | if (sve_supported) { | ||
62 | - t = ahcf->isar.id_aa64pfr0; | ||
63 | - t = FIELD_DP64(t, ID_AA64PFR0, SVE, 1); | ||
64 | - ahcf->isar.id_aa64pfr0 = t; | ||
65 | - | ||
66 | /* | ||
67 | * There is a range of kernels between kernel commit 73433762fcae | ||
68 | * and f81cb2c3ad41 which have a bug where the kernel doesn't expose | ||
69 | * SYS_ID_AA64ZFR0_EL1 via the ONE_REG API unless the VM has enabled | ||
70 | - * SVE support, so we only read it here, rather than together with all | ||
71 | - * the other ID registers earlier. | ||
72 | + * SVE support, which resulted in an error rather than RAZ. | ||
73 | + * So only read the register if we set KVM_ARM_VCPU_SVE above. | ||
74 | */ | ||
75 | err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64zfr0, | ||
76 | ARM64_SYS_REG(3, 0, 0, 4, 4)); | ||
77 | -- | ||
78 | 2.25.1 | diff view generated by jsdifflib |
Deleted patch | |||
---|---|---|---|
1 | From: Richard Henderson <richard.henderson@linaro.org> | ||
2 | 1 | ||
3 | The test for the IF block indicates no ID registers are exposed, much | ||
4 | less host support for SVE. Move the SVE probe into the ELSE block. | ||
5 | |||
6 | Signed-off-by: Richard Henderson <richard.henderson@linaro.org> | ||
7 | Message-id: 20220726045828.53697-4-richard.henderson@linaro.org | ||
8 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
9 | Signed-off-by: Peter Maydell <peter.maydell@linaro.org> | ||
10 | --- | ||
11 | target/arm/kvm64.c | 22 +++++++++++----------- | ||
12 | 1 file changed, 11 insertions(+), 11 deletions(-) | ||
13 | |||
14 | diff --git a/target/arm/kvm64.c b/target/arm/kvm64.c | ||
15 | index XXXXXXX..XXXXXXX 100644 | ||
16 | --- a/target/arm/kvm64.c | ||
17 | +++ b/target/arm/kvm64.c | ||
18 | @@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf) | ||
19 | err |= read_sys_reg64(fdarray[2], &ahcf->isar.reset_pmcr_el0, | ||
20 | ARM64_SYS_REG(3, 3, 9, 12, 0)); | ||
21 | } | ||
22 | - } | ||
23 | |||
24 | - if (sve_supported) { | ||
25 | - /* | ||
26 | - * There is a range of kernels between kernel commit 73433762fcae | ||
27 | - * and f81cb2c3ad41 which have a bug where the kernel doesn't expose | ||
28 | - * SYS_ID_AA64ZFR0_EL1 via the ONE_REG API unless the VM has enabled | ||
29 | - * SVE support, which resulted in an error rather than RAZ. | ||
30 | - * So only read the register if we set KVM_ARM_VCPU_SVE above. | ||
31 | - */ | ||
32 | - err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64zfr0, | ||
33 | - ARM64_SYS_REG(3, 0, 0, 4, 4)); | ||
34 | + if (sve_supported) { | ||
35 | + /* | ||
36 | + * There is a range of kernels between kernel commit 73433762fcae | ||
37 | + * and f81cb2c3ad41 which have a bug where the kernel doesn't | ||
38 | + * expose SYS_ID_AA64ZFR0_EL1 via the ONE_REG API unless the VM has | ||
39 | + * enabled SVE support, which resulted in an error rather than RAZ. | ||
40 | + * So only read the register if we set KVM_ARM_VCPU_SVE above. | ||
41 | + */ | ||
42 | + err |= read_sys_reg64(fdarray[2], &ahcf->isar.id_aa64zfr0, | ||
43 | + ARM64_SYS_REG(3, 0, 0, 4, 4)); | ||
44 | + } | ||
45 | } | ||
46 | |||
47 | kvm_arm_destroy_scratch_host_vcpu(fdarray); | ||
48 | -- | ||
49 | 2.25.1 | diff view generated by jsdifflib |