| Message ID | 0e2727adeb8cd73274425322f2f793561bdc927e.1719919669.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | Handled Elsewhere, archived |
| Headers | show |
| Series | iommu: Remove iommu_fwspec ops | expand |
Hi Robin, On 02/07/2024 12:40, Robin Murphy wrote: > There's no real need for callers to resolve ops from a fwnode in order > to then pass both to iommu_fwspec_init() - it's simpler and more sensible > for that to resolve the ops itself. This in turn means we can centralise > the notion of checking for a present driver, and enforce that fwspecs > aren't allocated unless and until we know they will be usable. > > Also use this opportunity to modernise with some "new" helpers that > arrived shortly after this code was first written; the generic > fwnode_handle_get() clears up that ugly get/put mismatch, while > of_fwnode_handle() can now abstract those open-coded dereferences. > > Tested-by: Jean-Philippe Brucker <jean-philippe@linaro.org> > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > --- > v2: Add of_fwnode_handle() cleanup as well > --- > drivers/acpi/arm64/iort.c | 19 +++++-------------- > drivers/acpi/scan.c | 8 +++----- > drivers/acpi/viot.c | 11 ++--------- > drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 +-- > drivers/iommu/iommu-priv.h | 2 ++ > drivers/iommu/iommu.c | 9 ++++++--- > drivers/iommu/mtk_iommu_v1.c | 2 +- > drivers/iommu/of_iommu.c | 19 ++++++------------- > drivers/iommu/tegra-smmu.c | 2 +- > include/acpi/acpi_bus.h | 3 +-- > include/linux/iommu.h | 13 ++----------- > 11 files changed, 30 insertions(+), 61 deletions(-) > > diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c > index c0b1c2c19444..1b39e9ae7ac1 100644 > --- a/drivers/acpi/arm64/iort.c > +++ b/drivers/acpi/arm64/iort.c > @@ -1221,10 +1221,10 @@ static bool iort_pci_rc_supports_ats(struct acpi_iort_node *node) > static int iort_iommu_xlate(struct device *dev, struct acpi_iort_node *node, > u32 streamid) > { > - const struct iommu_ops *ops; > struct fwnode_handle *iort_fwnode; > > - if (!node) > + /* If there's no SMMU driver at all, give up now */ > + if (!node || !iort_iommu_driver_enabled(node->type)) > return -ENODEV; > > iort_fwnode = iort_get_fwnode(node); > @@ -1232,19 +1232,10 @@ static int iort_iommu_xlate(struct device *dev, struct acpi_iort_node *node, > return -ENODEV; > > /* > - * If the ops look-up fails, this means that either > - * the SMMU drivers have not been probed yet or that > - * the SMMU drivers are not built in the kernel; > - * Depending on whether the SMMU drivers are built-in > - * in the kernel or not, defer the IOMMU configuration > - * or just abort it. > + * If the SMMU drivers are enabled but not loaded/probed > + * yet, this will defer. > */ > - ops = iommu_ops_from_fwnode(iort_fwnode); > - if (!ops) > - return iort_iommu_driver_enabled(node->type) ? > - -EPROBE_DEFER : -ENODEV; > - > - return acpi_iommu_fwspec_init(dev, streamid, iort_fwnode, ops); > + return acpi_iommu_fwspec_init(dev, streamid, iort_fwnode); > } > > struct iort_pci_alias_info { > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > index 503773707e01..8d5a589db141 100644 > --- a/drivers/acpi/scan.c > +++ b/drivers/acpi/scan.c > @@ -1577,12 +1577,11 @@ int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map) > > #ifdef CONFIG_IOMMU_API > int acpi_iommu_fwspec_init(struct device *dev, u32 id, > - struct fwnode_handle *fwnode, > - const struct iommu_ops *ops) > + struct fwnode_handle *fwnode) > { > int ret; > > - ret = iommu_fwspec_init(dev, fwnode, ops); > + ret = iommu_fwspec_init(dev, fwnode); > if (ret) > return ret; > > @@ -1639,8 +1638,7 @@ static int acpi_iommu_configure_id(struct device *dev, const u32 *id_in) > #else /* !CONFIG_IOMMU_API */ > > int acpi_iommu_fwspec_init(struct device *dev, u32 id, > - struct fwnode_handle *fwnode, > - const struct iommu_ops *ops) > + struct fwnode_handle *fwnode) > { > return -ENODEV; > } > diff --git a/drivers/acpi/viot.c b/drivers/acpi/viot.c > index c8025921c129..2aa69a2fba73 100644 > --- a/drivers/acpi/viot.c > +++ b/drivers/acpi/viot.c > @@ -307,21 +307,14 @@ void __init acpi_viot_init(void) > static int viot_dev_iommu_init(struct device *dev, struct viot_iommu *viommu, > u32 epid) > { > - const struct iommu_ops *ops; > - > - if (!viommu) > + if (!viommu || !IS_ENABLED(CONFIG_VIRTIO_IOMMU)) > return -ENODEV; > > /* We're not translating ourself */ > if (device_match_fwnode(dev, viommu->fwnode)) > return -EINVAL; > > - ops = iommu_ops_from_fwnode(viommu->fwnode); > - if (!ops) > - return IS_ENABLED(CONFIG_VIRTIO_IOMMU) ? > - -EPROBE_DEFER : -ENODEV; > - > - return acpi_iommu_fwspec_init(dev, epid, viommu->fwnode, ops); > + return acpi_iommu_fwspec_init(dev, epid, viommu->fwnode); > } > > static int viot_pci_dev_iommu_init(struct pci_dev *pdev, u16 dev_id, void *data) > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c > index 87c81f75cf84..c200e6d3aed5 100644 > --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c > @@ -178,8 +178,7 @@ static int arm_smmu_register_legacy_master(struct device *dev, > it.cur_count = 1; > } > > - err = iommu_fwspec_init(dev, &smmu_dev->of_node->fwnode, > - &arm_smmu_ops); > + err = iommu_fwspec_init(dev, NULL); > if (err) > return err; > > diff --git a/drivers/iommu/iommu-priv.h b/drivers/iommu/iommu-priv.h > index 5f731d994803..078cafcf49b4 100644 > --- a/drivers/iommu/iommu-priv.h > +++ b/drivers/iommu/iommu-priv.h > @@ -17,6 +17,8 @@ static inline const struct iommu_ops *dev_iommu_ops(struct device *dev) > return dev->iommu->iommu_dev->ops; > } > > +const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode); > + > int iommu_group_replace_domain(struct iommu_group *group, > struct iommu_domain *new_domain); > > diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c > index 9df7cc75c1bc..7618c4285cf9 100644 > --- a/drivers/iommu/iommu.c > +++ b/drivers/iommu/iommu.c > @@ -2822,11 +2822,14 @@ const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode > return ops; > } > > -int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode, > - const struct iommu_ops *ops) > +int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode) > { > + const struct iommu_ops *ops = iommu_ops_from_fwnode(iommu_fwnode); > struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); > > + if (!ops) > + return -EPROBE_DEFER; > + > if (fwspec) > return ops == fwspec->ops ? 0 : -EINVAL; > > @@ -2838,7 +2841,7 @@ int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode, > if (!fwspec) > return -ENOMEM; > > - of_node_get(to_of_node(iommu_fwnode)); > + fwnode_handle_get(iommu_fwnode); > fwspec->iommu_fwnode = iommu_fwnode; > fwspec->ops = ops; > dev_iommu_fwspec_set(dev, fwspec); > diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c > index 2b64ea46318f..c6ea5b4baff3 100644 > --- a/drivers/iommu/mtk_iommu_v1.c > +++ b/drivers/iommu/mtk_iommu_v1.c > @@ -412,7 +412,7 @@ static int mtk_iommu_v1_create_mapping(struct device *dev, > return -EINVAL; > } > > - ret = iommu_fwspec_init(dev, &args->np->fwnode, &mtk_iommu_v1_ops); > + ret = iommu_fwspec_init(dev, of_fwnode_handle(args->np)); > if (ret) > return ret; > > diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c > index 3afe0b48a48d..08c523ad55ad 100644 > --- a/drivers/iommu/of_iommu.c > +++ b/drivers/iommu/of_iommu.c > @@ -21,26 +21,19 @@ static int of_iommu_xlate(struct device *dev, > struct of_phandle_args *iommu_spec) > { > const struct iommu_ops *ops; > - struct fwnode_handle *fwnode = &iommu_spec->np->fwnode; > int ret; > > - ops = iommu_ops_from_fwnode(fwnode); > - if ((ops && !ops->of_xlate) || > - !of_device_is_available(iommu_spec->np)) > + if (!of_device_is_available(iommu_spec->np)) > return -ENODEV; > > - ret = iommu_fwspec_init(dev, fwnode, ops); > + ret = iommu_fwspec_init(dev, of_fwnode_handle(iommu_spec->np)); > + if (ret == -EPROBE_DEFER) > + return driver_deferred_probe_check_state(dev); > if (ret) > return ret; > - /* > - * The otherwise-empty fwspec handily serves to indicate the specific > - * IOMMU device we're waiting for, which will be useful if we ever get > - * a proper probe-ordering dependency mechanism in future. > - */ > - if (!ops) > - return driver_deferred_probe_check_state(dev); > > - if (!try_module_get(ops->owner)) > + ops = dev_iommu_fwspec_get(dev)->ops; > + if (!ops->of_xlate || !try_module_get(ops->owner)) > return -ENODEV; > > ret = ops->of_xlate(dev, iommu_spec); > diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c > index f86c7ae91814..4365d9936e68 100644 > --- a/drivers/iommu/tegra-smmu.c > +++ b/drivers/iommu/tegra-smmu.c > @@ -837,7 +837,7 @@ static int tegra_smmu_configure(struct tegra_smmu *smmu, struct device *dev, > const struct iommu_ops *ops = smmu->iommu.ops; > int err; > > - err = iommu_fwspec_init(dev, &dev->of_node->fwnode, ops); > + err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); > if (err < 0) { > dev_err(dev, "failed to initialize fwspec: %d\n", err); > return err; > diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h > index 1a4dfd7a1c4a..9d815837e297 100644 > --- a/include/acpi/acpi_bus.h > +++ b/include/acpi/acpi_bus.h > @@ -736,8 +736,7 @@ struct iommu_ops; > bool acpi_dma_supported(const struct acpi_device *adev); > enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev); > int acpi_iommu_fwspec_init(struct device *dev, u32 id, > - struct fwnode_handle *fwnode, > - const struct iommu_ops *ops); > + struct fwnode_handle *fwnode); > int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map); > int acpi_dma_configure_id(struct device *dev, enum dev_dma_attr attr, > const u32 *input_id); > diff --git a/include/linux/iommu.h b/include/linux/iommu.h > index 17b3f36ad843..81893aad9ee4 100644 > --- a/include/linux/iommu.h > +++ b/include/linux/iommu.h > @@ -1005,11 +1005,9 @@ struct iommu_mm_data { > struct list_head sva_handles; > }; > > -int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode, > - const struct iommu_ops *ops); > +int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode); > void iommu_fwspec_free(struct device *dev); > int iommu_fwspec_add_ids(struct device *dev, const u32 *ids, int num_ids); > -const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode); > > static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev) > { > @@ -1315,8 +1313,7 @@ static inline void iommu_device_unlink(struct device *dev, struct device *link) > } > > static inline int iommu_fwspec_init(struct device *dev, > - struct fwnode_handle *iommu_fwnode, > - const struct iommu_ops *ops) > + struct fwnode_handle *iommu_fwnode) > { > return -ENODEV; > } > @@ -1331,12 +1328,6 @@ static inline int iommu_fwspec_add_ids(struct device *dev, u32 *ids, > return -ENODEV; > } > > -static inline > -const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode) > -{ > - return NULL; > -} > - > static inline int > iommu_dev_enable_feature(struct device *dev, enum iommu_dev_features feat) > { I am seeing some failures on -next with some of our devices. Bisect is pointing to this commit. Looks like the host1x device is no longer probing successfully. I see the following ... tegra-host1x 50000000.host1x: failed to initialize fwspec: -517 nouveau 57000000.gpu: failed to initialize fwspec: -517 The probe seems to be deferred forever. The above is seen on Tegra210 but Tegra30 and Tegra194 are also having the same problem. Interestingly it is not all devices and so make me wonder if we are missing something on these devices? Let me know if you have any thoughts. Cheers Jon
On 2024-07-12 12:01 pm, Jon Hunter wrote: > Hi Robin, > > On 02/07/2024 12:40, Robin Murphy wrote: >> There's no real need for callers to resolve ops from a fwnode in order >> to then pass both to iommu_fwspec_init() - it's simpler and more sensible >> for that to resolve the ops itself. This in turn means we can centralise >> the notion of checking for a present driver, and enforce that fwspecs >> aren't allocated unless and until we know they will be usable. >> >> Also use this opportunity to modernise with some "new" helpers that >> arrived shortly after this code was first written; the generic >> fwnode_handle_get() clears up that ugly get/put mismatch, while >> of_fwnode_handle() can now abstract those open-coded dereferences. >> >> Tested-by: Jean-Philippe Brucker <jean-philippe@linaro.org> >> Signed-off-by: Robin Murphy <robin.murphy@arm.com> >> --- >> v2: Add of_fwnode_handle() cleanup as well >> --- >> drivers/acpi/arm64/iort.c | 19 +++++-------------- >> drivers/acpi/scan.c | 8 +++----- >> drivers/acpi/viot.c | 11 ++--------- >> drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 +-- >> drivers/iommu/iommu-priv.h | 2 ++ >> drivers/iommu/iommu.c | 9 ++++++--- >> drivers/iommu/mtk_iommu_v1.c | 2 +- >> drivers/iommu/of_iommu.c | 19 ++++++------------- >> drivers/iommu/tegra-smmu.c | 2 +- >> include/acpi/acpi_bus.h | 3 +-- >> include/linux/iommu.h | 13 ++----------- >> 11 files changed, 30 insertions(+), 61 deletions(-) >> >> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c >> index c0b1c2c19444..1b39e9ae7ac1 100644 >> --- a/drivers/acpi/arm64/iort.c >> +++ b/drivers/acpi/arm64/iort.c >> @@ -1221,10 +1221,10 @@ static bool iort_pci_rc_supports_ats(struct >> acpi_iort_node *node) >> static int iort_iommu_xlate(struct device *dev, struct >> acpi_iort_node *node, >> u32 streamid) >> { >> - const struct iommu_ops *ops; >> struct fwnode_handle *iort_fwnode; >> - if (!node) >> + /* If there's no SMMU driver at all, give up now */ >> + if (!node || !iort_iommu_driver_enabled(node->type)) >> return -ENODEV; >> iort_fwnode = iort_get_fwnode(node); >> @@ -1232,19 +1232,10 @@ static int iort_iommu_xlate(struct device >> *dev, struct acpi_iort_node *node, >> return -ENODEV; >> /* >> - * If the ops look-up fails, this means that either >> - * the SMMU drivers have not been probed yet or that >> - * the SMMU drivers are not built in the kernel; >> - * Depending on whether the SMMU drivers are built-in >> - * in the kernel or not, defer the IOMMU configuration >> - * or just abort it. >> + * If the SMMU drivers are enabled but not loaded/probed >> + * yet, this will defer. >> */ >> - ops = iommu_ops_from_fwnode(iort_fwnode); >> - if (!ops) >> - return iort_iommu_driver_enabled(node->type) ? >> - -EPROBE_DEFER : -ENODEV; >> - >> - return acpi_iommu_fwspec_init(dev, streamid, iort_fwnode, ops); >> + return acpi_iommu_fwspec_init(dev, streamid, iort_fwnode); >> } >> struct iort_pci_alias_info { >> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c >> index 503773707e01..8d5a589db141 100644 >> --- a/drivers/acpi/scan.c >> +++ b/drivers/acpi/scan.c >> @@ -1577,12 +1577,11 @@ int acpi_dma_get_range(struct device *dev, >> const struct bus_dma_region **map) >> #ifdef CONFIG_IOMMU_API >> int acpi_iommu_fwspec_init(struct device *dev, u32 id, >> - struct fwnode_handle *fwnode, >> - const struct iommu_ops *ops) >> + struct fwnode_handle *fwnode) >> { >> int ret; >> - ret = iommu_fwspec_init(dev, fwnode, ops); >> + ret = iommu_fwspec_init(dev, fwnode); >> if (ret) >> return ret; >> @@ -1639,8 +1638,7 @@ static int acpi_iommu_configure_id(struct device >> *dev, const u32 *id_in) >> #else /* !CONFIG_IOMMU_API */ >> int acpi_iommu_fwspec_init(struct device *dev, u32 id, >> - struct fwnode_handle *fwnode, >> - const struct iommu_ops *ops) >> + struct fwnode_handle *fwnode) >> { >> return -ENODEV; >> } >> diff --git a/drivers/acpi/viot.c b/drivers/acpi/viot.c >> index c8025921c129..2aa69a2fba73 100644 >> --- a/drivers/acpi/viot.c >> +++ b/drivers/acpi/viot.c >> @@ -307,21 +307,14 @@ void __init acpi_viot_init(void) >> static int viot_dev_iommu_init(struct device *dev, struct viot_iommu >> *viommu, >> u32 epid) >> { >> - const struct iommu_ops *ops; >> - >> - if (!viommu) >> + if (!viommu || !IS_ENABLED(CONFIG_VIRTIO_IOMMU)) >> return -ENODEV; >> /* We're not translating ourself */ >> if (device_match_fwnode(dev, viommu->fwnode)) >> return -EINVAL; >> - ops = iommu_ops_from_fwnode(viommu->fwnode); >> - if (!ops) >> - return IS_ENABLED(CONFIG_VIRTIO_IOMMU) ? >> - -EPROBE_DEFER : -ENODEV; >> - >> - return acpi_iommu_fwspec_init(dev, epid, viommu->fwnode, ops); >> + return acpi_iommu_fwspec_init(dev, epid, viommu->fwnode); >> } >> static int viot_pci_dev_iommu_init(struct pci_dev *pdev, u16 dev_id, >> void *data) >> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c >> b/drivers/iommu/arm/arm-smmu/arm-smmu.c >> index 87c81f75cf84..c200e6d3aed5 100644 >> --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c >> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c >> @@ -178,8 +178,7 @@ static int arm_smmu_register_legacy_master(struct >> device *dev, >> it.cur_count = 1; >> } >> - err = iommu_fwspec_init(dev, &smmu_dev->of_node->fwnode, >> - &arm_smmu_ops); >> + err = iommu_fwspec_init(dev, NULL); >> if (err) >> return err; >> diff --git a/drivers/iommu/iommu-priv.h b/drivers/iommu/iommu-priv.h >> index 5f731d994803..078cafcf49b4 100644 >> --- a/drivers/iommu/iommu-priv.h >> +++ b/drivers/iommu/iommu-priv.h >> @@ -17,6 +17,8 @@ static inline const struct iommu_ops >> *dev_iommu_ops(struct device *dev) >> return dev->iommu->iommu_dev->ops; >> } >> +const struct iommu_ops *iommu_ops_from_fwnode(const struct >> fwnode_handle *fwnode); >> + >> int iommu_group_replace_domain(struct iommu_group *group, >> struct iommu_domain *new_domain); >> diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c >> index 9df7cc75c1bc..7618c4285cf9 100644 >> --- a/drivers/iommu/iommu.c >> +++ b/drivers/iommu/iommu.c >> @@ -2822,11 +2822,14 @@ const struct iommu_ops >> *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode >> return ops; >> } >> -int iommu_fwspec_init(struct device *dev, struct fwnode_handle >> *iommu_fwnode, >> - const struct iommu_ops *ops) >> +int iommu_fwspec_init(struct device *dev, struct fwnode_handle >> *iommu_fwnode) >> { >> + const struct iommu_ops *ops = iommu_ops_from_fwnode(iommu_fwnode); >> struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); >> + if (!ops) >> + return -EPROBE_DEFER; >> + >> if (fwspec) >> return ops == fwspec->ops ? 0 : -EINVAL; >> @@ -2838,7 +2841,7 @@ int iommu_fwspec_init(struct device *dev, struct >> fwnode_handle *iommu_fwnode, >> if (!fwspec) >> return -ENOMEM; >> - of_node_get(to_of_node(iommu_fwnode)); >> + fwnode_handle_get(iommu_fwnode); >> fwspec->iommu_fwnode = iommu_fwnode; >> fwspec->ops = ops; >> dev_iommu_fwspec_set(dev, fwspec); >> diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c >> index 2b64ea46318f..c6ea5b4baff3 100644 >> --- a/drivers/iommu/mtk_iommu_v1.c >> +++ b/drivers/iommu/mtk_iommu_v1.c >> @@ -412,7 +412,7 @@ static int mtk_iommu_v1_create_mapping(struct >> device *dev, >> return -EINVAL; >> } >> - ret = iommu_fwspec_init(dev, &args->np->fwnode, &mtk_iommu_v1_ops); >> + ret = iommu_fwspec_init(dev, of_fwnode_handle(args->np)); >> if (ret) >> return ret; >> diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c >> index 3afe0b48a48d..08c523ad55ad 100644 >> --- a/drivers/iommu/of_iommu.c >> +++ b/drivers/iommu/of_iommu.c >> @@ -21,26 +21,19 @@ static int of_iommu_xlate(struct device *dev, >> struct of_phandle_args *iommu_spec) >> { >> const struct iommu_ops *ops; >> - struct fwnode_handle *fwnode = &iommu_spec->np->fwnode; >> int ret; >> - ops = iommu_ops_from_fwnode(fwnode); >> - if ((ops && !ops->of_xlate) || >> - !of_device_is_available(iommu_spec->np)) >> + if (!of_device_is_available(iommu_spec->np)) >> return -ENODEV; >> - ret = iommu_fwspec_init(dev, fwnode, ops); >> + ret = iommu_fwspec_init(dev, of_fwnode_handle(iommu_spec->np)); >> + if (ret == -EPROBE_DEFER) >> + return driver_deferred_probe_check_state(dev); >> if (ret) >> return ret; >> - /* >> - * The otherwise-empty fwspec handily serves to indicate the >> specific >> - * IOMMU device we're waiting for, which will be useful if we >> ever get >> - * a proper probe-ordering dependency mechanism in future. >> - */ >> - if (!ops) >> - return driver_deferred_probe_check_state(dev); >> - if (!try_module_get(ops->owner)) >> + ops = dev_iommu_fwspec_get(dev)->ops; >> + if (!ops->of_xlate || !try_module_get(ops->owner)) >> return -ENODEV; >> ret = ops->of_xlate(dev, iommu_spec); >> diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c >> index f86c7ae91814..4365d9936e68 100644 >> --- a/drivers/iommu/tegra-smmu.c >> +++ b/drivers/iommu/tegra-smmu.c >> @@ -837,7 +837,7 @@ static int tegra_smmu_configure(struct tegra_smmu >> *smmu, struct device *dev, >> const struct iommu_ops *ops = smmu->iommu.ops; >> int err; >> - err = iommu_fwspec_init(dev, &dev->of_node->fwnode, ops); >> + err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); >> if (err < 0) { >> dev_err(dev, "failed to initialize fwspec: %d\n", err); >> return err; >> diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h >> index 1a4dfd7a1c4a..9d815837e297 100644 >> --- a/include/acpi/acpi_bus.h >> +++ b/include/acpi/acpi_bus.h >> @@ -736,8 +736,7 @@ struct iommu_ops; >> bool acpi_dma_supported(const struct acpi_device *adev); >> enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev); >> int acpi_iommu_fwspec_init(struct device *dev, u32 id, >> - struct fwnode_handle *fwnode, >> - const struct iommu_ops *ops); >> + struct fwnode_handle *fwnode); >> int acpi_dma_get_range(struct device *dev, const struct >> bus_dma_region **map); >> int acpi_dma_configure_id(struct device *dev, enum dev_dma_attr attr, >> const u32 *input_id); >> diff --git a/include/linux/iommu.h b/include/linux/iommu.h >> index 17b3f36ad843..81893aad9ee4 100644 >> --- a/include/linux/iommu.h >> +++ b/include/linux/iommu.h >> @@ -1005,11 +1005,9 @@ struct iommu_mm_data { >> struct list_head sva_handles; >> }; >> -int iommu_fwspec_init(struct device *dev, struct fwnode_handle >> *iommu_fwnode, >> - const struct iommu_ops *ops); >> +int iommu_fwspec_init(struct device *dev, struct fwnode_handle >> *iommu_fwnode); >> void iommu_fwspec_free(struct device *dev); >> int iommu_fwspec_add_ids(struct device *dev, const u32 *ids, int >> num_ids); >> -const struct iommu_ops *iommu_ops_from_fwnode(const struct >> fwnode_handle *fwnode); >> static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct >> device *dev) >> { >> @@ -1315,8 +1313,7 @@ static inline void iommu_device_unlink(struct >> device *dev, struct device *link) >> } >> static inline int iommu_fwspec_init(struct device *dev, >> - struct fwnode_handle *iommu_fwnode, >> - const struct iommu_ops *ops) >> + struct fwnode_handle *iommu_fwnode) >> { >> return -ENODEV; >> } >> @@ -1331,12 +1328,6 @@ static inline int iommu_fwspec_add_ids(struct >> device *dev, u32 *ids, >> return -ENODEV; >> } >> -static inline >> -const struct iommu_ops *iommu_ops_from_fwnode(const struct >> fwnode_handle *fwnode) >> -{ >> - return NULL; >> -} >> - >> static inline int >> iommu_dev_enable_feature(struct device *dev, enum iommu_dev_features >> feat) >> { > > > I am seeing some failures on -next with some of our devices. Bisect is > pointing to this commit. Looks like the host1x device is no longer > probing successfully. I see the following ... > > tegra-host1x 50000000.host1x: failed to initialize fwspec: -517 > nouveau 57000000.gpu: failed to initialize fwspec: -517 > > The probe seems to be deferred forever. The above is seen on Tegra210 > but Tegra30 and Tegra194 are also having the same problem. Interestingly > it is not all devices and so make me wonder if we are missing something > on these devices? Let me know if you have any thoughts. Ugh, tegra-smmu has been doing a complete nonsense this whole time - on closer inspection, it's passing the fwnode of the *client device* where it should be that of the IOMMU device :( I *think* it should probably just be a case of: - err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); + err = iommu_fwspec_init(dev, of_fwnode_handle(smmu->dev->of_node)); since smmu->dev appears to be the same one initially passed to iommu_device_register(), so it at least ought to match and work, but the SMMU device vs. MC device thing leaves me mildly wary of how correct it might be overall. (Also now I'm wondering why I didn't just use dev_fwnode() there...) Thanks, Robin.
On 12/07/2024 12:48, Robin Murphy wrote: ... >> I am seeing some failures on -next with some of our devices. Bisect is >> pointing to this commit. Looks like the host1x device is no longer >> probing successfully. I see the following ... >> >> tegra-host1x 50000000.host1x: failed to initialize fwspec: -517 >> nouveau 57000000.gpu: failed to initialize fwspec: -517 >> >> The probe seems to be deferred forever. The above is seen on Tegra210 >> but Tegra30 and Tegra194 are also having the same problem. >> Interestingly it is not all devices and so make me wonder if we are >> missing something on these devices? Let me know if you have any thoughts. > > Ugh, tegra-smmu has been doing a complete nonsense this whole time - on > closer inspection, it's passing the fwnode of the *client device* where > it should be that of the IOMMU device :( > > I *think* it should probably just be a case of: > > - err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); > + err = iommu_fwspec_init(dev, of_fwnode_handle(smmu->dev->of_node)); > > since smmu->dev appears to be the same one initially passed to > iommu_device_register(), so it at least ought to match and work, but the > SMMU device vs. MC device thing leaves me mildly wary of how correct it > might be overall. > > (Also now I'm wondering why I didn't just use dev_fwnode() there...) Yes making that change in the tegra-smmu driver does fix it. Thanks! Jon
On Fri, Jul 12, 2024 at 12:48:31PM +0100, Robin Murphy wrote: > On 2024-07-12 12:01 pm, Jon Hunter wrote: > > I am seeing some failures on -next with some of our devices. Bisect is > > pointing to this commit. Looks like the host1x device is no longer > > probing successfully. I see the following ... > > > > tegra-host1x 50000000.host1x: failed to initialize fwspec: -517 > > nouveau 57000000.gpu: failed to initialize fwspec: -517 > > > > The probe seems to be deferred forever. The above is seen on Tegra210 > > but Tegra30 and Tegra194 are also having the same problem. Interestingly > > it is not all devices and so make me wonder if we are missing something > > on these devices? Let me know if you have any thoughts. > > Ugh, tegra-smmu has been doing a complete nonsense this whole time - on > closer inspection, it's passing the fwnode of the *client device* where it > should be that of the IOMMU device :( Ha, so it is! > I *think* it should probably just be a case of: > > - err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); > + err = iommu_fwspec_init(dev, of_fwnode_handle(smmu->dev->of_node)); > > since smmu->dev appears to be the same one initially passed to > iommu_device_register(), so it at least ought to match and work, but the > SMMU device vs. MC device thing leaves me mildly wary of how correct it > might be overall. Jon -- any chance you could give this fix a go, please? I'm hesitant to drop the whole branch just for this, but we've basically run out of time for 6.11 and so knowing we have a working fix would be really helpful. Cheers, Will
On Fri, Jul 12, 2024 at 04:24:48PM +0100, Jon Hunter wrote: > > On 12/07/2024 12:48, Robin Murphy wrote: > > ... > > > > I am seeing some failures on -next with some of our devices. Bisect > > > is pointing to this commit. Looks like the host1x device is no > > > longer probing successfully. I see the following ... > > > > > > tegra-host1x 50000000.host1x: failed to initialize fwspec: -517 > > > nouveau 57000000.gpu: failed to initialize fwspec: -517 > > > > > > The probe seems to be deferred forever. The above is seen on > > > Tegra210 but Tegra30 and Tegra194 are also having the same problem. > > > Interestingly it is not all devices and so make me wonder if we are > > > missing something on these devices? Let me know if you have any > > > thoughts. > > > > Ugh, tegra-smmu has been doing a complete nonsense this whole time - on > > closer inspection, it's passing the fwnode of the *client device* where > > it should be that of the IOMMU device :( > > > > I *think* it should probably just be a case of: > > > > - err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); > > + err = iommu_fwspec_init(dev, of_fwnode_handle(smmu->dev->of_node)); > > > > since smmu->dev appears to be the same one initially passed to > > iommu_device_register(), so it at least ought to match and work, but the > > SMMU device vs. MC device thing leaves me mildly wary of how correct it > > might be overall. > > > > (Also now I'm wondering why I didn't just use dev_fwnode() there...) > > > Yes making that change in the tegra-smmu driver does fix it. Fantastic! I'll pick it up right now. Cheers, Will
On 12/07/2024 4:24 pm, Jon Hunter wrote: > > On 12/07/2024 12:48, Robin Murphy wrote: > > ... > >>> I am seeing some failures on -next with some of our devices. Bisect >>> is pointing to this commit. Looks like the host1x device is no longer >>> probing successfully. I see the following ... >>> >>> tegra-host1x 50000000.host1x: failed to initialize fwspec: -517 >>> nouveau 57000000.gpu: failed to initialize fwspec: -517 >>> >>> The probe seems to be deferred forever. The above is seen on Tegra210 >>> but Tegra30 and Tegra194 are also having the same problem. >>> Interestingly it is not all devices and so make me wonder if we are >>> missing something on these devices? Let me know if you have any >>> thoughts. >> >> Ugh, tegra-smmu has been doing a complete nonsense this whole time - >> on closer inspection, it's passing the fwnode of the *client device* >> where it should be that of the IOMMU device :( >> >> I *think* it should probably just be a case of: >> >> - err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); >> + err = iommu_fwspec_init(dev, of_fwnode_handle(smmu->dev->of_node)); >> >> since smmu->dev appears to be the same one initially passed to >> iommu_device_register(), so it at least ought to match and work, but >> the SMMU device vs. MC device thing leaves me mildly wary of how >> correct it might be overall. >> >> (Also now I'm wondering why I didn't just use dev_fwnode() there...) > > > Yes making that change in the tegra-smmu driver does fix it. Ace, thanks for confirming! I was just writing a follow-up to say that I've pretty much convinced myself that this (proper diff below) should in fact be the right thing to do in general as well :) Will, Joerg, would you prefer to have a standalone fix patch for the nvidia/tegra branch to then re-merge fwspec-ops-removal and fix up the conflict, or just a patch on top of fwspec-ops-removal as below? Thanks, Robin. ----->8----- diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index 4365d9936e68..7f633bb5efef 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -837,7 +837,7 @@ static int tegra_smmu_configure(struct tegra_smmu *smmu, struct device *dev, const struct iommu_ops *ops = smmu->iommu.ops; int err; - err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); + err = iommu_fwspec_init(dev, dev_fwnode(smmu->dev)); if (err < 0) { dev_err(dev, "failed to initialize fwspec: %d\n", err); return err;
On Fri, Jul 12, 2024 at 04:28:37PM +0100, Robin Murphy wrote: > On 12/07/2024 4:24 pm, Jon Hunter wrote: > > > > On 12/07/2024 12:48, Robin Murphy wrote: > > > > ... > > > > > > I am seeing some failures on -next with some of our devices. > > > > Bisect is pointing to this commit. Looks like the host1x device > > > > is no longer probing successfully. I see the following ... > > > > > > > > tegra-host1x 50000000.host1x: failed to initialize fwspec: -517 > > > > nouveau 57000000.gpu: failed to initialize fwspec: -517 > > > > > > > > The probe seems to be deferred forever. The above is seen on > > > > Tegra210 but Tegra30 and Tegra194 are also having the same > > > > problem. Interestingly it is not all devices and so make me > > > > wonder if we are missing something on these devices? Let me know > > > > if you have any thoughts. > > > > > > Ugh, tegra-smmu has been doing a complete nonsense this whole time - > > > on closer inspection, it's passing the fwnode of the *client device* > > > where it should be that of the IOMMU device :( > > > > > > I *think* it should probably just be a case of: > > > > > > - err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); > > > + err = iommu_fwspec_init(dev, of_fwnode_handle(smmu->dev->of_node)); > > > > > > since smmu->dev appears to be the same one initially passed to > > > iommu_device_register(), so it at least ought to match and work, but > > > the SMMU device vs. MC device thing leaves me mildly wary of how > > > correct it might be overall. > > > > > > (Also now I'm wondering why I didn't just use dev_fwnode() there...) > > > > > > Yes making that change in the tegra-smmu driver does fix it. > > Ace, thanks for confirming! I was just writing a follow-up to say that I've > pretty much convinced myself that this (proper diff below) should in fact be > the right thing to do in general as well :) > > Will, Joerg, would you prefer to have a standalone fix patch for the > nvidia/tegra branch to then re-merge fwspec-ops-removal and fix up the > conflict, or just a patch on top of fwspec-ops-removal as below? I've just fixed it locally on the tegra branch, so I'll then just resolve the conflict with fwspec-ops-removal the right way. That way, we can backport the thing if we need to. Cheers, Will
On 12/07/2024 4:31 pm, Will Deacon wrote: > On Fri, Jul 12, 2024 at 04:28:37PM +0100, Robin Murphy wrote: >> On 12/07/2024 4:24 pm, Jon Hunter wrote: >>> >>> On 12/07/2024 12:48, Robin Murphy wrote: >>> >>> ... >>> >>>>> I am seeing some failures on -next with some of our devices. >>>>> Bisect is pointing to this commit. Looks like the host1x device >>>>> is no longer probing successfully. I see the following ... >>>>> >>>>> ��tegra-host1x 50000000.host1x: failed to initialize fwspec: -517 >>>>> ��nouveau 57000000.gpu: failed to initialize fwspec: -517 >>>>> >>>>> The probe seems to be deferred forever. The above is seen on >>>>> Tegra210 but Tegra30 and Tegra194 are also having the same >>>>> problem. Interestingly it is not all devices and so make me >>>>> wonder if we are missing something on these devices? Let me know >>>>> if you have any thoughts. >>>> >>>> Ugh, tegra-smmu has been doing a complete nonsense this whole time - >>>> on closer inspection, it's passing the fwnode of the *client device* >>>> where it should be that of the IOMMU device :( >>>> >>>> I *think* it should probably just be a case of: >>>> >>>> -��� err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); >>>> +��� err = iommu_fwspec_init(dev, of_fwnode_handle(smmu->dev->of_node)); >>>> >>>> since smmu->dev appears to be the same one initially passed to >>>> iommu_device_register(), so it at least ought to match and work, but >>>> the SMMU device vs. MC device thing leaves me mildly wary of how >>>> correct it might be overall. >>>> >>>> (Also now I'm wondering why I didn't just use dev_fwnode() there...) >>> >>> >>> Yes making that change in the tegra-smmu driver does fix it. >> >> Ace, thanks for confirming! I was just writing a follow-up to say that I've >> pretty much convinced myself that this (proper diff below) should in fact be >> the right thing to do in general as well :) >> >> Will, Joerg, would you prefer to have a standalone fix patch for the >> nvidia/tegra branch to then re-merge fwspec-ops-removal and fix up the >> conflict, or just a patch on top of fwspec-ops-removal as below? > > I've just fixed it locally on the tegra branch, so I'll then just > resolve the conflict with fwspec-ops-removal the right way. That way, we > can backport the thing if we need to. Cool, thanks for taking care of it! Robin.
diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c index c0b1c2c19444..1b39e9ae7ac1 100644 --- a/drivers/acpi/arm64/iort.c +++ b/drivers/acpi/arm64/iort.c @@ -1221,10 +1221,10 @@ static bool iort_pci_rc_supports_ats(struct acpi_iort_node *node) static int iort_iommu_xlate(struct device *dev, struct acpi_iort_node *node, u32 streamid) { - const struct iommu_ops *ops; struct fwnode_handle *iort_fwnode; - if (!node) + /* If there's no SMMU driver at all, give up now */ + if (!node || !iort_iommu_driver_enabled(node->type)) return -ENODEV; iort_fwnode = iort_get_fwnode(node); @@ -1232,19 +1232,10 @@ static int iort_iommu_xlate(struct device *dev, struct acpi_iort_node *node, return -ENODEV; /* - * If the ops look-up fails, this means that either - * the SMMU drivers have not been probed yet or that - * the SMMU drivers are not built in the kernel; - * Depending on whether the SMMU drivers are built-in - * in the kernel or not, defer the IOMMU configuration - * or just abort it. + * If the SMMU drivers are enabled but not loaded/probed + * yet, this will defer. */ - ops = iommu_ops_from_fwnode(iort_fwnode); - if (!ops) - return iort_iommu_driver_enabled(node->type) ? - -EPROBE_DEFER : -ENODEV; - - return acpi_iommu_fwspec_init(dev, streamid, iort_fwnode, ops); + return acpi_iommu_fwspec_init(dev, streamid, iort_fwnode); } struct iort_pci_alias_info { diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 503773707e01..8d5a589db141 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1577,12 +1577,11 @@ int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map) #ifdef CONFIG_IOMMU_API int acpi_iommu_fwspec_init(struct device *dev, u32 id, - struct fwnode_handle *fwnode, - const struct iommu_ops *ops) + struct fwnode_handle *fwnode) { int ret; - ret = iommu_fwspec_init(dev, fwnode, ops); + ret = iommu_fwspec_init(dev, fwnode); if (ret) return ret; @@ -1639,8 +1638,7 @@ static int acpi_iommu_configure_id(struct device *dev, const u32 *id_in) #else /* !CONFIG_IOMMU_API */ int acpi_iommu_fwspec_init(struct device *dev, u32 id, - struct fwnode_handle *fwnode, - const struct iommu_ops *ops) + struct fwnode_handle *fwnode) { return -ENODEV; } diff --git a/drivers/acpi/viot.c b/drivers/acpi/viot.c index c8025921c129..2aa69a2fba73 100644 --- a/drivers/acpi/viot.c +++ b/drivers/acpi/viot.c @@ -307,21 +307,14 @@ void __init acpi_viot_init(void) static int viot_dev_iommu_init(struct device *dev, struct viot_iommu *viommu, u32 epid) { - const struct iommu_ops *ops; - - if (!viommu) + if (!viommu || !IS_ENABLED(CONFIG_VIRTIO_IOMMU)) return -ENODEV; /* We're not translating ourself */ if (device_match_fwnode(dev, viommu->fwnode)) return -EINVAL; - ops = iommu_ops_from_fwnode(viommu->fwnode); - if (!ops) - return IS_ENABLED(CONFIG_VIRTIO_IOMMU) ? - -EPROBE_DEFER : -ENODEV; - - return acpi_iommu_fwspec_init(dev, epid, viommu->fwnode, ops); + return acpi_iommu_fwspec_init(dev, epid, viommu->fwnode); } static int viot_pci_dev_iommu_init(struct pci_dev *pdev, u16 dev_id, void *data) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index 87c81f75cf84..c200e6d3aed5 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -178,8 +178,7 @@ static int arm_smmu_register_legacy_master(struct device *dev, it.cur_count = 1; } - err = iommu_fwspec_init(dev, &smmu_dev->of_node->fwnode, - &arm_smmu_ops); + err = iommu_fwspec_init(dev, NULL); if (err) return err; diff --git a/drivers/iommu/iommu-priv.h b/drivers/iommu/iommu-priv.h index 5f731d994803..078cafcf49b4 100644 --- a/drivers/iommu/iommu-priv.h +++ b/drivers/iommu/iommu-priv.h @@ -17,6 +17,8 @@ static inline const struct iommu_ops *dev_iommu_ops(struct device *dev) return dev->iommu->iommu_dev->ops; } +const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode); + int iommu_group_replace_domain(struct iommu_group *group, struct iommu_domain *new_domain); diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 9df7cc75c1bc..7618c4285cf9 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -2822,11 +2822,14 @@ const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode return ops; } -int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode, - const struct iommu_ops *ops) +int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode) { + const struct iommu_ops *ops = iommu_ops_from_fwnode(iommu_fwnode); struct iommu_fwspec *fwspec = dev_iommu_fwspec_get(dev); + if (!ops) + return -EPROBE_DEFER; + if (fwspec) return ops == fwspec->ops ? 0 : -EINVAL; @@ -2838,7 +2841,7 @@ int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode, if (!fwspec) return -ENOMEM; - of_node_get(to_of_node(iommu_fwnode)); + fwnode_handle_get(iommu_fwnode); fwspec->iommu_fwnode = iommu_fwnode; fwspec->ops = ops; dev_iommu_fwspec_set(dev, fwspec); diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c index 2b64ea46318f..c6ea5b4baff3 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c @@ -412,7 +412,7 @@ static int mtk_iommu_v1_create_mapping(struct device *dev, return -EINVAL; } - ret = iommu_fwspec_init(dev, &args->np->fwnode, &mtk_iommu_v1_ops); + ret = iommu_fwspec_init(dev, of_fwnode_handle(args->np)); if (ret) return ret; diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 3afe0b48a48d..08c523ad55ad 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -21,26 +21,19 @@ static int of_iommu_xlate(struct device *dev, struct of_phandle_args *iommu_spec) { const struct iommu_ops *ops; - struct fwnode_handle *fwnode = &iommu_spec->np->fwnode; int ret; - ops = iommu_ops_from_fwnode(fwnode); - if ((ops && !ops->of_xlate) || - !of_device_is_available(iommu_spec->np)) + if (!of_device_is_available(iommu_spec->np)) return -ENODEV; - ret = iommu_fwspec_init(dev, fwnode, ops); + ret = iommu_fwspec_init(dev, of_fwnode_handle(iommu_spec->np)); + if (ret == -EPROBE_DEFER) + return driver_deferred_probe_check_state(dev); if (ret) return ret; - /* - * The otherwise-empty fwspec handily serves to indicate the specific - * IOMMU device we're waiting for, which will be useful if we ever get - * a proper probe-ordering dependency mechanism in future. - */ - if (!ops) - return driver_deferred_probe_check_state(dev); - if (!try_module_get(ops->owner)) + ops = dev_iommu_fwspec_get(dev)->ops; + if (!ops->of_xlate || !try_module_get(ops->owner)) return -ENODEV; ret = ops->of_xlate(dev, iommu_spec); diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index f86c7ae91814..4365d9936e68 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -837,7 +837,7 @@ static int tegra_smmu_configure(struct tegra_smmu *smmu, struct device *dev, const struct iommu_ops *ops = smmu->iommu.ops; int err; - err = iommu_fwspec_init(dev, &dev->of_node->fwnode, ops); + err = iommu_fwspec_init(dev, of_fwnode_handle(dev->of_node)); if (err < 0) { dev_err(dev, "failed to initialize fwspec: %d\n", err); return err; diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 1a4dfd7a1c4a..9d815837e297 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h @@ -736,8 +736,7 @@ struct iommu_ops; bool acpi_dma_supported(const struct acpi_device *adev); enum dev_dma_attr acpi_get_dma_attr(struct acpi_device *adev); int acpi_iommu_fwspec_init(struct device *dev, u32 id, - struct fwnode_handle *fwnode, - const struct iommu_ops *ops); + struct fwnode_handle *fwnode); int acpi_dma_get_range(struct device *dev, const struct bus_dma_region **map); int acpi_dma_configure_id(struct device *dev, enum dev_dma_attr attr, const u32 *input_id); diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 17b3f36ad843..81893aad9ee4 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -1005,11 +1005,9 @@ struct iommu_mm_data { struct list_head sva_handles; }; -int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode, - const struct iommu_ops *ops); +int iommu_fwspec_init(struct device *dev, struct fwnode_handle *iommu_fwnode); void iommu_fwspec_free(struct device *dev); int iommu_fwspec_add_ids(struct device *dev, const u32 *ids, int num_ids); -const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode); static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev) { @@ -1315,8 +1313,7 @@ static inline void iommu_device_unlink(struct device *dev, struct device *link) } static inline int iommu_fwspec_init(struct device *dev, - struct fwnode_handle *iommu_fwnode, - const struct iommu_ops *ops) + struct fwnode_handle *iommu_fwnode) { return -ENODEV; } @@ -1331,12 +1328,6 @@ static inline int iommu_fwspec_add_ids(struct device *dev, u32 *ids, return -ENODEV; } -static inline -const struct iommu_ops *iommu_ops_from_fwnode(const struct fwnode_handle *fwnode) -{ - return NULL; -} - static inline int iommu_dev_enable_feature(struct device *dev, enum iommu_dev_features feat) {