[PULL 0/3] target-arm queue
[PULL v2 00/12] target-arm queue
1
Only thing for Arm for rc1 is RTH's fix for the KVM SVE probe code.
1
v2: minor tweak to fix format string issue on Windows hosts...
2
2
3
-- PMM
4
3
5
The following changes since commit 4e06b3fc1b5e1ec03f22190eabe56891dc9c2236:
4
The following changes since commit 6eeea6725a70e6fcb5abba0764496bdab07ddfb3:
6
5
7
Merge tag 'pull-hex-20220731' of https://github.com/quic/qemu into staging (2022-07-31 21:38:54 -0700)
6
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-10-06' into staging (2020-10-06 21:13:34 +0100)
8
7
9
are available in the Git repository at:
8
are available in the Git repository at:
10
9
11
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220801
10
https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20201008-1
12
11
13
for you to fetch changes up to 5265d24c981dfdda8d29b44f7e84a514da75eedc:
12
for you to fetch changes up to d1b6b7017572e8d82f26eb827a1dba0e8cf3cae6:
14
13
15
target/arm: Move sve probe inside kvm >= 4.15 branch (2022-08-01 16:21:18 +0100)
14
target/arm: Make '-cpu max' have a 48-bit PA (2020-10-08 21:40:01 +0100)
16
15
17
----------------------------------------------------------------
16
----------------------------------------------------------------
18
target-arm queue:
17
target-arm queue:
19
* Fix KVM SVE ID register probe code
18
* hw/ssi/npcm7xx_fiu: Fix handling of unsigned integer
19
* hw/arm/fsl-imx25: Fix a typo
20
* hw/arm/sbsa-ref : Fix SMMUv3 Initialisation
21
* hw/arm/sbsa-ref : allocate IRQs for SMMUv3
22
* hw/char/bcm2835_aux: Allow less than 32-bit accesses
23
* hw/arm/virt: Implement kvm-steal-time
24
* target/arm: Make '-cpu max' have a 48-bit PA
20
25
21
----------------------------------------------------------------
26
----------------------------------------------------------------
22
Richard Henderson (3):
27
Andrew Jones (6):
23
target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features
28
linux headers: sync to 5.9-rc7
24
target/arm: Set KVM_ARM_VCPU_SVE while probing the host
29
target/arm/kvm: Make uncalled stubs explicitly unreachable
25
target/arm: Move sve probe inside kvm >= 4.15 branch
30
hw/arm/virt: Move post cpu realize check into its own function
31
hw/arm/virt: Move kvm pmu setup to virt_cpu_post_init
32
tests/qtest: Restore aarch64 arm-cpu-features test
33
hw/arm/virt: Implement kvm-steal-time
26
34
27
target/arm/kvm64.c | 45 ++++++++++++++++++++++-----------------------
35
Graeme Gregory (2):
28
1 file changed, 22 insertions(+), 23 deletions(-)
36
hw/arm/sbsa-ref : Fix SMMUv3 Initialisation
37
hw/arm/sbsa-ref : allocate IRQs for SMMUv3
38
39
Peter Maydell (1):
40
target/arm: Make '-cpu max' have a 48-bit PA
41
42
Philippe Mathieu-Daudé (3):
43
hw/ssi/npcm7xx_fiu: Fix handling of unsigned integer
44
hw/arm/fsl-imx25: Fix a typo
45
hw/char/bcm2835_aux: Allow less than 32-bit accesses
46
47
docs/system/arm/cpu-features.rst | 11 ++++
48
include/hw/arm/fsl-imx25.h | 2 +-
49
include/hw/arm/virt.h | 5 ++
50
linux-headers/linux/kvm.h | 6 ++-
51
target/arm/cpu.h | 4 ++
52
target/arm/kvm_arm.h | 94 ++++++++++++++++++++++++++-------
53
hw/arm/sbsa-ref.c | 3 +-
54
hw/arm/virt.c | 111 ++++++++++++++++++++++++++++-----------
55
hw/char/bcm2835_aux.c | 4 +-
56
hw/ssi/npcm7xx_fiu.c | 12 ++---
57
target/arm/cpu.c | 8 +++
58
target/arm/cpu64.c | 4 ++
59
target/arm/kvm.c | 16 ++++++
60
target/arm/kvm64.c | 64 ++++++++++++++++++++--
61
target/arm/monitor.c | 2 +-
62
tests/qtest/arm-cpu-features.c | 25 +++++++--
63
hw/ssi/trace-events | 2 +-
64
tests/qtest/meson.build | 3 +-
65
18 files changed, 304 insertions(+), 72 deletions(-)
66
diff view generated by jsdifflib
[PULL 1/3] target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features
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
[PULL 2/3] target/arm: Set KVM_ARM_VCPU_SVE while probing the host
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
[PULL 3/3] target/arm: Move sve probe inside kvm >= 4.15 branch
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

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.