|
 |
ed5979 |
From 969ea1ff46b52c5fe6d87f2eeb1625871a2dfb2a Mon Sep 17 00:00:00 2001
|
|
|
ed5979 |
From: Gavin Shan <gshan@redhat.com>
|
|
|
ed5979 |
Date: Wed, 21 Dec 2022 08:48:45 +0800
|
|
|
ed5979 |
Subject: [PATCH 8/8] hw/arm/virt: Enable compat high memory region address
|
|
|
ed5979 |
assignment for 9.2.0 machine
|
|
|
ed5979 |
|
|
|
ed5979 |
RH-Author: Gavin Shan <gshan@redhat.com>
|
|
|
ed5979 |
RH-MergeRequest: 126: hw/arm/virt: Optimize high memory region address assignment
|
|
|
ed5979 |
RH-Bugzilla: 2113840
|
|
|
ed5979 |
RH-Acked-by: Eric Auger <eric.auger@redhat.com>
|
|
|
ed5979 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
ed5979 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
ed5979 |
RH-Commit: [8/8] beda1791c0c35dce5c669efd47685302b8468032
|
|
|
ed5979 |
|
|
|
ed5979 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2113840
|
|
|
ed5979 |
Upstream: RHEL only
|
|
|
ed5979 |
|
|
|
ed5979 |
The compact high memory region address assignment is enabled for 9.2.0,
|
|
|
ed5979 |
but it's kept as disabled for 9.0.0, to keep the backwards compatibility
|
|
|
ed5979 |
on 9.0.0. Note that these newly added properties ('compact-highmem',
|
|
|
ed5979 |
'highmem-redists', 'highmem-ecam', and 'highmem-mmio') in the upstream
|
|
|
ed5979 |
aren't exposed for the downstream.
|
|
|
ed5979 |
|
|
|
ed5979 |
Signed-off-by: Gavin Shan <gshan@redhat.com>
|
|
|
ed5979 |
---
|
|
|
ed5979 |
hw/arm/virt.c | 3 +++
|
|
|
ed5979 |
1 file changed, 3 insertions(+)
|
|
|
ed5979 |
|
|
|
ed5979 |
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
|
|
ed5979 |
index 304fa0d6e7..e41c0b462c 100644
|
|
|
ed5979 |
--- a/hw/arm/virt.c
|
|
|
ed5979 |
+++ b/hw/arm/virt.c
|
|
|
ed5979 |
@@ -3581,6 +3581,7 @@ static void rhel_virt_instance_init(Object *obj)
|
|
|
ed5979 |
|
|
|
ed5979 |
/* High memory is enabled by default */
|
|
|
ed5979 |
vms->highmem = true;
|
|
|
ed5979 |
+ vms->highmem_compact = !vmc->no_highmem_compact;
|
|
|
ed5979 |
vms->gic_version = VIRT_GIC_VERSION_NOSEL;
|
|
|
ed5979 |
|
|
|
ed5979 |
vms->highmem_ecam = !vmc->no_highmem_ecam;
|
|
|
ed5979 |
@@ -3659,5 +3660,7 @@ static void rhel900_virt_options(MachineClass *mc)
|
|
|
ed5979 |
|
|
|
ed5979 |
/* Disable FEAT_LPA2 since old kernels (<= v5.12) don't boot with that feature */
|
|
|
ed5979 |
vmc->no_tcg_lpa2 = true;
|
|
|
ed5979 |
+ /* Compact layout for high memory regions was introduced with 9.2.0 */
|
|
|
ed5979 |
+ vmc->no_highmem_compact = true;
|
|
|
ed5979 |
}
|
|
|
ed5979 |
DEFINE_RHEL_MACHINE(9, 0, 0)
|
|
|
ed5979 |
--
|
|
|
ed5979 |
2.31.1
|
|
|
ed5979 |
|