On Sun, 7 Jul 2019 22:29:50 +0800 Tao Xu <tao3...@intel.com> wrote: > From: Liu Jingqi <jingqi....@intel.com> > > HMAT is defined in ACPI 6.3: 5.2.27 Heterogeneous Memory Attribute Table > (HMAT). The specification references below link: > http://www.uefi.org/sites/default/files/resources/ACPI_6_3_final_Jan30.pdf > > It describes the memory attributes, such as memory side cache > attributes and bandwidth and latency details, related to the > Memory Proximity Domain. The software is > expected to use this information as hint for optimization. > > This structure describes Memory Proximity Domain Attributes by memory > subsystem and its associativity with processor proximity domain as well as > hint for memory usage. > > Signed-off-by: Liu Jingqi <jingqi....@intel.com> > Signed-off-by: Tao Xu <tao3...@intel.com> Looks good to me. Thanks for changing to 6.3.
Reviewed-by: Jonathan Cameron <jonathan.came...@huawei.com> > --- > > Changes in v6: > Update to ACPI 6.3, main changes are: > - Renamed as Memory Proximity Domain Attributes, use numa nodes to > replace memory ranges > - Use "-numa initiator" to describe "the Attached Initiator", more > clear for memory topology > - Because HMAT does not use memory ranges, remove the codes to build > mem_renges for dimm device > --- > hw/acpi/Kconfig | 5 +++ > hw/acpi/Makefile.objs | 1 + > hw/acpi/hmat.c | 101 ++++++++++++++++++++++++++++++++++++++++++ > hw/acpi/hmat.h | 45 +++++++++++++++++++ > hw/i386/acpi-build.c | 3 ++ > 5 files changed, 155 insertions(+) > create mode 100644 hw/acpi/hmat.c > create mode 100644 hw/acpi/hmat.h > > diff --git a/hw/acpi/Kconfig b/hw/acpi/Kconfig > index 7c59cf900b..039bb99efa 100644 > --- a/hw/acpi/Kconfig > +++ b/hw/acpi/Kconfig > @@ -7,6 +7,7 @@ config ACPI_X86 > select ACPI_NVDIMM > select ACPI_CPU_HOTPLUG > select ACPI_MEMORY_HOTPLUG > + select ACPI_HMAT > > config ACPI_X86_ICH > bool > @@ -31,3 +32,7 @@ config ACPI_VMGENID > bool > default y > depends on PC > + > +config ACPI_HMAT > + bool > + depends on ACPI > diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs > index 9bb2101e3b..c05019b059 100644 > --- a/hw/acpi/Makefile.objs > +++ b/hw/acpi/Makefile.objs > @@ -6,6 +6,7 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o > common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o > common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o > common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o > +common-obj-$(CONFIG_ACPI_HMAT) += hmat.o > common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o > > common-obj-y += acpi_interface.o > diff --git a/hw/acpi/hmat.c b/hw/acpi/hmat.c > new file mode 100644 > index 0000000000..abf99b1adc > --- /dev/null > +++ b/hw/acpi/hmat.c > @@ -0,0 +1,101 @@ > +/* > + * HMAT ACPI Implementation > + * > + * Copyright(C) 2019 Intel Corporation. > + * > + * Author: > + * Liu jingqi <jingqi....@linux.intel.com> > + * Tao Xu <tao3...@intel.com> > + * > + * HMAT is defined in ACPI 6.3: 5.2.27 Heterogeneous Memory Attribute Table > + * (HMAT) > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see > <http://www.gnu.org/licenses/> > + */ > + > +#include "qemu/osdep.h" > +#include "sysemu/numa.h" > +#include "hw/acpi/hmat.h" > + > +/* > + * ACPI 6.3: > + * 5.2.27.3 Memory Proximity Domain Attributes Structure: Table 5-141 > + */ > +static void build_hmat_mpda(GArray *table_data, uint16_t flags, int > initiator, > + int mem_node) > +{ > + > + /* Memory Proximity Domain Attributes Structure */ > + /* Type */ > + build_append_int_noprefix(table_data, 0, 2); > + /* Reserved */ > + build_append_int_noprefix(table_data, 0, 2); > + /* Length */ > + build_append_int_noprefix(table_data, 40, 4); > + /* Flags */ > + build_append_int_noprefix(table_data, flags, 2); > + /* Reserved */ > + build_append_int_noprefix(table_data, 0, 2); > + /* Proximity Domain for the Attached Initiator */ > + build_append_int_noprefix(table_data, initiator, 4); > + /* Proximity Domain for the Memory */ > + build_append_int_noprefix(table_data, mem_node, 4); > + /* Reserved */ > + build_append_int_noprefix(table_data, 0, 4); > + /* > + * Reserved: > + * Previously defined as the Start Address of the System Physical > + * Address Range. Deprecated since ACPI Spec 6.3. > + */ > + build_append_int_noprefix(table_data, 0, 8); > + /* > + * Reserved: > + * Previously defined as the Range Length of the region in bytes. > + * Deprecated since ACPI Spec 6.3. > + */ > + build_append_int_noprefix(table_data, 0, 8); > +} > + > +/* Build HMAT sub table structures */ > +static void hmat_build_table_structs(GArray *table_data, NumaState *nstat) > +{ > + uint16_t flags; > + int i; > + > + for (i = 0; i < nstat->num_nodes; i++) { > + flags = 0; > + > + if (nstat->nodes[i].initiator_valid) { > + flags |= HMAT_PROX_INIT_VALID; > + } > + > + build_hmat_mpda(table_data, flags, nstat->nodes[i].initiator, i); > + } > +} > + > +void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState *nstat) > +{ > + uint64_t hmat_start; > + > + hmat_start = table_data->len; > + > + /* reserve space for HMAT header */ > + acpi_data_push(table_data, 40); > + > + hmat_build_table_structs(table_data, nstat); > + > + build_header(linker, table_data, > + (void *)(table_data->data + hmat_start), > + "HMAT", table_data->len - hmat_start, 2, NULL, NULL); > +} > diff --git a/hw/acpi/hmat.h b/hw/acpi/hmat.h > new file mode 100644 > index 0000000000..574cfba60a > --- /dev/null > +++ b/hw/acpi/hmat.h > @@ -0,0 +1,45 @@ > +/* > + * HMAT ACPI Implementation Header > + * > + * Copyright(C) 2019 Intel Corporation. > + * > + * Author: > + * Liu jingqi <jingqi....@linux.intel.com> > + * Tao Xu <tao3...@intel.com> > + * > + * HMAT is defined in ACPI 6.3: 5.2.27 Heterogeneous Memory Attribute Table > + * (HMAT) > + * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2 of the License, or (at your option) any later version. > + * > + * This library is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with this library; if not, see > <http://www.gnu.org/licenses/> > + */ > + > +#ifndef HMAT_H > +#define HMAT_H > + > +#include "hw/acpi/acpi-defs.h" > +#include "hw/acpi/acpi.h" > +#include "hw/acpi/bios-linker-loader.h" > +#include "hw/acpi/aml-build.h" > + > +/* > + * ACPI 6.3: 5.2.27.3 Memory Proximity Domain Attributes Structure, > + * Table 5-141, Field "flag", Bit [0]: set to 1 to indicate that data in > + * the Proximity Domain for the Attached Initiator field is valid. > + * Other bits reserved. > + */ > +#define HMAT_PROX_INIT_VALID 0x1 > + > +void build_hmat(GArray *table_data, BIOSLinker *linker, NumaState *nstat); > + > +#endif > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c > index 0e451e06d1..34f2f898ce 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -65,6 +65,7 @@ > #include "hw/i386/intel_iommu.h" > > #include "hw/acpi/ipmi.h" > +#include "hw/acpi/hmat.h" > > /* These are used to size the ACPI tables for -M pc-i440fx-1.7 and > * -M pc-i440fx-2.0. Even if the actual amount of AML generated grows > @@ -2684,6 +2685,8 @@ void acpi_build(AcpiBuildTables *tables, MachineState > *machine) > acpi_add_table(table_offsets, tables_blob); > build_slit(tables_blob, tables->linker, machine); > } > + acpi_add_table(table_offsets, tables_blob); > + build_hmat(tables_blob, tables->linker, machine->numa_state); > } > if (acpi_get_mcfg(&mcfg)) { > acpi_add_table(table_offsets, tables_blob);
