From patchwork Thu Feb 14 01:30:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthias Kaehlcke X-Patchwork-Id: 10811557 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 886E813A4 for ; Thu, 14 Feb 2019 01:31:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 756172DF4C for ; Thu, 14 Feb 2019 01:31:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 69B572DF4E; Thu, 14 Feb 2019 01:31:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DEC592DF4C for ; Thu, 14 Feb 2019 01:31:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730236AbfBNBbT (ORCPT ); Wed, 13 Feb 2019 20:31:19 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:42515 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731024AbfBNBay (ORCPT ); Wed, 13 Feb 2019 20:30:54 -0500 Received: by mail-pl1-f196.google.com with SMTP id s1so2174396plp.9 for ; Wed, 13 Feb 2019 17:30:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cJPsF4XxjEGWMiB9f3+lShzsGeUaN6tuDYb4BL3O6BA=; b=YIlwuLFnsN4k9F1/3gvjIie+67GffreLIWW+CwTMVxR8aaH75NsYm79ezmabwTE+7Z HKOgwH8iTSFV0aDF3VdQrSKiHQWde0wU9mwev7P61sdiBhWTY+IeABrsL72f+iNgoG9F EwSsXD9/cRavIJZ2uFuCjTejkPYG6mESFtaxQ= 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=cJPsF4XxjEGWMiB9f3+lShzsGeUaN6tuDYb4BL3O6BA=; b=stiE4lEovTbghf5KyUZO3FMq77JL8BcV8wpoppFRrV6T5jTP0YV0lUmgnn9tF3rWRH uIrSG4x5Oo4OaMpBoekeRB4LyIAFlP42oPE180tEC912mmtugrPFXbKzI0x4F/3eiXCR r9/0HKtlvWOUS0NM/r2/dJZxAF/F7AYgvfzjz7OcFIOO8NBTFhRKb78FiFlbIcrE8d3w JcDEeyVbNqhA4TPh9o+oAURThjpLrFWsTgXmRixc7ggalkQ/6TKslj0foS8DN1pUnQmn 7bd3eE1cukMe/fldE46DRqS4py306WLzfrW2GccmvaZRS4Auait9CPNWiqQOB2YSIB55 BDzw== X-Gm-Message-State: AHQUAub2quTqUBjM6CNUXcZ5HXgdA96htNumCqzc1sJ5AHJWJszzJZCh dMP/q/2tFOQeq44EW5op4PEwNQ== X-Google-Smtp-Source: AHgI3Ib0uzj8u4s+io55IqeyUT/B8Bj7K2MGYIcavwhZARaOwvrzHZSNKpOX8d4kySoluce9he4KEQ== X-Received: by 2002:a17:902:aa8c:: with SMTP id d12mr1332765plr.25.1550107854202; Wed, 13 Feb 2019 17:30:54 -0800 (PST) Received: from mka.mtv.corp.google.com ([2620:15c:202:1:75a:3f6e:21d:9374]) by smtp.gmail.com with ESMTPSA id p64sm811072pfi.56.2019.02.13.17.30.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 17:30:53 -0800 (PST) From: Matthias Kaehlcke To: MyungJoo Ham , Kyungmin Park , Chanwoo Choi , Thierry Reding , Jonathan Hunter , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, Lukasz Luba Cc: Matthias Kaehlcke Subject: [PATCH 1/4] PM / devfreq: Track overall load monitor state instead of 'stop_polling' Date: Wed, 13 Feb 2019 17:30:39 -0800 Message-Id: <20190214013042.254790-2-mka@chromium.org> X-Mailer: git-send-email 2.20.1.791.gb4d0f1c61a-goog In-Reply-To: <20190214013042.254790-1-mka@chromium.org> References: <20190214013042.254790-1-mka@chromium.org> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The field ->stop_polling indicates whether load monitoring should be/is stopped, it is set in devfreq_monitor_suspend(). Change the variable to hold the general state of load monitoring (stopped, running, suspended). Besides improving readability of conditions involving the field and this prepares the terrain for moving some duplicated code from the governors into the devfreq core. Hold the devfreq lock in devfreq_monitor_start/stop() to ensure proper synchronization. Signed-off-by: Matthias Kaehlcke --- drivers/devfreq/devfreq.c | 34 +++++++++++++++++++++++++--------- include/linux/devfreq.h | 4 ++-- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 0ae3de76833b7..1d3a43f8b3a10 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -29,6 +29,10 @@ #include #include "governor.h" +#define DEVFREQ_MONITOR_STOPPED 0 +#define DEVFREQ_MONITOR_RUNNING 1 +#define DEVFREQ_MONITOR_SUSPENDED 2 + static struct class *devfreq_class; /* @@ -407,10 +411,17 @@ static void devfreq_monitor(struct work_struct *work) */ void devfreq_monitor_start(struct devfreq *devfreq) { - INIT_DEFERRABLE_WORK(&devfreq->work, devfreq_monitor); - if (devfreq->profile->polling_ms) + mutex_lock(&devfreq->lock); + + if (devfreq->profile->polling_ms) { + INIT_DEFERRABLE_WORK(&devfreq->work, devfreq_monitor); queue_delayed_work(devfreq_wq, &devfreq->work, msecs_to_jiffies(devfreq->profile->polling_ms)); + + devfreq->monitor_state = DEVFREQ_MONITOR_RUNNING; + } + + mutex_unlock(&devfreq->lock); } EXPORT_SYMBOL(devfreq_monitor_start); @@ -425,6 +436,10 @@ EXPORT_SYMBOL(devfreq_monitor_start); void devfreq_monitor_stop(struct devfreq *devfreq) { cancel_delayed_work_sync(&devfreq->work); + + mutex_lock(&devfreq->lock); + devfreq->monitor_state = DEVFREQ_MONITOR_STOPPED; + mutex_unlock(&devfreq->lock); } EXPORT_SYMBOL(devfreq_monitor_stop); @@ -443,13 +458,13 @@ EXPORT_SYMBOL(devfreq_monitor_stop); void devfreq_monitor_suspend(struct devfreq *devfreq) { mutex_lock(&devfreq->lock); - if (devfreq->stop_polling) { + if (devfreq->monitor_state != DEVFREQ_MONITOR_RUNNING) { mutex_unlock(&devfreq->lock); return; } devfreq_update_status(devfreq, devfreq->previous_freq); - devfreq->stop_polling = true; + devfreq->monitor_state = DEVFREQ_MONITOR_SUSPENDED; mutex_unlock(&devfreq->lock); cancel_delayed_work_sync(&devfreq->work); } @@ -468,7 +483,7 @@ void devfreq_monitor_resume(struct devfreq *devfreq) unsigned long freq; mutex_lock(&devfreq->lock); - if (!devfreq->stop_polling) + if (devfreq->monitor_state == DEVFREQ_MONITOR_STOPPED) goto out; if (!delayed_work_pending(&devfreq->work) && @@ -477,7 +492,7 @@ void devfreq_monitor_resume(struct devfreq *devfreq) msecs_to_jiffies(devfreq->profile->polling_ms)); devfreq->last_stat_updated = jiffies; - devfreq->stop_polling = false; + devfreq->monitor_state = DEVFREQ_MONITOR_RUNNING; if (devfreq->profile->get_cur_freq && !devfreq->profile->get_cur_freq(devfreq->dev.parent, &freq)) @@ -504,13 +519,14 @@ void devfreq_interval_update(struct devfreq *devfreq, unsigned int *delay) mutex_lock(&devfreq->lock); devfreq->profile->polling_ms = new_delay; - if (devfreq->stop_polling) + if (devfreq->monitor_state == DEVFREQ_MONITOR_SUSPENDED) goto out; /* if new delay is zero, stop polling */ if (!new_delay) { mutex_unlock(&devfreq->lock); cancel_delayed_work_sync(&devfreq->work); + devfreq->monitor_state == DEVFREQ_MONITOR_STOPPED; return; } @@ -526,7 +542,7 @@ void devfreq_interval_update(struct devfreq *devfreq, unsigned int *delay) mutex_unlock(&devfreq->lock); cancel_delayed_work_sync(&devfreq->work); mutex_lock(&devfreq->lock); - if (!devfreq->stop_polling) + if (devfreq->monitor_state != DEVFREQ_MONITOR_SUSPENDED) queue_delayed_work(devfreq_wq, &devfreq->work, msecs_to_jiffies(devfreq->profile->polling_ms)); } @@ -1372,7 +1388,7 @@ static ssize_t trans_stat_show(struct device *dev, int i, j; unsigned int max_state = devfreq->profile->max_state; - if (!devfreq->stop_polling && + if ((devfreq->monitor_state == DEVFREQ_MONITOR_RUNNING) && devfreq_update_status(devfreq, devfreq->previous_freq)) return 0; if (max_state == 0) diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h index fbffa74bfc1bb..0a618bbb8b294 100644 --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h @@ -130,7 +130,7 @@ struct devfreq_dev_profile { * @max_freq: Limit maximum frequency requested by user (0: none) * @scaling_min_freq: Limit minimum frequency requested by OPP interface * @scaling_max_freq: Limit maximum frequency requested by OPP interface - * @stop_polling: devfreq polling status of a device. + * @monitor_state: State of the load monitor. * @suspend_freq: frequency of a device set during suspend phase. * @resume_freq: frequency of a device set in resume phase. * @suspend_count: suspend requests counter for a device. @@ -168,7 +168,7 @@ struct devfreq { unsigned long max_freq; unsigned long scaling_min_freq; unsigned long scaling_max_freq; - bool stop_polling; + int monitor_state; unsigned long suspend_freq; unsigned long resume_freq;