From patchwork Tue Mar 23 02:59:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 12156709 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 BD6CCC433DB for ; Tue, 23 Mar 2021 03:15:07 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47703619A8 for ; Tue, 23 Mar 2021 03:15:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47703619A8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=i0MMyvS2dKJwZBz1qhbvwHupf+G1g8GCa8h96ORe4xk=; b=maBlZrRuaU8uXarD1aRjx3fPZ0 kscAApBzDQp54meVS++RwYVr0wUGD6ksgyNNOOByjnJPZti7juwR3eLfFGwTmuT1+ITzbcxpQdEmg RQ+TVJ8GGkhC7krwu1uQKcRfnphE82LffzfOFtRrghkQUi0AB4l9re7dPk4ggtDox+HG47ESc/UzG OEy5+oLJdcAPc7WTXHsjm56fm2qT5GdXBeAnRhq9XvkJfV9L3xcQKN+nhfLRX0Bl9zOIbu0yCetEn kKjJFBOQLRFx/qGEp9y/OxfuiKWW6tg4J4fTjdrvBBxYeqnXrWT57X8dwQJklJVWE2J1k4g3/zJki 8mCy/wzQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lOXU2-00DWpr-Rs; Tue, 23 Mar 2021 03:13:30 +0000 Received: from inva020.nxp.com ([92.121.34.13]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lOXTf-00DWiz-Ah for linux-arm-kernel@lists.infradead.org; Tue, 23 Mar 2021 03:13:10 +0000 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 0EA4F1A1B18; Tue, 23 Mar 2021 04:13:07 +0100 (CET) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id 283961A1B04; Tue, 23 Mar 2021 04:13:02 +0100 (CET) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id DB246402BB; Tue, 23 Mar 2021 04:12:55 +0100 (CET) From: Dong Aisheng To: linux-pm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: dongas86@gmail.com, kernel@pengutronix.de, shawnguo@kernel.org, linux-imx@nxp.com, linux-kernel@vger.kernel.org, myungjoo.ham@samsung.com, kyungmin.park@samsung.com, cw00.choi@samsung.com, abel.vesa@nxp.com, Dong Aisheng Subject: [PATCH V2 5/6] PM / devfreq: governor: optimize simpleondemand get_target_freq Date: Tue, 23 Mar 2021 10:59:18 +0800 Message-Id: <1616468359-14513-6-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1616468359-14513-1-git-send-email-aisheng.dong@nxp.com> References: <1616468359-14513-1-git-send-email-aisheng.dong@nxp.com> X-Virus-Scanned: ClamAV using ClamSMTP X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210323_031307_495771_0764A95D X-CRM114-Status: GOOD ( 14.64 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The device profile up_threshold/down_differential only needs to be initialized once when calling devm_devfreq_add_device. It's unnecessary to put the data check logic in the hot path (.get_target_freq()) where it will be called all the time during polling. Instead, we only check and initialize it one time during DEVFREQ_GOV_START. This also helps check data validability in advance during DEVFREQ_GOV_START rather than checking it later when running .get_target_freq(). Signed-off-by: Dong Aisheng --- Change Log: v1->v2: * rebase to devfreq-testing --- drivers/devfreq/devfreq.c | 24 +++++------------- drivers/devfreq/governor_simpleondemand.c | 31 +++++++++++++++-------- 2 files changed, 26 insertions(+), 29 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index cacda7d1f858..270e51f5318f 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -1908,9 +1908,7 @@ static ssize_t up_threshold_show(struct device *dev, if (!df->profile) return -EINVAL; - return sprintf(buf, "%d\n", df->profile->up_threshold - ? df->profile->up_threshold - : DEVFREQ_UP_THRESHOLD); + return sprintf(buf, "%d\n", df->profile->up_threshold); } static ssize_t up_threshold_store(struct device *dev, @@ -1934,9 +1932,7 @@ static ssize_t up_threshold_store(struct device *dev, if (value > 100) value = 100; - down_differential = df->profile->down_differential - ? df->profile->down_differential - : DEVFREQ_DOWN_DIFFERENCTIAL; + down_differential = df->profile->down_differential; if (value < down_differential) value = down_differential; @@ -1961,9 +1957,7 @@ static ssize_t down_differential_show(struct device *dev, if (!df->profile) return -EINVAL; - return sprintf(buf, "%d\n", df->profile->down_differential - ? df->profile->down_differential - : DEVFREQ_DOWN_DIFFERENCTIAL); + return sprintf(buf, "%d\n", df->profile->down_differential); } static ssize_t down_differential_store(struct device *dev, @@ -1984,9 +1978,7 @@ static ssize_t down_differential_store(struct device *dev, if (ret != 1) return -EINVAL; - up_threshold = df->profile->up_threshold - ? df->profile->up_threshold - : DEVFREQ_UP_THRESHOLD; + up_threshold = df->profile->up_threshold; if (value > up_threshold) value = up_threshold; @@ -2113,16 +2105,12 @@ static int devfreq_summary_show(struct seq_file *s, void *data) polling_ms = 0; if (IS_SUPPORTED_ATTR(devfreq->governor->attrs, UP_THRESHOLD)) - up_threshold = devfreq->profile->up_threshold - ? devfreq->profile->up_threshold - : DEVFREQ_UP_THRESHOLD; + up_threshold = devfreq->profile->up_threshold; else up_threshold = 0; if (IS_SUPPORTED_ATTR(devfreq->governor->attrs, DOWN_DIFF)) - down_differential = devfreq->profile->down_differential - ? devfreq->profile->down_differential - : DEVFREQ_DOWN_DIFFERENCTIAL; + down_differential = devfreq->profile->down_differential; else down_differential = 0; mutex_unlock(&devfreq->lock); diff --git a/drivers/devfreq/governor_simpleondemand.c b/drivers/devfreq/governor_simpleondemand.c index 93f6061667d9..3e195b46554a 100644 --- a/drivers/devfreq/governor_simpleondemand.c +++ b/drivers/devfreq/governor_simpleondemand.c @@ -18,8 +18,8 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, int err; struct devfreq_dev_status *stat; unsigned long long a, b; - unsigned int dfso_upthreshold = DEVFREQ_UP_THRESHOLD; - unsigned int dfso_downdifferential = DEVFREQ_DOWN_DIFFERENCTIAL; + unsigned int dfso_upthreshold = df->profile->up_threshold; + unsigned int dfso_downdifferential = df->profile->down_differential; err = devfreq_update_stats(df); if (err) @@ -27,15 +27,6 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, stat = &df->last_status; - if (df->profile->up_threshold) - dfso_upthreshold = df->profile->up_threshold; - if (df->profile->down_differential) - dfso_downdifferential = df->profile->down_differential; - - if (dfso_upthreshold > 100 || - dfso_upthreshold < dfso_downdifferential) - return -EINVAL; - /* Assume MAX if it is going to be divided by zero */ if (stat->total_time == 0) { *freq = DEVFREQ_MAX_FREQ; @@ -79,11 +70,29 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, return 0; } +static int devfreq_simple_ondemand_check_od(struct devfreq *df) +{ + if (!df->profile->up_threshold) + df->profile->up_threshold = DEVFREQ_UP_THRESHOLD; + + if (!df->profile->down_differential) + df->profile->down_differential = DEVFREQ_DOWN_DIFFERENCTIAL; + + if (df->profile->up_threshold > 100 || + df->profile->up_threshold < df->profile->down_differential) + return -EINVAL; + + return 0; +} + static int devfreq_simple_ondemand_handler(struct devfreq *devfreq, unsigned int event, void *data) { switch (event) { case DEVFREQ_GOV_START: + if (devfreq_simple_ondemand_check_od(devfreq)) + return -EINVAL; + devfreq_monitor_start(devfreq); break;