From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2C610C35DF5 for ; Tue, 25 Feb 2020 05:08:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F3E1324682 for ; Tue, 25 Feb 2020 05:08:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="eseBaJpt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727031AbgBYFIn (ORCPT ); Tue, 25 Feb 2020 00:08:43 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:42778 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726974AbgBYFIm (ORCPT ); Tue, 25 Feb 2020 00:08:42 -0500 Received: by mail-pf1-f193.google.com with SMTP id 4so6530525pfz.9 for ; Mon, 24 Feb 2020 21:08:41 -0800 (PST) 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=bdantuu/5XxtE9f3CRUqpZsUq5/+hM9onGf3l9IzGoE=; b=eseBaJptDm8Ew+v8SqbkusD/nIsIJS5Q63dC5indg6vPCEKfEsMcIPCQ8LryIf6XAJ luL/+OrUx2Oy46HC+ptZ0HilMyfsc3zomlNmnYnHrzOLjZXAFyJ08p9/b5DGXYu8eaNo PUEltGUedjDLPkqZYyTqtRnfnUv2t/X/LDaRewmylTEofSd4xUVGA5OvCe0kLjUwXBn/ CRfUhK+/zob1g6uYsBJXymtFuGPFlDawi9R0laHsTU7R41pTUTtrKve6Bra6du4WP12c XCipO95SvbpgfSoF3P77ZiAEQSxcEhkwIXQFr7HKn24Gcs06BdepRKmhhhLGfZjwPG7U nieg== 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=bdantuu/5XxtE9f3CRUqpZsUq5/+hM9onGf3l9IzGoE=; b=c11spkcV1++Y5tYOk+XDwX3YSN0CR6k1to2gjcquDMgGYYxHRR155Dsa1vlwJ/OwJ4 dyvabJrbZb9bhe0KMS0LUOfHntL4RICNqJJRMALna4U7c1te+/hG207vBHIuXlCDquBQ pgbDykSt4gTUc2RTHJUnR/3HqqYSLHhqg52/2AQJxCVUuW4oK3VK/JzOFQAznps9PMHP Sy6Q4J54piQKQgr7ie2L2e/hPVptR8sTyTAUhHW/XVhsFvzOvcQZw6zkydm+nm2N67ab TcB+CXjkVQ6YddfZz6smkp234VO9XSJsjuCVaCoabMPjjk/vrB80+QUAJSEVzW/ZSsRp wACQ== X-Gm-Message-State: APjAAAW2AvK+sfrCGutGgoAdIaZY6uZsTwnE152vGVgv8cQ9hbGX7yyZ Wij3TN1PBU8o2jsnQetbPyCgyKH1S/Y= X-Google-Smtp-Source: APXvYqx5Kz8YB9icmd79yhCto0VvLnWu8Muf2e9T+i5OFmjE22x563qcKYydlVaxtypL+7AeLyRalw== X-Received: by 2002:a63:e5d:: with SMTP id 29mr9354407pgo.124.1582607321206; Mon, 24 Feb 2020 21:08:41 -0800 (PST) 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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 21:08:40 -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 2/6] driver core: Set deferred_probe_timeout to a longer default if CONFIG_MODULES is set Date: Tue, 25 Feb 2020 05:08:24 +0000 Message-Id: <20200225050828.56458-3-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> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When using modules, its common for the modules not to be loaded until quite late by userland. With the current code, driver_deferred_probe_check_state() will stop returning EPROBE_DEFER after late_initcall, which can cause module dependency resolution to fail after that. So allow a longer window of 30 seconds (picked somewhat arbitrarily, but influenced by the similar regulator core timeout value) in the case where modules are enabled. 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 * Made change conditional on CONFIG_MODULES --- drivers/base/dd.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/base/dd.c b/drivers/base/dd.c index d75b34de6964..fe26f2574a6d 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -224,7 +224,16 @@ static int deferred_devs_show(struct seq_file *s, void *data) } DEFINE_SHOW_ATTRIBUTE(deferred_devs); +#ifdef CONFIG_MODULES +/* + * 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; +#else +/* In the case of !modules, no probe timeout needed */ static int deferred_probe_timeout = -1; +#endif static int __init deferred_probe_timeout_setup(char *str) { int timeout; -- 2.17.1