[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 05/10] i386/pc: factor out cxl range end to helper
From: |
Joao Martins |
Subject: |
[PATCH v6 05/10] i386/pc: factor out cxl range end to helper |
Date: |
Fri, 1 Jul 2022 17:10:09 +0100 |
Move calculation of CXL memory region end to separate helper in
preparation to allow pc_pci_hole64_start() to be called before
any mrs 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(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 6c7c49ca5a32..0abbf81841a9 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) {
--
2.17.2
- [PATCH v6 06/10] i386/pc: factor out cxl range start to helper, (continued)
[PATCH v6 07/10] i386/pc: handle unitialized mr in pc_get_cxl_range_end(), Joao Martins, 2022/07/01
[PATCH v6 05/10] i386/pc: factor out cxl range end to helper,
Joao Martins <=
[PATCH v6 09/10] i386/pc: relocate 4g start to 1T where applicable, Joao Martins, 2022/07/01
- Re: [PATCH v6 09/10] i386/pc: relocate 4g start to 1T where applicable, Joao Martins, 2022/07/07
- Re: [PATCH v6 09/10] i386/pc: relocate 4g start to 1T where applicable, Igor Mammedov, 2022/07/11
- Re: [PATCH v6 09/10] i386/pc: relocate 4g start to 1T where applicable, Joao Martins, 2022/07/11
- Re: [PATCH v6 09/10] i386/pc: relocate 4g start to 1T where applicable, Joao Martins, 2022/07/11
- Re: [PATCH v6 09/10] i386/pc: relocate 4g start to 1T where applicable, Joao Martins, 2022/07/11
- Re: [PATCH v6 09/10] i386/pc: relocate 4g start to 1T where applicable, Igor Mammedov, 2022/07/12
- Re: [PATCH v6 09/10] i386/pc: relocate 4g start to 1T where applicable, Joao Martins, 2022/07/12