| Message ID | 20220715171628.21437-6-joao.m.martins@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i386/pc: Fix creation of >= 1010G guests on AMD systems with IOMMU | expand |
On Fri, 15 Jul 2022 18:16:22 +0100 Joao Martins <joao.m.martins@oracle.com> wrote: > Move calculation of CXL memory region end to separate helper. > > This is in preparation to a future change that removes CXL range > dependency on the CXL memory region, with the goal of allowing > pc_pci_hole64_start() to be called before any memory region are > initialized. > > Cc: Jonathan Cameron <jonathan.cameron@huawei.com> > Signed-off-by: Joao Martins <joao.m.martins@oracle.com> Acked-by: Igor Mammedov <imammedo@redhat.com> > --- > hw/i386/pc.c | 31 +++++++++++++++++++++---------- > 1 file changed, 21 insertions(+), 10 deletions(-) > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 216e38da938e..1f42f194d7b7 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -825,6 +825,25 @@ static hwaddr pc_above_4g_end(PCMachineState *pcms) > return x86ms->above_4g_mem_start + x86ms->above_4g_mem_size; > } > > +static uint64_t pc_get_cxl_range_end(PCMachineState *pcms) > +{ > + uint64_t start = 0; > + > + if (pcms->cxl_devices_state.host_mr.addr) { > + start = pcms->cxl_devices_state.host_mr.addr + > + memory_region_size(&pcms->cxl_devices_state.host_mr); > + if (pcms->cxl_devices_state.fixed_windows) { > + GList *it; > + for (it = pcms->cxl_devices_state.fixed_windows; it; it = it->next) { > + CXLFixedWindow *fw = it->data; > + start = fw->mr.addr + memory_region_size(&fw->mr); > + } > + } > + } > + > + return start; > +} > + > void pc_memory_init(PCMachineState *pcms, > MemoryRegion *system_memory, > MemoryRegion *rom_memory, > @@ -1022,16 +1041,8 @@ uint64_t pc_pci_hole64_start(void) > MachineState *ms = MACHINE(pcms); > uint64_t hole64_start = 0; > > - if (pcms->cxl_devices_state.host_mr.addr) { > - hole64_start = pcms->cxl_devices_state.host_mr.addr + > - memory_region_size(&pcms->cxl_devices_state.host_mr); > - if (pcms->cxl_devices_state.fixed_windows) { > - GList *it; > - for (it = pcms->cxl_devices_state.fixed_windows; it; it = it->next) { > - CXLFixedWindow *fw = it->data; > - hole64_start = fw->mr.addr + memory_region_size(&fw->mr); > - } > - } > + if (pcms->cxl_devices_state.is_enabled) { > + hole64_start = pc_get_cxl_range_end(pcms); > } else if (pcmc->has_reserved_memory && ms->device_memory->base) { > hole64_start = ms->device_memory->base; > if (!pcmc->broken_reserved_end) {
diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 216e38da938e..1f42f194d7b7 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -825,6 +825,25 @@ static hwaddr pc_above_4g_end(PCMachineState *pcms) return x86ms->above_4g_mem_start + x86ms->above_4g_mem_size; } +static uint64_t pc_get_cxl_range_end(PCMachineState *pcms) +{ + uint64_t start = 0; + + if (pcms->cxl_devices_state.host_mr.addr) { + start = pcms->cxl_devices_state.host_mr.addr + + memory_region_size(&pcms->cxl_devices_state.host_mr); + if (pcms->cxl_devices_state.fixed_windows) { + GList *it; + for (it = pcms->cxl_devices_state.fixed_windows; it; it = it->next) { + CXLFixedWindow *fw = it->data; + start = fw->mr.addr + memory_region_size(&fw->mr); + } + } + } + + return start; +} + void pc_memory_init(PCMachineState *pcms, MemoryRegion *system_memory, MemoryRegion *rom_memory, @@ -1022,16 +1041,8 @@ uint64_t pc_pci_hole64_start(void) MachineState *ms = MACHINE(pcms); uint64_t hole64_start = 0; - if (pcms->cxl_devices_state.host_mr.addr) { - hole64_start = pcms->cxl_devices_state.host_mr.addr + - memory_region_size(&pcms->cxl_devices_state.host_mr); - if (pcms->cxl_devices_state.fixed_windows) { - GList *it; - for (it = pcms->cxl_devices_state.fixed_windows; it; it = it->next) { - CXLFixedWindow *fw = it->data; - hole64_start = fw->mr.addr + memory_region_size(&fw->mr); - } - } + if (pcms->cxl_devices_state.is_enabled) { + hole64_start = pc_get_cxl_range_end(pcms); } else if (pcmc->has_reserved_memory && ms->device_memory->base) { hole64_start = ms->device_memory->base; if (!pcmc->broken_reserved_end) {
Move calculation of CXL memory region end to separate helper. This is in preparation to a future change that removes CXL range dependency on the CXL memory region, with the goal of allowing pc_pci_hole64_start() to be called before any memory region are initialized. Cc: Jonathan Cameron <jonathan.cameron@huawei.com> Signed-off-by: Joao Martins <joao.m.martins@oracle.com> --- hw/i386/pc.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-)