openkylin
/
platform_kernel-5.15
mirror of https://gitee.com/openkylin/platform_kernel-5.15.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This reverts commit cec72f3efc.

Commit cec72f3efc ("driver core: Don't do deferred probe in parallel
with kernel_init thread") was fixing a commit 716a7a2596 ("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: Saravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20201121020232.908850-4-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Saravana Kannan 2020-11-20 18:02:18 -08:00 committed by Greg Kroah-Hartman
parent 3b052a3e30
commit 96d8a9168e
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/base/base.h
View File

@ -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;

1
drivers/base/core.c
View File

@ -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);
} }

5
drivers/base/dd.c
View File

@ -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