Received-SPF: pass (google.com: domain of linux-kernel+bounces-145435-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Mon, 15 Apr 2024 23:16:20 +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 v10 8/8] cpufreq: amd-pstate: Add quirk for the pstate
 CPPC capabilities missing
Message-ID: <Zh1ExGtyhGOsduOs@amd.com>
References: <cover.1711335714.git.perry.yuan@amd.com>
 <31afd5ae23f8b1d7c6a2f0efe593a368dee61224.1711335714.git.perry.yuan@amd.com>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <31afd5ae23f8b1d7c6a2f0efe593a368dee61224.1711335714.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?cyg+cc1JgcdKJKztSnmRRwkR6ckjA/8xc230DkgsYzC+RWiXTpa350NdLg7Y?=
 =?us-ascii?Q?kF9J924JkU96s98Kczxku45vbcu6SjS+eNVk58fUFLmII+fKPqWjzZe9UN+j?=
 =?us-ascii?Q?zFiaxrnwG4gElzg4aS2Hp5w9SAshta6rpjReoZcqnNdvy+ZlOf0XLhNniK3c?=
 =?us-ascii?Q?YN84WrhfQZynpu1TaYo57nmknhs6ka9N9Gkywr3S7OFusItp4z53Uvw/YUYo?=
 =?us-ascii?Q?7o5JOtlIsgEFq3HrTxdzfaeeGSkkYeExcZhyCEPzyq7kCCcyju9CICypmiUw?=
 =?us-ascii?Q?lf7ilEeciGi8eGOYJbQpCugc/dMqbP98qaRGgc5oapiXf9tP74lFyD+h1GZh?=
 =?us-ascii?Q?MlYeUKTpUAvpn6K7ZNHekdqSbQRQJeKEzSkyabbjXVvs9ixJj8wzz+l9xCHE?=
 =?us-ascii?Q?fvf3tizlYcLXT4xqDxAIhpeCua3lIreb/CL9/CTLKUvkwBi+0UMNaVDqlhBF?=
 =?us-ascii?Q?/qckKdFUU3BwGgsFkWCwPqODNdhTC3Ow3kbzXCuHjYQrLLG/x1ygDOANGrJR?=
 =?us-ascii?Q?7QFCbBxGlb2ZhFy/wWiy5WXnl0q1/8Ic89pNkYlg7flfBLAOkzLbvD4SaD08?=
 =?us-ascii?Q?nihKzT1pwtEujkvArstf35pD3dybsjPnKGAq03W15JN8NFNMWNuNW69qDVXV?=
 =?us-ascii?Q?C6Y7fqPSTiQqEbt1c/zwDaBuOW3FiAv0c5VeT77geYsNP5NDXKVUxOnaHFK7?=
 =?us-ascii?Q?l7WlTouru/mdIJoBCiU+3sJJ9UJjC9IkJ5Es0pA68UWAY2zvtHHgfJ3Br7S4?=
 =?us-ascii?Q?sRZMHNAos7u1smyD70Zx5/QBHPOPcuJHrZeiLVTKOnNqP+wNkowC6enWneZD?=
 =?us-ascii?Q?T58fuXGLm6dqwFUtfErQxovd9F809tfudb70/T6H3oak4wAKeDHSFR5FKNNx?=
 =?us-ascii?Q?iYluJhTL3xWyYttfCfm4GxOrB56X7jRFC4xkJ5pkY3yhK+zVvNhSOa9ud55j?=
 =?us-ascii?Q?5/q8pxNuNUNbA1rbeC7+Ck4ZHVp3AHBVvEH3DRNgmW/gkHcR+9KS35SrldRU?=
 =?us-ascii?Q?UVyRcsuDNMIPutQUDHu9Iph5rP6ls73ecvwwtWqBkgwAtvfiuf0OkEzS/6xD?=
 =?us-ascii?Q?Be45nL/1Bbv34HqSIQ4yCGzbXFlQ7+YR3XBucTQVBuUgGbaTikIKgd/W3SC7?=
 =?us-ascii?Q?vhZxNk0VTGTvklq4A4ICzvtHVY/7Jy2Njp1lT2a8UhdhMt05yLOql479nZrb?=
 =?us-ascii?Q?L5sKlBqk0Qd1oor+XWyRAu8ctBkG9E/z6uypVoMkDdU4R+OljKVWWpbHo89z?=
 =?us-ascii?Q?oJdW67p7Q98lzL6ZPrS6egvjR8igWjvl+JCLlrOJI/WO8mJmtCsdhE0MQRYk?=
 =?us-ascii?Q?pMOLwoiHzfc0tWh5qdpOox26WNXSEeyR1XXVL2rHs41f7HftP0oxGCZ8j5dn?=
 =?us-ascii?Q?h9b4/ZA+g4G9CI6JyObap4g2ym5jZ6mO1mm4VSnZZlV1VsVWBVQyzA5wzbDl?=
 =?us-ascii?Q?eMXEm3s9KiofV0BGObbED9B7oHHq6nxofKxsuOM+cgIhY+QHr7xau0wUeZJM?=
 =?us-ascii?Q?kwttKtQQ4o9czcUVhl8AQNYhW7lltjSxB1Dzg+YiY2wHoUgJoAX8IV4Cxnse?=
 =?us-ascii?Q?I3gyDAvJ/Dl53ux4lG/pcDQEJFdk7phlrABLgT6M?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 2ceda8da-9046-469d-03be-08dc5d5f0dec
X-MS-Exchange-CrossTenant-AuthSource: SJ2PR12MB8690.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Apr 2024 15:16:41.8303
 (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: IxX7KrzN0+9UH3/e/KZqynxBJ4WDL4rdqmGkQoIClgMFI4Lz30jt7ziHIKzLPxH4nXelKqvP0xpOWPaWIJQxOA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4303

On Mon, Mar 25, 2024 at 11:03:28AM +0800, Yuan, Perry wrote:
> Add quirks 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.
> 
> The workaround will match the broken BIOS which lack of CPPC capabilities
> nominal_freq and lowest_freq definition in the ACPI table.
> 
> $ cat /sys/devices/system/cpu/cpu0/acpi_cppc/lowest_freq
> 0
> $ cat /sys/devices/system/cpu/cpu0/acpi_cppc/nominal_freq
> 0
> 
> Reviewed-by: Mario Limonciello <mario.limonciello@amd.com>
> Reviewed-by: Gautham R. Shenoy <gautham.shenoy@amd.com>
> Tested-by: Dhananjay Ugwekar <Dhananjay.Ugwekar@amd.com>
> Signed-off-by: Perry Yuan <perry.yuan@amd.com>
> ---
>  drivers/cpufreq/amd-pstate.c | 53 ++++++++++++++++++++++++++++++++++--
>  include/linux/amd-pstate.h   |  6 ++++
>  2 files changed, 57 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/cpufreq/amd-pstate.c b/drivers/cpufreq/amd-pstate.c
> index ec049b62b366..59a2db225d98 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;

If we set quirks as global pointer, while the amd-pstate is uninstalling,
should we free the quirks as well?

Thanks,
Ray

>  
>  /*
>   * AMD Energy Preference Performance (EPP)
> @@ -111,6 +112,41 @@ 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_7k62_bios_bug(const struct dmi_system_id *dmi)
> +{
> +	/**
> +	 * match the broken bios for family 17h processor support CPPC V2
> +	 * broken BIOS lack of nominal_freq and lowest_freq capabilities
> +	 * definition in ACPI tables
> +	 */
> +	if (boot_cpu_has(X86_FEATURE_ZEN2)) {
> +		quirks = dmi->driver_data;
> +		pr_info("Overriding nominal and lowest frequencies for %s\n", dmi->ident);
> +		return 1;
> +	}
> +
> +	return 0;
> +}
> +
> +static const struct dmi_system_id amd_pstate_quirks_table[] __initconst = {
> +	{
> +		.callback = dmi_matched_7k62_bios_bug,
> +		.ident = "AMD EPYC 7K62",
> +		.matches = {
> +			DMI_MATCH(DMI_BIOS_VERSION, "5.14"),
> +			DMI_MATCH(DMI_BIOS_RELEASE, "12/12/2019"),
> +		},
> +		.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;
> @@ -812,8 +848,16 @@ static int amd_pstate_init_freq(struct amd_cpudata *cpudata)
>  	if (ret)
>  		return ret;
>  
> -	min_freq = cppc_perf.lowest_freq * 1000;
> -	nominal_freq = cppc_perf.nominal_freq * 1000;
> +	if (quirks && quirks->lowest_freq)
> +		min_freq = quirks->lowest_freq * 1000;
> +	else
> +		min_freq = cppc_perf.lowest_freq * 1000;
> +
> +	if (quirks && quirks->nominal_freq)
> +		nominal_freq = quirks->nominal_freq * 1000;
> +	else
> +		nominal_freq = cppc_perf.nominal_freq * 1000;
> +
>  	nominal_perf = READ_ONCE(cpudata->nominal_perf);
>  
>  	highest_perf = READ_ONCE(cpudata->highest_perf);
> @@ -1662,6 +1706,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 ab7e82533718..6b832153a126 100644
> --- a/include/linux/amd-pstate.h
> +++ b/include/linux/amd-pstate.h
> @@ -128,4 +128,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 */
> -- 
> 2.34.1
>