From: Lu Baolu <baolu.lu@linux.intel.com>
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>,
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: baolu.lu@linux.intel.com, Daniel Drake <drake@endlessm.com>,
jonathan.derrick@intel.com, iommu@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org,
linux-arm-msm@vger.kernel.org,
linux-mediatek@lists.infradead.org,
linux-rockchip@lists.infradead.org, linux-s390@vger.kernel.org,
linux-tegra@vger.kernel.org,
virtualization@lists.linux-foundation.org,
Joerg Roedel <jroedel@suse.de>
Subject: Re: [PATCH v3 16/34] iommu/vt-d: Convert to probe/release_device() call-backs
Date: Thu, 30 Apr 2020 08:07:57 +0800 [thread overview]
Message-ID: <7ceca31f-cf24-d4f8-04fd-74691dd3c11a@linux.intel.com> (raw)
In-Reply-To: <20200429133712.31431-17-joro@8bytes.org>
On 2020/4/29 21:36, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@suse.de>
>
> Convert the Intel 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>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Best regards,
baolu
> ---
> drivers/iommu/intel-iommu.c | 67 ++++---------------------------------
> 1 file changed, 6 insertions(+), 61 deletions(-)
>
> diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
> index b9f905a55dda..b906727f5b85 100644
> --- a/drivers/iommu/intel-iommu.c
> +++ b/drivers/iommu/intel-iommu.c
> @@ -5781,78 +5781,27 @@ static bool intel_iommu_capable(enum iommu_cap cap)
> return false;
> }
>
> -static int intel_iommu_add_device(struct device *dev)
> +static struct iommu_device *intel_iommu_probe_device(struct device *dev)
> {
> - struct dmar_domain *dmar_domain;
> - struct iommu_domain *domain;
> struct intel_iommu *iommu;
> - struct iommu_group *group;
> u8 bus, devfn;
> - int ret;
>
> iommu = device_to_iommu(dev, &bus, &devfn);
> if (!iommu)
> - return -ENODEV;
> -
> - iommu_device_link(&iommu->iommu, dev);
> + return ERR_PTR(-ENODEV);
>
> if (translation_pre_enabled(iommu))
> dev->archdata.iommu = DEFER_DEVICE_DOMAIN_INFO;
>
> - group = iommu_group_get_for_dev(dev);
> -
> - if (IS_ERR(group)) {
> - ret = PTR_ERR(group);
> - goto unlink;
> - }
> -
> - iommu_group_put(group);
> -
> - domain = iommu_get_domain_for_dev(dev);
> - dmar_domain = to_dmar_domain(domain);
> - if (domain->type == IOMMU_DOMAIN_DMA) {
> - if (device_def_domain_type(dev) == IOMMU_DOMAIN_IDENTITY) {
> - ret = iommu_request_dm_for_dev(dev);
> - if (ret) {
> - dmar_remove_one_dev_info(dev);
> - dmar_domain->flags |= DOMAIN_FLAG_LOSE_CHILDREN;
> - domain_add_dev_info(si_domain, dev);
> - dev_info(dev,
> - "Device uses a private identity domain.\n");
> - }
> - }
> - } else {
> - if (device_def_domain_type(dev) == IOMMU_DOMAIN_DMA) {
> - ret = iommu_request_dma_domain_for_dev(dev);
> - if (ret) {
> - dmar_remove_one_dev_info(dev);
> - dmar_domain->flags |= DOMAIN_FLAG_LOSE_CHILDREN;
> - if (!get_private_domain_for_dev(dev)) {
> - dev_warn(dev,
> - "Failed to get a private domain.\n");
> - ret = -ENOMEM;
> - goto unlink;
> - }
> -
> - dev_info(dev,
> - "Device uses a private dma domain.\n");
> - }
> - }
> - }
> -
> if (device_needs_bounce(dev)) {
> dev_info(dev, "Use Intel IOMMU bounce page dma_ops\n");
> set_dma_ops(dev, &bounce_dma_ops);
> }
>
> - return 0;
> -
> -unlink:
> - iommu_device_unlink(&iommu->iommu, dev);
> - return ret;
> + return &iommu->iommu;
> }
>
> -static void intel_iommu_remove_device(struct device *dev)
> +static void intel_iommu_release_device(struct device *dev)
> {
> struct intel_iommu *iommu;
> u8 bus, devfn;
> @@ -5863,10 +5812,6 @@ static void intel_iommu_remove_device(struct device *dev)
>
> dmar_remove_one_dev_info(dev);
>
> - iommu_group_remove_device(dev);
> -
> - iommu_device_unlink(&iommu->iommu, dev);
> -
> if (device_needs_bounce(dev))
> set_dma_ops(dev, NULL);
> }
> @@ -6198,8 +6143,8 @@ const struct iommu_ops intel_iommu_ops = {
> .map = intel_iommu_map,
> .unmap = intel_iommu_unmap,
> .iova_to_phys = intel_iommu_iova_to_phys,
> - .add_device = intel_iommu_add_device,
> - .remove_device = intel_iommu_remove_device,
> + .probe_device = intel_iommu_probe_device,
> + .release_device = intel_iommu_release_device,
> .get_resv_regions = intel_iommu_get_resv_regions,
> .put_resv_regions = generic_iommu_put_resv_regions,
> .apply_resv_region = intel_iommu_apply_resv_region,
>
next prev parent reply other threads:[~2020-04-30 0:08 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 13:36 [PATCH v3 00/34] iommu: Move iommu_group setup to IOMMU core code Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 01/34] iommu: Move default domain allocation to separate function Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 02/34] iommu: Add def_domain_type() callback in iommu_ops Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 03/34] iommu/amd: Implement iommu_ops->def_domain_type call-back Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 04/34] iommu/vt-d: Wire up iommu_ops->def_domain_type Joerg Roedel
2020-04-29 23:58 ` Lu Baolu
2020-04-29 13:36 ` [PATCH v3 05/34] iommu/amd: Remove dma_mask check from check_device() Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 06/34] iommu/amd: Return -ENODEV in add_device when device is not handled by IOMMU Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 07/34] iommu: Add probe_device() and release_device() call-backs Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 08/34] iommu: Move default domain allocation to iommu_probe_device() Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 09/34] iommu: Keep a list of allocated groups in __iommu_probe_device() Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 10/34] iommu: Move new probe_device path to separate function Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 11/34] iommu: Split off default domain allocation from group assignment Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 12/34] iommu: Move iommu_group_create_direct_mappings() out of iommu_group_add_device() Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 13/34] iommu: Export bus_iommu_probe() and make is safe for re-probing Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 14/34] iommu/amd: Remove dev_data->passthrough Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 15/34] iommu/amd: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 16/34] iommu/vt-d: " Joerg Roedel
2020-04-30 0:07 ` Lu Baolu [this message]
2020-04-29 13:36 ` [PATCH v3 17/34] iommu/arm-smmu: " Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 18/34] iommu/pamu: " Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 19/34] iommu/s390: " Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 20/34] iommu/virtio: " Joerg Roedel
2020-04-29 13:36 ` [PATCH v3 21/34] iommu/msm: " Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 22/34] iommu/mediatek: " Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 23/34] iommu/mediatek-v1 " Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 24/34] iommu/qcom: " Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 25/34] iommu/rockchip: " Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 26/34] iommu/tegra: " Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 27/34] iommu/renesas: " Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 28/34] iommu/omap: Remove orphan_dev tracking Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 29/34] iommu/omap: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 30/34] iommu/exynos: Use first SYSMMU in controllers list for IOMMU core Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 31/34] iommu/exynos: Convert to probe/release_device() call-backs Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 32/34] iommu: Remove add_device()/remove_device() code-paths Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 33/34] iommu: Move more initialization to __iommu_probe_device() Joerg Roedel
2020-04-29 13:37 ` [PATCH v3 34/34] iommu: Unexport iommu_group_get_for_dev() Joerg Roedel
2020-05-05 12:37 ` [PATCH v3 00/34] iommu: Move iommu_group setup to IOMMU core code Joerg Roedel
2020-07-01 0:40 ` Qian Cai
2020-07-01 10:53 ` Robin Murphy
2020-07-04 0:17 ` Qian Cai
2020-07-09 15:24 ` Joerg Roedel
[not found] ` <20200704090957.8892-1-hdanton@sina.com>
2020-07-09 15:23 ` [PATCH v3 07/34] iommu: Add probe_device() and release_device() call-backs 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=7ceca31f-cf24-d4f8-04fd-74691dd3c11a@linux.intel.com \
--to=baolu.lu@linux.intel.com \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=drake@endlessm.com \
--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=jonathan.derrick@intel.com \
--cc=jonathanh@nvidia.com \
--cc=joro@8bytes.org \
--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).