[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/37] target/arm/cpu64: Replace kvm_supported with sve_vq_support
From: |
Peter Maydell |
Subject: |
[PULL 08/37] target/arm/cpu64: Replace kvm_supported with sve_vq_supported |
Date: |
Thu, 26 Aug 2021 18:02:38 +0100 |
From: Andrew Jones <drjones@redhat.com>
Now that we have an ARMCPU member sve_vq_supported we no longer
need the local kvm_supported bitmap for KVM's supported vector
lengths.
Signed-off-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20210823160647.34028-4-drjones@redhat.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
target/arm/cpu64.c | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c
index eb9318c83b7..557fd475774 100644
--- a/target/arm/cpu64.c
+++ b/target/arm/cpu64.c
@@ -265,14 +265,17 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
* any of the above. Finally, if SVE is not disabled, then at least one
* vector length must be enabled.
*/
- DECLARE_BITMAP(kvm_supported, ARM_MAX_VQ);
DECLARE_BITMAP(tmp, ARM_MAX_VQ);
uint32_t vq, max_vq = 0;
- /* Collect the set of vector lengths supported by KVM. */
- bitmap_zero(kvm_supported, ARM_MAX_VQ);
+ /*
+ * CPU models specify a set of supported vector lengths which are
+ * enabled by default. Attempting to enable any vector length not set
+ * in the supported bitmap results in an error. When KVM is enabled we
+ * fetch the supported bitmap from the host.
+ */
if (kvm_enabled() && kvm_arm_sve_supported()) {
- kvm_arm_sve_get_vls(CPU(cpu), kvm_supported);
+ kvm_arm_sve_get_vls(CPU(cpu), cpu->sve_vq_supported);
} else if (kvm_enabled()) {
assert(!cpu_isar_feature(aa64_sve, cpu));
}
@@ -299,7 +302,7 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
* For KVM we have to automatically enable all supported
unitialized
* lengths, even when the smaller lengths are not all
powers-of-two.
*/
- bitmap_andnot(tmp, kvm_supported, cpu->sve_vq_init, max_vq);
+ bitmap_andnot(tmp, cpu->sve_vq_supported, cpu->sve_vq_init,
max_vq);
bitmap_or(cpu->sve_vq_map, cpu->sve_vq_map, tmp, max_vq);
} else {
/* Propagate enabled bits down through required powers-of-two. */
@@ -322,12 +325,12 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
/* Disabling a supported length disables all larger lengths. */
for (vq = 1; vq <= ARM_MAX_VQ; ++vq) {
if (test_bit(vq - 1, cpu->sve_vq_init) &&
- test_bit(vq - 1, kvm_supported)) {
+ test_bit(vq - 1, cpu->sve_vq_supported)) {
break;
}
}
max_vq = vq <= ARM_MAX_VQ ? vq - 1 : ARM_MAX_VQ;
- bitmap_andnot(cpu->sve_vq_map, kvm_supported,
+ bitmap_andnot(cpu->sve_vq_map, cpu->sve_vq_supported,
cpu->sve_vq_init, max_vq);
if (max_vq == 0 || bitmap_empty(cpu->sve_vq_map, max_vq)) {
error_setg(errp, "cannot disable sve%d", vq * 128);
@@ -392,7 +395,7 @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
if (kvm_enabled()) {
/* Ensure the set of lengths matches what KVM supports. */
- bitmap_xor(tmp, cpu->sve_vq_map, kvm_supported, max_vq);
+ bitmap_xor(tmp, cpu->sve_vq_map, cpu->sve_vq_supported, max_vq);
if (!bitmap_empty(tmp, max_vq)) {
vq = find_last_bit(tmp, max_vq) + 1;
if (test_bit(vq - 1, cpu->sve_vq_map)) {
--
2.20.1
- [PULL 00/37] target-arm queue, Peter Maydell, 2021/08/26
- [PULL 02/37] hw/dma/xlnx_csu_dma: Run trivial checks early in realize(), Peter Maydell, 2021/08/26
- [PULL 01/37] hw/arm/xlnx-zynqmp: Realize qspi controller *after* qspi_dma, Peter Maydell, 2021/08/26
- [PULL 03/37] hw/dma/xlnx_csu_dma: Always expect 'dma' link property to be set, Peter Maydell, 2021/08/26
- [PULL 05/37] hw/arm/Kconfig: no need to enable ACPI_MEMORY_HOTPLUG/ACPI_NVDIMM explicitly, Peter Maydell, 2021/08/26
- [PULL 07/37] target/arm/kvm64: Ensure sve vls map is completely clear, Peter Maydell, 2021/08/26
- [PULL 04/37] hw/dma/xlnx-zdma Always expect 'dma' link property to be set, Peter Maydell, 2021/08/26
- [PULL 08/37] target/arm/cpu64: Replace kvm_supported with sve_vq_supported,
Peter Maydell <=
- [PULL 06/37] target/arm/cpu: Introduce sve_vq_supported bitmap, Peter Maydell, 2021/08/26
- [PULL 09/37] target/arm/cpu64: Validate sve vector lengths are supported, Peter Maydell, 2021/08/26
- [PULL 10/37] docs/specs/acpu_cpu_hotplug: Convert to rST, Peter Maydell, 2021/08/26
- [PULL 15/37] softmmu: Use accel_find("xen") instead of xen_available(), Peter Maydell, 2021/08/26
- [PULL 12/37] docs/specs/acpi_pci_hotplug: Convert to rST, Peter Maydell, 2021/08/26
- [PULL 14/37] MAINTAINERS: Add ACPI specs documents to ACPI and NVDIMM sections, Peter Maydell, 2021/08/26
- [PULL 13/37] docs/specs/acpi_nvdimm: Convert to rST, Peter Maydell, 2021/08/26
- [PULL 11/37] docs/specs/acpi_mem_hotplug: Convert to rST, Peter Maydell, 2021/08/26
- [PULL 16/37] monitor: Use accel_find("kvm") instead of kvm_available(), Peter Maydell, 2021/08/26
- [PULL 17/37] softmmu/arch_init.c: Trim down include list, Peter Maydell, 2021/08/26