Received-SPF: pass (google.com: domain of linux-kernel+bounces-50004-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <097c6d94-2add-4c59-9ab3-8e8dbc7605c7@amd.com>
Date: Fri, 2 Feb 2024 09:16:46 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v2 6/6] cpufreq:amd-pstate: add quirk for the pstate CPPC
 capabilities missing
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.1706863981.git.perry.yuan@amd.com>
 <8a55135d10cfc906616d3cd4530f9aac487c5034.1706863981.git.perry.yuan@amd.com>
From: Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <8a55135d10cfc906616d3cd4530f9aac487c5034.1706863981.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?cDF1K0xweVVjOXIzMHRJUUVtYWJmUjNnbmxCSE40OWJpUkdpUlk5Z1h2enVn?=
 =?utf-8?B?WU54RXorVGtuZFVoV0VZV1YwNUdSSmF2RmNSbmRXbFZ1b1AySy9JMm1TcWp2?=
 =?utf-8?B?QjlnR3RqejNnWjIyM3VNYUlseisyUTd1VHhpU3haQ21abTBuQlNidzlQUHl3?=
 =?utf-8?B?RXVOczcrOC9tdjlJSEcxbG9nQmZDWkREd1VFU3M3QVRBSVMzRzJIbWwvemhZ?=
 =?utf-8?B?U2k1TzAxbndzR3F2MHdJM01pQU1id2EvVHI4VjE4dFFHdjFtcmpSN3QwQkdL?=
 =?utf-8?B?UzY5VnlHQjdiYkY2eVN5aVpSMERkWENkRHRqbEVtcTZ1cFpNem5zVlBHeWNy?=
 =?utf-8?B?OHFSQ1B1bUQzUW5UQ0c2c0k1ZnBtS21pM0g1TjNSOUowSjZnTHZxMnhFUjdG?=
 =?utf-8?B?a0FJcXVHTHZ6bnVaVWVDL25mbW1ncUZHSVU3a2lkdzFvNTZ3a0NsbTJqVU8w?=
 =?utf-8?B?ejc2NWR0RFJDSFVzSzVxd2c5b29zdGVBdXZLRThSdVB0ODMxZVpFSlZXUXVQ?=
 =?utf-8?B?WDhOMUsrRGRRZDRZVGcrdHpYRnY5eGpNNlJVYlNGaGlOZ20vRDAwelU3SHdP?=
 =?utf-8?B?b2JMM1pkb3UvVUZWV2ZLU3lLSTBFN0RhcW0vZE1YTTZXQkVDWFlvMjhEVnJn?=
 =?utf-8?B?QVFiOWVCZnljREpvL2FGaTNHeVlMck5meXpMdEpqVC94bjV5ZXA1a3ZRSDg5?=
 =?utf-8?B?SEovd0U1dllWdXpwRnhkK1UrZXY5d2ltR0xTTmhBZnRDOXhCdEFHMHBvSDl0?=
 =?utf-8?B?N2xEWjdZVkptRHI5WHdjeDkrODVTSUdoVFZJd1FYMlErN3RGNkY5dzcrRG1y?=
 =?utf-8?B?akcxcWY1RVNwWmNuelF2Z0JMYTFNRGVXa2VjN1RsZzVFVTJEb2tZL01CSkNG?=
 =?utf-8?B?b3B6L2hzbklGWE1JWlJXeU8yY1J5VXlsRDRmZUNlTC9raG84WGZjQlV5akRo?=
 =?utf-8?B?TndEcFBqY0o2d2YwQlJ0cDlzcDhZYWpBQk1GSnh2U3FkZzF3RCtHUXc2VWVs?=
 =?utf-8?B?alIreWlWeHJOeWI4US9NSmQ5Z2EzbnBqTlFhcGNBODlhSXd2bzBOMjJkRzhq?=
 =?utf-8?B?VHd5QUhZODA4TVRuQzJsTHcrV3I4VHFqdHJ0UnBWRmYvRGVOQTJnblUrQTRR?=
 =?utf-8?B?T3ljaEVBOFZFVDg0cTVUTkE0YkFCZnhLQmFwb0F5MjF6Ukt5ekdDdUxJRHg4?=
 =?utf-8?B?K0VLVE1uSzJTVCt0ZWdGSUJBZjlWTG5IUG43ZURQSWFjVm1uQWRMZ0hIZzdU?=
 =?utf-8?B?SkhPaFpDa2dsOU9ROXYwUzNqbkxaWWpPcW84VWtvQWpESk1KU0JtYU9qL0F0?=
 =?utf-8?B?LzhFSENPd2JjeUlzVU1OSjhVQUJ1RHhPVTlrS0k3aU4wUzNQOExIY1lkOVhj?=
 =?utf-8?B?VitiVUNnMHNsZ0hwLzNha213WjNEanF6Qnd1WUJMcmNmMWVGalNqQzBFVGpO?=
 =?utf-8?B?WVFXQ0doazR5SStLekdrWG0xQXdheGVFQ0ZmNmdRTUcrR1ZJc0pYSXc2THd4?=
 =?utf-8?B?ZVM3c1R6T0l5dnZ0Q0ZSZU1yQVk0NERDOGxHeElDdDBuNmNwV1hmcC80ZitK?=
 =?utf-8?B?THBFUFJkSHEvaU9OMVhVQVQ5amQreEE1ZUg4NmlSd1BsOXBoamVYVGdZSzky?=
 =?utf-8?B?bFU2OHNCOXROaGZCV2NMR3ZlWmloM3pDSFNFZlI0NXY1aU9VZkZXYWRKbWVL?=
 =?utf-8?B?cHBkR3EvWjVMSm9pcUZQYUUyQlFYTWxONnJpZlJ2MXY4N29sV1pURUVTcUJH?=
 =?utf-8?B?UkN1TjQ3Zm5kNEwwaUhuQm5Na1lucnQ3bkdKL1d0T1lNeEUrZDJEUkljZVVQ?=
 =?utf-8?B?N25ucTVlKzhycURxdEMyNGQvVVoxWUJpbUZwK3NLRnUvVWtyc1dCbjQzbm1E?=
 =?utf-8?B?NzBzTmJOSDFoenZpMlUvMmpCSjRHRnBIeG85VjByTzdvcEFqZW9IeDU5NDkw?=
 =?utf-8?B?clV4OXBqczZuR3hyUTl6cFFUWWhMQ3l3WUdHZzVBTXpPV1Jzc25mM0JhT0hC?=
 =?utf-8?B?NVBtdWtNRlNXM2wyVnlzTUo5RUdJeXpLY0czTFZBakhkNnQ3d3hlOTNRUndX?=
 =?utf-8?B?eTdBMG5KaU9TZUdRZ0lDK05pWEpxMGdMajMrZkc3bTcxNjRQcUVGN1MzaC85?=
 =?utf-8?Q?D1SPT3dACi7O4c9jw7US2CXzA?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 12468d41-cdd3-402c-babc-08dc2401fa70
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Feb 2024 15:16:49.6251
 (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: D8CHMmB+GCm8AiqD+Juz1LrCn28t1vLsSvTLjoOrEvojJew21hlYOMV61TNZrN8z+XXh64/C6+CwPTONOgMJ3w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7612

On 2/2/2024 02:55, Perry Yuan wrote:
> Add quirk table to get CPPC capabilities issue fixed by providing
> correct perf or frequency values while driver loading.
> 
> If CPPC capabilities are not defined in the ACPI tables or wrongly
> defined by platform firmware, it needs to use quick to get those
> issues fixed with correct workaround values to make pstate driver
> can be loaded even though there are CPPC capabilities errors.
> 
> Signed-off-by: Perry Yuan <perry.yuan@amd.com>
> ---
>   drivers/cpufreq/amd-pstate.c | 49 ++++++++++++++++++++++++++++++++++--
>   include/linux/amd-pstate.h   |  6 +++++
>   2 files changed, 53 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index 77effc3caf6c..4d426516abb9 100644
> --- a/drivers/cpufreq/amd-pstate.c
> +++ b/drivers/cpufreq/amd-pstate.c
> @@ -67,6 +67,7 @@ static struct cpufreq_driver amd_pstate_epp_driver;
>   static int cppc_state = AMD_PSTATE_UNDEFINED;
>   static bool cppc_enabled;
>   static bool amd_pstate_prefcore = true;
> +static struct quirk_entry *quirks;
>   
>   /*
>    * AMD Energy Preference Performance (EPP)
> @@ -111,6 +112,33 @@ static unsigned int epp_values[] = {
>   
>   typedef int (*cppc_mode_transition_fn)(int);
>   
> +static struct quirk_entry quirk_amd_7k62 = {
> +	.nominal_freq = 2600,
> +	.lowest_freq = 550,
> +};
> +
> +static int __init dmi_matched(const struct dmi_system_id *dmi)
> +{
> +	quirks = dmi->driver_data;
> +	pr_info("hardware type %s found\n", dmi->ident);
> +
> +	return 1;
> +}
> +
> +static const struct dmi_system_id amd_pstate_quirks_table[] __initconst = {
> +	{
> +		.callback = dmi_matched,
> +		.ident = "AMD EPYC 7K62",
> +		.matches = {
> +			DMI_MATCH(DMI_PRODUCT_VERSION, "C1"),
> +			DMI_MATCH(DMI_PRODUCT_SERIAL, "FX19911000028")

I saw your response to v1, but really this is too narrow for upstream.
It's literally applying to a SINGLE system.

I feel the rest of the patch is fine, but we shouldn't be adding single 
system quirks.

> +		},
> +		.driver_data = &quirk_amd_7k62,
> +	},
> +	{}
> +};
> +MODULE_DEVICE_TABLE(dmi, amd_pstate_quirks_table);
> +
>   static inline int get_mode_idx_from_str(const char *str, size_t size)
>   {
>   	int i;
> @@ -600,13 +628,19 @@ static void amd_pstate_adjust_perf(unsigned int cpu,
>   static int amd_get_min_freq(struct amd_cpudata *cpudata)
>   {
>   	struct cppc_perf_caps cppc_perf;
> +	u32 lowest_freq;
>   
>   	int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
>   	if (ret)
>   		return ret;
>   
> +	if (quirks && quirks->lowest_freq)
> +		lowest_freq = quirks->lowest_freq;
> +	else
> +		lowest_freq = cppc_perf.lowest_freq;
> +
>   	/* Switch to khz */
> -	return cppc_perf.lowest_freq * 1000;
> +	return lowest_freq * 1000;
>   }
>   
>   static int amd_get_max_freq(struct amd_cpudata *cpudata)
> @@ -635,12 +669,18 @@ static int amd_get_max_freq(struct amd_cpudata *cpudata)
>   static int amd_get_nominal_freq(struct amd_cpudata *cpudata)
>   {
>   	struct cppc_perf_caps cppc_perf;
> +	u32 nominal_freq;
>   
>   	int ret = cppc_get_perf_caps(cpudata->cpu, &cppc_perf);
>   	if (ret)
>   		return ret;
>   
> -	return cppc_perf.nominal_freq;
> +	if (quirks && quirks->nominal_freq)
> +		nominal_freq = quirks->nominal_freq;
> +	else
> +		nominal_freq = cppc_perf.nominal_freq;
> +
> +	return nominal_freq;
>   }
>   
>   static int amd_get_lowest_nonlinear_freq(struct amd_cpudata *cpudata)
> @@ -1672,6 +1712,11 @@ static int __init amd_pstate_init(void)
>   	if (cpufreq_get_current_driver())
>   		return -EEXIST;
>   
> +	quirks = NULL;
> +
> +	/* check if this machine need CPPC quirks */
> +	dmi_check_system(amd_pstate_quirks_table);
> +
>   	switch (cppc_state) {
>   	case AMD_PSTATE_UNDEFINED:
>   		/* Disable on the following configs by default:
> diff --git a/include/linux/amd-pstate.h b/include/linux/amd-pstate.h
> index d21838835abd..7b2cbb892fd9 100644
> --- a/include/linux/amd-pstate.h
> +++ b/include/linux/amd-pstate.h
> @@ -124,4 +124,10 @@ static const char * const amd_pstate_mode_string[] = {
>   	[AMD_PSTATE_GUIDED]      = "guided",
>   	NULL,
>   };
> +
> +struct quirk_entry {
> +	u32 nominal_freq;
> +	u32 lowest_freq;
> +};
> +
>   #endif /* _LINUX_AMD_PSTATE_H */