From patchwork Thu Oct 3 15:54:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175109 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp534586ill; Thu, 3 Oct 2019 09:13:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqzrvRXqb7en5Ga77LRhZbVrVRahJRhDB4iI99fRUVlHSxDq3xdMFR3WLALqatJ47CLK2frx X-Received: by 2002:aa7:c4d0:: with SMTP id p16mr10430273edr.266.1570119208561; Thu, 03 Oct 2019 09:13:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570119208; cv=none; d=google.com; s=arc-20160816; b=w4eQSyirKDbiHnb/gUYh6lXTTANv9y47RNVVfAhobHibYbjZHaSQAChUPKApZBFrj2 0UvQCycPzsRioPIvtinQGiN4xM43LF0+Hi2ymQYBX9+wlzuYXgR3SRPCf13iopOmVnUZ +7jN4136q2KqWN+SwXnPTx8LianhKFRpJlHE5H0TVO9w8bjH4qskYsRh0+iwJ4q1Iblm RMiZZRwaIe+csYx1qYY/ludktokmrOvvfy3N50sy8zKHmvbmy7TWAN3lWLSrAfe+LBCx T0mVoMoJE8F3lc5kRd+JkPlKZ/rB2vqMd+IKwT0pYmPRY2E55LweXVNO02ryYT6H6xes p+sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=IvpuYupW2J+9W9QXyQ6HvbsRtTU+Y30WQHtcCZCSqqw=; b=oDiElXOXYSWm/3QccNJ9XgRV+b4hImlip9ojRC3iE7SPgFWJngTHQrKV2MVkckRFXj oUrnZTeVNX/RvfPmeI6p/teif0tW1A39jVGfBgN0Uv3V8qlnWZagvf9R1xfCLvckyTLk p6OeycR/XehGjfH/ZkNQwsqRmEBTvydBEWk7Q9MrLvEgOMubfXwg7kgs0+WxIzzfjJ+c n85Xqj8ZR/b0MyUgmvoSk5aRK9ZKVBYfywM3wfiGO6WAjlFR0mkmwNiA8+vrBARpJ4xq cUX3qVimkEgRL/+k9wWeh5+pBhkqmmNJxzdhgbGU8eIL2YFMNuQlt1hxTCMEW+AX0Fsc iV8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VI6ALlh3; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p23si295233eju.435.2019.10.03.09.13.28; Thu, 03 Oct 2019 09:13:28 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=VI6ALlh3; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731695AbfJCQNZ (ORCPT + 14 others); Thu, 3 Oct 2019 12:13:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:36112 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388293AbfJCQNZ (ORCPT ); Thu, 3 Oct 2019 12:13:25 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4F957222C2; Thu, 3 Oct 2019 16:13:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570119203; bh=FJYnZg6WMObUE1C/7zbp248X1y4DM67iXnpE0grTntk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VI6ALlh3aRHfmaQKPCk9j8a313lwY7/RdzJwoWrEuBdeVj/ZpjnClOxmAyQRgieID 0jqGnDo5CePDZL+dmt5unV7twOuzSzdFuhVkg4wchuxcV2xGax2jfkXKBYAVSuGiUO ynoulvwftDItIoOnpZrlgELFRP+1diPaHetVyQpA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Brown , Lee Jones Subject: [PATCH 4.14 162/185] regulator: Defer init completion for a while after late_initcall Date: Thu, 3 Oct 2019 17:54:00 +0200 Message-Id: <20191003154515.611438519@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154437.541662648@linuxfoundation.org> References: <20191003154437.541662648@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Brown commit 55576cf1853798e86f620766e23b604c9224c19c upstream. The kernel has no way of knowing when we have finished instantiating drivers, between deferred probe and systems that build key drivers as modules we might be doing this long after userspace has booted. This has always been a bit of an issue with regulator_init_complete since it can power off hardware that's not had it's driver loaded which can result in user visible effects, the main case is powering off displays. Practically speaking it's not been an issue in real systems since most systems that use the regulator API are embedded and build in key drivers anyway but with Arm laptops coming on the market it's becoming more of an issue so let's do something about it. In the absence of any better idea just defer the powering off for 30s after late_initcall(), this is obviously a hack but it should mask the issue for now and it's no more arbitrary than late_initcall() itself. Ideally we'd have some heuristics to detect if we're on an affected system and tune or skip the delay appropriately, and there may be some need for a command line option to be added. Link: https://lore.kernel.org/r/20190904124250.25844-1-broonie@kernel.org Signed-off-by: Mark Brown Tested-by: Lee Jones Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/regulator/core.c | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -4503,7 +4503,7 @@ static int __init regulator_init(void) /* init early to allow our consumers to complete system booting */ core_initcall(regulator_init); -static int __init regulator_late_cleanup(struct device *dev, void *data) +static int regulator_late_cleanup(struct device *dev, void *data) { struct regulator_dev *rdev = dev_to_rdev(dev); const struct regulator_ops *ops = rdev->desc->ops; @@ -4552,18 +4552,9 @@ unlock: return 0; } -static int __init regulator_init_complete(void) +static void regulator_init_complete_work_function(struct work_struct *work) { /* - * Since DT doesn't provide an idiomatic mechanism for - * enabling full constraints and since it's much more natural - * with DT to provide them just assume that a DT enabled - * system has full constraints. - */ - if (of_have_populated_dt()) - has_full_constraints = true; - - /* * Regulators may had failed to resolve their input supplies * when were registered, either because the input supply was * not registered yet or because its parent device was not @@ -4580,6 +4571,35 @@ static int __init regulator_init_complet */ class_for_each_device(®ulator_class, NULL, NULL, regulator_late_cleanup); +} + +static DECLARE_DELAYED_WORK(regulator_init_complete_work, + regulator_init_complete_work_function); + +static int __init regulator_init_complete(void) +{ + /* + * Since DT doesn't provide an idiomatic mechanism for + * enabling full constraints and since it's much more natural + * with DT to provide them just assume that a DT enabled + * system has full constraints. + */ + if (of_have_populated_dt()) + has_full_constraints = true; + + /* + * We punt completion for an arbitrary amount of time since + * systems like distros will load many drivers from userspace + * so consumers might not always be ready yet, this is + * particularly an issue with laptops where this might bounce + * the display off then on. Ideally we'd get a notification + * from userspace when this happens but we don't so just wait + * a bit and hope we waited long enough. It'd be better if + * we'd only do this on systems that need it, and a kernel + * command line option might be useful. + */ + schedule_delayed_work(®ulator_init_complete_work, + msecs_to_jiffies(30000)); return 0; }