[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 07/11] i386/pc: handle unitialized mr in pc_get_cxl_range_end(
From: |
Joao Martins |
Subject: |
[PATCH v9 07/11] i386/pc: handle unitialized mr in pc_get_cxl_range_end() |
Date: |
Tue, 19 Jul 2022 18:00:10 +0100 |
Remove pc_get_cxl_range_end() dependency on the CXL memory region,
and replace with one that does not require the CXL host_mr to determine
the start of CXL start.
This in preparation to allow pc_pci_hole64_start() to be called early
in pc_memory_init(), handle CXL memory region end when its underlying
memory region isn't yet initialized.
Cc: Jonathan Cameron <jonathan.cameron@huawei.com>
Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
---
hw/i386/pc.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 3fdcab4bb4f3..c654be6cf0bd 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -843,17 +843,15 @@ static uint64_t pc_get_cxl_range_start(PCMachineState
*pcms)
static uint64_t pc_get_cxl_range_end(PCMachineState *pcms)
{
- uint64_t start = 0;
+ uint64_t start = pc_get_cxl_range_start(pcms) + MiB;
- 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);
- }
+ if (pcms->cxl_devices_state.fixed_windows) {
+ GList *it;
+
+ start = ROUND_UP(start, 256 * MiB);
+ for (it = pcms->cxl_devices_state.fixed_windows; it; it = it->next) {
+ CXLFixedWindow *fw = it->data;
+ start += fw->size;
}
}
--
2.17.2
- [PATCH v9 00/11] i386/pc: Fix creation of >= 1010G guests on AMD systems with IOMMU, Joao Martins, 2022/07/19
- [PATCH v9 02/11] i386/pc: create pci-host qdev prior to pc_memory_init(), Joao Martins, 2022/07/19
- [PATCH v9 04/11] i386/pc: factor out above-4g end to an helper, Joao Martins, 2022/07/19
- [PATCH v9 01/11] hw/i386: add 4g boundary start to X86MachineState, Joao Martins, 2022/07/19
- [PATCH v9 05/11] i386/pc: factor out cxl range end to helper, Joao Martins, 2022/07/19
- [PATCH v9 06/11] i386/pc: factor out cxl range start to helper, Joao Martins, 2022/07/19
- [PATCH v9 09/11] i386/pc: bounds check phys-bits against max used GPA, Joao Martins, 2022/07/19
- [PATCH v9 11/11] i386/pc: restrict AMD only enforcing of 1Tb hole to new machine type, Joao Martins, 2022/07/19
- [PATCH v9 03/11] i386/pc: pass pci_hole64_size to pc_memory_init(), Joao Martins, 2022/07/19
- [PATCH v9 07/11] i386/pc: handle unitialized mr in pc_get_cxl_range_end(),
Joao Martins <=
- [PATCH v9 08/11] i386/pc: factor out device_memory base/size to helper, Joao Martins, 2022/07/19
- [PATCH v9 10/11] i386/pc: relocate 4g start to 1T where applicable, Joao Martins, 2022/07/19