From patchwork Thu Jul 4 07:36:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 168466 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1921747ilk; Thu, 4 Jul 2019 00:36:51 -0700 (PDT) X-Google-Smtp-Source: APXvYqyMHlNt3zWqYYmLT2mupX0CvfUHPRie0JQnl+2aHKozs5FB4bXqZrH1zn+5oIGVMGIAZ7qm X-Received: by 2002:a17:902:1129:: with SMTP id d38mr48337113pla.220.1562225810986; Thu, 04 Jul 2019 00:36:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562225810; cv=none; d=google.com; s=arc-20160816; b=Zh0GyXkar7jeRFlI3Nd3BUpMEjRfDtc7bkNKS5QkVs38bB00XcL5QBiJkeLWq+XxG/ dZW+JbhgFGdyjFzxfaB/tFDCg6aAy8C/YBpzifT9ejT6NPl2Js7we9KiO/oJqCe0da/3 CSi8O22mFCvdSy2j9jb4RZDOkTNmIIDKURDj5iP2Cz3J3iBUpK5Hpsbr57COtdsAIH00 wtkfT0Dlxd7PbZPgVFYtu8hv1pg0kUyIfathz47qnZc1fCsTkETR4D9NWh3QyAkyomjD GvyqBEtS4FaBlsbIZHyFacVkHwWJ9hUh0QlDZKM1b65Tm4sSoxDX7LS3qoxRg+B7rqjT luVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TxHtLXc14HRc+q+EFuMAl2ixyKPfQQHRTF5mh6/bpEU=; b=KvPL0dDiFt0Vvoi4Alb/ftjt39MlJnoWtZ5IsIW5udwKRBStSXoZtgQH7MZ161C/9C fpvj3KSePz6srWzB3EqYHghD4g1sqlJyt4gxgYKbcyJSMRGrToOSozi3P66Vzp7SbOHz LkgS4+3E/Dv+Pl9UCfP6+MjF1CGrIlO+Dd+Dr47Pag3R6+DPQ/nYImuD7aGWbX3CvS3x cyun7P2+ZjyMQQUoiJyJUdlp03lRB8uy40zswV2X8ODZUIvX8NJkfiaVCOP8XOD3fCrm WOpDZd54RU3vj3nXpANCr9kOOqLE6HEEZt+UV2VviioxEXxfWzV90nxVBEr6sZTA58KU bvSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IQT7MrQx; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b18si4711514pgm.82.2019.07.04.00.36.50; Thu, 04 Jul 2019 00:36:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IQT7MrQx; spf=pass (google.com: best guess record for domain of linux-pm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-pm-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727548AbfGDHgu (ORCPT + 11 others); Thu, 4 Jul 2019 03:36:50 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:43914 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727528AbfGDHgs (ORCPT ); Thu, 4 Jul 2019 03:36:48 -0400 Received: by mail-pg1-f196.google.com with SMTP id f25so2493225pgv.10 for ; Thu, 04 Jul 2019 00:36:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TxHtLXc14HRc+q+EFuMAl2ixyKPfQQHRTF5mh6/bpEU=; b=IQT7MrQxceoW2i6DY1x54dzHxcQi4hu0k1Vm4r8RLMVDMIPYHzWdczor/7fo2jJ3Tx XRmbkYtpnWpqCx89MVVgU+ew0PmZZFLGzSfJVar1i2+5uXREv6Ty3D4/aItVDZ0NpMAm a0iNpxKioP+JcNoutryTVaWaP8EuFx3cyiWDvr742vz90dyY298fqT8QNDpW9NgcqNX6 kU0iBVrBYL88ifOm8R1pPNuAkJIjuK7oqBNDxByqF2vSKwUWdQmQ3NMcWNu4JukZbeC2 urQmq39fn4u+FU8RfVRTYnQvCp7ZqtR7brCH4Mro+mLrTD8/nwsZHDEAOsBnkSJa59j3 eNJg== 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=TxHtLXc14HRc+q+EFuMAl2ixyKPfQQHRTF5mh6/bpEU=; b=GMWenxxrjgywVx09Pmw70pT3xOTCneHYWce1v9s+UY9ZKj0XnVkHVhveGkT6ZpxYTC JZk7mUgzsDC7EVJLB6jGWVzdmOZy2JZLd2OwqJLlmGbE5gGDX///OZRoned+OgIsrkAo Z3yRG5OYU/8cw+A2hPeycOmo48t9RDRa0qhuX/A1IsFKTgbLRaKkflW3V5MaMozz2vhC p+8QZZ3Z9Fl1g+DFKC93BKYGInaUWQCcDsSPhuEVbXPZY6duk0h7jP6IguMd/Z50K7OG Pj38oS2bOk/FETsU7dSHi9cdB2ZNVmedy5tNf9kV0T3hHGWq8t/JnP4Q/iQRLy+XBTWI j8tg== X-Gm-Message-State: APjAAAWE2XV3s/wVaxMEQxypt/BU/JibATGgT/G0MZb85ItsOs/s2Kbv CQ9qfZeICh/wyHMT6REwNAH3mdgqC2A= X-Received: by 2002:a17:90b:d8b:: with SMTP id bg11mr18097327pjb.30.1562225807852; Thu, 04 Jul 2019 00:36:47 -0700 (PDT) Received: from localhost ([122.172.21.205]) by smtp.gmail.com with ESMTPSA id d12sm4515059pfd.96.2019.07.04.00.36.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2019 00:36:47 -0700 (PDT) From: Viresh Kumar To: Rafael Wysocki , Srinivas Pandruvada , Len Brown Cc: Viresh Kumar , linux-pm@vger.kernel.org, Vincent Guittot , "Rafael J . Wysocki" , linux-kernel@vger.kernel.org Subject: [PATCH V6 6/7] cpufreq: intel_pstate: Reuse refresh_frequency_limits() Date: Thu, 4 Jul 2019 13:06:22 +0530 Message-Id: X-Mailer: git-send-email 2.21.0.rc0.269.g1a574e7a288b In-Reply-To: References: MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org The implementation of intel_pstate_update_max_freq() is quite similar to refresh_frequency_limits(), lets reuse it. Finding minimum of policy->user_policy.max and policy->cpuinfo.max_freq in intel_pstate_update_max_freq() is redundant as cpufreq_set_policy() will call the ->verify() callback of intel-pstate driver, which will do this comparison anyway and so dropping it from intel_pstate_update_max_freq() doesn't harm. Signed-off-by: Viresh Kumar Signed-off-by: Rafael J. Wysocki --- drivers/cpufreq/cpufreq.c | 3 ++- drivers/cpufreq/intel_pstate.c | 7 +------ include/linux/cpufreq.h | 1 + 3 files changed, 4 insertions(+), 7 deletions(-) -- 2.21.0.rc0.269.g1a574e7a288b diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 81117e4d43cc..091789e868ee 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c @@ -1116,7 +1116,7 @@ static int cpufreq_add_policy_cpu(struct cpufreq_policy *policy, unsigned int cp return ret; } -static void refresh_frequency_limits(struct cpufreq_policy *policy) +void refresh_frequency_limits(struct cpufreq_policy *policy) { struct cpufreq_policy new_policy; @@ -1133,6 +1133,7 @@ static void refresh_frequency_limits(struct cpufreq_policy *policy) up_write(&policy->rwsem); } +EXPORT_SYMBOL(refresh_frequency_limits); static void handle_update(struct work_struct *work) { diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index f2ff5de988c1..cc27d4c59dca 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -898,7 +898,6 @@ static void intel_pstate_update_policies(void) static void intel_pstate_update_max_freq(unsigned int cpu) { struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpu); - struct cpufreq_policy new_policy; struct cpudata *cpudata; if (!policy) @@ -908,11 +907,7 @@ static void intel_pstate_update_max_freq(unsigned int cpu) policy->cpuinfo.max_freq = global.turbo_disabled_mf ? cpudata->pstate.max_freq : cpudata->pstate.turbo_freq; - memcpy(&new_policy, policy, sizeof(*policy)); - new_policy.max = min(policy->user_policy.max, policy->cpuinfo.max_freq); - new_policy.min = min(policy->user_policy.min, new_policy.max); - - cpufreq_set_policy(policy, &new_policy); + refresh_frequency_limits(policy); cpufreq_cpu_release(policy); } diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 95425941f46d..1fa37b675a80 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -207,6 +207,7 @@ void cpufreq_cpu_release(struct cpufreq_policy *policy); int cpufreq_get_policy(struct cpufreq_policy *policy, unsigned int cpu); int cpufreq_set_policy(struct cpufreq_policy *policy, struct cpufreq_policy *new_policy); +void refresh_frequency_limits(struct cpufreq_policy *policy); void cpufreq_update_policy(unsigned int cpu); void cpufreq_update_limits(unsigned int cpu); bool have_governor_per_policy(void);