| Message ID | 20220819221616.2107893-5-saravanak@google.com |
|---|---|
| State | Accepted |
| Commit | a4f124908617553ea3929a17293cea4960c92ba3 |
| Headers | show |
| Series | Bring back driver_deferred_probe_check_state() for now | expand |
On Fri, Aug 19, 2022 at 03:16:14PM -0700, Saravana Kannan wrote: > This reverts commit b09796d528bbf06e3e10a4a8f78038719da7ebc6. > > An issue was reported[1] on the original commit. I'll need to address that > before I can delete the use of driver_deferred_probe_check_state(). So, > bring it back for now. > > [1] - https://lore.kernel.org/lkml/4799738.LvFx2qVVIh@steina-w/ https://lore.kernel.org/lkml/Yv+dpeIPvde7oDHi@myrica/ > > Fixes: b09796d528bb ("iommu/of: Delete usage of driver_deferred_probe_check_state()") > Reported-by: Jean-Philippe Brucker <jpb@kernel.org> > Signed-off-by: Saravana Kannan <saravanak@google.com> Tested-by: Jean-Philippe Brucker <jpb@kernel.org> > --- > drivers/iommu/of_iommu.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c > index 41f4eb005219..5696314ae69e 100644 > --- a/drivers/iommu/of_iommu.c > +++ b/drivers/iommu/of_iommu.c > @@ -40,7 +40,7 @@ static int of_iommu_xlate(struct device *dev, > * a proper probe-ordering dependency mechanism in future. > */ > if (!ops) > - return -ENODEV; > + return driver_deferred_probe_check_state(dev); > > if (!try_module_get(ops->owner)) > return -ENODEV; > -- > 2.37.1.595.g718a3a8f04-goog >
diff --git a/drivers/iommu/of_iommu.c b/drivers/iommu/of_iommu.c index 41f4eb005219..5696314ae69e 100644 --- a/drivers/iommu/of_iommu.c +++ b/drivers/iommu/of_iommu.c @@ -40,7 +40,7 @@ static int of_iommu_xlate(struct device *dev, * a proper probe-ordering dependency mechanism in future. */ if (!ops) - return -ENODEV; + return driver_deferred_probe_check_state(dev); if (!try_module_get(ops->owner)) return -ENODEV;
This reverts commit b09796d528bbf06e3e10a4a8f78038719da7ebc6. An issue was reported[1] on the original commit. I'll need to address that before I can delete the use of driver_deferred_probe_check_state(). So, bring it back for now. [1] - https://lore.kernel.org/lkml/4799738.LvFx2qVVIh@steina-w/ Fixes: b09796d528bb ("iommu/of: Delete usage of driver_deferred_probe_check_state()") Reported-by: Jean-Philippe Brucker <jpb@kernel.org> Signed-off-by: Saravana Kannan <saravanak@google.com> --- drivers/iommu/of_iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)