From patchwork Thu Aug 22 22:45:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13774319 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 50D30C5320E for ; Thu, 22 Aug 2024 22:49:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=24E2ZJlxZRFr5xBB3D3mkMAuhlD0R/qQC+7zUcBQFEc=; b=laDbhihitkqs3SaUpX9s5i1CRV ngonpcbxFUX8rIUOgORhCP5JYA8be5KE/bgI5UPq9IRCqpiNNOHi2ihRhq6gxuo8mxDvQEzworg+o TTxNj7PehljCh43LI4d7ddOe/lD7ZU43AV1ycCU6CsUUxssPmbudNzBVAb78ShKqX/YTWqV76n8wE DoWn7TXZfCVQYByIOHaEu7hEuOe3eh2mOIikiHkq4IULtMJEb1LeTjiq4ziJ6MQExm3uHdrpfbC45 4edM4xzLX2cc/AZUy68j0tJAHLd5dDMemZbY5ReJ3X4dDJuARHQ+GPeVG4zEyuYDWsyW/lyWCd8HX /fBl6Tqg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1shGcA-0000000EWRf-2cOE; Thu, 22 Aug 2024 22:49:10 +0000 Received: from mail-lj1-x235.google.com ([2a00:1450:4864:20::235]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1shGZG-0000000EVdI-3ipG for linux-arm-kernel@lists.infradead.org; Thu, 22 Aug 2024 22:46:12 +0000 Received: by mail-lj1-x235.google.com with SMTP id 38308e7fff4ca-2ef2c56d9dcso12281091fa.2 for ; Thu, 22 Aug 2024 15:46:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1724366769; x=1724971569; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=24E2ZJlxZRFr5xBB3D3mkMAuhlD0R/qQC+7zUcBQFEc=; b=t8OO22SAYJy2XQ03lRwp0u+Ug98gJH9OiIx0+vumjdozRAnXCw5qvCFfXwCb72J+jU 7V8b3oHWJZIXGPVExPntPKaofezfasnpd6dP2A43O4kZ7Ir79kj5Brehl+Cy29iQdVnR dPz+weGbnFnIgYq8agUtU8Ehz2sWu4m+OqtueFAay91/NuD64vHYZSamd+D532Tw0ARr m1FBbu2zvsaHvnLbA6b5DGBT3GuGZ+EXrUIa/1t42qlp1EoNJ40cGSYEdA+qLKluiAty xs/2tm0K49q/6Go8hpfbyKW0tNv5MuCWbbvh1uujWOaUhaBonc5GO8PVjUyK9t9i4L36 qrrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724366769; x=1724971569; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=24E2ZJlxZRFr5xBB3D3mkMAuhlD0R/qQC+7zUcBQFEc=; b=AjzZ7pbb/OtuXgnDh7kF+j8fcQIYH+EyDfnQWUEQPowY2X6aFGpce7fUS2YNySIdkT GHVeONCDwlZdc5gB2wkNB9CvWs+m69QmXEcVOK4LmBUX0emg/FTfoCfwVWjtX3Gc7w8T 9evZz6r5Q5bSGmsvdVmA+jVNVrr4fxyf/I+QeQTu1RZSlzOORjXLiAh56pQA/qqkCgca hVzmfNolTmMb8pShttw708Xangbh/V12F7rhNxZBdPZhmaIC2tre77vXimpvmTmdsww+ dZ55xoZBz42JCKk/bmjyayu+zkcHXh8v0LtUxr/M4oJk90xAyKOmedgEKsYJvsdBDZyM nQMw== X-Forwarded-Encrypted: i=1; AJvYcCXyRO7+iBPb9gJvwyfu2tIPWMftWEqrCsc+Oy/ljU+nOXyg0t6bWAe3U2N6aLqI2HiDh2mPtiugDGFvXNNhtJd1@lists.infradead.org X-Gm-Message-State: AOJu0YxwYodI0oWs6g3N/MoQe2lwe1+HE3SvPlrrYOTjZq334VZ75lBo r9mqUW8QLK9MvE6z2IouW+xDfLssU1EkAEyQ8/YHxrOU4RXekztL4CVjgxwM2Xs= X-Google-Smtp-Source: AGHT+IELTL8/y0e0fGbr2lzzbBRJ4DDHIa+OZXd4j/RR2q0PvMAUXPDsy1xGSGg5oKqO9JdJ+zyCrg== X-Received: by 2002:a05:6512:23a9:b0:52c:d27b:ddcb with SMTP id 2adb3069b0e04-534387554cemr259563e87.3.1724366768686; Thu, 22 Aug 2024 15:46:08 -0700 (PDT) Received: from uffe-tuxpro14.. (h-178-174-189-39.A498.priv.bahnhof.se. [178.174.189.39]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5334ea362a4sm379443e87.66.2024.08.22.15.46.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2024 15:46:08 -0700 (PDT) From: Ulf Hansson To: Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Bjorn Andersson , Konrad Dybcio , Nikunj Kela , Bryan O'Donoghue , Thierry Reding , Mikko Perttunen , Jonathan Hunter , Stephan Gerhold , Ilia Lin , Stanimir Varbanov , Vikash Garodia , Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 03/10] pmdomain: core: Manage the default required OPP from a separate function Date: Fri, 23 Aug 2024 00:45:40 +0200 Message-Id: <20240822224547.385095-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240822224547.385095-1-ulf.hansson@linaro.org> References: <20240822224547.385095-1-ulf.hansson@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240822_154610_961309_289E9A71 X-CRM114-Status: GOOD ( 17.91 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org To improve the readability of the code in __genpd_dev_pm_attach(), let's move out the required OPP handling into a separate function. Signed-off-by: Ulf Hansson --- Changes in v3: - None. Changes in v2: - None. --- drivers/pmdomain/core.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/drivers/pmdomain/core.c b/drivers/pmdomain/core.c index 2731b285e017..08c2192c02b4 100644 --- a/drivers/pmdomain/core.c +++ b/drivers/pmdomain/core.c @@ -2884,12 +2884,34 @@ static void genpd_dev_pm_sync(struct device *dev) genpd_queue_power_off_work(pd); } +static int genpd_set_required_opp(struct device *dev, unsigned int index) +{ + int ret, pstate; + + /* Set the default performance state */ + pstate = of_get_required_opp_performance_state(dev->of_node, index); + if (pstate < 0 && pstate != -ENODEV && pstate != -EOPNOTSUPP) { + ret = pstate; + goto err; + } else if (pstate > 0) { + ret = dev_pm_genpd_set_performance_state(dev, pstate); + if (ret) + goto err; + dev_gpd_data(dev)->default_pstate = pstate; + } + + return 0; +err: + dev_err(dev, "failed to set required performance state for power-domain %s: %d\n", + dev_to_genpd(dev)->name, ret); + return ret; +} + static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev, unsigned int index, bool power_on) { struct of_phandle_args pd_args; struct generic_pm_domain *pd; - int pstate; int ret; ret = of_parse_phandle_with_args(dev->of_node, "power-domains", @@ -2918,17 +2940,9 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev, dev->pm_domain->detach = genpd_dev_pm_detach; dev->pm_domain->sync = genpd_dev_pm_sync; - /* Set the default performance state */ - pstate = of_get_required_opp_performance_state(dev->of_node, index); - if (pstate < 0 && pstate != -ENODEV && pstate != -EOPNOTSUPP) { - ret = pstate; + ret = genpd_set_required_opp(dev, index); + if (ret) goto err; - } else if (pstate > 0) { - ret = dev_pm_genpd_set_performance_state(dev, pstate); - if (ret) - goto err; - dev_gpd_data(dev)->default_pstate = pstate; - } if (power_on) { genpd_lock(pd); @@ -2950,8 +2964,6 @@ static int __genpd_dev_pm_attach(struct device *dev, struct device *base_dev, return 1; err: - dev_err(dev, "failed to set required performance state for power-domain %s: %d\n", - pd->name, ret); genpd_remove_device(pd, dev); return ret; }