On Wed, 20 Oct 2021 18:27:39 +0100
Jean-Philippe Brucker <jean-phili...@linaro.org> wrote:
> When a virtio-iommu is instantiated, describe it using the ACPI VIOT
> table.
>
> Reviewed-by: Eric Auger <eric.au...@redhat.com>
> Signed-off-by: Jean-Philippe Brucker <jean-phili...@linaro.org>
Acked-by: Igor Mammedov <imamm...@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 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
