| Message ID | 20210903143208.2434284-4-jean-philippe@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | virtio-iommu: Add ACPI support | expand |
Hi Jean, On 9/3/21 4:32 PM, Jean-Philippe Brucker wrote: > When a virtio-iommu is instantiated, describe it using the ACPI VIOT > table. > > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> Reviewed-by: Eric Auger <eric.auger@redhat.com> Thanks Eric > --- > 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 4ba0aca067..7da0422446 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -29,6 +29,7 @@ config ARM_VIRT > select ACPI_HW_REDUCED > select ACPI_NVDIMM > select ACPI_APEI > + select ACPI_VIOT > > config CHEETAH > bool > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c > index 037cc1fd82..e2fa677d80 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 > > @@ -849,6 +850,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(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 4ba0aca067..7da0422446 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -29,6 +29,7 @@ config ARM_VIRT select ACPI_HW_REDUCED select ACPI_NVDIMM select ACPI_APEI + select ACPI_VIOT config CHEETAH bool diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 037cc1fd82..e2fa677d80 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 @@ -849,6 +850,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(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,
When a virtio-iommu is instantiated, describe it using the ACPI VIOT table. Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> --- hw/arm/Kconfig | 1 + hw/arm/virt-acpi-build.c | 7 +++++++ 2 files changed, 8 insertions(+) -- 2.33.0