84 lines
2.8 KiB
Diff
84 lines
2.8 KiB
Diff
|
From bd5b7edbf8f4425f4b4e0d49a00cbdd48d9c6f48 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Gavin Shan <gshan@redhat.com>
|
||
|
|
Date: Wed, 21 Dec 2022 08:48:45 +0800
|
||
|
|
Subject: [PATCH 2/8] hw/arm/virt: Rename variable size to region_size in
|
||
|
|
virt_set_high_memmap()
|
||
|
|
|
||
|
|
RH-Author: Gavin Shan <gshan@redhat.com>
|
||
|
|
RH-MergeRequest: 126: hw/arm/virt: Optimize high memory region address assignment
|
||
|
|
RH-Bugzilla: 2113840
|
||
|
|
RH-Acked-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [2/8] 1cadf1b00686cceb45821a58fdcb509bc5da335d
|
||
|
|
|
||
|
|
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2113840
|
||
|
|
|
||
|
|
This renames variable 'size' to 'region_size' in virt_set_high_memmap().
|
||
|
|
Its counterpart ('region_base') will be introduced in next patch.
|
||
|
|
|
||
|
|
No functional change intended.
|
||
|
|
|
||
|
|
Signed-off-by: Gavin Shan <gshan@redhat.com>
|
||
|
|
Reviewed-by: Eric Auger <eric.auger@redhat.com>
|
||
|
|
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
|
||
|
|
Reviewed-by: Marc Zyngier <maz@kernel.org>
|
||
|
|
Tested-by: Zhenyu Zhang <zhenyzha@redhat.com>
|
||
|
|
Message-id: 20221029224307.138822-3-gshan@redhat.com
|
||
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||
|
|
(cherry picked from commit 370bea9d1c78796eec235ed6cb4310f489931a62)
|
||
|
|
Signed-off-by: Gavin Shan <gshan@redhat.com>
|
||
|
|
---
|
||
|
|
hw/arm/virt.c | 15 ++++++++-------
|
||
|
|
1 file changed, 8 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
|
||
|
|
index bea5f54720..ca098d40b8 100644
|
||
|
|
--- a/hw/arm/virt.c
|
||
|
|
+++ b/hw/arm/virt.c
|
||
|
|
@@ -1739,15 +1739,16 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx)
|
||
|
|
static void virt_set_high_memmap(VirtMachineState *vms,
|
||
|
|
hwaddr base, int pa_bits)
|
||
|
|
{
|
||
|
|
+ hwaddr region_size;
|
||
|
|
+ bool fits;
|
||
|
|
int i;
|
||
|
|
|
||
|
|
for (i = VIRT_LOWMEMMAP_LAST; i < ARRAY_SIZE(extended_memmap); i++) {
|
||
|
|
- hwaddr size = extended_memmap[i].size;
|
||
|
|
- bool fits;
|
||
|
|
+ region_size = extended_memmap[i].size;
|
||
|
|
|
||
|
|
- base = ROUND_UP(base, size);
|
||
|
|
+ base = ROUND_UP(base, region_size);
|
||
|
|
vms->memmap[i].base = base;
|
||
|
|
- vms->memmap[i].size = size;
|
||
|
|
+ vms->memmap[i].size = region_size;
|
||
|
|
|
||
|
|
/*
|
||
|
|
* Check each device to see if they fit in the PA space,
|
||
|
|
@@ -1755,9 +1756,9 @@ static void virt_set_high_memmap(VirtMachineState *vms,
|
||
|
|
*
|
||
|
|
* For each device that doesn't fit, disable it.
|
||
|
|
*/
|
||
|
|
- fits = (base + size) <= BIT_ULL(pa_bits);
|
||
|
|
+ fits = (base + region_size) <= BIT_ULL(pa_bits);
|
||
|
|
if (fits) {
|
||
|
|
- vms->highest_gpa = base + size - 1;
|
||
|
|
+ vms->highest_gpa = base + region_size - 1;
|
||
|
|
}
|
||
|
|
|
||
|
|
switch (i) {
|
||
|
|
@@ -1772,7 +1773,7 @@ static void virt_set_high_memmap(VirtMachineState *vms,
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
|
||
|
|
- base += size;
|
||
|
|
+ base += region_size;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
--
|
||
|
|
2.31.1
|
||
|
|
|