From: Thierry Reding <thierry.reding@gmail.com>
To: Ben Skeggs <bskeggs@redhat.com>
Cc: Joerg Roedel <jroedel@suse.de>,
nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
linux-tegra@vger.kernel.org
Subject: [PATCH v3 2/9] iommu: Add dummy dev_iommu_fwspec_get() helper
Date: Mon, 9 Dec 2019 12:59:58 +0100 [thread overview]
Message-ID: <20191209120005.2254786-3-thierry.reding@gmail.com> (raw)
In-Reply-To: <20191209120005.2254786-1-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia.com>
This dummy implementation is useful to avoid a dependency on the
IOMMU_API Kconfig symbol in drivers that can optionally use the IOMMU
API.
In order to fully use this, also move the struct iommu_fwspec definition
out of the IOMMU_API protected region.
Acked-by: Joerg Roedel <jroedel@suse.de>
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
Changes in v3:
- remove duplicate struct iommu_fwspec definition
include/linux/iommu.h | 48 +++++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 216e919875ea..bb28453bb09c 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -190,6 +190,27 @@ struct iommu_sva_ops {
iommu_mm_exit_handler_t mm_exit;
};
+/**
+ * struct iommu_fwspec - per-device IOMMU instance data
+ * @ops: ops for this device's IOMMU
+ * @iommu_fwnode: firmware handle for this device's IOMMU
+ * @iommu_priv: IOMMU driver private data for this device
+ * @flags: IOMMU flags associated with this device
+ * @num_ids: number of associated device IDs
+ * @ids: IDs which this device may present to the IOMMU
+ */
+struct iommu_fwspec {
+ const struct iommu_ops *ops;
+ struct fwnode_handle *iommu_fwnode;
+ void *iommu_priv;
+ u32 flags;
+ unsigned int num_ids;
+ u32 ids[1];
+};
+
+/* ATS is supported */
+#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0)
+
#ifdef CONFIG_IOMMU_API
/**
@@ -565,27 +586,6 @@ extern struct iommu_group *generic_device_group(struct device *dev);
/* FSL-MC device grouping function */
struct iommu_group *fsl_mc_device_group(struct device *dev);
-/**
- * struct iommu_fwspec - per-device IOMMU instance data
- * @ops: ops for this device's IOMMU
- * @iommu_fwnode: firmware handle for this device's IOMMU
- * @iommu_priv: IOMMU driver private data for this device
- * @flags: IOMMU flags associated with this device
- * @num_ids: number of associated device IDs
- * @ids: IDs which this device may present to the IOMMU
- */
-struct iommu_fwspec {
- const struct iommu_ops *ops;
- struct fwnode_handle *iommu_fwnode;
- void *iommu_priv;
- u32 flags;
- unsigned int num_ids;
- u32 ids[1];
-};
-
-/* ATS is supported */
-#define IOMMU_FWSPEC_PCI_RC_ATS (1 << 0)
-
/**
* struct iommu_sva - handle to a device-mm bond
*/
@@ -634,7 +634,6 @@ int iommu_sva_get_pasid(struct iommu_sva *handle);
struct iommu_ops {};
struct iommu_group {};
-struct iommu_fwspec {};
struct iommu_device {};
struct iommu_fault_param {};
struct iommu_iotlb_gather {};
@@ -980,6 +979,11 @@ const struct iommu_ops *iommu_ops_from_fwnode(struct fwnode_handle *fwnode)
return NULL;
}
+static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev)
+{
+ return NULL;
+}
+
static inline bool
iommu_dev_has_feature(struct device *dev, enum iommu_dev_features feat)
{
--
2.23.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2019-12-09 11:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 11:59 [PATCH v3 0/9] drm/nouveau: Various fixes for GP10B Thierry Reding
2019-12-09 11:59 ` [PATCH v3 1/9] iommu: Document iommu_fwspec::flags field Thierry Reding
2019-12-09 11:59 ` Thierry Reding [this message]
2019-12-09 11:59 ` [PATCH v3 3/9] drm/nouveau: fault: Add support for GP10B Thierry Reding
[not found] ` <20191209120005.2254786-1-thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-12-09 12:00 ` [PATCH v3 4/9] drm/nouveau: tegra: Do not try to disable PCI device Thierry Reding
2019-12-09 12:00 ` [PATCH v3 5/9] drm/nouveau: tegra: Avoid pulsing reset twice Thierry Reding
2019-12-09 12:00 ` [PATCH v3 6/9] drm/nouveau: tegra: Set clock rate if not set Thierry Reding
2019-12-09 12:00 ` [PATCH v3 7/9] drm/nouveau: secboot: Read WPR configuration from GPU registers Thierry Reding
2019-12-09 12:00 ` [PATCH v3 8/9] drm/nouveau: gp10b: Add custom L2 cache implementation Thierry Reding
2019-12-09 12:00 ` [PATCH v3 9/9] drm/nouveau: gp10b: Use correct copy engine Thierry Reding
2019-12-10 8:15 ` [Nouveau] [PATCH v3 0/9] drm/nouveau: Various fixes for GP10B Ben Skeggs
[not found] ` <CACAvsv4NX7jvZb5_X5auU4-KKk9PfmtJvmnQNjY7ihqgXaRS6A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-12-10 13:12 ` Thierry Reding
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=20191209120005.2254786-3-thierry.reding@gmail.com \
--to=thierry.reding@gmail.com \
--cc=bskeggs@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jroedel@suse.de \
--cc=linux-tegra@vger.kernel.org \
--cc=nouveau@lists.freedesktop.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