iommu.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
From: Joerg Roedel <joro@8bytes.org>
To: iommu@lists.linux-foundation.org
Cc: Jean-Philippe Brucker <jean-philippe@linaro.org>,
	Joerg Roedel <jroedel@suse.de>, Will Deacon <will@kernel.org>,
	linux-arm-msm@vger.kernel.org, guohanjun@huawei.com,
	linux-kernel@vger.kernel.org,
	Bjorn Andersson <bjorn.andersson@linaro.org>,
	Thierry Reding <thierry.reding@gmail.com>,
	linux-mediatek@lists.infradead.org,
	Andy Gross <agross@kernel.org>,
	Sudeep Holla <sudeep.holla@arm.com>,
	Matthias Brugger <matthias.bgg@gmail.com>,
	Sean Paul <sean@poorly.run>, Robin Murphy <robin.murphy@arm.com>
Subject: [PATCH v3 15/15] iommu: Move fwspec->iommu_priv to struct dev_iommu
Date: Fri, 20 Mar 2020 10:14:14 +0100	[thread overview]
Message-ID: <20200320091414.3941-16-joro@8bytes.org> (raw)
In-Reply-To: <20200320091414.3941-1-joro@8bytes.org>

From: Joerg Roedel <jroedel@suse.de>

Move the pointer for iommu private data from struct iommu_fwspec to
struct dev_iommu.

Tested-by: Will Deacon <will@kernel.org> # arm-smmu
Reviewed-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
 include/linux/iommu.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 056900e75758..8c4d45fce042 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -369,6 +369,7 @@ struct iommu_fault_param {
  *
  * @fault_param: IOMMU detected device fault reporting data
  * @fwspec:	 IOMMU fwspec data
+ * @priv:	 IOMMU Driver private data
  *
  * TODO: migrate other per device data pointers under iommu_dev_data, e.g.
  *	struct iommu_group	*iommu_group;
@@ -377,6 +378,7 @@ struct dev_iommu {
 	struct mutex lock;
 	struct iommu_fault_param	*fault_param;
 	struct iommu_fwspec		*fwspec;
+	void				*priv;
 };
 
 int  iommu_device_register(struct iommu_device *iommu);
@@ -589,7 +591,6 @@ struct iommu_group *fsl_mc_device_group(struct device *dev);
 struct iommu_fwspec {
 	const struct iommu_ops	*ops;
 	struct fwnode_handle	*iommu_fwnode;
-	void			*iommu_priv;
 	u32			flags;
 	u32			num_pasid_bits;
 	unsigned int		num_ids;
@@ -629,12 +630,12 @@ static inline void dev_iommu_fwspec_set(struct device *dev,
 
 static inline void *dev_iommu_priv_get(struct device *dev)
 {
-	return dev->iommu->fwspec->iommu_priv;
+	return dev->iommu->priv;
 }
 
 static inline void dev_iommu_priv_set(struct device *dev, void *priv)
 {
-	dev->iommu->fwspec->iommu_priv = priv;
+	dev->iommu->priv = priv;
 }
 
 int iommu_probe_device(struct device *dev);
-- 
2.17.1

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

      parent reply	other threads:[~2020-03-20  9:14 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-20  9:13 [PATCH v3 00/15] iommu: Move iommu_fwspec out of 'struct device' Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 01/15] iommu: Define dev_iommu_fwspec_get() for !CONFIG_IOMMU_API Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 02/15] ACPI/IORT: Remove direct access of dev->iommu_fwspec Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 03/15] drm/msm/mdp5: " Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 04/15] iommu/tegra-gart: " Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 05/15] iommu: Rename struct iommu_param to dev_iommu Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 06/15] iommu: Move iommu_fwspec to struct dev_iommu Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 07/15] iommu/arm-smmu: Fix uninitilized variable warning Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 08/15] iommu: Introduce accessors for iommu private data Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 09/15] iommu/arm-smmu-v3: Use accessor functions " Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 10/15] iommu/arm-smmu: " Joerg Roedel
2020-03-23 16:02   ` Robin Murphy
2020-03-24 10:08     ` Joerg Roedel
2020-03-25 12:31       ` Robin Murphy
2020-03-26 15:08         ` Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 11/15] iommu/renesas: " Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 12/15] iommu/mediatek: " Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 13/15] iommu/qcom: " Joerg Roedel
2020-03-20  9:14 ` [PATCH v3 14/15] iommu/virtio: " Joerg Roedel
2020-03-20  9:14 ` Joerg Roedel [this message]

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=20200320091414.3941-16-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=matthias.bgg@gmail.com \
    --cc=robin.murphy@arm.com \
    --cc=sean@poorly.run \
    --cc=sudeep.holla@arm.com \
    --cc=thierry.reding@gmail.com \
    --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).