[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 75/82] hw/arm/virt: Enable HMAT on arm virt machine
From: |
Michael S. Tsirkin |
Subject: |
[PULL v2 75/82] hw/arm/virt: Enable HMAT on arm virt machine |
Date: |
Wed, 2 Nov 2022 12:11:58 -0400 |
From: Xiang Chen <chenxiang66@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 <chenxiang66@hisilicon.com>
Signed-off-by: Hesham Almatary <hesham.almatary@huawei.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20221027100037.251-7-hesham.almatary@huawei.com>
Tested-by: Yicong Yang <yangyicong@hisilicon.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/arm/virt-acpi-build.c | 7 +++++++
hw/arm/Kconfig | 1 +
2 files changed, 8 insertions(+)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index da9e41e72b..4156111d49 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"
@@ -987,6 +988,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) {
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
--
MST
- [PULL v2 65/82] msix: Assert that specified vector is in range, (continued)
- [PULL v2 65/82] msix: Assert that specified vector is in range, Michael S. Tsirkin, 2022/11/02
- [PULL v2 66/82] hw/i386/pc.c: CXL Fixed Memory Window should not reserve e820 in bios, Michael S. Tsirkin, 2022/11/02
- [PULL v2 62/82] tests: acpi: update expected blobs, Michael S. Tsirkin, 2022/11/02
- [PULL v2 67/82] hw/i386/acpi-build: Remove unused struct, Michael S. Tsirkin, 2022/11/02
- [PULL v2 68/82] hw/i386/acpi-build: Resolve redundant attribute, Michael S. Tsirkin, 2022/11/02
- [PULL v2 69/82] hw/i386/acpi-build: Resolve north rather than south bridges, Michael S. Tsirkin, 2022/11/02
- [PULL v2 73/82] tests: acpi: q35: update expected blobs *.hmat-noinitiators expected HMAT:, Michael S. Tsirkin, 2022/11/02
- [PULL v2 72/82] tests: acpi: q35: add test for hmat nodes without initiators, Michael S. Tsirkin, 2022/11/02
- [PULL v2 70/82] hmat acpi: Don't require initiator value in -numa, Michael S. Tsirkin, 2022/11/02
- [PULL v2 74/82] tests: Add HMAT AArch64/virt empty table files, Michael S. Tsirkin, 2022/11/02
- [PULL v2 75/82] hw/arm/virt: Enable HMAT on arm virt machine,
Michael S. Tsirkin <=
- [PULL v2 76/82] tests: acpi: aarch64/virt: add a test for hmat nodes with no initiators, Michael S. Tsirkin, 2022/11/02
- [PULL v2 71/82] tests: acpi: add and whitelist *.hmat-noinitiator expected blobs, Michael S. Tsirkin, 2022/11/02
- [PULL v2 77/82] tests: virt: Update expected *.acpihmatvirt tables, Michael S. Tsirkin, 2022/11/02
- [PULL v2 79/82] intel-iommu: don't warn guest errors when getting rid2pasid entry, Michael S. Tsirkin, 2022/11/02
- [PULL v2 78/82] vfio: move implement of vfio_get_xlat_addr() to memory.c, Michael S. Tsirkin, 2022/11/02
- [PULL v2 80/82] intel-iommu: drop VTDBus, Michael S. Tsirkin, 2022/11/02
- [PULL v2 81/82] intel-iommu: convert VTD_PE_GET_FPD_ERR() to be a function, Michael S. Tsirkin, 2022/11/02
- [PULL v2 82/82] intel-iommu: PASID support, Michael S. Tsirkin, 2022/11/02
- Re: [PULL v2 00/82] pci,pc,virtio: features, tests, fixes, cleanups, Stefan Hajnoczi, 2022/11/02