From patchwork Mon Jun 14 10:27:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 459825 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp3187720jae; Mon, 14 Jun 2021 04:20:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz272OSBpR8mPu5klJPIam4TSvFGSkSuRlTPOJnVg4jUVHBeYYj8JCguNaieOwSZRG8Gumd X-Received: by 2002:a17:906:365a:: with SMTP id r26mr15072427ejb.340.1623669606404; Mon, 14 Jun 2021 04:20:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623669606; cv=none; d=google.com; s=arc-20160816; b=Sf9Hm2ySTLA7O68/8EdknzNetA6jG1Q9n6BZAmGJ1LgmWsT4B2QUdcRz6RZ38fhEiR Rn486iVt4GzjILW8toxbDZ6XkiYTpS0Sw0hR+qBmHFWmAgOLad/8gVU6j4MaxKxUxUIP oGQ9+4YEuLzdK5EOTX6G/nP3KSjpBbD9K9pZd4lAPVfe79ltaX++GGll+uust8+AaXgU bMrPuDZqgJBqBZNP+SK3s2zNshYiDQgI4dwT0VBmMFQKHbHsiqLlyJODye60bszlr+V3 k+3eeszlU6rOQIv8ffyX7BeEbG5m/Ao6LRZLM9F7pMTjg7UO5aOPzgVizak1sB4NjrWO cNXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+kZqBSO2FWJvhZM9hfDXzBOgiHcbokPP5VOJX9c/JhU=; b=VOzfZLlSjsutOIg0d0u7HyPTnfcVLV8IowhaWeEVPyte9LXQmBg0+lAC3UAPcicoGu t1Fr+BLAF7vHDNZjbs98bB8E+wcwFk6JDJy7SKLYNVwEgDYPoMAt6c8bZrc50lEEH6er yfTZhaGAS6vGYUydufwGv3ZFGec2AAr4a0BWYh4van3hd6NqJMfWz1rveX96iXLDMcBu rw0UkY1XQMFl7E06QH+v+K4WLYNRcLO4UWGB1oKtdIhMNnTaIIrIyOWq9vbnYGVwxu+K 84DYsDT+ZNVxRHq/wwgzThJ3HcB5h5gfz9/1j1Wx2SX9MzGZWOI5+zeEbnNgN+ryZUkn lsKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iaop4UDP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v14si2410485edc.521.2021.06.14.04.20.06; Mon, 14 Jun 2021 04:20:06 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iaop4UDP; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235454AbhFNLWH (ORCPT + 12 others); Mon, 14 Jun 2021 07:22:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:50342 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236024AbhFNLUF (ORCPT ); Mon, 14 Jun 2021 07:20:05 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2A2BB6198F; Mon, 14 Jun 2021 10:51:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623667885; bh=uOuAHXP9EQLyzOxXuegsg55MUjHHW5Q0Wdl/IVh8Eok=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iaop4UDPizunfS2ba+nIJKA0ttn/D5IqOVq3/s7nQpp9j2onY1OnYzGCpYnOBRytJ HsKSN1ACGniAxdO46l2r4J+CMScnJcTJH/qbQdYSh8f2e6ApsXaVBp35SYZu9AQo1K 9ys6mFweOgbxaeTImoCZX2Fi1BbY00NCZy3X5oVE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dmitry Baryshkov , Mark Brown Subject: [PATCH 5.12 113/173] regulator: core: resolve supply for boot-on/always-on regulators Date: Mon, 14 Jun 2021 12:27:25 +0200 Message-Id: <20210614102701.931104529@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210614102658.137943264@linuxfoundation.org> References: <20210614102658.137943264@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dmitry Baryshkov commit 98e48cd9283dbac0e1445ee780889f10b3d1db6a upstream. For the boot-on/always-on regulators the set_machine_constrainst() is called before resolving rdev->supply. Thus the code would try to enable rdev before enabling supplying regulator. Enforce resolving supply regulator before enabling rdev. Fixes: aea6cb99703e ("regulator: resolve supply after creating regulator") Signed-off-by: Dmitry Baryshkov Link: https://lore.kernel.org/r/20210519221224.2868496-1-dmitry.baryshkov@linaro.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/regulator/core.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -1422,6 +1422,12 @@ static int set_machine_constraints(struc * and we have control then make sure it is enabled. */ if (rdev->constraints->always_on || rdev->constraints->boot_on) { + /* If we want to enable this regulator, make sure that we know + * the supplying regulator. + */ + if (rdev->supply_name && !rdev->supply) + return -EPROBE_DEFER; + if (rdev->supply) { ret = regulator_enable(rdev->supply); if (ret < 0) {