MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-05 21:35:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

iommu: Remove iommu_fwspec ops

Browse Source 
The ops in iommu_fwspec are only needed for the early configuration and
probe process, and by now are easy enough to derive on-demand in those
couple of places which need them, so remove the redundant stored copy.

Tested-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/55c1410b2cd09531eab4f8e2f18f92a0faa0ea75.1719919669.git.robin.murphy@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
This commit is contained in:
Robin Murphy 2024-07-02 12:40:51 +01:00 committed by Will Deacon
parent 5f937bc48a
commit 3e36c15fc1
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/iommu/iommu-priv.h
View File

@ -19,6 +19,11 @@ static inline const struct iommu_ops *dev_iommu_ops(struct device *dev)
const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode); const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode);
static inline const struct iommu_ops *iommu_fwspec_ops(struct iommu_fwspec *fwspec)
{
return iommu_ops_from_fwnode(fwspec ? fwspec->iommu_fwnode : NULL);
}
int iommu_group_replace_domain(struct iommu_group *group, int iommu_group_replace_domain(struct iommu_group *group,
struct iommu_domain *new_domain); struct iommu_domain *new_domain);

11
drivers/iommu/iommu.c
View File

@ -510,7 +510,6 @@ DEFINE_MUTEX(iommu_probe_device_lock);
static int __iommu_probe_device(struct device *dev, struct list_head *group_list) static int __iommu_probe_device(struct device *dev, struct list_head *group_list)
{ {
const struct iommu_ops *ops; const struct iommu_ops *ops;
struct iommu_fwspec *fwspec;
struct iommu_group *group; struct iommu_group *group;
struct group_device *gdev; struct group_device *gdev;
int ret; int ret;
@ -523,12 +522,7 @@ static int __iommu_probe_device(struct device *dev, struct list_head *group_list
* be present, and that any of their registered instances has suitable * be present, and that any of their registered instances has suitable
* ops for probing, and thus cheekily co-opt the same mechanism. * ops for probing, and thus cheekily co-opt the same mechanism.
*/ */
fwspec = dev_iommu_fwspec_get(dev); ops = iommu_fwspec_ops(dev_iommu_fwspec_get(dev));
if (fwspec && fwspec->ops)
ops = fwspec->ops;
else
ops = iommu_ops_from_fwnode(NULL);
if (!ops) if (!ops)
return -ENODEV; return -ENODEV;
/* /*
@ -2831,7 +2825,7 @@ int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode)
return -EPROBE_DEFER; return -EPROBE_DEFER;
if (fwspec) if (fwspec)
return ops == fwspec->ops ? 0 : -EINVAL; return ops == iommu_fwspec_ops(fwspec) ? 0 : -EINVAL;
if (!dev_iommu_get(dev)) if (!dev_iommu_get(dev))
return -ENOMEM; return -ENOMEM;
@ -2843,7 +2837,6 @@ int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode)
fwnode_handle_get(iommu_fwnode); fwnode_handle_get(iommu_fwnode);
fwspec->iommu_fwnode = iommu_fwnode; fwspec->iommu_fwnode = iommu_fwnode;
fwspec->ops = ops;
dev_iommu_fwspec_set(dev, fwspec); dev_iommu_fwspec_set(dev, fwspec);
return 0; return 0;
} }

4
drivers/iommu/of_iommu.c
View File

@ -17,6 +17,8 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/fsl/mc.h> #include <linux/fsl/mc.h>
#include "iommu-priv.h"
static int of_iommu_xlate(struct device *dev, static int of_iommu_xlate(struct device *dev,
struct of_phandle_args *iommu_spec) struct of_phandle_args *iommu_spec)
{ {
@ -32,7 +34,7 @@ static int of_iommu_xlate(struct device *dev,
if (ret) if (ret)
return ret; return ret;
ops = dev_iommu_fwspec_get(dev)->ops; ops = iommu_ops_from_fwnode(&iommu_spec->np->fwnode);
if (!ops->of_xlate || !try_module_get(ops->owner)) if (!ops->of_xlate || !try_module_get(ops->owner))
return -ENODEV; return -ENODEV;

2
include/linux/iommu.h
View File

@ -968,7 +968,6 @@ extern struct iommu_group *generic_single_device_group(struct device *dev);
/** /**
* struct iommu_fwspec - per-device IOMMU instance data * 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_fwnode: firmware handle for this device's IOMMU
* @flags: IOMMU_FWSPEC_* flags * @flags: IOMMU_FWSPEC_* flags
* @num_ids: number of associated device IDs * @num_ids: number of associated device IDs
@ -979,7 +978,6 @@ extern struct iommu_group *generic_single_device_group(struct device *dev);
* consumers. * consumers.
*/ */
struct iommu_fwspec { struct iommu_fwspec {
const struct iommu_ops *ops;
struct fwnode_handle *iommu_fwnode; struct fwnode_handle *iommu_fwnode;
u32 flags; u32 flags;
unsigned int num_ids; unsigned int num_ids;