Received-SPF: pass (google.com: domain of linux-kernel+bounces-40304-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Message-ID: <233100b4-e765-48e4-a1c0-88d01c621bd0@amd.com>
Date: Fri, 26 Jan 2024 09:56:47 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 3/7] cpufreq: amd-pstate: implement cpb_boost sysfs entry
 for boost control
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>
 <f94bfc67e95fca54a153e24d828ef27e26ee5c47.1706255676.git.perry.yuan@amd.com>
From: Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <f94bfc67e95fca54a153e24d828ef27e26ee5c47.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?THI4S0pmS2ludDV0ZksyMUpzSmpSZ3dOeWtiOHd2am0rZ3NURThZNVFybjhV?=
 =?utf-8?B?S0czYlRiT2Q3OEpJem81cDZ3b2ZKbEU4NXVOa0E1YXZPVjlOU09NQitFdzlY?=
 =?utf-8?B?T2ZmQ2kwamhEdlU3aUF0eWpVWGFxTmJhUWF1ODNUZUcyemVKWStHZ3gwc24y?=
 =?utf-8?B?YVc4K1BJM0YwVlhNQ2xQNytxUGRidG1ZZnhLbFVWU3RJeDhjWjF6c2xKNkFG?=
 =?utf-8?B?bVQwajhwMSszdm1YZDZyeThYRGp0KytBazB5VXNQOEgyU3FuRSs2bzgxQTd3?=
 =?utf-8?B?SFZjMWdMRDVMQ2thRzRXK01yYzhKOVE1c2VLTEliQjhDVFEwZFFJd3NBcUUr?=
 =?utf-8?B?bWcxWUs0d2h1TndtbHljM08yUXh3NHZYZzhGbVhBSUdmZlR1T0EyaDIyblo2?=
 =?utf-8?B?enhPV214YWo0L1RsdFVyVDg1cC9CVEtaNjNETWl0VWVsUmxtcENKSkZMNm1S?=
 =?utf-8?B?VVJvQUR1Vjd5R2xjY2tnSlhvcVY1Q3hpa01HaCtrOXZOMHdmdjBtMlUrOGZC?=
 =?utf-8?B?UWRTV1REMDhoN3loK3BxUzBUOEwxQWJHSVkzZzg2aVN1K3ZRdGQvTU9Mdmhw?=
 =?utf-8?B?eFRtc2h1MGFsYmx5a1J6K28rS1JVSER3N3kzS0c3WkxWY0s5eWgzemdCSUJE?=
 =?utf-8?B?eVJyeFdJT2RncXFJWko4VkZmL1FlWUp0VmpraXZEWXBUeTZPL3lEM3RYSVJv?=
 =?utf-8?B?emhqVDNKM0RjZUtMdGRzNlFEcnF6NTl1MjdnVkFOdWJOREpTSmJ1Z2kwcVhh?=
 =?utf-8?B?U1pHcnhkL3JQZTRaanZOMlJ4QXV5U1BFbi9jZXNheUEwdDVxbXp4U1B1NERR?=
 =?utf-8?B?VGJkWHU3ejBUSER0ZEhDOFJKZFRWY1l4QThDb2NZZTJGVjY0UXFjM2wybkxx?=
 =?utf-8?B?a2RiU01wZEVEU1MyWWRKcDRXRU4xSU91Y1FpN1R0bURBdTVIei9NYTZvYkhW?=
 =?utf-8?B?ZURLVVJCUWppY2NvSEYzU051clpTc09kM1F2MmZUeVg1eGlWSy91T1YwK3BG?=
 =?utf-8?B?K2dQcmplK1B0cU8vdnV5Z20yaVN1OUUwSnQzRVo1c1dTRW1VcFl4azJPNFF6?=
 =?utf-8?B?eTRnSXdFV3daVFJoa3FheUF3OW1qQk1tQW9lOTN5MThqZzh4L2ZRY0dPQUJU?=
 =?utf-8?B?OUFxcFFIdDBXaUxoWnRSQmN2US9tV2poOHA4aTBGOWRYY1dKMk5pNXdYTGxC?=
 =?utf-8?B?Z08rV3JPemF0NFBYbktBcjlzUGlWcFJUZjVBcGtyWW04dGwxbFBKOTkvRVlJ?=
 =?utf-8?B?K3B0ellGNkVmTDY0aUtLZDFQUUUzckRzQ3lTVlNndmY0YktIS0lKMzdsaDBD?=
 =?utf-8?B?YzBpVS9ZWVR1ZEpkZjR1cjV1eTRLN2FzZ000TTBxUEMyV0xVczhFM05CMVZE?=
 =?utf-8?B?L0lqNThkVHljSUU1QkVRTUwreDJ3bHBUL0t6eFlrOENCalAzcHhpQ0RiYmFO?=
 =?utf-8?B?bVdTd1VpSGJIdjliMnRkRlJhaTY2WURnWXZUWHBPQUpTaWJHZmt5Q09rOERL?=
 =?utf-8?B?VmU1SlR1VmRpdW4yZXR5ektmQUdRWGdCWk1LL3FHdUtGUHp4cnhWNkt6Q0FF?=
 =?utf-8?B?My9KVDB5RnFmQnEyMFpjcXoyZ09DbTdNOTN3MVZzMGVKcWRUdllPejJiVWdx?=
 =?utf-8?B?Y3h6d0VhOTV0TkdjRkxsazc0VTZjNXJ0QldUOFVCY1k4R2VNQk5kVjdPUWhj?=
 =?utf-8?B?SmQ5aDNXanBPcXZHanpITGE0Q1NFUkZxVW4xZUFzckN6RjBvK3lNV3hBVmtl?=
 =?utf-8?B?OHVFV1BXdWNZTWNwVlkzNDdHT0JvUVJBWHkyMnNaNTBDeXRjQUVmMW9RTlRn?=
 =?utf-8?B?YzFSRUdZSWZNd0tJbzVGNjExS25GT1JTMTZNTzhqOTRpMXI0bEUyTVVQT2JN?=
 =?utf-8?B?TWRiSWxTcGRYUWxsc1MrTUxBMStCQUZlNEx2U0k2TnVaejhZQnUxb2F6Qis1?=
 =?utf-8?B?aGZ3OVVmUDllZitVc1ZKNzdpN1pDVkdNQk1BNkFncDM5RjFxb1F4cEh3c3FT?=
 =?utf-8?B?ZmlWNDg1OVQ4a29hSUFPQTh5Zjk1OXpuTitCUDVwb2JjQkV0c0Y5R0dQTEUx?=
 =?utf-8?B?ZEZva2V6ZFQ5U25oUTFRQ2REOC8rRGFRQlpqaS9wMWZNMnZKTXZSZ0NmU3Z0?=
 =?utf-8?Q?q9e5fFHFyF5XMvQEqAnGtFDDK?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 05828a7e-0eb4-4acf-8505-08dc1e876920
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2024 15:56:51.4434
 (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: HYmx7igqOwLxbq0UxViygqwwNcfwi90w1Rg4k8ZRJQX9agaHAD0plfQcp+zmvUpnhB3aTamxxrLA3QyyfhV/mQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR12MB8127

On 1/26/2024 02:08, Perry Yuan wrote:
> From: Perry Yuan <Perry.Yuan@amd.com>
> 
> With this new sysfs entry `cpb_boost`created, user can change CPU boost
> state dynamically under `active` and `passive` modes.

What about guided mode?

> And the highest perf and frequency will also be updated as the boost
> state changing.
> 
> 0: check current boost state
> cat /sys/devices/system/cpu/amd_pstate/cpb_boost
> 
> 1: disable CPU boost
> sudo bash -c "echo 0 > /sys/devices/system/cpu/amd_pstate/cpb_boost"
> 
> 2: enable CPU boost
> sudo bash -c "echo 1 > /sys/devices/system/cpu/amd_pstate/cpb_boost"
> 
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217931
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217618
> 
> Signed-off-by: Perry Yuan <Perry.Yuan@amd.com>
> ---
>   drivers/cpufreq/amd-pstate.c | 97 ++++++++++++++++++++++++++++++++++++
>   1 file changed, 97 insertions(+)
> 
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 0dc9124140d4..b37bea7440b9 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -1036,6 +1036,101 @@ static ssize_t status_store(struct device *a, struct device_attribute *b,
>   	return ret < 0 ? ret : count;
>   }
>   
> +static int amd_cpu_boost_update(struct amd_cpudata *cpudata, u32 on)
> +{
> +	struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpudata->cpu);
> +	struct cppc_perf_ctrls perf_ctrls;
> +	u32 highest_perf, nominal_perf;
> +	int ret;
> +
> +	if (!policy)
> +		return -ENODATA;
> +
> +	highest_perf = READ_ONCE(cpudata->highest_perf);
> +	nominal_perf = READ_ONCE(cpudata->nominal_perf);
> +
> +	if (boot_cpu_has(X86_FEATURE_CPPC)) {
> +		u64 value = READ_ONCE(cpudata->cppc_req_cached);
> +
> +		value &= ~GENMASK_ULL(7, 0);

I think it's better to use the macro AMD_CPPC_MAX_PERF in this case.
The less magic masks in the code, the easier it is to follow.

> +		value |= on ? highest_perf : nominal_perf;
> +		WRITE_ONCE(cpudata->cppc_req_cached, value);
> +
> +		wrmsrl_on_cpu(cpudata->cpu, MSR_AMD_CPPC_REQ, value);
> +
> +	} else {
> +		perf_ctrls.max_perf = on ? highest_perf : nominal_perf;
> +		ret = cppc_set_epp_perf(cpudata->cpu, &perf_ctrls, 1);
> +		if (ret) {
> +			pr_debug("failed to set energy perf value (%d)\n", ret);
> +			return ret;
> +		}
> +	}
> +
> +	if (on)
> +		policy->cpuinfo.max_freq = cpudata->max_freq;
> +	else
> +		policy->cpuinfo.max_freq = cpudata->nominal_freq;
> +
> +	policy->max = policy->cpuinfo.max_freq;
> +
> +	if (cppc_state == AMD_PSTATE_PASSIVE) {
> +		ret = freq_qos_update_request(&cpudata->req[1],
> +				      policy->cpuinfo.max_freq);
> +	}
> +
> +	cpufreq_cpu_release(policy);
> +
> +	return ret;
> +}
> +
> +static ssize_t cpb_boost_show(struct device *dev,
> +			   struct device_attribute *attr, char *buf)
> +{
> +	return sysfs_emit(buf, "%u\n", global.cpb_boost);
> +}
> +
> +static ssize_t cpb_boost_store(struct device *dev, struct device_attribute *b,
> +			    const char *buf, size_t count)
> +{
> +	bool new_state;
> +	ssize_t ret;
> +	int cpu;
> +
> +	mutex_lock(&amd_pstate_driver_lock);
> +	if (!global.cpb_supported) {
> +		pr_err("Boost mode is not supported by this processor or SBIOS\n");
> +		return -EINVAL;
> +	}
> +
> +	ret = kstrtobool(buf, &new_state);
> +	if (ret)
> +		return -EINVAL;
> +
> +	global.cpb_boost = !!new_state;
> +
> +	for_each_possible_cpu(cpu) {
> +
> +		struct cpufreq_policy *policy = cpufreq_cpu_get(cpu);
> +		struct amd_cpudata *cpudata = policy->driver_data;
> +
> +		if (!cpudata) {
> +			pr_err("cpudata is NULL\n");
> +			ret = -ENODATA;
> +			cpufreq_cpu_put(policy);
> +			goto err_exit;
> +		}
> +
> +		amd_cpu_boost_update(cpudata, global.cpb_boost);
> +		refresh_frequency_limits(policy);
> +		cpufreq_cpu_put(policy);
> +	}
> +
> +err_exit:
> +	mutex_unlock(&amd_pstate_driver_lock);
> +	return ret < 0 ? ret : count;
> +}
> +
>   cpufreq_freq_attr_ro(amd_pstate_max_freq);
>   cpufreq_freq_attr_ro(amd_pstate_lowest_nonlinear_freq);
>   
> @@ -1043,6 +1138,7 @@ cpufreq_freq_attr_ro(amd_pstate_highest_perf);
>   cpufreq_freq_attr_rw(energy_performance_preference);
>   cpufreq_freq_attr_ro(energy_performance_available_preferences);
>   static DEVICE_ATTR_RW(status);
> +static DEVICE_ATTR_RW(cpb_boost);
>   
>   static struct freq_attr *amd_pstate_attr[] = {
>   	&amd_pstate_max_freq,
> @@ -1062,6 +1158,7 @@ static struct freq_attr *amd_pstate_epp_attr[] = {
>   
>   static struct attribute *pstate_global_attributes[] = {
>   	&dev_attr_status.attr,
> +	&dev_attr_cpb_boost.attr,
>   	NULL
>   };
>