[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 18/18] hw/arm/virt: Disable LPA2 for -machine virt-6.2
From: |
Richard Henderson |
Subject: |
[PATCH v4 18/18] hw/arm/virt: Disable LPA2 for -machine virt-6.2 |
Date: |
Tue, 1 Mar 2022 11:59:58 -1000 |
There is a Linux kernel bug present until v5.12 that prevents
booting with FEAT_LPA2 enabled. As a workaround for TCG,
disable this feature for machine versions prior to 7.0.
Cc: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/arm/virt.h | 1 +
hw/arm/virt.c | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index c1ea17d0de..7e76ee2619 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -132,6 +132,7 @@ struct VirtMachineClass {
bool no_secure_gpio;
/* Machines < 6.2 have no support for describing cpu topology to guest */
bool no_cpu_topology;
+ bool no_tcg_lpa2;
};
struct VirtMachineState {
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 46bf7ceddf..46a42502bc 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -2102,6 +2102,10 @@ static void machvirt_init(MachineState *machine)
object_property_set_bool(cpuobj, "pmu", false, NULL);
}
+ if (vmc->no_tcg_lpa2 && object_property_find(cpuobj, "lpa2")) {
+ object_property_set_bool(cpuobj, "lpa2", false, NULL);
+ }
+
if (object_property_find(cpuobj, "reset-cbar")) {
object_property_set_int(cpuobj, "reset-cbar",
vms->memmap[VIRT_CPUPERIPHS].base,
@@ -3020,8 +3024,11 @@ DEFINE_VIRT_MACHINE_AS_LATEST(7, 0)
static void virt_machine_6_2_options(MachineClass *mc)
{
+ VirtMachineClass *vmc = VIRT_MACHINE_CLASS(OBJECT_CLASS(mc));
+
virt_machine_7_0_options(mc);
compat_props_add(mc->compat_props, hw_compat_6_2, hw_compat_6_2_len);
+ vmc->no_tcg_lpa2 = true;
}
DEFINE_VIRT_MACHINE(6, 2)
--
2.25.1
- [PATCH v4 09/18] target/arm: Implement FEAT_LVA, (continued)
- [PATCH v4 09/18] target/arm: Implement FEAT_LVA, Richard Henderson, 2022/03/01
- [PATCH v4 12/18] target/arm: Introduce tlbi_aa64_get_range, Richard Henderson, 2022/03/01
- [PATCH v4 11/18] target/arm: Extend arm_fi_to_lfsc to level -1, Richard Henderson, 2022/03/01
- [PATCH v4 14/18] target/arm: Validate tlbi TG matches translation granule in use, Richard Henderson, 2022/03/01
- [PATCH v4 13/18] target/arm: Fix TLBIRange.base for 16k and 64k pages, Richard Henderson, 2022/03/01
- [PATCH v4 17/18] target/arm: Provide cpu property for controling FEAT_LPA2, Richard Henderson, 2022/03/01
- [PATCH v4 15/18] target/arm: Advertise all page sizes for -cpu max, Richard Henderson, 2022/03/01
- [PATCH v4 16/18] target/arm: Implement FEAT_LPA2, Richard Henderson, 2022/03/01
- [PATCH v4 18/18] hw/arm/virt: Disable LPA2 for -machine virt-6.2,
Richard Henderson <=
Re: [PATCH v4 00/18] target/arm: Implement LVA, LPA, LPA2 features, Peter Maydell, 2022/03/02