Commit 96d8a916 authored by Saravana Kannan's avatar Saravana Kannan Committed by Greg Kroah-Hartman

Revert "driver core: Don't do deferred probe in parallel with kernel_init thread"

This reverts commit cec72f3e.

Commit cec72f3e ("driver core: Don't do deferred probe in parallel
with kernel_init thread") was fixing a commit 716a7a25 ("driver
core: fw_devlink: Add support for batching fwnode parsing"). Since the
commit being fixed itself is going to be reverted, the fix can also be
reverted.
Signed-off-by: default avatarSaravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20201121020232.908850-4-saravanak@google.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3b052a3e
...@@ -156,6 +156,7 @@ extern char *make_class_name(const char *name, struct kobject *kobj); ...@@ -156,6 +156,7 @@ extern char *make_class_name(const char *name, struct kobject *kobj);
extern int devres_release_all(struct device *dev); extern int devres_release_all(struct device *dev);
extern void device_block_probing(void); extern void device_block_probing(void);
extern void device_unblock_probing(void); extern void device_unblock_probing(void);
extern void driver_deferred_probe_force_trigger(void);
/* /sys/devices directory */ /* /sys/devices directory */
extern struct kset *devices_kset; extern struct kset *devices_kset;
......
...@@ -1546,6 +1546,7 @@ void fw_devlink_resume(void) ...@@ -1546,6 +1546,7 @@ void fw_devlink_resume(void)
goto out; goto out;
device_link_add_missing_supplier_links(); device_link_add_missing_supplier_links();
driver_deferred_probe_force_trigger();
out: out:
mutex_unlock(&defer_fw_devlink_lock); mutex_unlock(&defer_fw_devlink_lock);
} }
......
...@@ -167,6 +167,11 @@ static void driver_deferred_probe_trigger(void) ...@@ -167,6 +167,11 @@ static void driver_deferred_probe_trigger(void)
if (!driver_deferred_probe_enable) if (!driver_deferred_probe_enable)
return; return;
driver_deferred_probe_force_trigger();
}
void driver_deferred_probe_force_trigger(void)
{
/* /*
* A successful probe means that all the devices in the pending list * A successful probe means that all the devices in the pending list
* should be triggered to be reprobed. Move all the deferred devices * should be triggered to be reprobed. Move all the deferred devices
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment