From patchwork Tue Mar 9 12:58:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aisheng Dong X-Patchwork-Id: 12125021 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 A3632C433E0 for ; Tue, 9 Mar 2021 13:15:32 +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 E3E4260C3E for ; Tue, 9 Mar 2021 13:15:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E3E4260C3E 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=NZXACxB1pjMXE/YdKbBZDmP2IvX39iGSphiuTiMWt/8=; b=hpoemGw8tKclpAKOgsO6fIJYSo 5lLRpfQjCT1bqibJmUvwAxQD8hmDAa5u8d5S8BQHI/JaqN83FsCb87yActOw9Qs7Z+5BOQKN76k78 CB8sWer1fYhhpeV4MNj3u8uU+adXbCJNrmKI26ovAPF+ysLIxPj+0uxQpS/3kx4R18n5/yxKBrds4 6SxJ6zg4Fi+bWR4fgHPQpQrd+xA8TwDaYYoNrTKrB2fKdIsYkCgUT5HfQ4b5t9OLQ3LI0kcgpSM22 g9MpviGcs4ZMc1icaUULi3Lid3gm4q+ISdRKZXGkGO/B1lr7GVBDndKKjkZcLIWMRNotOwVsQqY7J TPqLGjPw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJcB3-004WaN-Ad; Tue, 09 Mar 2021 13:13:33 +0000 Received: from inva020.nxp.com ([92.121.34.13]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJcA5-004WHn-5t for linux-arm-kernel@lists.infradead.org; Tue, 09 Mar 2021 13:12:34 +0000 Received: from inva020.nxp.com (localhost [127.0.0.1]) by inva020.eu-rdc02.nxp.com (Postfix) with ESMTP id D8C111A09B2; Tue, 9 Mar 2021 14:12:32 +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 B01CA1A1010; Tue, 9 Mar 2021 14:12:26 +0100 (CET) Received: from localhost.localdomain (shlinux2.ap.freescale.net [10.192.224.44]) by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id AB619402EB; Tue, 9 Mar 2021 14:12:15 +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 07/11] PM / devfreq: check get_dev_status before start monitor Date: Tue, 9 Mar 2021 20:58:37 +0800 Message-Id: <1615294733-22761-8-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_131233_352870_58766766 X-CRM114-Status: GOOD ( 13.09 ) 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 devfreq monitor depends on the device to provide load information by .get_dev_status() to calculate the next target freq. And this will cause changing governor to simple ondemand fail if device can't support. Signed-off-by: Dong Aisheng --- drivers/devfreq/devfreq.c | 10 +++++++--- drivers/devfreq/governor.h | 2 +- drivers/devfreq/governor_simpleondemand.c | 3 +-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 7231fe6862a2..d1787b6c7d7c 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -482,10 +482,13 @@ static void devfreq_monitor(struct work_struct *work) * to be called from governor in response to DEVFREQ_GOV_START * event when device is added to devfreq framework. */ -void devfreq_monitor_start(struct devfreq *devfreq) +int devfreq_monitor_start(struct devfreq *devfreq) { if (IS_SUPPORTED_FLAG(devfreq->governor->flags, IRQ_DRIVEN)) - return; + return 0; + + if (!devfreq->profile->get_dev_status) + return -EINVAL; switch (devfreq->profile->timer) { case DEVFREQ_TIMER_DEFERRABLE: @@ -495,12 +498,13 @@ void devfreq_monitor_start(struct devfreq *devfreq) INIT_DELAYED_WORK(&devfreq->work, devfreq_monitor); break; default: - return; + return -EINVAL; } if (devfreq->profile->polling_ms) queue_delayed_work(devfreq_wq, &devfreq->work, msecs_to_jiffies(devfreq->profile->polling_ms)); + return 0; } EXPORT_SYMBOL(devfreq_monitor_start); diff --git a/drivers/devfreq/governor.h b/drivers/devfreq/governor.h index 5cee3f64fe2b..31af6d072a10 100644 --- a/drivers/devfreq/governor.h +++ b/drivers/devfreq/governor.h @@ -75,7 +75,7 @@ struct devfreq_governor { unsigned int event, void *data); }; -void devfreq_monitor_start(struct devfreq *devfreq); +int devfreq_monitor_start(struct devfreq *devfreq); void devfreq_monitor_stop(struct devfreq *devfreq); void devfreq_monitor_suspend(struct devfreq *devfreq); void devfreq_monitor_resume(struct devfreq *devfreq); diff --git a/drivers/devfreq/governor_simpleondemand.c b/drivers/devfreq/governor_simpleondemand.c index d57b82a2b570..ea287b57cbf3 100644 --- a/drivers/devfreq/governor_simpleondemand.c +++ b/drivers/devfreq/governor_simpleondemand.c @@ -89,8 +89,7 @@ static int devfreq_simple_ondemand_handler(struct devfreq *devfreq, { switch (event) { case DEVFREQ_GOV_START: - devfreq_monitor_start(devfreq); - break; + return devfreq_monitor_start(devfreq); case DEVFREQ_GOV_STOP: devfreq_monitor_stop(devfreq);