From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jean-Philippe Brucker <jean-philippe@linaro.org>
Cc: rjw@rjwysocki.net, lenb@kernel.org, joro@8bytes.org,
will@kernel.org, catalin.marinas@arm.com,
baolu.lu@linux.intel.com, dwmw2@infradead.org,
linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org,
virtualization@lists.linux-foundation.org,
linux-arm-kernel@lists.infradead.org, eric.auger@redhat.com,
sebastien.boeuf@intel.com, robin.murphy@arm.com,
kevin.tian@intel.com, lorenzo.pieralisi@arm.com,
guohanjun@huawei.com, sudeep.holla@arm.com
Subject: Re: [PATCH v2 6/6] iommu/virtio: Enable x86 support
Date: Fri, 14 May 2021 08:34:13 -0400 [thread overview]
Message-ID: <20210514083402-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20210423113836.3974972-7-jean-philippe@linaro.org>
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-05-14 12:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-23 11:38 [PATCH v2 0/6] Add support for ACPI VIOT Jean-Philippe Brucker
2021-04-23 11:38 ` [PATCH v2 1/6] ACPI: arm64: Move DMA setup operations out of IORT Jean-Philippe Brucker
2021-04-23 11:38 ` [PATCH v2 2/6] ACPI: Move IOMMU setup code " Jean-Philippe Brucker
2021-05-21 16:42 ` Rafael J. Wysocki
2021-05-26 10:05 ` Jean-Philippe Brucker
2021-04-23 11:38 ` [PATCH v2 3/6] ACPI: Add driver for the VIOT table Jean-Philippe Brucker
2021-05-21 16:39 ` Rafael J. Wysocki
2021-05-26 10:04 ` Jean-Philippe Brucker
2021-04-23 11:38 ` [PATCH v2 4/6] iommu/dma: Pass address limit rather than size to iommu_setup_dma_ops() Jean-Philippe Brucker
2021-04-23 11:38 ` [PATCH v2 5/6] iommu/dma: Simplify calls " Jean-Philippe Brucker
2021-04-23 11:38 ` [PATCH v2 6/6] iommu/virtio: Enable x86 support Jean-Philippe Brucker
2021-05-14 12:34 ` Michael S. Tsirkin [this message]
2021-05-14 12:35 ` [PATCH v2 0/6] Add support for ACPI VIOT Michael S. Tsirkin
2021-05-17 11:51 ` Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210514083402-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=baolu.lu@linux.intel.com \
--cc=catalin.marinas@arm.com \
--cc=dwmw2@infradead.org \
--cc=eric.auger@redhat.com \
--cc=guohanjun@huawei.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=joro@8bytes.org \
--cc=kevin.tian@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=rjw@rjwysocki.net \
--cc=robin.murphy@arm.com \
--cc=sebastien.boeuf@intel.com \
--cc=sudeep.holla@arm.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).