Received-SPF: pass (google.com: domain of linux-kernel+bounces-154924-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Tue, 23 Apr 2024 18:51:52 +0800
From: Huang Rui <ray.huang@amd.com>
To: "Yuan, Perry" <Perry.Yuan@amd.com>
Cc: "rafael.j.wysocki@intel.com" <rafael.j.wysocki@intel.com>,
	"Limonciello, Mario" <Mario.Limonciello@amd.com>,
	"viresh.kumar@linaro.org" <viresh.kumar@linaro.org>,
	"Shenoy, Gautham Ranjal" <gautham.shenoy@amd.com>,
	"Petkov, Borislav" <Borislav.Petkov@amd.com>,
	"Deucher, Alexander" <Alexander.Deucher@amd.com>,
	"Huang, Shimmer" <Shimmer.Huang@amd.com>,
	"oleksandr@natalenko.name" <oleksandr@natalenko.name>,
	"Du, Xiaojian" <Xiaojian.Du@amd.com>,
	"Meng, Li (Jassmine)" <Li.Meng@amd.com>,
	"linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v7 2/6] cpufreq: amd-pstate: initialize new core
 precision boost state
Message-ID: <ZieSyM1h6lA8fCwO@amd.com>
References: <cover.1713861200.git.perry.yuan@amd.com>
 <5754a2e7a93a048431fa7a745582e62ba67df4e9.1713861200.git.perry.yuan@amd.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <5754a2e7a93a048431fa7a745582e62ba67df4e9.1713861200.git.perry.yuan@amd.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?pbxt3LULzqgDKUVG5/hMGqmmaC2/5fP3lXTvSRI9Ihf4kaTq7Ki63wprTnHH?=
 =?us-ascii?Q?7+lxfwEWhR7sf+7mMBS5VNMW1FRPBbPx29TOR1ey9L0zcFXLIv8qU/rBetNs?=
 =?us-ascii?Q?tKau8NK4pdQeJB7mDCAACguopxKpXKjrSbaGydukArushC9G6RahN/YRfnF+?=
 =?us-ascii?Q?E2h3SZg/+RP4NY+Dt8Nc4XzaaL0rxp8aQiHYHxIR3utgIuFGsQiekNulMpSI?=
 =?us-ascii?Q?8h64tjO+aEaeEUaXWQYc+C0O/gbH2nQTp1tPq2byzqHrKxh3iklf8S1kvUWU?=
 =?us-ascii?Q?zrDamSbimFhiA7PrS5l0OmOxs+yC2HOPKHmZ2ai4HoLKn8m9paB2HuOrcraT?=
 =?us-ascii?Q?WKUe8I0ygBaLi9xnyn5fBqWCjTGre4CJvVru7WGp3j60RTM2/u+XwLGIVJot?=
 =?us-ascii?Q?iwRsJnvynYeqkuAYob3SVhueXrA4XM0i9SSBnLWrPpwcYNUXbJkqjXmgjMW9?=
 =?us-ascii?Q?WU5pn2dDOBhOQhrMRXZ1X7eYpvOsu/XsVBLocCZgWLbu8TDeAH1B9Ry4q6/f?=
 =?us-ascii?Q?jOGt82ZUkJMji7egW91B/Ji63qHMkjGrxZBGmVA8I/HfWNvSR65F0WFU/L+j?=
 =?us-ascii?Q?w/qad1rVGgUSPaj4WiYHF+SEDMaWFEC9mNM52Eoq1rym+q3Re5yBdPW35M+X?=
 =?us-ascii?Q?WWv4ZdCWkQscwPHjjp68kmcc6qOH4/TosI4OqRX6bjoSNAG5uiw/AYOdMpQH?=
 =?us-ascii?Q?dXij1dtSyCSwvSizvax6tYNQBPRP8On3wrrvgP6A6t7aWXqeeHCvv4JzsED6?=
 =?us-ascii?Q?HZdyGDyryFcAD1pdpA7Cf33GLH1pBIKuM3r9TvMOtOYVR4+ehD0PAl5OZTj3?=
 =?us-ascii?Q?+PlrOI9nWmVxVHFrshWCsz7PwS9QOFCcWtZlX8FzeGLYxMZJ6N/HCRzOP8mm?=
 =?us-ascii?Q?Uz5bhEMuHXnZc7M3gBmpx1SkT5QBJCfptEznnwqi6egxVBtGojUtcT93MD3H?=
 =?us-ascii?Q?bjCk7aaIe+UvkvVKTTUpbQte/4l0ChuYjtI2FSLyABwjf6hce+moyavCgubM?=
 =?us-ascii?Q?EsDub9bJw5U7t0FqWL50APc+MmpbCRkT3IMAriA//14cJL9nhhuK1Hegqmdy?=
 =?us-ascii?Q?G1/GZPKYJEVv9pEtRqn9Ry+rPtGpNYn+SFBS1jzEokoVAre+uBBFnmEkYft3?=
 =?us-ascii?Q?N+ZC+Sf+S0WCdXctV8cm7GskguJMLciV9rsuko7JxFAhNY46SIRPzj/a6DA7?=
 =?us-ascii?Q?Rgo03jmY9P+D/Ba0MCsdZhF8w8fPSIEqka0M05bpVWldjXTeYc2uYXk681gh?=
 =?us-ascii?Q?y/POOkv9PqTcYhzfFZCnN63MwLLRDmK/prUB+WXm0MbE+1v9+55gp8eYkfaq?=
 =?us-ascii?Q?FK2XzneYmyUqf0m24wE4nYDUIhD3MSb20ed11OJOD/IpTQNFOG4v38ceODid?=
 =?us-ascii?Q?Rm5IXn8nVT4yKWYJGqRDYcc3rnAUD3tRHfEtjOT56o4m5xcrb3kIJF7WtxFl?=
 =?us-ascii?Q?VfGmJuBScC4Ttk/QHWlWnXFXklnUVeTI9VvxIknaDRbiVOcCZCqmW40Jx6MX?=
 =?us-ascii?Q?RvagZFd9LYS+OPCKhOIMmCDdWUh4DHHk05TXovqoTyNn/BVF1YJGP6xOlBTI?=
 =?us-ascii?Q?8UcEiekRiDmFhFHPorrnqG4n6oo4nI747z0JjbMf?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2129bc32-2e36-4d4d-6ce2-08dc63836ed1
X-MS-Exchange-CrossTenant-AuthSource: SJ2PR12MB8690.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Apr 2024 10:52:13.2517
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wSkMvlVdKsAYbtWPc+324SuPuVkTAn+qFcPAQC5+dx1G8VTqjNi2d4ikEOgVu57RLGd0xjHTYun91xyBXeX/gw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5806

On Tue, Apr 23, 2024 at 04:40:55PM +0800, Yuan, Perry wrote:
> From: Perry Yuan <Perry.Yuan@amd.com>
> 
> Add one global `global_params` to represent CPU Performance Boost(cpb)
> state for cpu frequency scaling, both active and passive modes all can
> support CPU cores frequency boosting control which is based on the BIOS
> setting, while BIOS turn on the "Core Performance Boost", it will
> allow OS control each core highest perf limitation from OS side.
> 
> The active, guided and passive modes of the amd-pstate driver can
> support frequency boost control when the "Core Performance Boost"
> (CPB) feature is enabled in the BIOS.  When enabled in BIOS, the user
> has an option at runtime to allow/disallow the cores from operating in
> the boost frequency range.
> 
> Add an amd_pstate_global_params object to record whether CPB is
> enabled in BIOS, and if it has been activated by the user
> 
> Reported-by: Artem S. Tashkinov" <aros@gmx.com>
> Cc: Oleksandr Natalenko <oleksandr@natalenko.name>
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217931
> Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>
> ---
>  drivers/cpufreq/amd-pstate.c | 39 +++++++++++++++++++++++++++---------
>  include/linux/amd-pstate.h   | 13 ++++++++++++
>  2 files changed, 42 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 83a29b257794..3d86cd7c9073 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -68,6 +68,8 @@ static int cppc_state = AMD_PSTATE_UNDEFINED;
>  static bool cppc_enabled;
>  static bool amd_pstate_prefcore = true;
>  static struct quirk_entry *quirks;
> +struct amd_pstate_global_params amd_pstate_global_params;
> +EXPORT_SYMBOL_GPL(amd_pstate_global_params);
>  
>  /*
>   * AMD Energy Preference Performance (EPP)
> @@ -665,18 +667,27 @@ static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)
>  	return 0;
>  }
>  
> -static void amd_pstate_boost_init(struct amd_cpudata *cpudata)
> +static int amd_pstate_boost_init(struct amd_cpudata *cpudata)
>  {
> -	u32 highest_perf, nominal_perf;
> +	u64 boost_val;
> +	int ret;
>  
> -	highest_perf = READ_ONCE(cpudata->highest_perf);
> -	nominal_perf = READ_ONCE(cpudata->nominal_perf);
> +	ret = rdmsrl_on_cpu(cpudata->cpu, MSR_K7_HWCR, &boost_val);
> +	if (ret) {
> +		pr_err_once("failed to read initial CPU boost state!\n");
> +		return ret;
> +	}
>  
> -	if (highest_perf <= nominal_perf)
> -		return;
> +	amd_pstate_global_params.cpb_supported = !(boost_val & MSR_K7_HWCR_CPB_DIS);

We have a X86_FEATURE_CPB bit to indicate whether current processor to
support boost. It would better to add a check here if amd-pstate need
forward support.

Thanks,
Ray

> +
> +	if (amd_pstate_global_params.cpb_supported) {
> +		cpudata->boost_supported = true;
> +		current_pstate_driver->boost_enabled = true;
> +	}
>  
> -	cpudata->boost_supported = true;
> -	current_pstate_driver->boost_enabled = true;
> +	amd_pstate_global_params.cpb_boost = amd_pstate_global_params.cpb_supported;
> +
> +	return ret;
>  }
>  
>  static void amd_perf_ctl_reset(unsigned int cpu)
> @@ -900,6 +911,11 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
>  
>  	amd_pstate_init_prefcore(cpudata);
>  
> +	/* initialize cpu cores boot state */
> +	ret = amd_pstate_boost_init(cpudata);
> +	if (ret)
> +		goto free_cpudata1;
> +
>  	ret = amd_pstate_init_perf(cpudata);
>  	if (ret)
>  		goto free_cpudata1;
> @@ -956,7 +972,6 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
>  
>  	policy->driver_data = cpudata;
>  
> -	amd_pstate_boost_init(cpudata);
>  	if (!current_pstate_driver->adjust_perf)
>  		current_pstate_driver->adjust_perf = amd_pstate_adjust_perf;
>  
> @@ -1363,6 +1378,11 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
>  
>  	amd_pstate_init_prefcore(cpudata);
>  
> +	/* initialize cpu cores boot state */
> +	ret = amd_pstate_boost_init(cpudata);
> +	if (ret)
> +		goto free_cpudata1;
> +
>  	ret = amd_pstate_init_perf(cpudata);
>  	if (ret)
>  		goto free_cpudata1;
> @@ -1417,7 +1437,6 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
>  			return ret;
>  		WRITE_ONCE(cpudata->cppc_cap1_cached, value);
>  	}
> -	amd_pstate_boost_init(cpudata);
>  
>  	return 0;
>  
> diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
> index 6b832153a126..c5e41de65f70 100644
> --- a/include/linux/amd-pstate.h
> +++ b/include/linux/amd-pstate.h
> @@ -134,4 +134,17 @@ struct quirk_entry {
>  	u32 lowest_freq;
>  };
>  
> +/**
> + * struct amd_pstate_global_params - Global parameters, mostly tunable via sysfs.
> + * @cpb_boost:		Whether or not to use boost CPU P-states.
> + * @cpb_supported:	Whether or not CPU boost P-states are available
> + *			based on the MSR_K7_HWCR bit[25] state
> + */
> +struct amd_pstate_global_params {
> +	bool cpb_boost;
> +	bool cpb_supported;
> +};
> +
> +extern struct amd_pstate_global_params amd_pstate_global_params;
> +
>  #endif /* _LINUX_AMD_PSTATE_H */
> -- 
> 2.34.1
>