From patchwork Mon Jan 11 07:43:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Yu X-Patchwork-Id: 12009857 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 26298C433E6 for ; Mon, 11 Jan 2021 07:40:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CD4F622B2C for ; Mon, 11 Jan 2021 07:40:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726573AbhAKHky (ORCPT ); Mon, 11 Jan 2021 02:40:54 -0500 Received: from mga02.intel.com ([134.134.136.20]:43170 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725917AbhAKHky (ORCPT ); Mon, 11 Jan 2021 02:40:54 -0500 IronPort-SDR: 5GbOYVGaLC+3LC4GYd2gMW3kqPung0RmyFOvr6xXp1mCLEZqmEAqEY23tqhg2tpa6QTnD4BhtR MRhVTBw4QlIQ== X-IronPort-AV: E=McAfee;i="6000,8403,9860"; a="164901398" X-IronPort-AV: E=Sophos;i="5.79,337,1602572400"; d="scan'208";a="164901398" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2021 23:40:12 -0800 IronPort-SDR: svIfTYNFBk4qwxUjpKkbRcodt3qGQWGl1AFWoZEsnbG0arR43xQ9ia1bxK0Yn/OzawQYQVzVjK UELJFJ+z8krA== X-IronPort-AV: E=Sophos;i="5.79,337,1602572400"; d="scan'208";a="571328551" Received: from chenyu-office.sh.intel.com ([10.239.158.173]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2021 23:40:10 -0800 From: Chen Yu To: Srinivas Pandruvada , Len Brown , "Rafael J. Wysocki" , Viresh Kumar Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Zhang Rui , Wendy Wang , Chen Yu Subject: [PATCH 1/2][v2] cpufreq: intel_pstate: Add parameter to get guarantee frequency Date: Mon, 11 Jan 2021 15:43:29 +0800 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Add input parameter to receive guarantee pstate from intel_pstate_get_hwp_max() for later use. No functional change intended. Signed-off-by: Chen Yu --- drivers/cpufreq/intel_pstate.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index eaf32ef7a030..bd3dd1be73ba 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -830,7 +830,7 @@ static struct freq_attr *hwp_cpufreq_attrs[] = { }; static void intel_pstate_get_hwp_max(struct cpudata *cpu, int *phy_max, - int *current_max) + int *current_max, int *guar_max) { u64 cap; @@ -842,6 +842,7 @@ static void intel_pstate_get_hwp_max(struct cpudata *cpu, int *phy_max, *current_max = HWP_HIGHEST_PERF(cap); *phy_max = HWP_HIGHEST_PERF(cap); + *guar_max = HWP_GUARANTEED_PERF(cap); } static void intel_pstate_hwp_set(unsigned int cpu) @@ -1205,7 +1206,7 @@ static ssize_t store_no_turbo(struct kobject *a, struct kobj_attribute *b, static void update_qos_request(enum freq_qos_req_type type) { - int max_state, turbo_max, freq, i, perf_pct; + int max_state, turbo_max, guar_state, freq, i, perf_pct; struct freq_qos_request *req; struct cpufreq_policy *policy; @@ -1223,7 +1224,7 @@ static void update_qos_request(enum freq_qos_req_type type) continue; if (hwp_active) - intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state); + intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state, &guar_state); else turbo_max = cpu->pstate.turbo_pstate; @@ -1731,9 +1732,9 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu) cpu->pstate.max_freq = cpu->pstate.max_pstate * cpu->pstate.scaling; if (hwp_active && !hwp_mode_bdw) { - unsigned int phy_max, current_max; + unsigned int phy_max, current_max, guar_state; - intel_pstate_get_hwp_max(cpu, &phy_max, ¤t_max); + intel_pstate_get_hwp_max(cpu, &phy_max, ¤t_max, &guar_state); cpu->pstate.turbo_freq = phy_max * cpu->pstate.scaling; cpu->pstate.turbo_pstate = phy_max; } else { @@ -2209,7 +2210,7 @@ static void intel_pstate_update_perf_limits(struct cpudata *cpu, unsigned int policy_max) { int32_t max_policy_perf, min_policy_perf; - int max_state, turbo_max; + int max_state, turbo_max, guar_state; int max_freq; /* @@ -2218,7 +2219,7 @@ static void intel_pstate_update_perf_limits(struct cpudata *cpu, * rather than pure ratios. */ if (hwp_active) { - intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state); + intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state, &guar_state); } else { max_state = global.no_turbo || global.turbo_disabled ? cpu->pstate.max_pstate : cpu->pstate.turbo_pstate; @@ -2331,9 +2332,9 @@ static void intel_pstate_verify_cpu_policy(struct cpudata *cpu, update_turbo_state(); if (hwp_active) { - int max_state, turbo_max; + int max_state, turbo_max, guar_state; - intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state); + intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state, &guar_state); max_freq = max_state * cpu->pstate.scaling; } else { max_freq = intel_pstate_get_max_freq(cpu); @@ -2691,7 +2692,7 @@ static void intel_cpufreq_adjust_perf(unsigned int cpunum, static int intel_cpufreq_cpu_init(struct cpufreq_policy *policy) { - int max_state, turbo_max, min_freq, max_freq, ret; + int max_state, turbo_max, guar_state, min_freq, max_freq, ret; struct freq_qos_request *req; struct cpudata *cpu; struct device *dev; @@ -2719,7 +2720,7 @@ static int intel_cpufreq_cpu_init(struct cpufreq_policy *policy) if (hwp_active) { u64 value; - intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state); + intel_pstate_get_hwp_max(cpu, &turbo_max, &max_state, &guar_state); policy->transition_delay_us = INTEL_CPUFREQ_TRANSITION_DELAY_HWP; rdmsrl_on_cpu(cpu->cpu, MSR_HWP_REQUEST, &value); WRITE_ONCE(cpu->hwp_req_cached, value); From patchwork Mon Jan 11 07:43:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Yu X-Patchwork-Id: 12009859 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=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 EF88AC433DB for ; Mon, 11 Jan 2021 07:41:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A149D229C6 for ; Mon, 11 Jan 2021 07:41:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727669AbhAKHlK (ORCPT ); Mon, 11 Jan 2021 02:41:10 -0500 Received: from mga09.intel.com ([134.134.136.24]:37525 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727666AbhAKHlK (ORCPT ); Mon, 11 Jan 2021 02:41:10 -0500 IronPort-SDR: ocXrBnJrTVUTVUSs2KHD9grsp29dmsH9Mk/l1MHQKkXcpENMwYcXqzVPmk76cIIrXjYYsLlR13 V97wdSuzlA2g== X-IronPort-AV: E=McAfee;i="6000,8403,9860"; a="177968048" X-IronPort-AV: E=Sophos;i="5.79,337,1602572400"; d="scan'208";a="177968048" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2021 23:40:29 -0800 IronPort-SDR: VlYwKUzp1mzzE3fVOmDmmJqAI1KfKXPKkEowabRmPbZ2s6pnfuw6Gyi93/YCshaIsx/bWnU74N M+AN7xy4vA0w== X-IronPort-AV: E=Sophos;i="5.79,337,1602572400"; d="scan'208";a="571328609" Received: from chenyu-office.sh.intel.com ([10.239.158.173]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Jan 2021 23:40:26 -0800 From: Chen Yu To: Srinivas Pandruvada , Len Brown , "Rafael J. Wysocki" , Viresh Kumar Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Zhang Rui , Wendy Wang , Chen Yu Subject: [PATCH 2/2][v2] cpufreq: intel_pstate: Get percpu max freq via HWP MSR register if available Date: Mon, 11 Jan 2021 15:43:42 +0800 Message-Id: <0ca097c7bbf58415b1df150ea50cb37579f8f8ab.1610338353.git.yu.c.chen@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org Currently when turbo is disabled(either by BIOS or by the user), the intel_pstate driver reads the max frequency from the package-wide MSR_PLATFORM_INFO(0xce) register. However on asymmetric platforms it is possible in theory that small and big core with HWP enabled might have different max cpu frequency, because the MSR_HWP_CAPABILITIES is percpu scope according to Intel Software Developer Manual. The turbo max freq is already percpu basis in current code, thus make similar change to the max non-turbo frequency as well. Reported-by: Wendy Wang Signed-off-by: Chen Yu --- v2: per Srinivas' suggestion, avoid duplicated assignment of max_pstate. -- drivers/cpufreq/intel_pstate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index bd3dd1be73ba..f2d18991d969 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -1725,11 +1725,9 @@ static void intel_pstate_max_within_limits(struct cpudata *cpu) static void intel_pstate_get_cpu_pstates(struct cpudata *cpu) { cpu->pstate.min_pstate = pstate_funcs.get_min(); - cpu->pstate.max_pstate = pstate_funcs.get_max(); cpu->pstate.max_pstate_physical = pstate_funcs.get_max_physical(); cpu->pstate.turbo_pstate = pstate_funcs.get_turbo(); cpu->pstate.scaling = pstate_funcs.get_scaling(); - cpu->pstate.max_freq = cpu->pstate.max_pstate * cpu->pstate.scaling; if (hwp_active && !hwp_mode_bdw) { unsigned int phy_max, current_max, guar_state; @@ -1737,8 +1735,12 @@ static void intel_pstate_get_cpu_pstates(struct cpudata *cpu) intel_pstate_get_hwp_max(cpu, &phy_max, ¤t_max, &guar_state); cpu->pstate.turbo_freq = phy_max * cpu->pstate.scaling; cpu->pstate.turbo_pstate = phy_max; + cpu->pstate.max_pstate = guar_state; + cpu->pstate.max_freq = guar_state * cpu->pstate.scaling; } else { cpu->pstate.turbo_freq = cpu->pstate.turbo_pstate * cpu->pstate.scaling; + cpu->pstate.max_pstate = pstate_funcs.get_max(); + cpu->pstate.max_freq = cpu->pstate.max_pstate * cpu->pstate.scaling; } if (pstate_funcs.get_aperf_mperf_shift)