iommu.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Joerg Roedel <joro@8bytes.org>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Kukjin Kim <kgene@kernel.org>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	David Woodhouse <dwmw2@infradead.org>,
	Lu Baolu <baolu.lu@linux.intel.com>,
	Andy Gross <agross@kernel.org>,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Rob Clark <robdclark@gmail.com>, Heiko Stuebner <heiko@sntech.de>,
	Gerald Schaefer <gerald.schaefer@de.ibm.com>,
	Thierry Reding <thierry.reding@gmail.com>,
	Jonathan Hunter <jonathanh@nvidia.com>,
	Jean-Philippe Brucker <jean-philippe@linaro.org>
Cc: linux-s390@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
	linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
	virtualization@lists.linux-foundation.org,
	linux-rockchip@lists.infradead.org,
	iommu@lists.linux-foundation.org, Joerg Roedel <jroedel@suse.de>,
	linux-mediatek@lists.infradead.org, linux-tegra@vger.kernel.org
Subject: [PATCH v2 20/33] iommu/virtio: Convert to probe/release_device() call-backs
Date: Tue, 14 Apr 2020 15:15:29 +0200	[thread overview]
Message-ID: <20200414131542.25608-21-joro@8bytes.org> (raw)
In-Reply-To: <20200414131542.25608-1-joro@8bytes.org>

From: Joerg Roedel <jroedel@suse.de>

Convert the VirtIO IOMMU driver to use the probe_device() and
release_device() call-backs of iommu_ops, so that the iommu core code
does the group and sysfs setup.

Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 drivers/iommu/virtio-iommu.c | 41 +++++++++---------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/drivers/iommu/virtio-iommu.c b/drivers/iommu/virtio-iommu.c
index d5cac4f46ca5..bda300c2a438 100644
--- a/drivers/iommu/virtio-iommu.c
+++ b/drivers/iommu/virtio-iommu.c
@@ -865,24 +865,23 @@ static struct viommu_dev *viommu_get_by_fwnode(struct fwnode_handle *fwnode)
 	return dev ? dev_to_virtio(dev)->priv : NULL;
 }
 
-static int viommu_add_device(struct device *dev)
+static struct iommu_device *viommu_probe_device(struct device *dev)
 {
 	int ret;
-	struct iommu_group *group;
 	struct viommu_endpoint *vdev;
 	struct viommu_dev *viommu = NULL;
 	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
 
 	if (!fwspec || fwspec->ops != &viommu_ops)
-		return -ENODEV;
+		return ERR_PTR(-ENODEV);
 
 	viommu = viommu_get_by_fwnode(fwspec->iommu_fwnode);
 	if (!viommu)
-		return -ENODEV;
+		return ERR_PTR(-ENODEV);
 
 	vdev = kzalloc(sizeof(*vdev), GFP_KERNEL);
 	if (!vdev)
-		return -ENOMEM;
+		return ERR_PTR(-ENOMEM);
 
 	vdev->dev = dev;
 	vdev->viommu = viommu;
@@ -896,45 +895,25 @@ static int viommu_add_device(struct device *dev)
 			goto err_free_dev;
 	}
 
-	ret = iommu_device_link(&viommu->iommu, dev);
-	if (ret)
-		goto err_free_dev;
+	return &viommu->iommu;
 
-	/*
-	 * Last step creates a default domain and attaches to it. Everything
-	 * must be ready.
-	 */
-	group = iommu_group_get_for_dev(dev);
-	if (IS_ERR(group)) {
-		ret = PTR_ERR(group);
-		goto err_unlink_dev;
-	}
-
-	iommu_group_put(group);
-
-	return PTR_ERR_OR_ZERO(group);
-
-err_unlink_dev:
-	iommu_device_unlink(&viommu->iommu, dev);
 err_free_dev:
 	generic_iommu_put_resv_regions(dev, &vdev->resv_regions);
 	kfree(vdev);
 
-	return ret;
+	return ERR_PTR(ret);
 }
 
-static void viommu_remove_device(struct device *dev)
+static void viommu_release_device(struct device *dev)
 {
-	struct viommu_endpoint *vdev;
 	struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev);
+	struct viommu_endpoint *vdev;
 
 	if (!fwspec || fwspec->ops != &viommu_ops)
 		return;
 
 	vdev = dev_iommu_priv_get(dev);
 
-	iommu_group_remove_device(dev);
-	iommu_device_unlink(&vdev->viommu->iommu, dev);
 	generic_iommu_put_resv_regions(dev, &vdev->resv_regions);
 	kfree(vdev);
 }
@@ -960,8 +939,8 @@ static struct iommu_ops viommu_ops = {
 	.unmap			= viommu_unmap,
 	.iova_to_phys		= viommu_iova_to_phys,
 	.iotlb_sync		= viommu_iotlb_sync,
-	.add_device		= viommu_add_device,
-	.remove_device		= viommu_remove_device,
+	.probe_device		= viommu_probe_device,
+	.release_device		= viommu_release_device,
 	.device_group		= viommu_device_group,
 	.get_resv_regions	= viommu_get_resv_regions,
 	.put_resv_regions	= generic_iommu_put_resv_regions,
-- 
2.17.1

_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

  parent reply	other threads:[~2020-04-14 13:16 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <CGME20200414131600eucas1p16f1ff6aedb780eb795a770dc08e5dec5@eucas1p1.samsung.com>
2020-04-14 13:15 ` [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 01/33] iommu: Move default domain allocation to separate function Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 02/33] iommu: Add def_domain_type() callback in iommu_ops Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 03/33] iommu/amd: Implement iommu_ops->def_domain_type call-back Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 04/33] iommu/vt-d: Wire up iommu_ops->def_domain_type Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 05/33] iommu/amd: Remove dma_mask check from check_device() Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 06/33] iommu/amd: Return -ENODEV in add_device when device is not handled by IOMMU Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 07/33] iommu: Add probe_device() and remove_device() call-backs Joerg Roedel
2020-04-15  6:36     ` Lu Baolu
2020-04-15 12:31       ` Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 08/33] iommu: Move default domain allocation to iommu_probe_device() Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 09/33] iommu: Keep a list of allocated groups in __iommu_probe_device() Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 10/33] iommu: Move new probe_device path to separate function Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 11/33] iommu: Split off default domain allocation from group assignment Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 12/33] iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device() Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 13/33] iommu: Export bus_iommu_probe() and make is safe for re-probing Joerg Roedel
2020-04-15  6:10     ` Lu Baolu
2020-04-15 12:29       ` Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 14/33] iommu/amd: Remove dev_data->passthrough Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 15/33] iommu/amd: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 16/33] iommu/vt-d: " Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 17/33] iommu/arm-smmu: " Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 18/33] iommu/pamu: " Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 19/33] iommu/s390: " Joerg Roedel
2020-04-14 13:15   ` Joerg Roedel [this message]
2020-04-14 13:15   ` [PATCH v2 21/33] iommu/msm: " Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 22/33] iommu/mediatek: " Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 23/33] iommu/mediatek-v1 " Joerg Roedel
2020-05-15  7:44     ` Yong Wu
2020-05-15 10:07       ` Joerg Roedel
2020-05-18  6:51         ` Yong Wu
2020-05-18 13:55           ` Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 24/33] iommu/qcom: " Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 25/33] iommu/rockchip: " Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 26/33] iommu/tegra: " Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 27/33] iommu/renesas: " Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 28/33] iommu/omap: Remove orphan_dev tracking Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 29/33] iommu/omap: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 30/33] iommu/exynos: Use first SYSMMU in controllers list for IOMMU core Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 31/33] iommu/exynos: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 32/33] iommu: Remove add_device()/remove_device() code-paths Joerg Roedel
2020-04-14 13:15   ` [PATCH v2 33/33] iommu: Unexport iommu_group_get_for_dev() Joerg Roedel
2020-04-16 11:48   ` [PATCH v2 00/33] iommu: Move iommu_group setup to IOMMU core code Marek Szyprowski
2020-04-17  1:03   ` Daniel Drake
2020-04-17  1:14     ` Derrick, Jonathan
2020-04-18 12:44       ` joro
2020-05-29 22:16   ` Jerry Snitselaar
2020-06-01 10:42     ` Jerry Snitselaar
2020-06-01 13:17       ` Jerry Snitselaar
2020-06-01 23:20         ` Lu Baolu
2020-06-01 23:16       ` Lu Baolu
2020-06-02  0:02         ` Jerry Snitselaar
2020-06-02 14:23           ` Joerg Roedel
2020-06-02 16:38             ` Jerry Snitselaar
2020-06-02 21:17               ` Jerry Snitselaar

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=20200414131542.25608-21-joro@8bytes.org \
    --to=joro@8bytes.org \
    --cc=agross@kernel.org \
    --cc=baolu.lu@linux.intel.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=dwmw2@infradead.org \
    --cc=gerald.schaefer@de.ibm.com \
    --cc=heiko@sntech.de \
    --cc=iommu@lists.linux-foundation.org \
    --cc=jean-philippe@linaro.org \
    --cc=jonathanh@nvidia.com \
    --cc=jroedel@suse.de \
    --cc=kgene@kernel.org \
    --cc=krzk@kernel.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=matthias.bgg@gmail.com \
    --cc=robdclark@gmail.com \
    --cc=robin.murphy@arm.com \
    --cc=thierry.reding@gmail.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).