[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/16] i386/pc: factor out cxl range end to helper
From: |
Michael S. Tsirkin |
Subject: |
[PULL 09/16] i386/pc: factor out cxl range end to helper |
Date: |
Tue, 26 Jul 2022 15:40:44 -0400 |
From: Joao Martins <joao.m.martins@oracle.com>
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>
Message-Id: <20220719170014.27028-6-joao.m.martins@oracle.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@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 d1e20ccb27..cb27309e76 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,
@@ -1020,16 +1039,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) {
--
MST
- [PULL 00/16] pc,virtio: fixes, Michael S. Tsirkin, 2022/07/26
- [PULL 01/16] acpi/nvdimm: Define trace events for NVDIMM and substitute nvdimm_debug(), Michael S. Tsirkin, 2022/07/26
- [PULL 02/16] hw/machine: Clear out left over CXL related pointer from move of state handling to machines., Michael S. Tsirkin, 2022/07/26
- [PULL 03/16] hw/i386/pc: Always place CXL Memory Regions after device_memory, Michael S. Tsirkin, 2022/07/26
- [PULL 05/16] hw/i386: add 4g boundary start to X86MachineState, Michael S. Tsirkin, 2022/07/26
- [PULL 06/16] i386/pc: create pci-host qdev prior to pc_memory_init(), Michael S. Tsirkin, 2022/07/26
- [PULL 04/16] hw/cxl: Fix size of constant in interleave granularity function., Michael S. Tsirkin, 2022/07/26
- [PULL 07/16] i386/pc: pass pci_hole64_size to pc_memory_init(), Michael S. Tsirkin, 2022/07/26
- [PULL 09/16] i386/pc: factor out cxl range end to helper,
Michael S. Tsirkin <=
- [PULL 10/16] i386/pc: factor out cxl range start to helper, Michael S. Tsirkin, 2022/07/26
- [PULL 08/16] i386/pc: factor out above-4g end to an helper, Michael S. Tsirkin, 2022/07/26
- [PULL 11/16] i386/pc: handle unitialized mr in pc_get_cxl_range_end(), Michael S. Tsirkin, 2022/07/26
- [PULL 13/16] i386/pc: bounds check phys-bits against max used GPA, Michael S. Tsirkin, 2022/07/26
- [PULL 14/16] i386/pc: relocate 4g start to 1T where applicable, Michael S. Tsirkin, 2022/07/26
- [PULL 12/16] i386/pc: factor out device_memory base/size to helper, Michael S. Tsirkin, 2022/07/26
- [PULL 15/16] i386/pc: restrict AMD only enforcing of 1Tb hole to new machine type, Michael S. Tsirkin, 2022/07/26
- [PULL 16/16] hw/virtio/virtio-iommu: Enforce power-of-two notify for both MAP and UNMAP, Michael S. Tsirkin, 2022/07/26
- Re: [PULL 00/16] pc,virtio: fixes, Richard Henderson, 2022/07/26