From patchwork Wed Jun 19 14:08:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 13703856 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 CD355C27C53 for ; Wed, 19 Jun 2024 14:09:58 +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=htFpAgDo306pFLyFNLJIsFnxeXuNDgJdkPPYgP2iQ3A=; b=TDajRC0XDD8NYOgnNhU81vL5Mq P5XOw4FcgLTtoLb0R0JYMPOnr7TT00EbdaIyj4Yke9i72mWw0VLi905vSUwD7tiVoh6fNbehJc47K erXif0n12WckgHJ6WkHsoQwMXcn1oglb1Q1vHpa3ppB5y7x7HKCs+c7rj+TIw7yVxamlgM8BQhAV+ srljho3lQd9U7PZuieLTTtNqBLVCSysFNIC+sd0667rPvyoeJsiMl/9qPuJJNT4J0x5OmGvCYQtHC QTsEFqOhwpnTaimPnPHwhX3Y0g0qe2nMXAN1+pP6+s7/sqaD/On2leIA90fOtVbyw9T7F9D+EOzIk 3CdkwVog==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJw0S-00000001RMR-33oi; Wed, 19 Jun 2024 14:09:48 +0000 Received: from mail-lf1-x129.google.com ([2a00:1450:4864:20::129]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sJvzx-00000001R2G-1ThI for linux-arm-kernel@lists.infradead.org; Wed, 19 Jun 2024 14:09:19 +0000 Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-5295e488248so7162567e87.2 for ; Wed, 19 Jun 2024 07:09:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718806155; x=1719410955; 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=htFpAgDo306pFLyFNLJIsFnxeXuNDgJdkPPYgP2iQ3A=; b=fYMjaR1JHrWLg0KEQdk9Vlj/E8ebO3Tt5ySWKwngWzq1GZrHVpL5Cm7lMLDFgugbG9 sP7tc7OhEYxnnDg14v2BTFWvk9qqxtgl6jD6Ws/5yDIARnYR0excx7GZhAepCYpfI10Z ZPpRkWsYxnGvsBkGo3Bmio849gEzWiL7WSMViRpHkpGFf/iNHcinsgTep6NLfJt0TAW2 BwBpHORne9WyOp6zWcDALZX97CysBpVS1yPUOvki+HGMRcMtF9YNR5HLFP57tntqemz0 wWtdoW2RxnvqpKAXLLPwzShe/33n5AsiiKyJAdfE1hcLhy2aAg9d/St0xd3NQTouWlsg svAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718806155; x=1719410955; 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=htFpAgDo306pFLyFNLJIsFnxeXuNDgJdkPPYgP2iQ3A=; b=CYNgfJ2UjNg+xjS62qtawl6IltrN3l1w9sYjQtmgkWGdIqRkXFRfjV012avF/TIn8e YDyMl0arOItRuV8+mLclh0zWz2D8WImpsNSx4K2DmHCGcoWmqOBNg7csxV6PqRa7jQnD 0XDiBmENXGWRzaUzmymGob7gjKAEpXOpR5EmcACOImuxZv02QfQyUhEPhy7MQeC2jCLf +SD3Ay2gsVmHO7arPaqWAU6HVhXPFgFgWQJpYyP18JhsXlMzBbszJRTnPIkQgzyFeO/0 YKjUKxfi28Y17+UWO5GenBLvtpTW+UPkMhqJY0mpKqGvoe7HJAuS4VlXIY0MvJ1twow4 IIeA== X-Forwarded-Encrypted: i=1; AJvYcCWTl1IqGi/wykisILHturO/Xe6bVrBO1sJqtzIMZ5sKP1OWM4yvSyXrg3zhZE004airaZ0MNUHZ3QBnOeTA16mLRYWuUvI15vp2O6EXpZa4V3NxhNI= X-Gm-Message-State: AOJu0YyJneVSaAJcamUizLvGH7AKqV8J9dDSKNTJfAbdgkxcknAsb8Au vuDyF4ZVPwSpvlYe1WHUbZNeTBMBnUFYetKiTZ2HmYkFye+Rjyg86CWElEja+/g= X-Google-Smtp-Source: AGHT+IHfAlr5DrpIAaWiiNsj4x6QaAAeJHHW2gKvh16J7kuwaVsds0u8zDkuPraMr/WEHw60Qa+NSw== X-Received: by 2002:ac2:44b6:0:b0:52c:893c:6c2c with SMTP id 2adb3069b0e04-52ccaa3756amr1415929e87.40.1718806153456; Wed, 19 Jun 2024 07:09:13 -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-52ca2872241sm1787003e87.124.2024.06.19.07.09.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jun 2024 07:09:13 -0700 (PDT) From: Ulf Hansson To: Viresh Kumar , Nishanth Menon , Stephen Boyd Cc: Bjorn Andersson , Konrad Dybcio , Nikunj Kela , Prasad Sodagudi , Thierry Reding , Jonathan Hunter , Ulf Hansson , linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/7] pmdomain: core: Manage the default required OPP from a separate function Date: Wed, 19 Jun 2024 16:08:47 +0200 Message-Id: <20240619140849.368580-6-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240619140849.368580-1-ulf.hansson@linaro.org> References: <20240619140849.368580-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-20240619_070917_477227_3D9946DF X-CRM114-Status: GOOD ( 17.26 ) 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 --- 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 83d978743659..74ebb8a423be 100644 --- a/drivers/pmdomain/core.c +++ b/drivers/pmdomain/core.c @@ -2774,12 +2774,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", @@ -2808,17 +2830,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); @@ -2840,8 +2854,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; }