From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C7A9C07E9B for ; Fri, 9 Jul 2021 18:54:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 02E0D61355 for ; Fri, 9 Jul 2021 18:54:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229506AbhGIS5J (ORCPT ); Fri, 9 Jul 2021 14:57:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229459AbhGIS5I (ORCPT ); Fri, 9 Jul 2021 14:57:08 -0400 Received: from mail-oi1-x22c.google.com (mail-oi1-x22c.google.com [IPv6:2607:f8b0:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E7D2C0613E6 for ; Fri, 9 Jul 2021 11:54:25 -0700 (PDT) Received: by mail-oi1-x22c.google.com with SMTP id s17so13459965oij.0 for ; Fri, 09 Jul 2021 11:54:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=Okt/vQX1xLFseXyS2zcH8+6wq1EWZun8qIPdwle5V30=; b=DOpPZtZD1NW1KSOq9LToGWjpIcuk8Aw81H5Y5hDL643RYgZS9OGKyTFaXZVYDCm6hA XCkADOtix8CVKenh7EzUD/NfNmswucQeGA3xU0lmcm0vIs8Ysgb12yByuMZjDFr6XDd7 4bZR4lFA4LPst4AIVYlMteXbQjBk30mzDxUunuR1nxsSXtTdzAOxW1k92lA5tX1fAKPV ULlgYa8lyQWgSlfvuDume7hnWdzANhcuGZi5+1qY8PcQYbk+BgvInhs5zmayPzHemB0m aNJQccKH4FsfgbukoYbtE+/XhZOihgbOeK/J3ldmTlqHAppyaSEsA9Dl/Y5LY8SGeQsn 0aeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=Okt/vQX1xLFseXyS2zcH8+6wq1EWZun8qIPdwle5V30=; b=qA6PpZKnn1kLGMDmnza5jYWkqFmGlFQR3bUBjrwaUYnjT5zUHjSxsnKHsIbj0MOoX0 svLl8tyfDcnlH0JlIu4koqdbWwHqleAy+s3TLEyRoAeR0yFup08XfwDhSPjbJ8HJyiI7 u5vnxQG8zywZL9D+aAPUtZcm1ZwiAQRCkv8adjGNe5O9w3ecW5JbC/S+mxR7FNceA8ad m1jJHt8TAZQtbmPuwvCsJPzg7C2yfU7qgElxhafudH1BQpVicpwaoa5W72t8OvjM30CC 3zlu/7+MfHaxMYJZqSVEyVebL1aRJEaj5FBWQEkSRcY3TpF4/NLtDProBpgnpOkS/XOl m3Cg== X-Gm-Message-State: AOAM531PxadpSsC6iubiNXZRIMNxTPDE1gwDAvO3LPot9tr870a2CKiV z2qNyQbJGMpfk6jnGpAJN2EeFA== X-Google-Smtp-Source: ABdhPJyjocthv/mPZVMXoeD9mhT7vXAed2apV5OzOXP+ndJNIK28KQMNVuE447rscrCzL4tLmJVHow== X-Received: by 2002:a05:6808:31a:: with SMTP id i26mr8750684oie.40.1625856863645; Fri, 09 Jul 2021 11:54:23 -0700 (PDT) Received: from yoga (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id g1sm1148975ooi.34.2021.07.09.11.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Jul 2021 11:54:23 -0700 (PDT) Date: Fri, 9 Jul 2021 13:54:20 -0500 From: Bjorn Andersson To: Dmitry Baryshkov Cc: Andy Gross , Rob Herring , Stephen Boyd , Taniya Das , Jonathan Marek , Michael Turquette , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, Bryan O'Donoghue , Mark Brown , Ulf Hansson , linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 4/7] clk: qcom: gdsc: call runtime PM functions for the provider device Message-ID: References: <20210709173202.667820-1-dmitry.baryshkov@linaro.org> <20210709173202.667820-5-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210709173202.667820-5-dmitry.baryshkov@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On Fri 09 Jul 12:31 CDT 2021, Dmitry Baryshkov wrote: > In order to properly handle runtime PM status of the provider device, > call pm_runtime_get/pm_runtime_put on the clock controller device. > > Signed-off-by: Dmitry Baryshkov > --- > drivers/clk/qcom/gdsc.c | 66 ++++++++++++++++++++++++++++++++++++++--- > drivers/clk/qcom/gdsc.h | 2 ++ > 2 files changed, 64 insertions(+), 4 deletions(-) > > diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c > index ccd36617d067..6bec31fccb09 100644 > --- a/drivers/clk/qcom/gdsc.c > +++ b/drivers/clk/qcom/gdsc.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -50,6 +51,30 @@ enum gdsc_status { > GDSC_ON > }; > > +static int gdsc_pm_runtime_get(struct gdsc *sc) > +{ > + int ret; > + > + if (!sc->rpm_dev) > + return 0; > + > + ret = pm_runtime_get_sync(sc->rpm_dev); > + if (ret < 0) { > + pm_runtime_put_noidle(sc->rpm_dev); > + return ret; > + } > + > + return 0; > +} > + > +static int gdsc_pm_runtime_put(struct gdsc *sc) > +{ > + if (!sc->rpm_dev) > + return 0; > + > + return pm_runtime_put_sync(sc->rpm_dev); > +} > + > /* Returns 1 if GDSC status is status, 0 if not, and < 0 on error */ > static int gdsc_check_status(struct gdsc *sc, enum gdsc_status status) > { > @@ -232,9 +257,8 @@ static void gdsc_retain_ff_on(struct gdsc *sc) > regmap_update_bits(sc->regmap, sc->gdscr, mask, mask); > } > > -static int gdsc_enable(struct generic_pm_domain *domain) > +static int _gdsc_enable(struct gdsc *sc) > { > - struct gdsc *sc = domain_to_gdsc(domain); > int ret; > > if (sc->pwrsts == PWRSTS_ON) > @@ -290,11 +314,28 @@ static int gdsc_enable(struct generic_pm_domain *domain) > return 0; > } > > -static int gdsc_disable(struct generic_pm_domain *domain) > +static int gdsc_enable(struct generic_pm_domain *domain) > { > struct gdsc *sc = domain_to_gdsc(domain); > int ret; > > + ret = gdsc_pm_runtime_get(sc); > + if (ret) > + return ret; > + > + ret = _gdsc_enable(sc); > + if (ret) { > + gdsc_pm_runtime_put(sc); I presume what you do here is to leave the pm_runtime state of dispcc active if we succeeded in enabling the gdsc. But the gdsc is a subdomain of the parent domain, so the framework should take case of its dependency. So the reason for gdsc_pm_runtime_get()/put() in this code path is so that you can access the dispcc registers, i.e. I think you should get()/put() regardless of the return value. > + return ret; > + } > + > + return 0; > +} > + > +static int _gdsc_disable(struct gdsc *sc) > +{ > + int ret; > + > if (sc->pwrsts == PWRSTS_ON) > return gdsc_assert_reset(sc); > > @@ -329,6 +370,18 @@ static int gdsc_disable(struct generic_pm_domain *domain) > return 0; > } > > +static int gdsc_disable(struct generic_pm_domain *domain) > +{ > + struct gdsc *sc = domain_to_gdsc(domain); > + int ret; > + If the gdsc is found to be on at initialization, the next operation that will happen is gdsc_disable() and as you didn't activate the pm_runtime state in gdsc_init() you would in theory get here with registers unaccessible. In practice though, the active gdsc should through the being a subdomain of the parent domain keep power on for you, so you won't notice this issue. But as above, I think you should wrap _gdsc_disable() in a get()/put() pair. > + ret = _gdsc_disable(sc); > + if (ret) > + return ret; > + > + return gdsc_pm_runtime_put(sc); > +} > + > static int gdsc_init(struct gdsc *sc) > { > u32 mask, val; > @@ -425,6 +478,8 @@ int gdsc_register(struct gdsc_desc *desc, > for (i = 0; i < num; i++) { > if (!scs[i]) > continue; > + if (pm_runtime_enabled(dev)) > + scs[i]->rpm_dev = dev; > scs[i]->regmap = regmap; > scs[i]->rcdev = rcdev; > ret = gdsc_init(scs[i]); > @@ -486,7 +541,10 @@ void gdsc_unregister(struct gdsc_desc *desc) > */ > int gdsc_gx_do_nothing_enable(struct generic_pm_domain *domain) > { > + struct gdsc *sc = domain_to_gdsc(domain); > + > /* Do nothing but give genpd the impression that we were successful */ > - return 0; > + /* Get the runtime PM device only */ > + return gdsc_pm_runtime_get(sc); Per above, if you let the framework deal with the gdsc's dependencies on the parent domain and you only get()/put() for the sake of dispcc then you don't need you don't need to do this to keep the subsequent gdsc_disable() in balance. > } > EXPORT_SYMBOL_GPL(gdsc_gx_do_nothing_enable); > diff --git a/drivers/clk/qcom/gdsc.h b/drivers/clk/qcom/gdsc.h > index 5bb396b344d1..a82982df0a55 100644 > --- a/drivers/clk/qcom/gdsc.h > +++ b/drivers/clk/qcom/gdsc.h > @@ -25,6 +25,7 @@ struct reset_controller_dev; > * @resets: ids of resets associated with this gdsc > * @reset_count: number of @resets > * @rcdev: reset controller > + * @rpm_dev: runtime PM device > */ > struct gdsc { > struct generic_pm_domain pd; > @@ -58,6 +59,7 @@ struct gdsc { > > const char *supply; > struct regulator *rsupply; > + struct device *rpm_dev; This isn't just the "runtime pm device", it's the device this gdsc is associated with. So "dev" sounds sufficient to me, but that requires that you have a separate bool rpm_enabled to remember if pm_runtime_enabled() was true during probe. So unless we need "dev" for something else this might be sufficient. Regards, Bjorn > }; > > struct gdsc_desc { > -- > 2.30.2 >