From patchwork Tue Mar 9 12:58:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 12125029 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 9C7A8C433DB for ; Tue, 9 Mar 2021 13:15:53 +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 236BF60C3E for ; Tue, 9 Mar 2021 13:15:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 236BF60C3E 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=Xlz4585a4HsC4wAsX0McMQPPjx3Rcs+bHFxtKRjTw3I=; b=DHJbrs6QuXk154UIjtaiyeUZi5 4CSVt/bLlgbLBdvaDdsNoTSVVD6ErwExDe5tjSO8TeUTqpGj3BaZSDC0Dmdk5EyBHJ/tmrNGbUYP+ KaKTRfTplOg5IuZR2UWQniiXe5hF8do+SdeSIAWJ5Tkf+TF4beqTSbnb6ktetItMccLX05PspzWd+ 9rZmRNV7/XICXZ/PNemZ8dD9ZKwctGeuRGD9PTlaP9+Sl5A2M0/SB6nW17FLkOP4jko23Gd2zzwil Lzw2LW1uj4c8SGKbCI1PTarI/MWCtz/YNLfRs0Ky4yCI5VCBrIjPWwj48ijGw2HjoQtHb00fL+BIT jNTGfIdg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJcBs-004Wyp-CF; Tue, 09 Mar 2021 13:14:24 +0000 Received: from inva021.nxp.com ([92.121.34.21]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJcA6-004WI7-Hp for linux-arm-kernel@lists.infradead.org; Tue, 09 Mar 2021 13:12:36 +0000 Received: from inva021.nxp.com (localhost [127.0.0.1]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 4BDE2200FA9; Tue, 9 Mar 2021 14:12:34 +0100 (CET) Received: from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com [165.114.16.14]) by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id E1B27200FBB; Tue, 9 Mar 2021 14:12:27 +0100 (CET) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id 5CD364033B; Tue, 9 Mar 2021 14:12:18 +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 09/11] PM / devfreq: governor: optimize simpleondemand get_target_freq Date: Tue, 9 Mar 2021 20:58:39 +0800 Message-Id: <1615294733-22761-10-git-send-email-aisheng.dong@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1615294733-22761-1-git-send-email-aisheng.dong@nxp.com> References: <1615294733-22761-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-20210309_131234_703676_7F5CF2F8 X-CRM114-Status: GOOD ( 17.10 ) 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 devfreq_simple_ondemand_data 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 --- drivers/devfreq/governor_simpleondemand.c | 50 +++++++++++++++-------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/drivers/devfreq/governor_simpleondemand.c b/drivers/devfreq/governor_simpleondemand.c index ea287b57cbf3..341eb7e9dc04 100644 --- a/drivers/devfreq/governor_simpleondemand.c +++ b/drivers/devfreq/governor_simpleondemand.c @@ -15,15 +15,19 @@ /* Default constants for DevFreq-Simple-Ondemand (DFSO) */ #define DFSO_UPTHRESHOLD (90) #define DFSO_DOWNDIFFERENCTIAL (5) + +static struct devfreq_simple_ondemand_data od_default = { + .upthreshold = DFSO_UPTHRESHOLD, + .downdifferential = DFSO_DOWNDIFFERENCTIAL, +}; + static int devfreq_simple_ondemand_func(struct devfreq *df, unsigned long *freq) { int err; struct devfreq_dev_status *stat; unsigned long long a, b; - unsigned int dfso_upthreshold = DFSO_UPTHRESHOLD; - unsigned int dfso_downdifferential = DFSO_DOWNDIFFERENCTIAL; - struct devfreq_simple_ondemand_data *data = df->data; + struct devfreq_simple_ondemand_data *od = df->data; err = devfreq_update_stats(df); if (err) @@ -31,16 +35,6 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, stat = &df->last_status; - if (data) { - if (data->upthreshold) - dfso_upthreshold = data->upthreshold; - if (data->downdifferential) - dfso_downdifferential = data->downdifferential; - } - 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; @@ -55,7 +49,7 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, /* Set MAX if it's busy enough */ if (stat->busy_time * 100 > - stat->total_time * dfso_upthreshold) { + stat->total_time * od->upthreshold) { *freq = DEVFREQ_MAX_FREQ; return 0; } @@ -68,7 +62,7 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, /* Keep the current frequency */ if (stat->busy_time * 100 > - stat->total_time * (dfso_upthreshold - dfso_downdifferential)) { + stat->total_time * (od->upthreshold - od->downdifferential)) { *freq = stat->current_frequency; return 0; } @@ -78,17 +72,41 @@ static int devfreq_simple_ondemand_func(struct devfreq *df, a *= stat->current_frequency; b = div_u64(a, stat->total_time); b *= 100; - b = div_u64(b, (dfso_upthreshold - dfso_downdifferential / 2)); + b = div_u64(b, (od->upthreshold - od->downdifferential / 2)); *freq = (unsigned long) b; return 0; } +static int devfreq_simple_ondemand_check_od(struct devfreq *devfreq) +{ + struct devfreq_simple_ondemand_data *od = devfreq->data; + + if (od) { + if (!od->upthreshold) + od->upthreshold = DFSO_UPTHRESHOLD; + + if (!od->downdifferential) + od->downdifferential = DFSO_DOWNDIFFERENCTIAL; + + if (od->upthreshold > 100 || + od->upthreshold < od->downdifferential) + return -EINVAL; + } else { + od = &od_default; + } + + 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; + return devfreq_monitor_start(devfreq); case DEVFREQ_GOV_STOP: