From patchwork Wed Jun 2 10:12:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12293661 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=-18.8 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,URIBL_BLOCKED, USER_AGENT_GIT 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 ED801C47092 for ; Wed, 2 Jun 2021 10:12:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D320F613E7 for ; Wed, 2 Jun 2021 10:12:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232164AbhFBKOS (ORCPT ); Wed, 2 Jun 2021 06:14:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232097AbhFBKOR (ORCPT ); Wed, 2 Jun 2021 06:14:17 -0400 Received: from mail-lj1-x22c.google.com (mail-lj1-x22c.google.com [IPv6:2a00:1450:4864:20::22c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE784C061574 for ; Wed, 2 Jun 2021 03:12:32 -0700 (PDT) Received: by mail-lj1-x22c.google.com with SMTP id a4so1899432ljd.5 for ; Wed, 02 Jun 2021 03:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hWJY2CFLHTV9te/K12aeGYAdOeh00bsaQx3awehhTns=; b=otscoI9pFx2lrv6RxW/6Gl7A/sdHQxh3kPnxbLMMZGHhdC2it/DuwnF4MCeokvSaZz zIupfLbKOtmT4BEQ7K1IjqQUkWgfOxanvdw+SEb67ZyGIsDjCVeP6JO11fRGmgALYH+/ K3pUMG01BEnsLg4OIyMOhLm369wsjxTzXQHmKPysQtLXG9MxfFQT1KGe+16d+jwZA/nD yB/uyW5CVoiTLxd4gL7vCOqMjRGtL3D/JlGQ2rTwkfefgVRxjXwmw05VdJebQ2oSu38X Xp4JkQfw4cL0kiQgbCnUMTxPfuZ0M69DwW+Oe93PVRRDGY8LhNT9YGBKl9Tc9I6yrw41 Wd4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hWJY2CFLHTV9te/K12aeGYAdOeh00bsaQx3awehhTns=; b=muMFtU+ILGpfijEXIOkfChQPkte4v5PuA+IJV44hZFI+tXowenBjYrj24opqbX5ODD 4DIywN8NF8dLWPSxqLB1h60+oDqxM0MPgHRnbyO5U82Veii9lJef0ZdVTI7mLJtwdnnW qushTlnWgCwbxjzrA2Tt7BSQ+X2pNZ4nLn1Uz4WYb5S5kVQZXPTLwMPorC/yYrVgY2Y2 AQxzjmQAH+pCkHO1vknn2ayLPQIvTmhImcuU7MuE2lgOxkqEJGMHURLI9QCOi35pef+W Ma1sLoEu36wzMHFXbU5FW0ZhARGy0DxQ8QkClJIv5FoBgvvZxE5/pRcgdUfUzXMX1mwk 2PLw== X-Gm-Message-State: AOAM532uCaoy6QQWUur8omj8RTx3LWeTA6VKRPlynPsEU2wx+r3X419C na2sLSz3JwJT+EPMheiNZNeQ4Q== X-Google-Smtp-Source: ABdhPJxYUSku4L7fSC+jpg2qG/mq4pKtA+sillsPDclxRNexC8+2QLmeOD45HAP9L6+27YKLwbnZUA== X-Received: by 2002:a2e:9083:: with SMTP id l3mr24610514ljg.315.1622628751113; Wed, 02 Jun 2021 03:12:31 -0700 (PDT) Received: from localhost.localdomain (h-155-4-129-146.NA.cust.bahnhof.se. [155.4.129.146]) by smtp.gmail.com with ESMTPSA id y35sm1948938lfa.122.2021.06.02.03.12.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 03:12:30 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Viresh Kumar , linux-pm@vger.kernel.org Cc: Ulf Hansson , Dmitry Osipenko , Jonathan Hunter , Thierry Reding , Rajendra Nayak , Stephan Gerhold , Roja Rani Yarubandi , Bjorn Andersson , Vincent Guittot , Stephen Boyd , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] PM: domains: Split code in dev_pm_genpd_set_performance_state() Date: Wed, 2 Jun 2021 12:12:13 +0200 Message-Id: <20210602101215.78094-2-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210602101215.78094-1-ulf.hansson@linaro.org> References: <20210602101215.78094-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org To prepare some of the code in dev_pm_genpd_set_performance_state() to be re-used from subsequent changes, let's split it up into two functions. Signed-off-by: Ulf Hansson Reviewed-by: Viresh Kumar --- drivers/base/power/domain.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index b6a782c31613..a3b6e751f366 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -379,6 +379,24 @@ static int _genpd_set_performance_state(struct generic_pm_domain *genpd, return ret; } +static int genpd_set_performance_state(struct device *dev, unsigned int state) +{ + struct generic_pm_domain *genpd = dev_to_genpd(dev); + struct generic_pm_domain_data *gpd_data = dev_gpd_data(dev); + unsigned int prev_state; + int ret; + + prev_state = gpd_data->performance_state; + gpd_data->performance_state = state; + + state = _genpd_reeval_performance_state(genpd, state); + ret = _genpd_set_performance_state(genpd, state, 0); + if (ret) + gpd_data->performance_state = prev_state; + + return ret; +} + /** * dev_pm_genpd_set_performance_state- Set performance state of device's power * domain. @@ -397,8 +415,6 @@ static int _genpd_set_performance_state(struct generic_pm_domain *genpd, int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state) { struct generic_pm_domain *genpd; - struct generic_pm_domain_data *gpd_data; - unsigned int prev; int ret; genpd = dev_to_genpd_safe(dev); @@ -410,16 +426,7 @@ int dev_pm_genpd_set_performance_state(struct device *dev, unsigned int state) return -EINVAL; genpd_lock(genpd); - - gpd_data = to_gpd_data(dev->power.subsys_data->domain_data); - prev = gpd_data->performance_state; - gpd_data->performance_state = state; - - state = _genpd_reeval_performance_state(genpd, state); - ret = _genpd_set_performance_state(genpd, state, 0); - if (ret) - gpd_data->performance_state = prev; - + ret = genpd_set_performance_state(dev, state); genpd_unlock(genpd); return ret; From patchwork Wed Jun 2 10:12:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12293663 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=-18.8 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,URIBL_BLOCKED, USER_AGENT_GIT 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 DA224C4708F for ; Wed, 2 Jun 2021 10:12:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BEBFF613B8 for ; Wed, 2 Jun 2021 10:12:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232123AbhFBKOS (ORCPT ); Wed, 2 Jun 2021 06:14:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36738 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231934AbhFBKOR (ORCPT ); Wed, 2 Jun 2021 06:14:17 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E3E8C061756 for ; Wed, 2 Jun 2021 03:12:34 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id b18so2472769lfv.11 for ; Wed, 02 Jun 2021 03:12:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KSQ/Hhdv/geuNZerNpw5PmMWOOCJZ7RFgPSp5JORONg=; b=IkG/6epNfEkZ1qT7vpb6Doka0wPZaljxQ/pa1Fi76aylVEMGZMdt0S46sfAP/7fNVM V81JWsEqBwjvDpbeGGqraXSw/dwEsUw3/rjoj+KWLwupUC9PYRuvScCpSJgCS5d38BeW eiaOvhiUuVhWtRpyTBcc/pKklqAJ01CqW8wxMWIjEHN9yh589IHdSmSzFsT5Iz9dvS3v I9BHqGMi32JjknuHwpUTdnvKbshxSx4xcl0QPfWnxmb2vYMi9DsIe5HAbMZvIZXb6k54 yuvcIir/0Di6lDsdfebIF/pphyfwC4IGrTbteJReNWa3kK5ks6VFyXkXHOEhsrvImyPW iV3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KSQ/Hhdv/geuNZerNpw5PmMWOOCJZ7RFgPSp5JORONg=; b=BIlr5vJ2Lm3SEi6m8E8+c4eb8yQxzTN5KD3YyYdwYlXvl+38VJXzmfGdXRDTfrU4bX hlUpDO/wSoeciYs6bp51csqpzzf5ehvWb+zRxSkeuy0BuoCU/6w0GBEX29J3/OxFTFCJ mdqJQKM7UVPjMpRPxPq0iwrXfmFE5/EquRnUOQEpgM+bnPQZH7LZKJKjs1odG9q+CXoN rxR54e0N7geNfbiVR1n3KeODDgp1Gq8ceoo7YskISh/54cBWay0nA1Zs2aq4xTw5g27X hv0y5vUYlBLG2NSh6raxUgM7oFnf6Pi2AnABl9Fe+pIDmmCLEgfh14vGjj0XhNHBcmQB PNyw== X-Gm-Message-State: AOAM533b7yQGcYTBN9T6mUarrnweFlzr7Zltd13LIOZ9O+IN45lYsD3Z IR0sze9AAaXmjvIiT2m4ZpHSJA== X-Google-Smtp-Source: ABdhPJx2vFqeoY4uP0jDdYZn95EyK+JpOwpNLIysagQIHxDH0hKmm4tvud9jfcRlkruXAxUZYhrZvg== X-Received: by 2002:ac2:5237:: with SMTP id i23mr4873494lfl.22.1622628752661; Wed, 02 Jun 2021 03:12:32 -0700 (PDT) Received: from localhost.localdomain (h-155-4-129-146.NA.cust.bahnhof.se. [155.4.129.146]) by smtp.gmail.com with ESMTPSA id y35sm1948938lfa.122.2021.06.02.03.12.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 03:12:31 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Viresh Kumar , linux-pm@vger.kernel.org Cc: Ulf Hansson , Dmitry Osipenko , Jonathan Hunter , Thierry Reding , Rajendra Nayak , Stephan Gerhold , Roja Rani Yarubandi , Bjorn Andersson , Vincent Guittot , Stephen Boyd , linux-kernel@vger.kernel.org Subject: [PATCH 2/3] PM: domains: Drop/restore performance state votes for devices at runtime PM Date: Wed, 2 Jun 2021 12:12:14 +0200 Message-Id: <20210602101215.78094-3-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210602101215.78094-1-ulf.hansson@linaro.org> References: <20210602101215.78094-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org A subsystem/driver that need to manage OPPs for its device, should typically drop its vote for the OPP when the device becomes runtime suspended. In this way, the corresponding aggregation of the performance state votes that is managed in genpd for the attached PM domain, may find that the aggregated vote can be decreased. Hence, it may allow genpd to set the lower performance state for the PM domain, thus avoiding to waste energy. To accomplish this, typically a subsystem/driver would need to call dev_pm_opp_set_rate|opp() for its device from its ->runtime_suspend() callback, to drop the vote for the OPP. Accordingly, it needs another call to dev_pm_opp_set_rate|opp() to restore the vote for the OPP from its ->runtime_resume() callback. To avoid boilerplate code in subsystems/driver to deal with these things, let's instead manage this internally in genpd. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 21 +++++++++++++++++++-- include/linux/pm_domain.h | 1 + 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index a3b6e751f366..81b9d4652b90 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -397,6 +397,18 @@ static int genpd_set_performance_state(struct device *dev, unsigned int state) return ret; } +static int genpd_drop_performance_state(struct device *dev) +{ + struct generic_pm_domain_data *gpd_data = dev_gpd_data(dev); + unsigned int prev_state; + + prev_state = gpd_data->performance_state; + if (prev_state && !genpd_set_performance_state(dev, 0)) + return prev_state; + + return 0; +} + /** * dev_pm_genpd_set_performance_state- Set performance state of device's power * domain. @@ -839,7 +851,8 @@ static int genpd_runtime_suspend(struct device *dev) { struct generic_pm_domain *genpd; bool (*suspend_ok)(struct device *__dev); - struct gpd_timing_data *td = &dev_gpd_data(dev)->td; + struct generic_pm_domain_data *gpd_data = dev_gpd_data(dev); + struct gpd_timing_data *td = &gpd_data->td; bool runtime_pm = pm_runtime_enabled(dev); ktime_t time_start; s64 elapsed_ns; @@ -896,6 +909,7 @@ static int genpd_runtime_suspend(struct device *dev) return 0; genpd_lock(genpd); + gpd_data->rpm_saved_pstate = genpd_drop_performance_state(dev); genpd_power_off(genpd, true, 0); genpd_unlock(genpd); @@ -913,7 +927,8 @@ static int genpd_runtime_suspend(struct device *dev) static int genpd_runtime_resume(struct device *dev) { struct generic_pm_domain *genpd; - struct gpd_timing_data *td = &dev_gpd_data(dev)->td; + struct generic_pm_domain_data *gpd_data = dev_gpd_data(dev); + struct gpd_timing_data *td = &gpd_data->td; bool runtime_pm = pm_runtime_enabled(dev); ktime_t time_start; s64 elapsed_ns; @@ -937,6 +952,8 @@ static int genpd_runtime_resume(struct device *dev) genpd_lock(genpd); ret = genpd_power_on(genpd, 0); + if (!ret && gpd_data->rpm_saved_pstate) + genpd_set_performance_state(dev, gpd_data->rpm_saved_pstate); genpd_unlock(genpd); if (ret) diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index dfcfbcecc34b..c3d6c15788a3 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -198,6 +198,7 @@ struct generic_pm_domain_data { struct notifier_block *power_nb; int cpu; unsigned int performance_state; + unsigned int rpm_saved_pstate; ktime_t next_wakeup; void *data; }; From patchwork Wed Jun 2 10:12:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 12293665 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=-15.9 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, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_GIT 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 30856C47092 for ; Wed, 2 Jun 2021 10:12:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15685613BA for ; Wed, 2 Jun 2021 10:12:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232227AbhFBKOT (ORCPT ); Wed, 2 Jun 2021 06:14:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232171AbhFBKOT (ORCPT ); Wed, 2 Jun 2021 06:14:19 -0400 Received: from mail-lj1-x235.google.com (mail-lj1-x235.google.com [IPv6:2a00:1450:4864:20::235]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EBE2CC061574 for ; Wed, 2 Jun 2021 03:12:35 -0700 (PDT) Received: by mail-lj1-x235.google.com with SMTP id e11so1849462ljn.13 for ; Wed, 02 Jun 2021 03:12:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=C0PrEdqIlPYceQIvyi2h1VFOj+MhO3lHQ6Qic3TwKKo=; b=EKjLMkzjNM5QGZZKAD4GkhTXZVGHf1OP7Nrl6TRvTAVse+F7+u9GF2TiD674xJhTFH 7L0niNMYpu7RF17IZF0iW0vkyzAAEtdj/RO5oV3gAWO+HjU22L4sXVMcHvjKC14gRiGD jsDabqkAp19sUFwQWKFZgB6LoEGS+PiO13sACnS59dGHV7OK3qIgj6bHu+Jo+RJrX1ri sftgT/pWXlmtVx9QqxPJkJpfJKU1sF3bqLVqXeHSzncWTDBpnpoVZJeGhKuW5/+Hs0gQ 5CJvHdza4iOu+DKpTHLJWSKJ6HpjiyWCdlUKfOpZJ+d8ylSzqu4XfBGUEKa/K03viRaO djKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=C0PrEdqIlPYceQIvyi2h1VFOj+MhO3lHQ6Qic3TwKKo=; b=BlDQl2Vgu0zuPt7atvfvrqVmzF79Ft6MJ+X2H/Sd4GYuD6yutr0O4/SONSXoHuM1mi Vf4tgOCZYV1v4JxPydfYJl93CadFgV1bMzRPDLep+LhD084kBVcFfI/8MomFiaDJ0kgF VulOfu+6YQhaKCprlvB7m6rhDHuZHob82EBXyeFVVxVvhF5Pz8Hp3NScMoBTxY7/Vv/u 2GK4d67tt0PgPIdh9U5yuUdMmmJnO3zwZiIOkHoN9QGruJs+4KGlFExjBPJjD3VhTK5r vlQSUGP+9MmyrP3XX0Mbn1Bn4ycjjJKRi7l+utAXj3NF5V3ltD/HYSQjU7QHnsqy53ck OtaQ== X-Gm-Message-State: AOAM5304ogHNBvqiR87Ljl5P16JYjno3ePIqphPonAELFs/Im+KXxJ/L s3rmMWY4v8knUXOhdF1dAWJ/ag== X-Google-Smtp-Source: ABdhPJyvYiEkPGa6Y6AXlYz/GT2pKU67zMM7rOxx5eSGTfjkkvNFuKoqZs0Td+mGvfPkiPvwGnNaUw== X-Received: by 2002:a2e:b0c8:: with SMTP id g8mr6076534ljl.453.1622628754305; Wed, 02 Jun 2021 03:12:34 -0700 (PDT) Received: from localhost.localdomain (h-155-4-129-146.NA.cust.bahnhof.se. [155.4.129.146]) by smtp.gmail.com with ESMTPSA id y35sm1948938lfa.122.2021.06.02.03.12.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 03:12:33 -0700 (PDT) From: Ulf Hansson To: "Rafael J . Wysocki" , Viresh Kumar , linux-pm@vger.kernel.org Cc: Ulf Hansson , Dmitry Osipenko , Jonathan Hunter , Thierry Reding , Rajendra Nayak , Stephan Gerhold , Roja Rani Yarubandi , Bjorn Andersson , Vincent Guittot , Stephen Boyd , linux-kernel@vger.kernel.org Subject: [PATCH 3/3] PM: domains: Drop/restore performance state votes for devices at system PM Date: Wed, 2 Jun 2021 12:12:15 +0200 Message-Id: <20210602101215.78094-4-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210602101215.78094-1-ulf.hansson@linaro.org> References: <20210602101215.78094-1-ulf.hansson@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Recent changes in genpd drops and restore performance state votes for devices during runtime PM. For the similar reasons, but to avoid the same kind of boilerplate code in device PM callbacks for system sleep in subsystems/drivers, let's drop and restore performance states votes in genpd for the attached devices during system sleep. Signed-off-by: Ulf Hansson --- drivers/base/power/domain.c | 14 ++++++++++++++ include/linux/pm_domain.h | 1 + 2 files changed, 15 insertions(+) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 81b9d4652b90..8487f1690deb 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1162,6 +1162,7 @@ static int genpd_prepare(struct device *dev) */ static int genpd_finish_suspend(struct device *dev, bool poweroff) { + struct generic_pm_domain_data *gpd_data = dev_gpd_data(dev); struct generic_pm_domain *genpd; int ret = 0; @@ -1192,6 +1193,7 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff) } genpd_lock(genpd); + gpd_data->pm_saved_pstate = genpd_drop_performance_state(dev); genpd->suspended_count++; genpd_sync_power_off(genpd, true, 0); genpd_unlock(genpd); @@ -1221,6 +1223,7 @@ static int genpd_suspend_noirq(struct device *dev) */ static int genpd_resume_noirq(struct device *dev) { + struct generic_pm_domain_data *gpd_data = dev_gpd_data(dev); struct generic_pm_domain *genpd; int ret; @@ -1236,6 +1239,8 @@ static int genpd_resume_noirq(struct device *dev) genpd_lock(genpd); genpd_sync_power_on(genpd, true, 0); genpd->suspended_count--; + if (gpd_data->pm_saved_pstate) + genpd_set_performance_state(dev, gpd_data->pm_saved_pstate); genpd_unlock(genpd); if (genpd->dev_ops.stop && genpd->dev_ops.start && @@ -1331,6 +1336,7 @@ static int genpd_poweroff_noirq(struct device *dev) */ static int genpd_restore_noirq(struct device *dev) { + struct generic_pm_domain_data *gpd_data = dev_gpd_data(dev); struct generic_pm_domain *genpd; int ret = 0; @@ -1355,6 +1361,8 @@ static int genpd_restore_noirq(struct device *dev) } genpd_sync_power_on(genpd, true, 0); + if (gpd_data->pm_saved_pstate) + genpd_set_performance_state(dev, gpd_data->pm_saved_pstate); genpd_unlock(genpd); if (genpd->dev_ops.stop && genpd->dev_ops.start && @@ -1400,23 +1408,29 @@ static void genpd_complete(struct device *dev) static void genpd_switch_state(struct device *dev, bool suspend) { struct generic_pm_domain *genpd; + struct generic_pm_domain_data *gpd_data; bool use_lock; genpd = dev_to_genpd_safe(dev); if (!genpd) return; + gpd_data = dev_gpd_data(dev); + use_lock = genpd_is_irq_safe(genpd); if (use_lock) genpd_lock(genpd); if (suspend) { + gpd_data->pm_saved_pstate = genpd_drop_performance_state(dev); genpd->suspended_count++; genpd_sync_power_off(genpd, use_lock, 0); } else { genpd_sync_power_on(genpd, use_lock, 0); genpd->suspended_count--; + if(gpd_data->pm_saved_pstate) + genpd_set_performance_state(dev, gpd_data->pm_saved_pstate); } if (use_lock) diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h index c3d6c15788a3..3eb215ac8adf 100644 --- a/include/linux/pm_domain.h +++ b/include/linux/pm_domain.h @@ -199,6 +199,7 @@ struct generic_pm_domain_data { int cpu; unsigned int performance_state; unsigned int rpm_saved_pstate; + unsigned int pm_saved_pstate; ktime_t next_wakeup; void *data; };