| Message ID | 20221011231832.149839-5-gshan@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | hw/arm/virt: Improve address assignment for high memory regions | expand |
On Wed, Oct 12 2022, Gavin Shan <gshan@redhat.com> wrote: > This introduces virt_get_high_memmap_enabled() helper, which returns > the pointer to vms->highmem_{redists, ecam, mmio}. The pointer will > be used in the subsequent patches. > > No functional change intended. > > Signed-off-by: Gavin Shan <gshan@redhat.com> > Tested-by: Zhenyu Zhang <zhenyzha@redhat.com> > --- > hw/arm/virt.c | 32 +++++++++++++++++++------------- > 1 file changed, 19 insertions(+), 13 deletions(-) Reviewed-by: Cornelia Huck <cohuck@redhat.com>
On 10/12/22 01:18, Gavin Shan wrote: > This introduces virt_get_high_memmap_enabled() helper, which returns > the pointer to vms->highmem_{redists, ecam, mmio}. The pointer will > be used in the subsequent patches. > > No functional change intended. > > Signed-off-by: Gavin Shan <gshan@redhat.com> > Tested-by: Zhenyu Zhang <zhenyzha@redhat.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Eric > --- > hw/arm/virt.c | 32 +++++++++++++++++++------------- > 1 file changed, 19 insertions(+), 13 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 0bf3cb7057..ee98a8a3b6 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -1689,14 +1689,31 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx) > return arm_cpu_mp_affinity(idx, clustersz); > } > > +static inline bool *virt_get_high_memmap_enabled(VirtMachineState *vms, > + int index) > +{ > + bool *enabled_array[] = { > + &vms->highmem_redists, > + &vms->highmem_ecam, > + &vms->highmem_mmio, > + }; > + > + assert(ARRAY_SIZE(extended_memmap) - VIRT_LOWMEMMAP_LAST == > + ARRAY_SIZE(enabled_array)); > + assert(index - VIRT_LOWMEMMAP_LAST < ARRAY_SIZE(enabled_array)); > + > + return enabled_array[index - VIRT_LOWMEMMAP_LAST]; > +} > + > static void virt_set_high_memmap(VirtMachineState *vms, > hwaddr base, int pa_bits) > { > hwaddr region_base, region_size; > - bool fits; > + bool *region_enabled, fits; > int i; > > for (i = VIRT_LOWMEMMAP_LAST; i < ARRAY_SIZE(extended_memmap); i++) { > + region_enabled = virt_get_high_memmap_enabled(vms, i); > region_base = ROUND_UP(base, extended_memmap[i].size); > region_size = extended_memmap[i].size; > > @@ -1714,18 +1731,7 @@ static void virt_set_high_memmap(VirtMachineState *vms, > vms->highest_gpa = region_base + region_size - 1; > } > > - switch (i) { > - case VIRT_HIGH_GIC_REDIST2: > - vms->highmem_redists &= fits; > - break; > - case VIRT_HIGH_PCIE_ECAM: > - vms->highmem_ecam &= fits; > - break; > - case VIRT_HIGH_PCIE_MMIO: > - vms->highmem_mmio &= fits; > - break; > - } > - > + *region_enabled &= fits; > base = region_base + region_size; > } > }
diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 0bf3cb7057..ee98a8a3b6 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1689,14 +1689,31 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx) return arm_cpu_mp_affinity(idx, clustersz); } +static inline bool *virt_get_high_memmap_enabled(VirtMachineState *vms, + int index) +{ + bool *enabled_array[] = { + &vms->highmem_redists, + &vms->highmem_ecam, + &vms->highmem_mmio, + }; + + assert(ARRAY_SIZE(extended_memmap) - VIRT_LOWMEMMAP_LAST == + ARRAY_SIZE(enabled_array)); + assert(index - VIRT_LOWMEMMAP_LAST < ARRAY_SIZE(enabled_array)); + + return enabled_array[index - VIRT_LOWMEMMAP_LAST]; +} + static void virt_set_high_memmap(VirtMachineState *vms, hwaddr base, int pa_bits) { hwaddr region_base, region_size; - bool fits; + bool *region_enabled, fits; int i; for (i = VIRT_LOWMEMMAP_LAST; i < ARRAY_SIZE(extended_memmap); i++) { + region_enabled = virt_get_high_memmap_enabled(vms, i); region_base = ROUND_UP(base, extended_memmap[i].size); region_size = extended_memmap[i].size; @@ -1714,18 +1731,7 @@ static void virt_set_high_memmap(VirtMachineState *vms, vms->highest_gpa = region_base + region_size - 1; } - switch (i) { - case VIRT_HIGH_GIC_REDIST2: - vms->highmem_redists &= fits; - break; - case VIRT_HIGH_PCIE_ECAM: - vms->highmem_ecam &= fits; - break; - case VIRT_HIGH_PCIE_MMIO: - vms->highmem_mmio &= fits; - break; - } - + *region_enabled &= fits; base = region_base + region_size; } }
This introduces virt_get_high_memmap_enabled() helper, which returns the pointer to vms->highmem_{redists, ecam, mmio}. The pointer will be used in the subsequent patches. No functional change intended. Signed-off-by: Gavin Shan <gshan@redhat.com> Tested-by: Zhenyu Zhang <zhenyzha@redhat.com> --- hw/arm/virt.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-)