| 1 | Only thing for Arm for rc1 is RTH's fix for the KVM SVE probe code. | 1 | v2: fix compile issue when building user-mode emulators with clang |
|---|---|---|---|
| 2 | 2 | ||
| 3 | -- PMM | 3 | -- PMM |
| 4 | 4 | ||
| 5 | The following changes since commit 4e06b3fc1b5e1ec03f22190eabe56891dc9c2236: | 5 | The following changes since commit 4cc10cae64c51e17844dc4358481c393d7bf1ed4: |
| 6 | 6 | ||
| 7 | Merge tag 'pull-hex-20220731' of https://github.com/quic/qemu into staging (2022-07-31 21:38:54 -0700) | 7 | Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging (2021-05-06 18:56:17 +0100) |
| 8 | 8 | ||
| 9 | are available in the Git repository at: | 9 | are available in the Git repository at: |
| 10 | 10 | ||
| 11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20220801 | 11 | https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20210510-1 |
| 12 | 12 | ||
| 13 | for you to fetch changes up to 5265d24c981dfdda8d29b44f7e84a514da75eedc: | 13 | for you to fetch changes up to c3080fbdaa381012666428fef2e5f7ce422ecfee: |
| 14 | 14 | ||
| 15 | target/arm: Move sve probe inside kvm >= 4.15 branch (2022-08-01 16:21:18 +0100) | 15 | hw/arm/xlnx: Fix PHY address for xilinx-zynq-a9 (2021-05-10 17:21:54 +0100) |
| 16 | 16 | ||
| 17 | ---------------------------------------------------------------- | 17 | ---------------------------------------------------------------- |
| 18 | target-arm queue: | 18 | target-arm queue: |
| 19 | * Fix KVM SVE ID register probe code | 19 | * docs: fix link in sbsa description |
| 20 | * linux-user/aarch64: Enable hwcap for RND, BTI, and MTE | ||
| 21 | * target/arm: Fix tlbbits calculation in tlbi_aa64_vae2is_write() | ||
| 22 | * target/arm: Split neon and vfp translation to their own | ||
| 23 | compilation units | ||
| 24 | * target/arm: Make WFI a NOP for userspace emulators | ||
| 25 | * hw/sd/omap_mmc: Use device_cold_reset() instead of | ||
| 26 | device_legacy_reset() | ||
| 27 | * include: More fixes for 'extern "C"' block use | ||
| 28 | * hw/arm/imx25_pdk: Fix error message for invalid RAM size | ||
| 29 | * hw/arm/mps2-tz: Implement AN524 memory remapping via machine property | ||
| 30 | * hw/arm/xlnx: Fix PHY address for xilinx-zynq-a9 | ||
| 20 | 31 | ||
| 21 | ---------------------------------------------------------------- | 32 | ---------------------------------------------------------------- |
| 22 | Richard Henderson (3): | 33 | Alex Bennée (1): |
| 23 | target/arm: Use kvm_arm_sve_supported in kvm_arm_get_host_cpu_features | 34 | docs: fix link in sbsa description |
| 24 | target/arm: Set KVM_ARM_VCPU_SVE while probing the host | ||
| 25 | target/arm: Move sve probe inside kvm >= 4.15 branch | ||
| 26 | 35 | ||
| 27 | target/arm/kvm64.c | 45 ++++++++++++++++++++++----------------------- | 36 | Guenter Roeck (1): |
| 28 | 1 file changed, 22 insertions(+), 23 deletions(-) | 37 | hw/arm/xlnx: Fix PHY address for xilinx-zynq-a9 |
| 38 | |||
| 39 | Peter Maydell (22): | ||
| 40 | target/arm: Fix tlbbits calculation in tlbi_aa64_vae2is_write() | ||
| 41 | target/arm: Move constant expanders to translate.h | ||
| 42 | target/arm: Share unallocated_encoding() and gen_exception_insn() | ||
| 43 | target/arm: Make functions used by m-nocp global | ||
| 44 | target/arm: Split m-nocp trans functions into their own file | ||
| 45 | target/arm: Move gen_aa32 functions to translate-a32.h | ||
| 46 | target/arm: Move vfp_{load, store}_reg{32, 64} to translate-vfp.c.inc | ||
| 47 | target/arm: Make functions used by translate-vfp global | ||
| 48 | target/arm: Make translate-vfp.c.inc its own compilation unit | ||
| 49 | target/arm: Move vfp_reg_ptr() to translate-neon.c.inc | ||
| 50 | target/arm: Delete unused typedef | ||
| 51 | target/arm: Move NeonGenThreeOpEnvFn typedef to translate.h | ||
| 52 | target/arm: Make functions used by translate-neon global | ||
| 53 | target/arm: Make translate-neon.c.inc its own compilation unit | ||
| 54 | target/arm: Make WFI a NOP for userspace emulators | ||
| 55 | hw/sd/omap_mmc: Use device_cold_reset() instead of device_legacy_reset() | ||
| 56 | osdep: Make os-win32.h and os-posix.h handle 'extern "C"' themselves | ||
| 57 | include/qemu/bswap.h: Handle being included outside extern "C" block | ||
| 58 | include/disas/dis-asm.h: Handle being included outside 'extern "C"' | ||
| 59 | hw/misc/mps2-scc: Add "QEMU interface" comment | ||
| 60 | hw/misc/mps2-scc: Support using CFG0 bit 0 for remapping | ||
| 61 | hw/arm/mps2-tz: Implement AN524 memory remapping via machine property | ||
| 62 | |||
| 63 | Philippe Mathieu-Daudé (1): | ||
| 64 | hw/arm/imx25_pdk: Fix error message for invalid RAM size | ||
| 65 | |||
| 66 | Richard Henderson (1): | ||
| 67 | linux-user/aarch64: Enable hwcap for RND, BTI, and MTE | ||
| 68 | |||
| 69 | docs/system/arm/mps2.rst | 10 + | ||
| 70 | docs/system/arm/sbsa.rst | 2 +- | ||
| 71 | include/disas/dis-asm.h | 12 +- | ||
| 72 | include/hw/misc/mps2-scc.h | 21 ++ | ||
| 73 | include/qemu/bswap.h | 26 ++- | ||
| 74 | include/qemu/osdep.h | 8 +- | ||
| 75 | include/sysemu/os-posix.h | 8 + | ||
| 76 | include/sysemu/os-win32.h | 8 + | ||
| 77 | target/arm/translate-a32.h | 144 +++++++++++++ | ||
| 78 | target/arm/translate-a64.h | 2 - | ||
| 79 | target/arm/translate.h | 29 +++ | ||
| 80 | hw/arm/imx25_pdk.c | 5 +- | ||
| 81 | hw/arm/mps2-tz.c | 108 +++++++++- | ||
| 82 | hw/arm/xilinx_zynq.c | 2 +- | ||
| 83 | hw/misc/mps2-scc.c | 13 +- | ||
| 84 | hw/sd/omap_mmc.c | 2 +- | ||
| 85 | linux-user/elfload.c | 13 ++ | ||
| 86 | target/arm/helper.c | 2 +- | ||
| 87 | target/arm/op_helper.c | 14 ++ | ||
| 88 | target/arm/translate-a64.c | 15 -- | ||
| 89 | target/arm/translate-m-nocp.c | 221 ++++++++++++++++++++ | ||
| 90 | .../arm/{translate-neon.c.inc => translate-neon.c} | 19 +- | ||
| 91 | .../arm/{translate-vfp.c.inc => translate-vfp.c} | 230 +++------------------ | ||
| 92 | target/arm/translate.c | 200 ++++-------------- | ||
| 93 | disas/arm-a64.cc | 2 - | ||
| 94 | disas/nanomips.cpp | 2 - | ||
| 95 | target/arm/meson.build | 15 +- | ||
| 96 | 27 files changed, 720 insertions(+), 413 deletions(-) | ||
| 97 | create mode 100644 target/arm/translate-a32.h | ||
| 98 | create mode 100644 target/arm/translate-m-nocp.c | ||
| 99 | rename target/arm/{translate-neon.c.inc => translate-neon.c} (99%) | ||
| 100 | rename target/arm/{translate-vfp.c.inc => translate-vfp.c} (94%) | ||
| 101 | 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 |