Received-SPF: pass (google.com: domain of linux-kernel+bounces-164488-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: <13bcd356-a5a0-4cf0-9222-bccc01177032@amd.com>
Date: Tue, 30 Apr 2024 12:06:20 -0500
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] tools/power/cpupower: Fix Pstate frequency reporting on
 AMD Family 1Ah CPUs
To: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>, trenn@suse.com,
 shuah@kernel.org
Cc: ananth.narayan@amd.com, gautham.shenoy@amd.com, linux-pm@vger.kernel.org,
 linux-kernel@vger.kernel.org, rafael@kernel.org, Perry.Yuan@amd.com
References: <20240430083706.69641-1-Dhananjay.Ugwekar@amd.com>
Content-Language: en-US
From: Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <20240430083706.69641-1-Dhananjay.Ugwekar@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?cFc1K3VDdStadVJxWGt4Ny8zVXIrVmhBOFg3cHA5Z1FsZERsOEpmYjN2V0dB?=
 =?utf-8?B?eVB1TWd0NDNKbzNEUDB3dDlMRC9VU210ZVJvL2ZqVTZ0TG5yelI0Z2tCYi9P?=
 =?utf-8?B?ZGhja05LbUVXVm16OVJOMDN2aXZ3RzFIbUFVVnRnekpRYWltUXJtcWN0R2Y3?=
 =?utf-8?B?TU94bzV4WlR5RU02TFNwKzc1dkxqQW04NGUyYUdxejdmREU2MmZtejF3RnRw?=
 =?utf-8?B?cG1oMFViVkRqc3BQcUM2NlJNMDJIZ0Q2RFhaL3V2aERaVXJJVCt1UnBjNDBN?=
 =?utf-8?B?akkvQjBxNHN2Y24wNm9SOTVkK1YzSDE4ZzVZZ0dmT3dlamJHWUwxMzdCcThy?=
 =?utf-8?B?azRoUjltVkNaSGVabm8yV0YrQ3d1L1ZmeHpXK0IvTmhydURCZXJibXlYaGFr?=
 =?utf-8?B?NmN3UGxnVEtVWTIyNG8razVHem9EMlhjbCtKcUNJNkNScFIwamQzVkdyYlNm?=
 =?utf-8?B?WWFMOEUyaEJNOFR4UDhrK0RwR0pIaU1tWlNnN2ZvVG9IcWVaRStWOFZ5Q05i?=
 =?utf-8?B?SzJpN3VpYXZDdFlpYTgrRFlRNG1aUERySDdRVU5vQWx5S3QyeG1KYm96dWJq?=
 =?utf-8?B?MFJHeDdmOCtZM1c4TjlOSSszdTh4NnZ4OEJ3cnhxZ2lvbE9aenZ1THpjZjlS?=
 =?utf-8?B?VnpDdTdpZW5WWUpKY3NmaURyWFNmeElVTU5OSVFUaG5YdDlMcGhQcDVleGlt?=
 =?utf-8?B?endCMXVHb0ZyWFMzTVJodlcwOUlHMUlSeFRWa293RFdhbmZSUzliTXBJR2h5?=
 =?utf-8?B?ZHBXMjJKQUlwRG1zN2wreURqTEJrOUVIMFAxVFVGZmtGMVZHTWtFYkRDUEVW?=
 =?utf-8?B?WmFGK3hlZWdldnZ4RDU2TFlBMVlZMG9peE5VWEpwMXBzckw0YnZGTFp5aTdB?=
 =?utf-8?B?NzFTUzlhQ21IZFBmMWZsVVdGSkltL3Arc0ZhekVDUmEyTTRaK3l1RmlTcXJu?=
 =?utf-8?B?VzhUdEQ5WjFhZ0tJMXlmZDFjd2t1QXBQS3dLNjVLOEIvemNDaUtsU0hkM1BL?=
 =?utf-8?B?RXFsUU52SU40VG1XelVLaUhpWGRuMjRmRE1vT1RNc3ZrMnVCY0NQUjY3aDRY?=
 =?utf-8?B?aFRFV0ZUdlZsdkFhNmxCdzM4VWNnUmd6OFVQZ012R0syMElyZVlVS0VLMitL?=
 =?utf-8?B?cHl5MCtYT3NlVVNHRG5reTZYTjA3S1Z4RkZtSU1MZ01uU2VjR2JZTEJTNThZ?=
 =?utf-8?B?WWk5dXpLQTlsWm1EcUxaV09ibXYvMXVJR25HU2oxOEpvamRzRCtpYmhLTk9r?=
 =?utf-8?B?S1ovbG04NjNEVElLS3p3Z0R5UU9yL1pLSGJPM29kYTFnTzl6KzRTc21lSFF3?=
 =?utf-8?B?R0ZxczhvWkpvYTVTOWpsWWNnK2IxejlMSy9OUm83Z2lMTUZPVUlQL0J4aFRp?=
 =?utf-8?B?NERmZ1BJYmpaZzJWY292dEowVWMwZVhXdStTS2puc1h4cmNQcngzMTRNU1ow?=
 =?utf-8?B?Skt0UW40dStmWDJxNzV4WVJ5QllLeGJQMU1GeHBTVEVVQlNVVVg1bnV4alpU?=
 =?utf-8?B?bU9EaDB4UElkcGFIVzF5SHZza1Y2cWp4RzJCZGVoVXZjUmNpSCs0c3FMWW1w?=
 =?utf-8?B?RmE0RXpqMngvYkQ0K1QyeWt1cm1WNDNlYXdDUlNxeUZEd2hyNUIzUERadW9X?=
 =?utf-8?B?clhVYzRSN05TcXR5cmdLLzZtcmJQdFkzY3VWOTdKdFFFVjN6RVZ6WEk1ZDMy?=
 =?utf-8?B?NmlrenNzMlpUUHFHM3BjQTlrQlBld0oyK1kvSGJ5bS9ybDBpUVQ1bmh4MkNl?=
 =?utf-8?B?Slg1N1BlQU5wZWt0VHRwSjlaRGFHR0w5Y1I1bXd1azJYQzlCVVVQSVFpeFc5?=
 =?utf-8?B?Z21aNEsvNjhPRE1ycG42aEJRMVFjK0dZVUh1YlZ4REoyNkVSK0VQNTBSVUl6?=
 =?utf-8?B?Lzg1aE5YTDVXU203YXZyTzBQNFlGaTQrQkpkbWhQTWtPTm1pTFcrVVR0Y3NU?=
 =?utf-8?B?NjhuTnBHckJDTWlzd0MwY3lsb0NLSVFYU2RNbzdtcjF5TS9maS9raXBINVZX?=
 =?utf-8?B?RTBQa25aTDQvbTFjVUplNkdOQXZieDhEbmlhcXpXWGs0b09UdU9JbW9FV05C?=
 =?utf-8?B?anR2dGZBWnBYWUo4SzJnenRLSXZMQ04wRU5ZeC9LeXk2alBzbnJnS3pKVUl4?=
 =?utf-8?Q?86w+CiPcvyHGqmN89GYBJggoz?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ff5d7f31-e63a-4587-0789-08dc6937dc62
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Apr 2024 17:06:22.2739
 (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: PwVlL4laG63f8mhl93fwtJEL7WYOqLJQ8+z3VfrnpksIZ+/E5gRlkOS2SUxrHXAIrJ/wJISC+LnzGWCtNJdIcA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB8464

On 4/30/2024 03:37, Dhananjay Ugwekar wrote:
> Update cpupower's P-State frequency calculation and reporting with AMD
> Family 1Ah+ processors, when using the acpi-cpufreq driver. This is due
> to a change in the PStateDef MSR layout in AMD Family 1Ah+.
> 
> [ dhananjay: commit log, tested on 4th and 5th Gen AMD EPYC system ]
> 
> Signed-off-by: Ananth Narayan <Ananth.Narayan@amd.com>
> Signed-off-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
>   tools/power/cpupower/utils/helpers/amd.c | 26 +++++++++++++++++++++---
>   1 file changed, 23 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c
> index c519cc89c97f..0a56e22240fc 100644
> --- a/tools/power/cpupower/utils/helpers/amd.c
> +++ b/tools/power/cpupower/utils/helpers/amd.c
> @@ -41,6 +41,16 @@ union core_pstate {
>   		unsigned res1:31;
>   		unsigned en:1;
>   	} pstatedef;
> +	/* since fam 1Ah: */
> +	struct {
> +		unsigned fid:12;
> +		unsigned res1:2;
> +		unsigned vid:8;
> +		unsigned iddval:8;
> +		unsigned idddiv:2;
> +		unsigned res2:31;
> +		unsigned en:1;
> +	} pstatedef2;
>   	unsigned long long val;
>   };
>   
> @@ -48,6 +58,10 @@ static int get_did(union core_pstate pstate)
>   {
>   	int t;
>   
> +	/* Fam 1Ah onward do not use did */
> +	if (cpupower_cpu_info.family >= 0x1A)
> +		return 0;
> +
>   	if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_PSTATEDEF)
>   		t = pstate.pstatedef.did;
>   	else if (cpupower_cpu_info.family == 0x12)
> @@ -61,12 +75,18 @@ static int get_did(union core_pstate pstate)
>   static int get_cof(union core_pstate pstate)
>   {
>   	int t;
> -	int fid, did, cof;
> +	int fid, did, cof = 0;
>   
>   	did = get_did(pstate);
>   	if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_PSTATEDEF) {
> -		fid = pstate.pstatedef.fid;
> -		cof = 200 * fid / did;
> +		if (cpupower_cpu_info.family >= 0x1A) {
> +			fid = pstate.pstatedef2.fid;
> +			if (fid > 0x0f)
> +				cof = (fid * 5);
> +		} else {
> +			fid = pstate.pstatedef.fid;
> +			cof = 200 * fid / did;
> +		}
>   	} else {
>   		t = 0x10;
>   		fid = pstate.pstate.fid;