[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 05/12] hw/arm/virt-acpi-build: Add VIOT table for virtio-iommu
From: |
Jean-Philippe Brucker |
Subject: |
[PATCH v5 05/12] hw/arm/virt-acpi-build: Add VIOT table for virtio-iommu |
Date: |
Wed, 20 Oct 2021 18:27:39 +0100 |
When a virtio-iommu is instantiated, describe it using the ACPI VIOT
table.
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
---
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 6cec97352b..e26639e1e1 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -55,6 +55,7 @@
#include "kvm_arm.h"
#include "migration/vmstate.h"
#include "hw/acpi/ghes.h"
+#include "hw/acpi/viot.h"
#define ARM_SPI_BASE 32
@@ -934,6 +935,12 @@ void virt_acpi_build(VirtMachineState *vms,
AcpiBuildTables *tables)
}
#endif
+ if (vms->iommu == VIRT_IOMMU_VIRTIO) {
+ acpi_add_table(table_offsets, tables_blob);
+ build_viot(ms, tables_blob, tables->linker, vms->virtio_iommu_bdf,
+ vms->oem_id, vms->oem_table_id);
+ }
+
/* XSDT is pointed to by RSDP */
xsdt = tables_blob->len;
build_xsdt(tables_blob, tables->linker, table_offsets, vms->oem_id,
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 2d37d29f02..e652590943 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -27,6 +27,7 @@ config ARM_VIRT
select DIMM
select ACPI_HW_REDUCED
select ACPI_APEI
+ select ACPI_VIOT
config CHEETAH
bool
--
2.33.0
- Re: [PATCH v5 02/12] hw/i386/pc: Remove x86_iommu_get_type(), (continued)
- [PATCH v5 03/12] hw/i386/pc: Move IOMMU singleton into PCMachineState, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 04/12] hw/i386/pc: Allow instantiating a virtio-iommu device, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 07/12] hw/arm/virt: Reject instantiation of multiple IOMMUs, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 05/12] hw/arm/virt-acpi-build: Add VIOT table for virtio-iommu,
Jean-Philippe Brucker <=
- [PATCH v5 06/12] hw/arm/virt: Remove device tree restriction for virtio-iommu, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 08/12] hw/arm/virt: Use object_property_set instead of qdev_prop_set, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 11/12] tests/acpi: add expected blob for VIOT test on virt machine, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 09/12] tests/acpi: allow updates of VIOT expected data files, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 12/12] tests/acpi: add expected blobs for VIOT test on q35 machine, Jean-Philippe Brucker, 2021/10/20
- [PATCH v5 10/12] tests/acpi: add test cases for VIOT, Jean-Philippe Brucker, 2021/10/20