public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Lu Baolu <baolu.lu@linux.intel.com>
To: Joerg Roedel <joro@8bytes.org>, Jason Gunthorpe <jgg@nvidia.com>,
	Christoph Hellwig <hch@infradead.org>,
	Kevin Tian <kevin.tian@intel.com>, Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>,
	Jean-Philippe Brucker <jean-philippe@linaro.org>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
	Hector Martin <marcan@marcan.st>, Sven Peter <sven@svenpeter.dev>,
	Rob Clark <robdclark@gmail.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
	Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Yong Wu <yong.wu@mediatek.com>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Heiko Stuebner <heiko@sntech.de>,
	Matthew Rosato <mjrosato@linux.ibm.com>,
	Orson Zhai <orsonzhai@gmail.com>,
	Baolin Wang <baolin.wang@linux.alibaba.com>,
	Chunyan Zhang <zhang.lyra@gmail.com>,
	Chen-Yu Tsai <wens@csie.org>,
	Thierry Reding <thierry.reding@gmail.com>,
	iommu@lists.linux.dev, linux-kernel@vger.kernel.org,
	Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH v4 15/19] iommu/s390: Add set_platform_dma_ops callback
Date: Wed,  4 Jan 2023 20:57:21 +0800	[thread overview]
Message-ID: <20230104125725.271850-16-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <20230104125725.271850-1-baolu.lu@linux.intel.com>

This IOMMU driver doesn't support default domain. Add the implementation
of set_platform_dma_ops callback so that the IOMMU core could return the
DMA control. With the set_platform_dma implemented, there's no need for
detach_dev. Remove it to avoid dead code.

Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
 drivers/iommu/s390-iommu.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c
index ed33c6cce083..5591dab99446 100644
--- a/drivers/iommu/s390-iommu.c
+++ b/drivers/iommu/s390-iommu.c
@@ -144,13 +144,10 @@ static int s390_iommu_attach_device(struct iommu_domain *domain,
 	return 0;
 }
 
-static void s390_iommu_detach_device(struct iommu_domain *domain,
-				     struct device *dev)
+static void s390_iommu_set_platform_dma(struct device *dev)
 {
 	struct zpci_dev *zdev = to_zpci_dev(dev);
 
-	WARN_ON(zdev->s390_domain != to_s390_domain(domain));
-
 	__s390_iommu_detach_device(zdev);
 	zpci_dma_init_device(zdev);
 }
@@ -435,11 +432,11 @@ static const struct iommu_ops s390_iommu_ops = {
 	.probe_device = s390_iommu_probe_device,
 	.release_device = s390_iommu_release_device,
 	.device_group = generic_device_group,
+	.set_platform_dma_ops = s390_iommu_set_platform_dma,
 	.pgsize_bitmap = SZ_4K,
 	.get_resv_regions = s390_iommu_get_resv_regions,
 	.default_domain_ops = &(const struct iommu_domain_ops) {
 		.attach_dev	= s390_iommu_attach_device,
-		.detach_dev	= s390_iommu_detach_device,
 		.map_pages	= s390_iommu_map_pages,
 		.unmap_pages	= s390_iommu_unmap_pages,
 		.flush_iotlb_all = s390_iommu_flush_iotlb_all,
-- 
2.34.1


  parent reply	other threads:[~2023-01-04 13:09 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-04 12:57 [PATCH v4 00/19] iommu: Retire detach_dev callback Lu Baolu
2023-01-04 12:57 ` [PATCH v4 01/19] iommu/amd: Remove " Lu Baolu
2023-01-09 11:47   ` Vasant Hegde
2023-01-04 12:57 ` [PATCH v4 02/19] iommu/apple-dart: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 03/19] iommu/qcom: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 04/19] iommu/exynos: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 05/19] iommu/ipmmu: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 06/19] iommu/mtk: " Lu Baolu
2023-01-04 13:14   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 07/19] iommu/rockchip: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 08/19] iommu/sprd: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 09/19] iommu/sun50i: " Lu Baolu
2023-01-04 12:57 ` [PATCH v4 10/19] iommu: Add set_platform_dma_ops iommu ops Lu Baolu
2023-01-04 13:17   ` Jason Gunthorpe
2023-01-05  5:58     ` Baolu Lu
2023-01-05 13:15       ` Jason Gunthorpe
2023-01-06  6:07         ` Baolu Lu
2023-01-06 14:26           ` Jason Gunthorpe
2023-01-07  2:48             ` Baolu Lu
2023-01-09 12:17               ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 11/19] iommu/fsl_pamu: Add set_platform_dma_ops callback Lu Baolu
2023-01-04 13:19   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 12/19] iommu/msm: " Lu Baolu
2023-01-04 13:19   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 13/19] iommu/mtk_v1: " Lu Baolu
2023-01-04 13:19   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 14/19] iommu/omap: " Lu Baolu
2023-01-04 13:19   ` Jason Gunthorpe
2023-01-04 12:57 ` Lu Baolu [this message]
2023-01-04 13:20   ` [PATCH v4 15/19] iommu/s390: " Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 16/19] iommu/gart: " Lu Baolu
2023-01-04 13:20   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 17/19] iommu/tegra: " Lu Baolu
2023-01-04 13:20   ` Jason Gunthorpe
2023-01-04 12:57 ` [PATCH v4 18/19] iommu: Remove deferred attach check from __iommu_detach_device() Lu Baolu
2023-01-04 12:57 ` [PATCH v4 19/19] iommu: Remove detach_dev callback Lu Baolu
2023-01-04 13:22   ` Jason Gunthorpe
2023-01-05  6:41     ` Baolu Lu

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=20230104125725.271850-16-baolu.lu@linux.intel.com \
    --to=baolu.lu@linux.intel.com \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=hch@infradead.org \
    --cc=heiko@sntech.de \
    --cc=iommu@lists.linux.dev \
    --cc=jean-philippe@linaro.org \
    --cc=jgg@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=kevin.tian@intel.com \
    --cc=krzysztof.kozlowski@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=marcan@marcan.st \
    --cc=matthias.bgg@gmail.com \
    --cc=mjrosato@linux.ibm.com \
    --cc=orsonzhai@gmail.com \
    --cc=robdclark@gmail.com \
    --cc=robin.murphy@arm.com \
    --cc=suravee.suthikulpanit@amd.com \
    --cc=sven@svenpeter.dev \
    --cc=thierry.reding@gmail.com \
    --cc=wens@csie.org \
    --cc=will@kernel.org \
    --cc=yong.wu@mediatek.com \
    --cc=zhang.lyra@gmail.com \
    /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