On Mon, 11 Jul 2022 11:44:34 +0100
Hesham Almatary <hesham.almat...@huawei.com> wrote:
> From: Xiang Chen <chenxian...@hisilicon.com>
>
> Since the patchset ("Build ACPI Heterogeneous Memory Attribute Table (HMAT)"),
> HMAT is supported, but only x86 is enabled. Enable HMAT on arm virt machine.
>
> Signed-off-by: Xiang Chen <chenxian...@hisilicon.com>
Reviewed-by: Igor Mammedov <imamm...@redhat.com>
> ---
> hw/arm/Kconfig | 1 +
> hw/arm/virt-acpi-build.c | 7 +++++++
> 2 files changed, 8 insertions(+)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 15fa79afd3..17fcde8e1c 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -30,6 +30,7 @@ config ARM_VIRT
> select ACPI_VIOT
> select VIRTIO_MEM_SUPPORTED
> select ACPI_CXL
> + select ACPI_HMAT
>
> config CHEETAH
> bool
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index 449fab0080..f19b55e486 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -42,6 +42,7 @@
> #include "hw/acpi/memory_hotplug.h"
> #include "hw/acpi/generic_event_device.h"
> #include "hw/acpi/tpm.h"
> +#include "hw/acpi/hmat.h"
> #include "hw/pci/pcie_host.h"
> #include "hw/pci/pci.h"
> #include "hw/pci/pci_bus.h"
> @@ -990,6 +991,12 @@ void virt_acpi_build(VirtMachineState *vms,
> AcpiBuildTables *tables)
> build_slit(tables_blob, tables->linker, ms, vms->oem_id,
> vms->oem_table_id);
> }
> +
> + if (ms->numa_state->hmat_enabled) {
> + acpi_add_table(table_offsets, tables_blob);
> + build_hmat(tables_blob, tables->linker, ms->numa_state,
> + vms->oem_id, vms->oem_table_id);
> + }
> }
>
> if (ms->nvdimms_state->is_enabled) {
