Received-SPF: pass (google.com: domain of linux-kernel+bounces-40310-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Message-ID: <a673c90b-40c2-4b62-9239-530ced5a9140@amd.com>
Date: Fri, 26 Jan 2024 10:01:01 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 2/7] cpufreq: amd-pstate: initialize new core precision
 boost state
Content-Language: en-US
To: Perry Yuan <perry.yuan@amd.com>, rafael.j.wysocki@intel.com,
 viresh.kumar@linaro.org, Ray.Huang@amd.com, gautham.shenoy@amd.com,
 Borislav.Petkov@amd.com
Cc: Alexander.Deucher@amd.com, Xinmei.Huang@amd.com, Xiaojian.Du@amd.com,
 Li.Meng@amd.com, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
References: <cover.1706255676.git.perry.yuan@amd.com>
 <0409d40c500eeb8d4d84ecb028b73f2eee147822.1706255676.git.perry.yuan@amd.com>
From: Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <0409d40c500eeb8d4d84ecb028b73f2eee147822.1706255676.git.perry.yuan@amd.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?Z2RUQmxOQWI0OGh3bjR5Z3NNNG5qUUxpWmQxbUtwMkpRSkhpU1J6K1FodmFw?=
 =?utf-8?B?UEV5RTBzWkxHY0JnRmRlQ3lRMFhVVnh2bERjcjBYdUFXK1VvQy91VjlpdkFm?=
 =?utf-8?B?cjFibU5rT2t4cisvejNRc0RseVpoWDJtZm9Cb3MwRklZUDZIR2dGQTdYYjBN?=
 =?utf-8?B?OXBuUmgzaDgwcGNxK21zOTlEK0RRZE9ubENlYXlBYzhLVWhRSFJNd2ZxVVRH?=
 =?utf-8?B?b0I4Zml6cGhBbDlYR3F3NHZIMzdPUGJYTDd6YWIvdy9pRGZzajBZMTU4VEg3?=
 =?utf-8?B?NzNlL3h3TmFxaG5yUTQvT0IwdUZHenlqWEg3MEhmMWg4cFVtNUN3dDdRK1FP?=
 =?utf-8?B?dmVWNExxRHQ1dVpzalYwYVk5U0U4am90cFA4WVRUVStuQXh2N0RFOVdIcTZV?=
 =?utf-8?B?Ri8xN1dxMzZuWnNWckFJLzdudGJ2a09PU2dRY3BFOXRPL1RJSGF3TWNnaVhI?=
 =?utf-8?B?eGQwZjhwNmNOZ3VTYWJIalN4WE1ZL2dhYkN4N1lSaXBuUmwzUGtVZTMrOXQ0?=
 =?utf-8?B?Nnltc3FGRHJXUTd2cWgzN1AzeE5SVG04Y0ZFS0hXaWRBRU5hanVlMWJaWWFr?=
 =?utf-8?B?eDRYY0g2ek4vNHJoYzBwMWtsd1gycEFhV3N1Sm5ObGRZbHptYjBpMlBoLy9i?=
 =?utf-8?B?dUNpaURYYVRRYTRodG1qR1JaMkNnd3BTNHNjV3FpckZFRS9zSzg1alpLQU9r?=
 =?utf-8?B?N2djK29nai9qOWczN1pOdG5zWVJQb25id1IxTTZIamhqaGV0MFNBRjhHQnE5?=
 =?utf-8?B?a04rVW1XaXhPY1BmSVMvc2UzcW5wT0puYTBYNjRDbU91c2hYS0lZZUl4eHpT?=
 =?utf-8?B?czVwcGdZK3pPZmI0a1RNaW5PS1JtNFQycy9FK2g4dVFReDlySkZvcEx1WUM4?=
 =?utf-8?B?K1ZxMkwra1ZIOU5BdDhoNTBvemtyeXl6cWpxcEtsNDR2TkJvWGo2L0IwVE5z?=
 =?utf-8?B?dG9hLy9lenk4bzdJVWV4WFY4cjRmNFQ1NUNkVFh3Z1lycHl1bHM4NEtEU1pR?=
 =?utf-8?B?M1QrSzhzeEpuTGRqeWZMZkxZZEprc3E2SmMxemFMYWV4OG1zbk4wRllZRWEx?=
 =?utf-8?B?MDA4dXliRkpZcDNWcjR4ajAvWVZkUXlPVWJZb0dRRVNuMjVuQVFJbzIwZzJn?=
 =?utf-8?B?K3FEU0kzUmtVNStSU3QySkk3OVl2R3F1RTJnR0c5YUZzMXZZZkx3ZlhGd3VK?=
 =?utf-8?B?YlpvcTZpdzl4ZXl0RjNHR2xEMXJwZEdHVUl1L3pOMlJlWjg1WHJITUIwbVlt?=
 =?utf-8?B?c0J6YTVxbHhtVlBRWW9OVzBoczdqRHpwWjhOcmVNdzVaa3N4OHhHUTZsSmtJ?=
 =?utf-8?B?b0lyYmU1d0crSG5Cald2cFVjcjl6K1hWNzNBdjNQWlRBVW1veDBhQWY1a0Yv?=
 =?utf-8?B?Z3pWTnhYcTM5TW95b1B3Z3ZsM3NISXZlTkx3RHdrc1RmVFJDVlBQY1hmZ3I0?=
 =?utf-8?B?WkFYY3R5bjJIdnhVUFRPNW1NcEZRVURmRDNpZWY3SE43aDdXdGZDV2pwejd5?=
 =?utf-8?B?TUErOUNPTnN1QTB3VGVEVkc1K1lZLzZ5UFdLZzVnQktCbno3TUlxTXdSUVhP?=
 =?utf-8?B?eUxYWlVPWE1YektsWEdlamJBZWlpZHhHRGxlU3d0NEljMDg5Uld2clZDVC95?=
 =?utf-8?B?ZkUxUVUvalVHejV0VHBFY3lWOUE1YS9qRVNDYmZjVHBBK0k1dWN3akVmeFRC?=
 =?utf-8?B?aG1GZ0ttL2VtSDZTbDBGWEhjL21sTDgyQmdKNHJ0eW1pM2VVUndyQkJkNEVr?=
 =?utf-8?B?S1hMa1RVOHdXNDFVQXJ3QUpZV0taTkgrdVpJOExLTUE5YVdrUHVUWm11WlA4?=
 =?utf-8?B?N1N6OXNDUFd3ZjFPMUI4NFB4bm5MZnVodG1SZDFGVXFMNlpBSWN0UC9OVk5H?=
 =?utf-8?B?Q1N2L3dmZkRGTWxWOHBpTCthRDBiVmNiR1hqS003QzBuTFlyQm9HR003TnZQ?=
 =?utf-8?B?SEp3ZHJzQTRKbFZRbTh0a3l2cDJCMExNQzBpbStDaVliSTJRUHlrM25HY1l5?=
 =?utf-8?B?M3poeTV6UWROdXVGckFmMFFpVHBsYWZRQUxhS1ZzQmNCcXdON1p1R3ZCa1dU?=
 =?utf-8?B?TXd5RWFIM0JJZ2VVSFBYak5EZTk0QXVIQzMwdnF4WjJOV3Q4SXJ5aTg2VFpz?=
 =?utf-8?Q?7q7OraP9xt6IjPhe/YhiXv9J2?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 45795423-8e43-43fe-d3a0-08dc1e8800b4
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2024 16:01:05.8235
 (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: 4E0UTlviwTvyb1ZKOrDiUOZ6++RHUS0DIbtpr87rkzEfyu29w/ykr6q5LSxKAJcJeMGnlLayUNtiZw2vk7jtiw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM8PR12MB5429

On 1/26/2024 02:08, Perry Yuan wrote:
> From: Perry Yuan <Perry.Yuan@amd.com>
> 
> Add gloal global_params to represent current 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.
> 
> If core performance boost is disabled while a core is in a boosted P-state,
> the core transitions to the highest performance non-boosted P-state,
> that is the same as the nominal frequency limit.
> 
> Issue: https://bugzilla.kernel.org/show_bug.cgi?id=217931

Rather than "Issue" this should be "Closes:", and the tag should come 
right after the Reported-by tag.

> Reported-by: Artem S. Tashkinov" <aros@gmx.com>
> Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>
> ---
>   drivers/cpufreq/amd-pstate.c | 46 ++++++++++++++++++++++++++++--------
>   include/linux/amd-pstate.h   |  1 -
>   2 files changed, 36 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 8f308f56ade6..0dc9124140d4 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -65,6 +65,19 @@ static struct cpufreq_driver amd_pstate_epp_driver;
>   static int cppc_state = AMD_PSTATE_UNDEFINED;
>   static bool cppc_enabled;
>   
> +/**
> + * struct 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 global_params {
> +	bool cpb_boost;
> +	bool cpb_supported;
> +};
> +
> +static struct global_params global;
> +
>   /*
>    * AMD Energy Preference Performance (EPP)
>    * The EPP is used in the CCLK DPM controller to drive
> @@ -632,18 +645,27 @@ static int amd_get_lowest_nonlinear_freq(struct amd_cpudata *cpudata)
>   	return lowest_nonlinear_freq * 1000;
>   }
>   
> -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_state, 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;
> +	boost_state = (boost_val >> 25) & 0x1;
> +	if (!boost_state) {
> +		global.cpb_supported = true;
> +		global.cpb_boost = true;
> +	} else {
> +		global.cpb_supported = false;
> +		global.cpb_boost = false;
> +	}

Seems like a lot of lines and an extra variable that could be simplified 
down to just:

global.cpb_supported = (boost_val >> 25) & 0x1;
global.cpb_boost = global.cpb_supported;

>   
> -	cpudata->boost_supported = true;
> -	current_pstate_driver->boost_enabled = true;
> +	return ret;
>   }
>   
>   static void amd_perf_ctl_reset(unsigned int cpu)
> @@ -676,6 +698,9 @@ static int amd_pstate_cpu_init(struct cpufreq_policy *policy)
>   	if (ret)
>   		goto free_cpudata1;
>   
> +	/* initialize cpu cores boot state */
> +	amd_pstate_boost_init(cpudata);
> +
>   	min_freq = amd_get_min_freq(cpudata);
>   	max_freq = amd_get_max_freq(cpudata);
>   	nominal_freq = amd_get_nominal_freq(cpudata);
> @@ -725,7 +750,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;
>   
> @@ -1093,6 +1117,9 @@ static int amd_pstate_epp_cpu_init(struct cpufreq_policy *policy)
>   	if (ret)
>   		goto free_cpudata1;
>   
> +	/* initialize cpu cores boot state */
> +	amd_pstate_boost_init(cpudata);
> +
>   	min_freq = amd_get_min_freq(cpudata);
>   	max_freq = amd_get_max_freq(cpudata);
>   	nominal_freq = amd_get_nominal_freq(cpudata);
> @@ -1143,7 +1170,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 446394f84606..66d939a344b1 100644
> --- a/include/linux/amd-pstate.h
> +++ b/include/linux/amd-pstate.h
> @@ -80,7 +80,6 @@ struct amd_cpudata {
>   	struct amd_aperf_mperf prev;
>   
>   	u64	freq;
> -	bool	boost_supported;
>   
>   	/* EPP feature related attributes*/
>   	s16	epp_policy;