[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 6/8] pc: Add VIOT table for virtio-iommu
From: |
Eric Auger |
Subject: |
Re: [PATCH v2 6/8] pc: Add VIOT table for virtio-iommu |
Date: |
Mon, 6 Sep 2021 17:02:05 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 |
Hi jean,
On 9/3/21 4:32 PM, Jean-Philippe Brucker wrote:
> The ACPI Virtual I/O Translation table (VIOT) describes the relation
> between a virtio-iommu and the endpoints it manages. When a virtio-iommu
> device is instantiated, add a VIOT table.
As there is no used of pcms->virtio_iommu and virtio_iommu_bdf yet, maybe
squash this into next patch?
Thanks
Eric
>
> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
> ---
> hw/i386/Kconfig | 1 +
> include/hw/i386/pc.h | 2 ++
> hw/i386/acpi-build.c | 5 +++++
> hw/i386/pc.c | 7 +++++++
> 4 files changed, 15 insertions(+)
>
> diff --git a/hw/i386/Kconfig b/hw/i386/Kconfig
> index ddedcef0b2..13db05d557 100644
> --- a/hw/i386/Kconfig
> +++ b/hw/i386/Kconfig
> @@ -54,6 +54,7 @@ config PC_ACPI
> select ACPI_X86
> select ACPI_CPU_HOTPLUG
> select ACPI_MEMORY_HOTPLUG
> + select ACPI_VIOT
> select SMBUS_EEPROM
> select PFLASH_CFI01
> depends on ACPI_SMBUS
> diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
> index 88dffe7517..979b8d0b7c 100644
> --- a/include/hw/i386/pc.h
> +++ b/include/hw/i386/pc.h
> @@ -45,6 +45,8 @@ typedef struct PCMachineState {
> bool pit_enabled;
> bool hpet_enabled;
> bool default_bus_bypass_iommu;
> + bool virtio_iommu;
> + uint16_t virtio_iommu_bdf;
> uint64_t max_fw_size;
>
> /* NUMA information: */
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index a33ac8b91e..078b7f5c6f 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -71,6 +71,7 @@
>
> #include "hw/acpi/ipmi.h"
> #include "hw/acpi/hmat.h"
> +#include "hw/acpi/viot.h"
>
> /* These are used to size the ACPI tables for -M pc-i440fx-1.7 and
> * -M pc-i440fx-2.0. Even if the actual amount of AML generated grows
> @@ -2559,6 +2560,10 @@ void acpi_build(AcpiBuildTables *tables, MachineState
> *machine)
> build_dmar_q35(tables_blob, tables->linker, x86ms->oem_id,
> x86ms->oem_table_id);
> }
> + } else if (pcms->virtio_iommu) {
> + acpi_add_table(table_offsets, tables_blob);
> + build_viot(tables_blob, tables->linker, pcms->virtio_iommu_bdf,
> + x86ms->oem_id, x86ms->oem_table_id);
> }
> if (machine->nvdimms_state->is_enabled) {
> nvdimm_build_acpi(table_offsets, tables_blob, tables->linker,
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index c2b9d62a35..694fc9ce07 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -84,6 +84,7 @@
> #include "hw/i386/intel_iommu.h"
> #include "hw/net/ne2000-isa.h"
> #include "standard-headers/asm-x86/bootparam.h"
> +#include "hw/virtio/virtio-iommu.h"
> #include "hw/virtio/virtio-pmem-pci.h"
> #include "hw/virtio/virtio-mem-pci.h"
> #include "hw/mem/memory-device.h"
> @@ -1388,6 +1389,12 @@ static void pc_machine_device_plug_cb(HotplugHandler
> *hotplug_dev,
> } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_PMEM_PCI) ||
> object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) {
> pc_virtio_md_pci_plug(hotplug_dev, dev, errp);
> + } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) {
> + PCMachineState *pcms = PC_MACHINE(hotplug_dev);
> + PCIDevice *pdev = PCI_DEVICE(dev);
> +
> + pcms->virtio_iommu = true;
> + pcms->virtio_iommu_bdf = pci_get_bdf(pdev);
> }
> }
>
- [PATCH v2 3/8] hw/arm/virt-acpi-build: Add VIOT table for virtio-iommu, (continued)
- [PATCH v2 3/8] hw/arm/virt-acpi-build: Add VIOT table for virtio-iommu, Jean-Philippe Brucker, 2021/09/03
- [PATCH v2 2/8] hw/acpi: Add VIOT table, Jean-Philippe Brucker, 2021/09/03
- [PATCH v2 5/8] hw/arm/virt: Reject instantiation of multiple IOMMUs, Jean-Philippe Brucker, 2021/09/03
- [PATCH v2 4/8] hw/arm/virt: Remove device tree restriction for virtio-iommu, Jean-Philippe Brucker, 2021/09/03
- [PATCH v2 6/8] pc: Add VIOT table for virtio-iommu, Jean-Philippe Brucker, 2021/09/03
- Re: [PATCH v2 6/8] pc: Add VIOT table for virtio-iommu,
Eric Auger <=
- [PATCH v2 8/8] docs: Add '-device virtio-iommu' entry, Jean-Philippe Brucker, 2021/09/03
- [PATCH v2 7/8] pc: Allow instantiating a virtio-iommu device, Jean-Philippe Brucker, 2021/09/03