1 | v1->v2 changes: drop the sd card-reparenting patch | 1 | Only thing for Arm for rc1 is RTH's fix for the KVM SVE probe code. |
---|---|---|---|
2 | and the 2 raspi2 patches that depend on it. | ||
3 | 2 | ||
4 | -- PMM | 3 | -- PMM |
5 | 4 | ||
6 | The following changes since commit 6181478f6395cdd9d6ffd99623d0c9f39ea53606: | 5 | The following changes since commit 4e06b3fc1b5e1ec03f22190eabe56891dc9c2236: |
7 | 6 | ||
8 | Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2017-02-28 08:46:03 +0000) | 7 | Merge tag 'pull-hex-20220731' of https://github.com/quic/qemu into staging (2022-07-31 21:38:54 -0700) |
9 | 8 | ||
10 | are available in the git repository at: | 9 | are available in the Git repository at: |
11 | 10 | ||
12 | git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20170228 | 11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220801 |
13 | 12 | ||
14 | for you to fetch changes up to f3a6339a5bbc160d327299c67bb68c6d07fa4a61: | 13 | for you to fetch changes up to 5265d24c981dfdda8d29b44f7e84a514da75eedc: |
15 | 14 | ||
16 | hw/arm/exynos: Fix proper mapping of CPUs by providing real cluster ID (2017-02-28 12:08:20 +0000) | 15 | target/arm: Move sve probe inside kvm >= 4.15 branch (2022-08-01 16:21:18 +0100) |
17 | 16 | ||
18 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
19 | target-arm queue: | 18 | target-arm queue: |
20 | * raspi2: implement RNG module | 19 | * Fix KVM SVE ID register probe code |
21 | * raspi2: implement new SD card controller (but don't wire it up) | ||
22 | * sdhci: bugfixes for block transfers | ||
23 | * virt: fix cpu object reference leak | ||
24 | * Add missing fp_access_check() to aarch64 crypto instructions | ||
25 | * cputlb: Don't assume do_unassigned_access() never returns | ||
26 | * virt: Add a user option to disallow ITS instantiation | ||
27 | * i.MX timers: fix reset handling | ||
28 | * ARMv7M NVIC: rewrite to fix broken priority handling and masking | ||
29 | * exynos: Fix proper mapping of CPUs by providing real cluster ID | ||
30 | * exynos: Fix Linux kernel division by zero for PLLs | ||
31 | 20 | ||
32 | ---------------------------------------------------------------- | 21 | ---------------------------------------------------------------- |
33 | Clement Deschamps (1): | 22 | Richard Henderson (3): |
34 | bcm2835_sdhost: add bcm2835 sdhost controller | 23 | target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features |
24 | target/arm: Set KVM_ARM_VCPU_SVE while probing the host | ||
25 | target/arm: Move sve probe inside kvm >= 4.15 branch | ||
35 | 26 | ||
36 | Eric Auger (1): | 27 | target/arm/kvm64.c | 45 ++++++++++++++++++++++----------------------- |
37 | hw/arm/virt: Add a user option to disallow ITS instantiation | 28 | 1 file changed, 22 insertions(+), 23 deletions(-) |
38 | |||
39 | Igor Mammedov (1): | ||
40 | hw/arm/virt: fix cpu object reference leak | ||
41 | |||
42 | Krzysztof Kozlowski (2): | ||
43 | hw/arm/exynos: Fix Linux kernel division by zero for PLLs | ||
44 | hw/arm/exynos: Fix proper mapping of CPUs by providing real cluster ID | ||
45 | |||
46 | Kurban Mallachiev (1): | ||
47 | ARM i.MX timers: fix reset handling | ||
48 | |||
49 | Marcin Chojnacki (1): | ||
50 | target-arm: Implement BCM2835 hardware RNG | ||
51 | |||
52 | Michael Davidsaver (5): | ||
53 | armv7m: Rewrite NVIC to not use any GIC code | ||
54 | arm: gic: Remove references to NVIC | ||
55 | armv7m: Escalate exceptions to HardFault if necessary | ||
56 | armv7m: Simpler and faster exception start | ||
57 | armv7m: VECTCLRACTIVE and VECTRESET are UNPREDICTABLE | ||
58 | |||
59 | Nick Reilly (1): | ||
60 | Add missing fp_access_check() to aarch64 crypto instructions | ||
61 | |||
62 | Peter Maydell (10): | ||
63 | bcm2835_rng: Use qcrypto_random_bytes() rather than rand() | ||
64 | cputlb: Don't assume do_unassigned_access() never returns | ||
65 | armv7m: Rename nvic_state to NVICState | ||
66 | armv7m: Implement reading and writing of PRIGROUP | ||
67 | armv7m: Fix condition check for taking exceptions | ||
68 | armv7m: Remove unused armv7m_nvic_acknowledge_irq() return value | ||
69 | armv7m: Extract "exception taken" code into functions | ||
70 | armv7m: Check exception return consistency | ||
71 | armv7m: Raise correct kind of UsageFault for attempts to execute ARM code | ||
72 | armv7m: Allow SHCSR writes to change pending and active bits | ||
73 | |||
74 | Prasad J Pandit (4): | ||
75 | sd: sdhci: mask transfer mode register value | ||
76 | sd: sdhci: check transfer mode register in multi block transfer | ||
77 | sd: sdhci: conditionally invoke multi block transfer | ||
78 | sd: sdhci: Remove block count enable check in single block transfers | ||
79 | |||
80 | hw/misc/Makefile.objs | 3 +- | ||
81 | hw/sd/Makefile.objs | 1 + | ||
82 | hw/intc/gic_internal.h | 7 +- | ||
83 | include/hw/arm/bcm2835_peripherals.h | 2 + | ||
84 | include/hw/arm/virt.h | 1 + | ||
85 | include/hw/misc/bcm2835_rng.h | 27 ++ | ||
86 | include/hw/sd/bcm2835_sdhost.h | 48 ++ | ||
87 | target/arm/cpu.h | 23 +- | ||
88 | cputlb.c | 15 +- | ||
89 | hw/arm/bcm2835_peripherals.c | 15 + | ||
90 | hw/arm/exynos4210.c | 18 + | ||
91 | hw/arm/virt.c | 32 +- | ||
92 | hw/intc/arm_gic.c | 31 +- | ||
93 | hw/intc/arm_gic_common.c | 23 +- | ||
94 | hw/intc/armv7m_nvic.c | 885 ++++++++++++++++++++++++++++------- | ||
95 | hw/misc/bcm2835_rng.c | 149 ++++++ | ||
96 | hw/misc/exynos4210_clk.c | 164 +++++++ | ||
97 | hw/sd/bcm2835_sdhost.c | 429 +++++++++++++++++ | ||
98 | hw/sd/sdhci.c | 25 +- | ||
99 | hw/timer/imx_gpt.c | 33 +- | ||
100 | linux-user/main.c | 1 + | ||
101 | target/arm/cpu.c | 16 +- | ||
102 | target/arm/helper.c | 245 +++++++--- | ||
103 | target/arm/translate-a64.c | 12 + | ||
104 | target/arm/translate.c | 8 +- | ||
105 | hw/intc/trace-events | 15 + | ||
106 | 26 files changed, 1897 insertions(+), 331 deletions(-) | ||
107 | create mode 100644 include/hw/misc/bcm2835_rng.h | ||
108 | create mode 100644 include/hw/sd/bcm2835_sdhost.h | ||
109 | create mode 100644 hw/misc/bcm2835_rng.c | ||
110 | create mode 100644 hw/misc/exynos4210_clk.c | ||
111 | create mode 100644 hw/sd/bcm2835_sdhost.c | ||
112 | diff view generated by jsdifflib |
New patch | |||
---|---|---|---|
1 | From: Richard Henderson <richard.henderson@linaro.org> | ||
1 | 2 | ||
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 |
New patch | |||
---|---|---|---|
1 | From: Richard Henderson <richard.henderson@linaro.org> | ||
1 | 2 | ||
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 |
New patch | |||
---|---|---|---|
1 | From: Richard Henderson <richard.henderson@linaro.org> | ||
1 | 2 | ||
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 |