[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/16] i386/pc: factor out cxl range start to helper
From: |
Michael S. Tsirkin |
Subject: |
[PULL 10/16] i386/pc: factor out cxl range start to helper |
Date: |
Tue, 26 Jul 2022 15:40:47 -0400 |
From: Joao Martins <joao.m.martins@oracle.com>
Factor out the calculation of the base address of the memory region.
It will be used later on for the cxl range end counterpart calculation
and as well in pc_memory_init() CXL memory region initialization, thus
avoiding duplication.
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-7-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 | 24 +++++++++++++++++-------
1 file changed, 17 insertions(+), 7 deletions(-)
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index cb27309e76..9e1a067c41 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -825,6 +825,22 @@ 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_start(PCMachineState *pcms)
+{
+ PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
+ MachineState *machine = MACHINE(pcms);
+ hwaddr cxl_base;
+
+ if (pcmc->has_reserved_memory && machine->device_memory->base) {
+ cxl_base = machine->device_memory->base
+ + memory_region_size(&machine->device_memory->mr);
+ } else {
+ cxl_base = pc_above_4g_end(pcms);
+ }
+
+ return cxl_base;
+}
+
static uint64_t pc_get_cxl_range_end(PCMachineState *pcms)
{
uint64_t start = 0;
@@ -946,13 +962,7 @@ void pc_memory_init(PCMachineState *pcms,
MemoryRegion *mr = &pcms->cxl_devices_state.host_mr;
hwaddr cxl_size = MiB;
- if (pcmc->has_reserved_memory && machine->device_memory->base) {
- cxl_base = machine->device_memory->base
- + memory_region_size(&machine->device_memory->mr);
- } else {
- cxl_base = pc_above_4g_end(pcms);
- }
-
+ cxl_base = pc_get_cxl_range_start(pcms);
e820_add_entry(cxl_base, cxl_size, E820_RESERVED);
memory_region_init(mr, OBJECT(machine), "cxl_host_reg", cxl_size);
memory_region_add_subregion(system_memory, cxl_base, mr);
--
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, 2022/07/26
- [PULL 10/16] i386/pc: factor out cxl range start to helper,
Michael S. Tsirkin <=
- [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