From patchwork Sat Feb 18 08:32:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saravana Kannan X-Patchwork-Id: 58901 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp280753wrn; Sat, 18 Feb 2023 00:41:12 -0800 (PST) X-Google-Smtp-Source: AK7set+ARJtRnEN18UowjpTiDpiip5PGyavsfBr3lf/GpKFjt3CtXb+pR/MaS51l04tMiZB+GDYd X-Received: by 2002:a17:907:60c9:b0:8ae:80d5:7385 with SMTP id hv9-20020a17090760c900b008ae80d57385mr10053987ejc.10.1676709671818; Sat, 18 Feb 2023 00:41:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676709671; cv=none; d=google.com; s=arc-20160816; b=c8wNHQjwpZgABd+fN/DP12p/zDy7N3cBifaUq/L4MfkdtruIsGznV3RETwHmyeQbgW 0So3NTPftFWAjZntaxZtMLwEP2AJ9gk4shcfV+8CE84aeyD6YMwfqirfDgR9aYsZkdtT ixdrbMFH4baSFsAddaNIWqbtbx0qGFfn93N6pgG+8LYIWDnE1MkCqDt79AEwa8d5bwZ0 x6J6iY6XcjczmUOJvZi/xkA+6GUDg9NbvHAz7gwTMSub423pMaNRQDFvFyG87/rps/rF NCl5NYZm0eKW2M7P92KWasJwSoPzUniAPueaU7tdIvovkZVqSdoGBFhNs3kDHPYnUGWe U76w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=wf3aa1fibAc7MkDg7PORyU7RaVXEoouFWua6YI0T5Hw=; b=vjGxMyLc8veXJ3vCxQgveOoTCqTczrJax4MQD71zdc2miybG2noCVhw/H5EgvGsJrq pP+bkLfHCZNaFh37V5m//Q+3/+tbq/e1R+G5Nw+Hl02UzqgEhySvMv22bWQ7BXKgp0mW JyxImx2ox2vL438WGpsNkTRD9k53KTyrKg6DtyDQVKQljPhmR+QhW7oZLTWHrE9vEobJ 1F5qefcMr1xjDQ7qNFwWETaaXGVSStruS0AJ3IifFt69EDIs9kW3yXC3rmnYgruWYGNj Y00JnrPCspv4kPR91AWnL9TEFbcgz3QWGjEoi2Cf3WT00VWtQMRivJ0/jpMJWaJ06dGp Rafg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="r/CAEVeZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id wi6-20020a170906fd4600b0087877581bfcsi6616784ejb.982.2023.02.18.00.40.48; Sat, 18 Feb 2023 00:41:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="r/CAEVeZ"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229847AbjBRIdT (ORCPT + 99 others); Sat, 18 Feb 2023 03:33:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229536AbjBRIdJ (ORCPT ); Sat, 18 Feb 2023 03:33:09 -0500 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 832A1498A4 for ; Sat, 18 Feb 2023 00:33:07 -0800 (PST) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-5365936facfso28247027b3.4 for ; Sat, 18 Feb 2023 00:33:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=wf3aa1fibAc7MkDg7PORyU7RaVXEoouFWua6YI0T5Hw=; b=r/CAEVeZKaF7JFTzJGZPssmJ2DIsZyZc9v5lclCdMbxrxNh2Q3QLMVp4pLNRuC/Q5o s27Bkv2TMKwmgM8oUoVvMvQEDvRGwftjSDp/ve6slRHgGsw5Ms0v43lU1FgwAhrBbFUe 35o2FkSyM0x9/CMG8wr9G7/tyB/xKWzUmAI6tpiI86269U3STCkvIy4CWA8W6S2SdtXS 95eDXAunOWuxhtEP+diSImXUFuEa0VFXp1IRPtl0LmzghMSuArwHNw5gdcwOcP5ghRmt Jtm9ur/C7VTni40wqDN76966yegfo02FQ3vpbSwRhwDhCS/71+WQUH1e/qqxm6JVCgxQ FjGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=wf3aa1fibAc7MkDg7PORyU7RaVXEoouFWua6YI0T5Hw=; b=0ZaTWhUKZvAjtJ4OnYtDA3bE5SkbyYSfzl5xRXzXvlwtuyvPgY3FTvrdMPsOpybPTO lkyFSkBglA/b1nEeKt8H9z/R49H3IPYkplqG5IbxQY3++r2NGIjF9z/2Yb2f+Ki3W7Ls K5F4d7bnMuGqjNxSuRh2hLLJQx6DhHpTfFhdzRaNmM2/7Y0o3LwFgrdPelL3GCwEcVV7 /fgM5z4dti0CgckkLJlxvSq8uSGj3WnoOi0K5sxPY1mqzaBV0HogNQY/1PqhZzcM9f8T WuYu/uRACygDV4XAJdtoahml0hpjbkq0YH14CRvqg8luaMAu8gDz/DnmHs9UHPr5qkR1 Pkqw== X-Gm-Message-State: AO0yUKXyIaoRxJahLPDh4GRiZZ8RPD6PMh906B+8k00X4Ubr04xjcwSN ZbWOETL8BL9unDpzPzso9sU378wX0jcpzkc= X-Received: from saravanak.san.corp.google.com ([2620:15c:2d:3:382:7632:f7fc:4737]) (user=saravanak job=sendgmr) by 2002:a81:6a41:0:b0:534:3fd:8403 with SMTP id f62-20020a816a41000000b0053403fd8403mr652502ywc.89.1676709186748; Sat, 18 Feb 2023 00:33:06 -0800 (PST) Date: Sat, 18 Feb 2023 00:32:51 -0800 In-Reply-To: <20230218083252.2044423-1-saravanak@google.com> Message-Id: <20230218083252.2044423-5-saravanak@google.com> Mime-Version: 1.0 References: <20230218083252.2044423-1-saravanak@google.com> X-Mailer: git-send-email 2.39.2.637.g21b0678d19-goog Subject: [RFC v1 4/4] regulator: core: Move regulator supply resolving to the probe function From: Saravana Kannan To: Liam Girdwood , Mark Brown Cc: Saravana Kannan , Greg Kroah-Hartman , Geert Uytterhoeven , Marek Szyprowski , Bjorn Andersson , Sudeep Holla , Tony Lindgren , Doug Anderson , Guenter Roeck , Luca Weiss , kernel-team@android.com, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1758157520755062837?= X-GMAIL-MSGID: =?utf-8?q?1758157520755062837?= We can simplify the regulator's supply resolving code if we resolve the supply in the regulator's probe function. This allows us to: - Consolidate the supply resolution code to one place. - Avoid the need for recursion by allow driver core to take care of handling dependencies. - Avoid races and simplify locking by reusing the guarantees provided by driver core. - Avoid last minute/lazy resolving during regulator_get(). - Simplify error handling because we can assume the supply has been resolved once a regulator is probed. - Allow driver core to use device links/fw_devlink, where available, to resolve the regulator supplies in the optimal order. Signed-off-by: Saravana Kannan --- drivers/regulator/core.c | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index d5f9fdd79c14..f3bf74d1a81d 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1952,7 +1952,7 @@ static struct regulator_dev *regulator_dev_lookup(struct device *dev, if (node) { r = of_find_regulator_by_node(node); of_node_put(node); - if (r) + if (r && r->dev.links.status == DL_DEV_DRIVER_BOUND) return r; /* @@ -1982,11 +1982,11 @@ static struct regulator_dev *regulator_dev_lookup(struct device *dev, } mutex_unlock(®ulator_list_mutex); - if (r) + if (r && r->dev.links.status == DL_DEV_DRIVER_BOUND) return r; r = regulator_lookup_by_name(supply); - if (r) + if (r && r->dev.links.status == DL_DEV_DRIVER_BOUND) return r; return ERR_PTR(-ENODEV); @@ -2050,13 +2050,6 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) } } - /* Recursively resolve the supply of the supply */ - ret = regulator_resolve_supply(r); - if (ret < 0) { - put_device(&r->dev); - goto out; - } - /* * Recheck rdev->supply with rdev->mutex lock held to avoid a race * between rdev->supply null check and setting rdev->supply in @@ -2178,13 +2171,6 @@ struct regulator *_regulator_get(struct device *dev, const char *id, return regulator; } - ret = regulator_resolve_supply(rdev); - if (ret < 0) { - regulator = ERR_PTR(ret); - put_device(&rdev->dev); - return regulator; - } - if (!try_module_get(rdev->owner)) { regulator = ERR_PTR(-EPROBE_DEFER); put_device(&rdev->dev); @@ -5649,9 +5635,6 @@ regulator_register(struct device *dev, regulator_resolve_coupling(rdev); mutex_unlock(®ulator_list_mutex); - /* try to resolve regulators supply since a new one was registered */ - bus_for_each_dev(®ulator_bus, NULL, NULL, - regulator_register_resolve_supply); kfree(config); return rdev; @@ -5782,7 +5765,9 @@ static const struct dev_pm_ops __maybe_unused regulator_pm_ops = { static int regulator_drv_probe(struct device *dev) { - return 0; + struct regulator_dev *rdev = dev_to_rdev(dev); + + return regulator_resolve_supply(rdev); } static struct device_driver regulator_drv = {