Message ID | 1461571547-13132-5-git-send-email-zhaoshenglong@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Mon, Apr 25, 2016 at 04:05:46PM +0800, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > Move acpi_build_srat_memory to common place so that it could be reused > by ARM. Rename it to build_acpi_srat_memory. > > Cc: Michael S. Tsirkin <mst@redhat.com> > Cc: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > hw/acpi/aml-build.c | 11 +++++++++++ > hw/i386/acpi-build.c | 29 +++++------------------------ > include/hw/acpi/aml-build.h | 10 ++++++++++ > 3 files changed, 26 insertions(+), 24 deletions(-) > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index ab89ca6..f945524 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -1563,3 +1563,14 @@ build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets, > build_header(linker, table_data, > (void *)rsdt, "RSDT", rsdt_len, 1, oem_id, oem_table_id); > } > + > +void build_acpi_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, > + uint64_t len, int node, MemoryAffinityFlags flags) > +{ > + numamem->type = ACPI_SRAT_MEMORY; > + numamem->length = sizeof(*numamem); > + numamem->proximity = cpu_to_le32(node); > + numamem->flags = cpu_to_le32(flags); > + numamem->base_addr = cpu_to_le64(base); > + numamem->range_length = cpu_to_le64(len); > +} > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 3c031aa..f939191 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -2427,25 +2427,6 @@ build_tpm2(GArray *table_data, GArray *linker) > (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL); > } > > -typedef enum { > - MEM_AFFINITY_NOFLAGS = 0, > - MEM_AFFINITY_ENABLED = (1 << 0), > - MEM_AFFINITY_HOTPLUGGABLE = (1 << 1), > - MEM_AFFINITY_NON_VOLATILE = (1 << 2), > -} MemoryAffinityFlags; > - > -static void > -acpi_build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, > - uint64_t len, int node, MemoryAffinityFlags flags) > -{ > - numamem->type = ACPI_SRAT_MEMORY; > - numamem->length = sizeof(*numamem); > - numamem->proximity = cpu_to_le32(node); > - numamem->flags = cpu_to_le32(flags); > - numamem->base_addr = cpu_to_le64(base); > - numamem->range_length = cpu_to_le64(len); > -} > - > static void > build_srat(GArray *table_data, GArray *linker, MachineState *machine) > { > @@ -2491,7 +2472,7 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) > numa_start = table_data->len; > > numamem = acpi_data_push(table_data, sizeof *numamem); > - acpi_build_srat_memory(numamem, 0, 640*1024, 0, MEM_AFFINITY_ENABLED); > + build_acpi_srat_memory(numamem, 0, 640*1024, 0, MEM_AFFINITY_ENABLED); > next_base = 1024 * 1024; > for (i = 1; i < pcms->numa_nodes + 1; ++i) { > mem_base = next_base; > @@ -2507,7 +2488,7 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) > mem_len -= next_base - pcms->below_4g_mem_size; > if (mem_len > 0) { > numamem = acpi_data_push(table_data, sizeof *numamem); > - acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1, > + build_acpi_srat_memory(numamem, mem_base, mem_len, i - 1, > MEM_AFFINITY_ENABLED); > } > mem_base = 1ULL << 32; > @@ -2515,13 +2496,13 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) > next_base += (1ULL << 32) - pcms->below_4g_mem_size; > } > numamem = acpi_data_push(table_data, sizeof *numamem); > - acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1, > + build_acpi_srat_memory(numamem, mem_base, mem_len, i - 1, > MEM_AFFINITY_ENABLED); > } > slots = (table_data->len - numa_start) / sizeof *numamem; > for (; slots < pcms->numa_nodes + 2; slots++) { > numamem = acpi_data_push(table_data, sizeof *numamem); > - acpi_build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS); > + build_acpi_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS); > } > > /* > @@ -2531,7 +2512,7 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) > */ > if (hotplugabble_address_space_size) { > numamem = acpi_data_push(table_data, sizeof *numamem); > - acpi_build_srat_memory(numamem, pcms->hotplug_memory.base, > + build_acpi_srat_memory(numamem, pcms->hotplug_memory.base, > hotplugabble_address_space_size, 0, > MEM_AFFINITY_HOTPLUGGABLE | > MEM_AFFINITY_ENABLED); > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index 2c994b3..a9e8a04 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -198,6 +198,13 @@ typedef enum { > AML_PULL_NONE = 3, > } AmlPinConfig; > > +typedef enum { > + MEM_AFFINITY_NOFLAGS = 0, > + MEM_AFFINITY_ENABLED = (1 << 0), > + MEM_AFFINITY_HOTPLUGGABLE = (1 << 1), > + MEM_AFFINITY_NON_VOLATILE = (1 << 2), > +} MemoryAffinityFlags; > + > typedef > struct AcpiBuildTables { > GArray *table_data; > @@ -372,4 +379,7 @@ int > build_append_named_dword(GArray *array, const char *name_format, ...) > GCC_FMT_ATTR(2, 3); > > +void build_acpi_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, > + uint64_t len, int node, MemoryAffinityFlags flags); > + > #endif > -- > 2.0.4 > > > I probably would have just called it 'build_srat_memory', but anyway Reviewed-by: Andrew Jones <drjones@redhat.com>
On 04/25/2016 11:05 AM, Shannon Zhao wrote: > From: Shannon Zhao <shannon.zhao@linaro.org> > > Move acpi_build_srat_memory to common place so that it could be reused > by ARM. Rename it to build_acpi_srat_memory. > > Cc: Michael S. Tsirkin <mst@redhat.com> > Cc: Igor Mammedov <imammedo@redhat.com> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> > --- > hw/acpi/aml-build.c | 11 +++++++++++ > hw/i386/acpi-build.c | 29 +++++------------------------ > include/hw/acpi/aml-build.h | 10 ++++++++++ > 3 files changed, 26 insertions(+), 24 deletions(-) > > diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c > index ab89ca6..f945524 100644 > --- a/hw/acpi/aml-build.c > +++ b/hw/acpi/aml-build.c > @@ -1563,3 +1563,14 @@ build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets, > build_header(linker, table_data, > (void *)rsdt, "RSDT", rsdt_len, 1, oem_id, oem_table_id); > } > + > +void build_acpi_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, > + uint64_t len, int node, MemoryAffinityFlags flags) > +{ > + numamem->type = ACPI_SRAT_MEMORY; > + numamem->length = sizeof(*numamem); > + numamem->proximity = cpu_to_le32(node); > + numamem->flags = cpu_to_le32(flags); > + numamem->base_addr = cpu_to_le64(base); > + numamem->range_length = cpu_to_le64(len); > +} > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 3c031aa..f939191 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -2427,25 +2427,6 @@ build_tpm2(GArray *table_data, GArray *linker) > (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL); > } > > -typedef enum { > - MEM_AFFINITY_NOFLAGS = 0, > - MEM_AFFINITY_ENABLED = (1 << 0), > - MEM_AFFINITY_HOTPLUGGABLE = (1 << 1), > - MEM_AFFINITY_NON_VOLATILE = (1 << 2), > -} MemoryAffinityFlags; > - > -static void > -acpi_build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, > - uint64_t len, int node, MemoryAffinityFlags flags) > -{ > - numamem->type = ACPI_SRAT_MEMORY; > - numamem->length = sizeof(*numamem); > - numamem->proximity = cpu_to_le32(node); > - numamem->flags = cpu_to_le32(flags); > - numamem->base_addr = cpu_to_le64(base); > - numamem->range_length = cpu_to_le64(len); > -} > - > static void > build_srat(GArray *table_data, GArray *linker, MachineState *machine) > { > @@ -2491,7 +2472,7 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) > numa_start = table_data->len; > > numamem = acpi_data_push(table_data, sizeof *numamem); > - acpi_build_srat_memory(numamem, 0, 640*1024, 0, MEM_AFFINITY_ENABLED); > + build_acpi_srat_memory(numamem, 0, 640*1024, 0, MEM_AFFINITY_ENABLED); Please run checkpatch before submitting. It will help getting it in sooner :) In this case the ERROR was here before your code, but you have chance to fix it. Thanks, Marcel > next_base = 1024 * 1024; > for (i = 1; i < pcms->numa_nodes + 1; ++i) { > mem_base = next_base; > @@ -2507,7 +2488,7 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) > mem_len -= next_base - pcms->below_4g_mem_size; > if (mem_len > 0) { > numamem = acpi_data_push(table_data, sizeof *numamem); > - acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1, > + build_acpi_srat_memory(numamem, mem_base, mem_len, i - 1, > MEM_AFFINITY_ENABLED); > } > mem_base = 1ULL << 32; > @@ -2515,13 +2496,13 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) > next_base += (1ULL << 32) - pcms->below_4g_mem_size; > } > numamem = acpi_data_push(table_data, sizeof *numamem); > - acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1, > + build_acpi_srat_memory(numamem, mem_base, mem_len, i - 1, > MEM_AFFINITY_ENABLED); > } > slots = (table_data->len - numa_start) / sizeof *numamem; > for (; slots < pcms->numa_nodes + 2; slots++) { > numamem = acpi_data_push(table_data, sizeof *numamem); > - acpi_build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS); > + build_acpi_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS); > } > > /* > @@ -2531,7 +2512,7 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) > */ > if (hotplugabble_address_space_size) { > numamem = acpi_data_push(table_data, sizeof *numamem); > - acpi_build_srat_memory(numamem, pcms->hotplug_memory.base, > + build_acpi_srat_memory(numamem, pcms->hotplug_memory.base, > hotplugabble_address_space_size, 0, > MEM_AFFINITY_HOTPLUGGABLE | > MEM_AFFINITY_ENABLED); > diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h > index 2c994b3..a9e8a04 100644 > --- a/include/hw/acpi/aml-build.h > +++ b/include/hw/acpi/aml-build.h > @@ -198,6 +198,13 @@ typedef enum { > AML_PULL_NONE = 3, > } AmlPinConfig; > > +typedef enum { > + MEM_AFFINITY_NOFLAGS = 0, > + MEM_AFFINITY_ENABLED = (1 << 0), > + MEM_AFFINITY_HOTPLUGGABLE = (1 << 1), > + MEM_AFFINITY_NON_VOLATILE = (1 << 2), > +} MemoryAffinityFlags; > + > typedef > struct AcpiBuildTables { > GArray *table_data; > @@ -372,4 +379,7 @@ int > build_append_named_dword(GArray *array, const char *name_format, ...) > GCC_FMT_ATTR(2, 3); > > +void build_acpi_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, > + uint64_t len, int node, MemoryAffinityFlags flags); > + > #endif >
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index ab89ca6..f945524 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -1563,3 +1563,14 @@ build_rsdt(GArray *table_data, GArray *linker, GArray *table_offsets, build_header(linker, table_data, (void *)rsdt, "RSDT", rsdt_len, 1, oem_id, oem_table_id); } + +void build_acpi_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, + uint64_t len, int node, MemoryAffinityFlags flags) +{ + numamem->type = ACPI_SRAT_MEMORY; + numamem->length = sizeof(*numamem); + numamem->proximity = cpu_to_le32(node); + numamem->flags = cpu_to_le32(flags); + numamem->base_addr = cpu_to_le64(base); + numamem->range_length = cpu_to_le64(len); +} diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 3c031aa..f939191 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2427,25 +2427,6 @@ build_tpm2(GArray *table_data, GArray *linker) (void *)tpm2_ptr, "TPM2", sizeof(*tpm2_ptr), 4, NULL, NULL); } -typedef enum { - MEM_AFFINITY_NOFLAGS = 0, - MEM_AFFINITY_ENABLED = (1 << 0), - MEM_AFFINITY_HOTPLUGGABLE = (1 << 1), - MEM_AFFINITY_NON_VOLATILE = (1 << 2), -} MemoryAffinityFlags; - -static void -acpi_build_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, - uint64_t len, int node, MemoryAffinityFlags flags) -{ - numamem->type = ACPI_SRAT_MEMORY; - numamem->length = sizeof(*numamem); - numamem->proximity = cpu_to_le32(node); - numamem->flags = cpu_to_le32(flags); - numamem->base_addr = cpu_to_le64(base); - numamem->range_length = cpu_to_le64(len); -} - static void build_srat(GArray *table_data, GArray *linker, MachineState *machine) { @@ -2491,7 +2472,7 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) numa_start = table_data->len; numamem = acpi_data_push(table_data, sizeof *numamem); - acpi_build_srat_memory(numamem, 0, 640*1024, 0, MEM_AFFINITY_ENABLED); + build_acpi_srat_memory(numamem, 0, 640*1024, 0, MEM_AFFINITY_ENABLED); next_base = 1024 * 1024; for (i = 1; i < pcms->numa_nodes + 1; ++i) { mem_base = next_base; @@ -2507,7 +2488,7 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) mem_len -= next_base - pcms->below_4g_mem_size; if (mem_len > 0) { numamem = acpi_data_push(table_data, sizeof *numamem); - acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1, + build_acpi_srat_memory(numamem, mem_base, mem_len, i - 1, MEM_AFFINITY_ENABLED); } mem_base = 1ULL << 32; @@ -2515,13 +2496,13 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) next_base += (1ULL << 32) - pcms->below_4g_mem_size; } numamem = acpi_data_push(table_data, sizeof *numamem); - acpi_build_srat_memory(numamem, mem_base, mem_len, i - 1, + build_acpi_srat_memory(numamem, mem_base, mem_len, i - 1, MEM_AFFINITY_ENABLED); } slots = (table_data->len - numa_start) / sizeof *numamem; for (; slots < pcms->numa_nodes + 2; slots++) { numamem = acpi_data_push(table_data, sizeof *numamem); - acpi_build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS); + build_acpi_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS); } /* @@ -2531,7 +2512,7 @@ build_srat(GArray *table_data, GArray *linker, MachineState *machine) */ if (hotplugabble_address_space_size) { numamem = acpi_data_push(table_data, sizeof *numamem); - acpi_build_srat_memory(numamem, pcms->hotplug_memory.base, + build_acpi_srat_memory(numamem, pcms->hotplug_memory.base, hotplugabble_address_space_size, 0, MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED); diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h index 2c994b3..a9e8a04 100644 --- a/include/hw/acpi/aml-build.h +++ b/include/hw/acpi/aml-build.h @@ -198,6 +198,13 @@ typedef enum { AML_PULL_NONE = 3, } AmlPinConfig; +typedef enum { + MEM_AFFINITY_NOFLAGS = 0, + MEM_AFFINITY_ENABLED = (1 << 0), + MEM_AFFINITY_HOTPLUGGABLE = (1 << 1), + MEM_AFFINITY_NON_VOLATILE = (1 << 2), +} MemoryAffinityFlags; + typedef struct AcpiBuildTables { GArray *table_data; @@ -372,4 +379,7 @@ int build_append_named_dword(GArray *array, const char *name_format, ...) GCC_FMT_ATTR(2, 3); +void build_acpi_srat_memory(AcpiSratMemoryAffinity *numamem, uint64_t base, + uint64_t len, int node, MemoryAffinityFlags flags); + #endif