[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v6 06/10] i386/pc: factor out cxl range start to helper
From: |
Igor Mammedov |
Subject: |
Re: [PATCH v6 06/10] i386/pc: factor out cxl range start to helper |
Date: |
Thu, 7 Jul 2022 15:00:15 +0200 |
On Fri, 1 Jul 2022 17:10:10 +0100
Joao Martins <joao.m.martins@oracle.com> wrote:
> Factor out the calculation of the base address of the MR. It will be
> used later on for the cxl range end counterpart calculation and as
> well in pc_memory_init() CXL mr initialization, thus avoiding
> duplication.
>
> Cc: Jonathan Cameron <jonathan.cameron@huawei.com>
> Signed-off-by: Joao Martins <joao.m.martins@oracle.com>
needs to be rebased on top of
[PATCH 2/3] hw/i386/pc: Always place CXL Memory Regions after device_memory
> ---
> hw/i386/pc.c | 28 +++++++++++++++++++---------
> 1 file changed, 19 insertions(+), 9 deletions(-)
>
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 0abbf81841a9..8655cc3b8894 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -825,6 +825,24 @@ 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;
> + if (!pcmc->broken_reserved_end) {
> + cxl_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,15 +964,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;
> - if (!pcmc->broken_reserved_end) {
> - cxl_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);
- [PATCH v6 03/10] i386/pc: pass pci_hole64_size to pc_memory_init(), (continued)
[PATCH v6 01/10] hw/i386: add 4g boundary start to X86MachineState, Joao Martins, 2022/07/01
[PATCH v6 04/10] i386/pc: factor out above-4g end to an helper, Joao Martins, 2022/07/01
[PATCH v6 06/10] i386/pc: factor out cxl range start to helper, Joao Martins, 2022/07/01
- Re: [PATCH v6 06/10] i386/pc: factor out cxl range start to helper,
Igor Mammedov <=
[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, 2022/07/01