Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Xiongfeng Wang <wangxiongfeng2@huawei.com>
To:     <rjw@rjwysocki.net>, <viresh.kumar@linaro.org>,
        <Souvik.Chakravarty@arm.com>, <Thanu.Rangarajan@arm.com>
CC:     <Sudeep.Holla@arm.com>, <guohanjun@huawei.com>,
        <john.garry@huawei.com>, <jonathan.cameron@huawei.com>,
        <linux-pm@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
        <wangxiongfeng2@huawei.com>
Subject: [RFC PATCH v2 1/3] cpufreq: handle the return value of '.set_boost()' properly
Date:   Mon, 18 May 2020 15:10:06 +0800
Message-ID: <1589785808-12138-2-git-send-email-wangxiongfeng2@huawei.com>
In-Reply-To: <1589785808-12138-1-git-send-email-wangxiongfeng2@huawei.com>
References: <1589785808-12138-1-git-send-email-wangxiongfeng2@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

'freq_qos_update_request()' called by 'cpufreq_boost_set_sw()' reutrns 1
when the effective constraint value of frequency QoS has changed. It's
not an error code. So handle the return value 1 of '.set_boost()' in
'cpufreq_boost_trigger_state()' properly.

Signed-off-by: Xiongfeng Wang <wangxiongfeng2@huawei.com>
---
 drivers/cpufreq/cpufreq.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index 4adac3a..bb6746e 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2540,7 +2540,10 @@ int cpufreq_boost_trigger_state(int state)
 	write_unlock_irqrestore(&cpufreq_driver_lock, flags);
 
 	ret = cpufreq_driver->set_boost(state);
-	if (ret) {
+	if (ret == 1) {
+		pr_debug("The effective constraint value of frequency QoS has changed.\n");
+		return 0;
+	} else if (ret) {
 		write_lock_irqsave(&cpufreq_driver_lock, flags);
 		cpufreq_driver->boost_enabled = !state;
 		write_unlock_irqrestore(&cpufreq_driver_lock, flags);
-- 
1.7.12.4