[v2,6/6] iommu/virtio: Enable x86 support

Message ID 20210423113836.3974972-7-jean-philippe@linaro.org
State Superseded
Headers show
Series
  • Add support for ACPI VIOT
Related show

Commit Message

Jean-Philippe Brucker April 23, 2021, 11:38 a.m.
With the VIOT support in place, x86 platforms can now use the
virtio-iommu.

Because the other x86 IOMMU drivers aren't yet ready to use the
acpi_dma_setup() path, x86 doesn't implement arch_setup_dma_ops() at the
moment. Similarly to Vt-d and AMD IOMMU, call iommu_setup_dma_ops() from
probe_finalize().

Acked-by: Joerg Roedel <jroedel@suse.de>

Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>

---
 drivers/iommu/Kconfig        | 3 ++-
 drivers/iommu/dma-iommu.c    | 1 +
 drivers/iommu/virtio-iommu.c | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

-- 
2.31.1

Comments

Michael S. Tsirkin May 14, 2021, 12:34 p.m. | #1
On Fri, Apr 23, 2021 at 01:38:37PM +0200, Jean-Philippe Brucker wrote:
> With the VIOT support in place, x86 platforms can now use the

> virtio-iommu.

> 

> Because the other x86 IOMMU drivers aren't yet ready to use the

> acpi_dma_setup() path, x86 doesn't implement arch_setup_dma_ops() at the

> moment. Similarly to Vt-d and AMD IOMMU, call iommu_setup_dma_ops() from

> probe_finalize().

> 

> Acked-by: Joerg Roedel <jroedel@suse.de>

> Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>


Acked-by: Michael S. Tsirkin <mst@redhat.com>


> ---

>  drivers/iommu/Kconfig        | 3 ++-

>  drivers/iommu/dma-iommu.c    | 1 +

>  drivers/iommu/virtio-iommu.c | 8 ++++++++

>  3 files changed, 11 insertions(+), 1 deletion(-)

> 

> diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig

> index aff8a4830dd1..07b7c25cbed8 100644

> --- a/drivers/iommu/Kconfig

> +++ b/drivers/iommu/Kconfig

> @@ -400,8 +400,9 @@ config HYPERV_IOMMU

>  config VIRTIO_IOMMU

>  	tristate "Virtio IOMMU driver"

>  	depends on VIRTIO

> -	depends on ARM64

> +	depends on (ARM64 || X86)

>  	select IOMMU_API

> +	select IOMMU_DMA

>  	select INTERVAL_TREE

>  	select ACPI_VIOT if ACPI

>  	help

> diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c

> index 175f8eaeb5b3..46ed43c400cf 100644

> --- a/drivers/iommu/dma-iommu.c

> +++ b/drivers/iommu/dma-iommu.c

> @@ -1332,6 +1332,7 @@ void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 dma_limit)

>  	 pr_warn("Failed to set up IOMMU for device %s; retaining platform DMA ops\n",

>  		 dev_name(dev));

>  }

> +EXPORT_SYMBOL_GPL(iommu_setup_dma_ops);

>  

>  static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev,

>  		phys_addr_t msi_addr, struct iommu_domain *domain)

> diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c

> index 29a397c2d12f..8be546a338e7 100644

> --- a/drivers/iommu/virtio-iommu.c

> +++ b/drivers/iommu/virtio-iommu.c

> @@ -1027,6 +1027,13 @@ static struct iommu_device *viommu_probe_device(struct device *dev)

>  	return ERR_PTR(ret);

>  }

>  

> +static void viommu_probe_finalize(struct device *dev)

> +{

> +#ifndef CONFIG_ARCH_HAS_SETUP_DMA_OPS

> +	iommu_setup_dma_ops(dev, 0, U64_MAX);

> +#endif

> +}

> +

>  static void viommu_release_device(struct device *dev)

>  {

>  	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);

> @@ -1063,6 +1070,7 @@ static struct iommu_ops viommu_ops = {

>  	.iova_to_phys		= viommu_iova_to_phys,

>  	.iotlb_sync		= viommu_iotlb_sync,

>  	.probe_device		= viommu_probe_device,

> +	.probe_finalize		= viommu_probe_finalize,

>  	.release_device		= viommu_release_device,

>  	.device_group		= viommu_device_group,

>  	.get_resv_regions	= viommu_get_resv_regions,

> -- 

> 2.31.1

Patch

diff --git a/drivers/iommu/Kconfig b/drivers/iommu/Kconfig
index aff8a4830dd1..07b7c25cbed8 100644
--- a/drivers/iommu/Kconfig
+++ b/drivers/iommu/Kconfig
@@ -400,8 +400,9 @@  config HYPERV_IOMMU
 config VIRTIO_IOMMU
 	tristate "Virtio IOMMU driver"
 	depends on VIRTIO
-	depends on ARM64
+	depends on (ARM64 || X86)
 	select IOMMU_API
+	select IOMMU_DMA
 	select INTERVAL_TREE
 	select ACPI_VIOT if ACPI
 	help
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 175f8eaeb5b3..46ed43c400cf 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -1332,6 +1332,7 @@  void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 dma_limit)
 	 pr_warn("Failed to set up IOMMU for device %s; retaining platform DMA ops\n",
 		 dev_name(dev));
 }
+EXPORT_SYMBOL_GPL(iommu_setup_dma_ops);
 
 static struct iommu_dma_msi_page *iommu_dma_get_msi_page(struct device *dev,
 		phys_addr_t msi_addr, struct iommu_domain *domain)
diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
index 29a397c2d12f..8be546a338e7 100644
--- a/drivers/iommu/virtio-iommu.c
+++ b/drivers/iommu/virtio-iommu.c
@@ -1027,6 +1027,13 @@  static struct iommu_device *viommu_probe_device(struct device *dev)
 	return ERR_PTR(ret);
 }
 
+static void viommu_probe_finalize(struct device *dev)
+{
+#ifndef CONFIG_ARCH_HAS_SETUP_DMA_OPS
+	iommu_setup_dma_ops(dev, 0, U64_MAX);
+#endif
+}
+
 static void viommu_release_device(struct device *dev)
 {
 	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
@@ -1063,6 +1070,7 @@  static struct iommu_ops viommu_ops = {
 	.iova_to_phys		= viommu_iova_to_phys,
 	.iotlb_sync		= viommu_iotlb_sync,
 	.probe_device		= viommu_probe_device,
+	.probe_finalize		= viommu_probe_finalize,
 	.release_device		= viommu_release_device,
 	.device_group		= viommu_device_group,
 	.get_resv_regions	= viommu_get_resv_regions,