From: Joerg Roedel <joro@8bytes.org>
To: iommu@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-mediatek@lists.infradead.org,
virtualization@lists.linux-foundation.org,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Hanjun Guo <guohanjun@huawei.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Rob Clark <robdclark@gmail.com>, Sean Paul <sean@poorly.run>,
Will Deacon <will@kernel.org>,
Robin Murphy <robin.murphy@arm.com>,
Joerg Roedel <joro@8bytes.org>,
Matthias Brugger <matthias.bgg@gmail.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jean-Philippe Brucker <jean-philippe@linaro.org>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Joerg Roedel <jroedel@suse.de>
Subject: [PATCH 09/15] iommu/arm-smmu-v3: Use accessor functions for iommu private data
Date: Tue, 10 Mar 2020 10:12:23 +0100 [thread overview]
Message-ID: <20200310091229.29830-10-joro@8bytes.org> (raw)
In-Reply-To: <20200310091229.29830-1-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
Make use of dev_iommu_priv_set/get() functions in the code.
Tested-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/arm-smmu-v3.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/iommu/arm-smmu-v3.c b/drivers/iommu/arm-smmu-v3.c
index aa3ac2a03807..2b68498dfb66 100644
--- a/drivers/iommu/arm-smmu-v3.c
+++ b/drivers/iommu/arm-smmu-v3.c
@@ -2659,7 +2659,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev)
if (!fwspec)
return -ENOENT;
- master = fwspec->iommu_priv;
+ master = dev_iommu_priv_get(dev);
smmu = master->smmu;
arm_smmu_detach_dev(master);
@@ -2795,7 +2795,7 @@ static int arm_smmu_add_device(struct device *dev)
if (!fwspec || fwspec->ops != &arm_smmu_ops)
return -ENODEV;
- if (WARN_ON_ONCE(fwspec->iommu_priv))
+ if (WARN_ON_ONCE(dev_iommu_priv_get(dev)))
return -EBUSY;
smmu = arm_smmu_get_by_fwnode(fwspec->iommu_fwnode);
@@ -2810,7 +2810,7 @@ static int arm_smmu_add_device(struct device *dev)
master->smmu = smmu;
master->sids = fwspec->ids;
master->num_sids = fwspec->num_ids;
- fwspec->iommu_priv = master;
+ dev_iommu_priv_set(dev, master);
/* Check the SIDs are in range of the SMMU and our stream table */
for (i = 0; i < master->num_sids; i++) {
@@ -2852,7 +2852,7 @@ static int arm_smmu_add_device(struct device *dev)
iommu_device_unlink(&smmu->iommu, dev);
err_free_master:
kfree(master);
- fwspec->iommu_priv = NULL;
+ dev_iommu_priv_set(dev, NULL);
return ret;
}
@@ -2865,7 +2865,7 @@ static void arm_smmu_remove_device(struct device *dev)
if (!fwspec || fwspec->ops != &arm_smmu_ops)
return;
- master = fwspec->iommu_priv;
+ master = dev_iommu_priv_get(dev);
smmu = master->smmu;
arm_smmu_detach_dev(master);
iommu_group_remove_device(dev);
--
2.17.1
next prev parent reply other threads:[~2020-03-10 9:13 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-10 9:12 [PATCH 00/15 v2] iommu: Move iommu_fwspec out of 'struct device' Joerg Roedel
2020-03-10 9:12 ` [PATCH 01/15] iommu: Define dev_iommu_fwspec_get() for !CONFIG_IOMMU_API Joerg Roedel
2020-03-16 15:39 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 02/15] ACPI/IORT: Remove direct access of dev->iommu_fwspec Joerg Roedel
2020-03-16 15:40 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 03/15] drm/msm/mdp5: " Joerg Roedel
2020-03-16 15:42 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 04/15] iommu/tegra-gart: " Joerg Roedel
2020-03-16 15:42 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 05/15] iommu: Rename struct iommu_param to dev_iommu Joerg Roedel
2020-03-16 15:45 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 06/15] iommu: Move iommu_fwspec to struct dev_iommu Joerg Roedel
2020-03-16 15:46 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 07/15] iommu/arm-smmu: Fix uninitilized variable warning Joerg Roedel
2020-03-16 15:47 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 08/15] iommu: Introduce accessors for iommu private data Joerg Roedel
2020-03-16 15:47 ` Jean-Philippe Brucker
2020-03-10 9:12 ` Joerg Roedel [this message]
2020-03-16 15:49 ` [PATCH 09/15] iommu/arm-smmu-v3: Use accessor functions " Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 10/15] iommu/arm-smmu: " Joerg Roedel
2020-03-16 17:55 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 11/15] iommu/renesas: " Joerg Roedel
2020-03-16 15:50 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 12/15] iommu/mediatek: " Joerg Roedel
2020-03-16 15:51 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 13/15] iommu/qcom: " Joerg Roedel
2020-03-16 15:52 ` Jean-Philippe Brucker
2020-03-19 13:11 ` Joerg Roedel
2020-03-10 9:12 ` [PATCH 14/15] iommu/virtio: " Joerg Roedel
2020-03-16 15:56 ` Jean-Philippe Brucker
2020-03-10 9:12 ` [PATCH 15/15] iommu: Move fwspec->iommu_priv to struct dev_iommu Joerg Roedel
2020-03-16 15:57 ` Jean-Philippe Brucker
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=20200310091229.29830-10-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=guohanjun@huawei.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=jroedel@suse.de \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=matthias.bgg@gmail.com \
--cc=robdclark@gmail.com \
--cc=robin.murphy@arm.com \
--cc=sean@poorly.run \
--cc=sudeep.holla@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).