From patchwork Tue Feb 25 05:08:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 183813 Delivered-To: patches@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp1263020ile; Mon, 24 Feb 2020 21:08:53 -0800 (PST) X-Received: by 2002:a17:90a:868b:: with SMTP id p11mr3140592pjn.60.1582607333172; Mon, 24 Feb 2020 21:08:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582607333; cv=none; d=google.com; s=arc-20160816; b=t7b/CFv6lIpOgxV5u7HZregtJLGhtnOFXof4cloxIDJTItlBWvJ0a4/TWvGqunhpnC q9m5LRskOaRD8u2PZrgcflHXo3XyAnAB6LS0OPa4GsXs4KzwtZ+NSWHBooSLh9dJU4Zs dysG2usXw4QBOhYnI7oRUhUHXhJ7V3vI+cOk9Sce8jP3OT8qMHAO13FcEQY84SbKwUwq 9F9VNhUOwGehKEdwJsNK4Tc4h7paNzmfZKv+tzC3iZaRPFV4EsGVVVMi9c5IlT4VcdZh 5hgkJOZBApm5nsLqv2BTDmpbTdrYLsQ1cyH0ayqOpwij7+KOlVWGtTWG9cidnXfA7gmd k51A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=al0yNnpxHbrkbnU0GkXBq3GBAXT9OW3YkTLBOR/+heI=; b=P2i1R+4J6HByBZbEmb6MhIqNhaA5C3/RM1f9kJzoPW5c3XgBA/n826FtDA37cxvBSW lhOlO1riwEhPozgqvCinMQz3uItVQRciuxlWW2IBQxfeZcrsSjcIKm8H4wGOJrI2TTJf trWlhwgerr97GTGEPwBp4gUkBjW7//DQ697IcaOwAGkIy22BYUlnB5DfVFhtghqRiJxl orbWXiMMizgt6X8XBPhpUbBqj2aLCBy8DJkDn2U7pYTU9QbgCmu55oJdaIoFeOctjB0d B/WlO7GYqMyWKgJ5GL8oOlKR2uiRvHPU4xmWZmJN+DZTNbC2v7qksNCE3Keo10zNpWvg OSrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rTdk+5bM; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id q8sor16652230pff.70.2020.02.24.21.08.53 for (Google Transport Security); Mon, 24 Feb 2020 21:08:53 -0800 (PST) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rTdk+5bM; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=al0yNnpxHbrkbnU0GkXBq3GBAXT9OW3YkTLBOR/+heI=; b=rTdk+5bMOM+HRL9wKEQyPyEKzfllOH6emQP6kJ0JbaGgfMspEx9D4EG6f07j0qZ6eA iUyyDaH6yh9/ilf2zj4FTE9BVjo+cQhw8secbrEa0uGoE/X9k+nW++hVRHfBotivunRX 7OMHcEKOaMXLp5ZWx+0l4FB/9Sy5LbtOpUflE9SQigrRwGpuE/udsdzLJFxIIBiwBtZu WKyX3NNNyGATkLWDTF01y187u6PFJp5dIAfcz7VNG4U7E81LdMhcIK3DuW/2hlsFNQRw NjDO9xlEkUm8JJI1O/3nV2c+B1lsYXls4TcWwu50hawLUD1LvKQbrX3seDfuWOjlHO+F 0lvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=al0yNnpxHbrkbnU0GkXBq3GBAXT9OW3YkTLBOR/+heI=; b=ZGCcdmxYokoBXwe4tA8kMRFPNZOMWH0m67Vs04h1AtAMkeThUpC3p7X9pAtJdq8bNK ZQyWvSCpOS3MoNpjf2n7GR+WVa3DoR2Sxovq64thEFSh2761EiWvO3WkF8zk/Hp6xmqC cd99RUK/6G1Vq0fR5BfjXFqPTqo9eDbhotqCMBBBO2jGG6HBOURtk/CMGtd1aLow4Hlb ksZ6yCr2Wo4T+S/wR+vFnYaPm+JAvH2zr1IJDQRTmhttvTQag5FRQx4pVykjwFF8daRo xo7UDGTJsCBg+FyPj232V2GnDP6hDzg1dVYGVOi2KjE9Nn2ZFyAk63XiyfhDKvNHqq/B /s8g== X-Gm-Message-State: APjAAAUxT7LukmLWNmyvl2F5XjBl38TVHgOcpf7xuIZKQUcOExxw5pwa mo4DASzHOJUNnHa9+ZUHbSyvTQuN X-Google-Smtp-Source: APXvYqxhk7Ltwaas8OK1QF0WV9MG82y+cNJGjUxEKBuCHPsResxQTxX7P1XMpbhqGCukyZWZ6+caHg== X-Received: by 2002:a63:28c3:: with SMTP id o186mr36905645pgo.248.1582607332765; Mon, 24 Feb 2020 21:08:52 -0800 (PST) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id r66sm15156450pfc.74.2020.02.24.21.08.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 21:08:52 -0800 (PST) From: John Stultz To: lkml Cc: John Stultz , Rob Herring , "Rafael J. Wysocki" , Kevin Hilman , Ulf Hansson , Pavel Machek , Len Brown , Todd Kjos , Saravana Kannan , Bjorn Andersson , Liam Girdwood , Mark Brown , Thierry Reding , Linus Walleij , Greg Kroah-Hartman , linux-pm@vger.kernel.org Subject: [PATCH v5 5/6] driver core: Rename deferred_probe_timeout and make it global Date: Tue, 25 Feb 2020 05:08:27 +0000 Message-Id: <20200225050828.56458-6-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200225050828.56458-1-john.stultz@linaro.org> References: <20200225050828.56458-1-john.stultz@linaro.org> Since other subsystems (like regulator) have similar arbitrary timeouts for how long they try to resolve driver dependencies, rename deferred_probe_timeout to driver_deferred_probe_timeout and set it as global, so it can be shared. Cc: Rob Herring Cc: "Rafael J. Wysocki" Cc: Kevin Hilman Cc: Ulf Hansson Cc: Pavel Machek Cc: Len Brown Cc: Todd Kjos Cc: Saravana Kannan Cc: Bjorn Andersson Cc: Liam Girdwood Cc: Mark Brown Cc: Thierry Reding Cc: Linus Walleij Cc: Greg Kroah-Hartman Cc: linux-pm@vger.kernel.org Reviewed-by: Rafael J. Wysocki Reviewed-by: Bjorn Andersson Signed-off-by: John Stultz --- v4: * Split out into its own patch as suggested by Mark * Renamed deferred_probe_timeout as suggested by Greg --- drivers/base/dd.c | 16 +++++++++------- include/linux/device/driver.h | 1 + 2 files changed, 10 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/drivers/base/dd.c b/drivers/base/dd.c index c09e4e7277d4..76888a7459d8 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -229,17 +229,19 @@ DEFINE_SHOW_ATTRIBUTE(deferred_devs); * In the case of modules, set the default probe timeout to * 30 seconds to give userland some time to load needed modules */ -static int deferred_probe_timeout = 30; +int driver_deferred_probe_timeout = 30; #else /* In the case of !modules, no probe timeout needed */ -static int deferred_probe_timeout = -1; +int driver_deferred_probe_timeout = -1; #endif +EXPORT_SYMBOL_GPL(driver_deferred_probe_timeout); + static int __init deferred_probe_timeout_setup(char *str) { int timeout; if (!kstrtoint(str, 10, &timeout)) - deferred_probe_timeout = timeout; + driver_deferred_probe_timeout = timeout; return 1; } __setup("deferred_probe_timeout=", deferred_probe_timeout_setup); @@ -264,7 +266,7 @@ int driver_deferred_probe_check_state(struct device *dev) return -ENODEV; } - if (!deferred_probe_timeout) { + if (!driver_deferred_probe_timeout) { dev_WARN(dev, "deferred probe timeout, ignoring dependency"); return -ETIMEDOUT; } @@ -276,7 +278,7 @@ static void deferred_probe_timeout_work_func(struct work_struct *work) { struct device_private *private, *p; - deferred_probe_timeout = 0; + driver_deferred_probe_timeout = 0; driver_deferred_probe_trigger(); flush_work(&deferred_probe_work); @@ -310,9 +312,9 @@ static int deferred_probe_initcall(void) driver_deferred_probe_trigger(); flush_work(&deferred_probe_work); - if (deferred_probe_timeout > 0) { + if (driver_deferred_probe_timeout > 0) { schedule_delayed_work(&deferred_probe_timeout_work, - deferred_probe_timeout * HZ); + driver_deferred_probe_timeout * HZ); } return 0; } diff --git a/include/linux/device/driver.h b/include/linux/device/driver.h index 5242afabfaba..ee7ba5b5417e 100644 --- a/include/linux/device/driver.h +++ b/include/linux/device/driver.h @@ -236,6 +236,7 @@ driver_find_device_by_acpi_dev(struct device_driver *drv, const void *adev) } #endif +extern int driver_deferred_probe_timeout; void driver_deferred_probe_add(struct device *dev); int driver_deferred_probe_check_state(struct device *dev); void driver_init(void);