> -----Original Message-----
> From: Andrew Jones [mailto:drjo...@redhat.com]
> Sent: Monday, May 28, 2018 6:02 PM
> To: Shameerali Kolothum Thodi <shameerali.kolothum.th...@huawei.com>
> Cc: qemu-devel@nongnu.org; qemu-...@nongnu.org;
> peter.mayd...@linaro.org; Jonathan Cameron
> <jonathan.came...@huawei.com>; Linuxarm <linux...@huawei.com>;
> eric.au...@redhat.com; alex.william...@redhat.com; Zhaoshenglong
> <zhaoshengl...@huawei.com>; imamm...@redhat.com
> Subject: Re: [Qemu-devel] [RFC v2 5/6] hw/arm: ACPI SRAT changes to
> accommodate non-contiguous mem
>
> On Wed, May 16, 2018 at 04:20:25PM +0100, Shameer Kolothum wrote:
> > This is in preparation for the next patch where initial ram is split
> > into a non-pluggable chunk and a pc-dimm modeled mem if the vaild
> > iova regions are non-contiguous.
> >
> > Signed-off-by: Shameer Kolothum <shameerali.kolothum.th...@huawei.com>
> > ---
> > hw/arm/virt-acpi-build.c | 24 ++++++++++++++++++++----
> > 1 file changed, 20 insertions(+), 4 deletions(-)
> >
> > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> > index c7c6a57..8d17b40 100644
> > --- a/hw/arm/virt-acpi-build.c
> > +++ b/hw/arm/virt-acpi-build.c
> > @@ -488,7 +488,7 @@ build_srat(GArray *table_data, BIOSLinker *linker,
> VirtMachineState *vms)
> > AcpiSratProcessorGiccAffinity *core;
> > AcpiSratMemoryAffinity *numamem;
> > int i, srat_start;
> > - uint64_t mem_base;
> > + uint64_t mem_base, mem_sz, mem_len;
> > MachineClass *mc = MACHINE_GET_CLASS(vms);
> > const CPUArchIdList *cpu_list = mc-
> >possible_cpu_arch_ids(MACHINE(vms));
> >
> > @@ -505,12 +505,28 @@ build_srat(GArray *table_data, BIOSLinker *linker,
> VirtMachineState *vms)
> > core->flags = cpu_to_le32(1);
> > }
> >
> > - mem_base = vms->memmap[VIRT_MEM].base;
> > + mem_base = vms->bootinfo.loader_start;
> > + mem_sz = vms->bootinfo.loader_start;
>
> mem_sz = vms->bootinfo.ram_size;
>
> Assuming the DT generator was correct, meaning bootinfo.ram_size will
> be the size of the non-pluggable dimm.
Oops!. I will correct that.
Thanks,
Shameer
> > for (i = 0; i < nb_numa_nodes; ++i) {
> > numamem = acpi_data_push(table_data, sizeof(*numamem));
> > - build_srat_memory(numamem, mem_base, numa_info[i].node_mem, i,
> > + mem_len = MIN(numa_info[i].node_mem, mem_sz);
> > + build_srat_memory(numamem, mem_base, mem_len, i,
> > MEM_AFFINITY_ENABLED);
> > - mem_base += numa_info[i].node_mem;
> > + mem_base += mem_len;
> > + mem_sz -= mem_len;
> > + if (!mem_sz) {
> > + break;
> > + }
> > + }
> > +
> > + /* Create table for initial pc-dimm ram, if any */
> > + if (vms->bootinfo.dimm_mem) {
> > + numamem = acpi_data_push(table_data, sizeof(*numamem));
> > + build_srat_memory(numamem, vms->bootinfo.dimm_mem->base,
> > + vms->bootinfo.dimm_mem->size,
> > + vms->bootinfo.dimm_mem->node,
> > + MEM_AFFINITY_ENABLED);
> > +
> > }
> >
> > build_header(linker, table_data, (void *)(table_data->data +
> > srat_start),
> > --
> > 2.7.4
> >
> >
> >