From: Joerg Roedel <joro@8bytes.org>
To: iommu@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Joerg Roedel <jroedel@suse.de>,
Hiroshi Doyu <hdoyu@nvidia.com>
Subject: [PATCH 08/12] iommu/tegra: Convert to iommu_capable() API function
Date: Fri, 5 Sep 2014 12:53:00 +0200 [thread overview]
Message-ID: <1409914384-21191-9-git-send-email-joro@8bytes.org> (raw)
In-Reply-To: <1409914384-21191-1-git-send-email-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
Cc: Hiroshi Doyu <hdoyu@nvidia.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/tegra-gart.c | 7 +++----
drivers/iommu/tegra-smmu.c | 7 +++----
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c
index b10a8ec..6f44ebb 100644
--- a/drivers/iommu/tegra-gart.c
+++ b/drivers/iommu/tegra-gart.c
@@ -303,13 +303,13 @@ static phys_addr_t gart_iommu_iova_to_phys(struct iommu_domain *domain,
return pa;
}
-static int gart_iommu_domain_has_cap(struct iommu_domain *domain,
- unsigned long cap)
+static bool gart_iommu_capable(enum iommu_cap cap)
{
- return 0;
+ return false;
}
static const struct iommu_ops gart_iommu_ops = {
+ .capable = gart_iommu_capable,
.domain_init = gart_iommu_domain_init,
.domain_destroy = gart_iommu_domain_destroy,
.attach_dev = gart_iommu_attach_dev,
@@ -317,7 +317,6 @@ static const struct iommu_ops gart_iommu_ops = {
.map = gart_iommu_map,
.unmap = gart_iommu_unmap,
.iova_to_phys = gart_iommu_iova_to_phys,
- .domain_has_cap = gart_iommu_domain_has_cap,
.pgsize_bitmap = GART_IOMMU_PGSIZES,
};
diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c
index 3ded389..05d14e1 100644
--- a/drivers/iommu/tegra-smmu.c
+++ b/drivers/iommu/tegra-smmu.c
@@ -780,10 +780,9 @@ static phys_addr_t smmu_iommu_iova_to_phys(struct iommu_domain *domain,
return PFN_PHYS(pfn);
}
-static int smmu_iommu_domain_has_cap(struct iommu_domain *domain,
- unsigned long cap)
+static bool smmu_iommu_capable(enum iommu_cap cap)
{
- return 0;
+ return false;
}
static int smmu_iommu_attach_dev(struct iommu_domain *domain,
@@ -949,6 +948,7 @@ static void smmu_iommu_domain_destroy(struct iommu_domain *domain)
}
static const struct iommu_ops smmu_iommu_ops = {
+ .capable = smmu_iommu_capable,
.domain_init = smmu_iommu_domain_init,
.domain_destroy = smmu_iommu_domain_destroy,
.attach_dev = smmu_iommu_attach_dev,
@@ -956,7 +956,6 @@ static const struct iommu_ops smmu_iommu_ops = {
.map = smmu_iommu_map,
.unmap = smmu_iommu_unmap,
.iova_to_phys = smmu_iommu_iova_to_phys,
- .domain_has_cap = smmu_iommu_domain_has_cap,
.pgsize_bitmap = SMMU_IOMMU_PGSIZES,
};
--
1.9.1
next prev parent reply other threads:[~2014-09-05 10:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-05 10:52 [PATCH 00/12] iommu: Convert iommu_domain_has_cap() to iommu_capable() Joerg Roedel
2014-09-05 10:52 ` [PATCH 01/12] iommu: Introduce iommu_capable API function Joerg Roedel
2014-09-05 10:52 ` [PATCH 02/12] iommu: Convert iommu-caps from define to enum Joerg Roedel
2014-09-05 10:52 ` [PATCH 03/12] iommu/amd: Convert to iommu_capable() API function Joerg Roedel
2014-09-05 10:52 ` [PATCH 04/12] iommu/arm-smmu: " Joerg Roedel
2014-09-08 16:51 ` Will Deacon
2014-09-09 13:57 ` Joerg Roedel
2014-09-17 8:53 ` [PATCH 04/13 v2] iommu/arm-smmu: Convert to iommu_capable() API function function Joerg Roedel
2014-09-19 16:42 ` Will Deacon
2014-09-22 15:36 ` Joerg Roedel
2014-09-05 10:52 ` [PATCH 05/12] iommu/fsl: Convert to iommu_capable() API function Joerg Roedel
2014-09-09 18:38 ` Varun Sethi
2014-09-05 10:52 ` [PATCH 06/12] iommu/vt-d: " Joerg Roedel
2014-09-05 10:52 ` [PATCH 07/12] iommu/msm: " Joerg Roedel
2014-09-05 10:53 ` Joerg Roedel [this message]
2014-09-05 10:53 ` [PATCH 09/12] kvm: iommu: Convert to use new " Joerg Roedel
2014-09-17 8:29 ` Joerg Roedel
2014-09-05 10:53 ` [PATCH 10/12] vfio: " Joerg Roedel
2014-09-08 23:14 ` Alex Williamson
2014-09-05 10:53 ` [PATCH 11/12] IB/usnic: " Joerg Roedel
2014-09-17 8:30 ` Joerg Roedel
2014-09-05 10:53 ` [PATCH 12/12] iommu: Remove iommu_domain_has_cap() " 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=1409914384-21191-9-git-send-email-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=hdoyu@nvidia.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.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).