Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Documentation/admin-guide/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1144,8 +1144,9 @@
deferred probe to give up waiting on dependencies to
probe. Only specific dependencies (subsystems or
drivers) that have opted in will be ignored. A timeout
of 0 will timeout at the end of initcalls. If the time
out hasn't expired, it'll be restarted by each
of 0 will timeout at the end of initcalls; a negative
value is treated as an infinite timeout value. If the
timeout hasn't expired, it'll be restarted by each
successful driver registration. This option will also
dump out devices still on the deferred probe list after
retrying.
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/configs/qcom.config
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ CONFIG_CPU_IDLE_THERMAL=y
CONFIG_DMABUF_HEAPS=y
CONFIG_DMABUF_HEAPS_CMA=y
CONFIG_DMABUF_HEAPS_SYSTEM=y
CONFIG_DRIVER_DEFERRED_PROBE_TIMEOUT=60
CONFIG_EDAC_QCOM=m
CONFIG_EXPERT=y
CONFIG_FW_LOADER_COMPRESS=y
Expand Down
9 changes: 9 additions & 0 deletions drivers/base/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,15 @@ config DEVTMPFS_SAFE
with the PROT_EXEC flag. This can break, for example, non-KMS
video drivers.

config DRIVER_DEFERRED_PROBE_TIMEOUT
int "Default value for deferred_probe_timeout"
default 0 if !MODULES
default 10 if MODULES
help
Set the default value for the deferred_probe_timeout kernel parameter.
See Documentation/admin-guide/kernel-parameters.txt for a description
of the deferred_probe_timeout kernel parameter.

config STANDALONE
bool "Select only drivers that don't need compile-time external firmware"
default y
Expand Down
6 changes: 1 addition & 5 deletions drivers/base/dd.c
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,7 @@ static int deferred_devs_show(struct seq_file *s, void *data)
}
DEFINE_SHOW_ATTRIBUTE(deferred_devs);

#ifdef CONFIG_MODULES
static int driver_deferred_probe_timeout = 15;
#else
static int driver_deferred_probe_timeout;
#endif
static int driver_deferred_probe_timeout = CONFIG_DRIVER_DEFERRED_PROBE_TIMEOUT;

static int __init deferred_probe_timeout_setup(char *str)
{
Expand Down