1 | Only thing for Arm for rc1 is RTH's fix for the KVM SVE probe code. | 1 | v1->v2: add system/index to docs/index.rst |
---|---|---|---|
2 | v2->v3: fix format string issues for OSX | ||
3 | v3->v4: actually fix format string issues, somehow | ||
4 | I failed to actually put the change into git :-( | ||
2 | 5 | ||
3 | -- PMM | 6 | The following changes since commit b7c359c748a2e3ccb97a184b9739feb2cd48de2f: |
4 | 7 | ||
5 | The following changes since commit 4e06b3fc1b5e1ec03f22190eabe56891dc9c2236: | 8 | Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.0-pull-request' into staging (2020-01-23 14:38:43 +0000) |
6 | |||
7 | Merge tag 'pull-hex-20220731' of https://github.com/quic/qemu into staging (2022-07-31 21:38:54 -0700) | ||
8 | 9 | ||
9 | are available in the Git repository at: | 10 | are available in the Git repository at: |
10 | 11 | ||
11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220801 | 12 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20200123-4 |
12 | 13 | ||
13 | for you to fetch changes up to 5265d24c981dfdda8d29b44f7e84a514da75eedc: | 14 | for you to fetch changes up to e9d20b55b2e4c8400143554f0e83e4e1fcb9bd0f: |
14 | 15 | ||
15 | target/arm: Move sve probe inside kvm >= 4.15 branch (2022-08-01 16:21:18 +0100) | 16 | hw/arm/exynos4210: Connect serial port DMA busy signals with pl330 (2020-01-23 16:34:15 +0000) |
16 | 17 | ||
17 | ---------------------------------------------------------------- | 18 | ---------------------------------------------------------------- |
18 | target-arm queue: | 19 | target-arm queue: |
19 | * Fix KVM SVE ID register probe code | 20 | * fix bug in PAuth emulation |
21 | * add PMU to Cortex-R5, Cortex-R5F | ||
22 | * qemu-nbd: Convert documentation to rST | ||
23 | * qemu-block-drivers: Convert documentation to rST | ||
24 | * Fix Exynos4210 UART DMA support | ||
25 | * Various minor code cleanups | ||
20 | 26 | ||
21 | ---------------------------------------------------------------- | 27 | ---------------------------------------------------------------- |
28 | Andrew Jones (1): | ||
29 | target/arm/arch_dump: Add SVE notes | ||
30 | |||
31 | Clement Deschamps (1): | ||
32 | target/arm: add PMU feature to cortex-r5 and cortex-r5f | ||
33 | |||
34 | Guenter Roeck (8): | ||
35 | dma/pl330: Convert to support tracing | ||
36 | hw/core/or-irq: Increase limit of or-lines to 48 | ||
37 | hw/arm/exynos4210: Fix DMA initialization | ||
38 | hw/char/exynos4210_uart: Convert to support tracing | ||
39 | hw/char/exynos4210_uart: Implement post_load function | ||
40 | hw/char/exynos4210_uart: Implement Rx FIFO level triggers and timeouts | ||
41 | hw/char/exynos4210_uart: Add receive DMA support | ||
42 | hw/arm/exynos4210: Connect serial port DMA busy signals with pl330 | ||
43 | |||
44 | Keqian Zhu (2): | ||
45 | hw/acpi: Remove extra indent in ACPI GED hotplug cb | ||
46 | hw/arm: Use helper function to trigger hotplug handler plug | ||
47 | |||
48 | Peter Maydell (3): | ||
49 | qemu-nbd: Convert invocation documentation to rST | ||
50 | docs: Create stub system manual | ||
51 | qemu-block-drivers: Convert to rST | ||
52 | |||
53 | Philippe Mathieu-Daudé (1): | ||
54 | hw/misc/stm32f4xx_syscfg: Fix copy/paste error | ||
55 | |||
22 | Richard Henderson (3): | 56 | Richard Henderson (3): |
23 | target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features | 57 | tests/tcg/aarch64: Fix compilation parameters for pauth-% |
24 | target/arm: Set KVM_ARM_VCPU_SVE while probing the host | 58 | tests/tcg/aarch64: Add pauth-3 |
25 | target/arm: Move sve probe inside kvm >= 4.15 branch | 59 | tests/tcg/aarch64: Add pauth-4 |
26 | 60 | ||
27 | target/arm/kvm64.c | 45 ++++++++++++++++++++++----------------------- | 61 | Vincent Dehors (1): |
28 | 1 file changed, 22 insertions(+), 23 deletions(-) | 62 | target/arm: Fix PAuth sbox functions |
63 | |||
64 | Makefile | 37 +- | ||
65 | tests/tcg/aarch64/Makefile.softmmu-target | 5 +- | ||
66 | tests/tcg/aarch64/Makefile.target | 3 +- | ||
67 | include/elf.h | 1 + | ||
68 | include/hw/arm/exynos4210.h | 4 + | ||
69 | include/hw/or-irq.h | 2 +- | ||
70 | target/arm/cpu.h | 25 + | ||
71 | hw/acpi/generic_event_device.c | 2 +- | ||
72 | hw/arm/exynos4210.c | 77 ++- | ||
73 | hw/arm/virt.c | 6 +- | ||
74 | hw/char/exynos4210_uart.c | 245 +++++--- | ||
75 | hw/dma/pl330.c | 88 +-- | ||
76 | hw/misc/stm32f4xx_syscfg.c | 2 +- | ||
77 | target/arm/arch_dump.c | 124 +++- | ||
78 | target/arm/cpu.c | 1 + | ||
79 | target/arm/kvm64.c | 24 - | ||
80 | target/arm/pauth_helper.c | 4 +- | ||
81 | tests/tcg/aarch64/pauth-1.c | 2 - | ||
82 | tests/tcg/aarch64/pauth-2.c | 2 - | ||
83 | tests/tcg/aarch64/pauth-4.c | 25 + | ||
84 | tests/tcg/aarch64/system/pauth-3.c | 40 ++ | ||
85 | MAINTAINERS | 1 + | ||
86 | docs/index.html.in | 1 + | ||
87 | docs/index.rst | 2 +- | ||
88 | docs/interop/conf.py | 4 +- | ||
89 | docs/interop/index.rst | 1 + | ||
90 | docs/interop/qemu-nbd.rst | 263 ++++++++ | ||
91 | docs/interop/qemu-option-trace.rst.inc | 30 + | ||
92 | docs/qemu-block-drivers.texi | 889 --------------------------- | ||
93 | docs/system/conf.py | 22 + | ||
94 | docs/system/index.rst | 17 + | ||
95 | docs/system/qemu-block-drivers.rst | 985 ++++++++++++++++++++++++++++++ | ||
96 | hw/char/trace-events | 20 + | ||
97 | hw/dma/trace-events | 24 + | ||
98 | qemu-doc.texi | 18 - | ||
99 | qemu-nbd.texi | 214 ------- | ||
100 | qemu-option-trace.texi | 4 + | ||
101 | qemu-options.hx | 2 +- | ||
102 | 38 files changed, 1898 insertions(+), 1318 deletions(-) | ||
103 | create mode 100644 tests/tcg/aarch64/pauth-4.c | ||
104 | create mode 100644 tests/tcg/aarch64/system/pauth-3.c | ||
105 | create mode 100644 docs/interop/qemu-nbd.rst | ||
106 | create mode 100644 docs/interop/qemu-option-trace.rst.inc | ||
107 | delete mode 100644 docs/qemu-block-drivers.texi | ||
108 | create mode 100644 docs/system/conf.py | ||
109 | create mode 100644 docs/system/index.rst | ||
110 | create mode 100644 docs/system/qemu-block-drivers.rst | ||
111 | delete mode 100644 qemu-nbd.texi | ||
112 | 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 |