Received-SPF: pass (google.com: domain of linux-kernel+bounces-50053-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <7b57ceea-f6d6-4d4a-9e3c-8cdcca08121b@amd.com>
Date: Fri, 2 Feb 2024 09:55:03 -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: "Yuan, Perry" <Perry.Yuan@amd.com>,
 "rafael.j.wysocki@intel.com" <rafael.j.wysocki@intel.com>,
 "viresh.kumar@linaro.org" <viresh.kumar@linaro.org>,
 "Huang, Ray" <Ray.Huang@amd.com>,
 "Shenoy, Gautham Ranjal" <gautham.shenoy@amd.com>,
 "Petkov, Borislav" <Borislav.Petkov@amd.com>
Cc: "Deucher, Alexander" <Alexander.Deucher@amd.com>,
 "Huang, Shimmer" <Shimmer.Huang@amd.com>, "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>
References: <cover.1706863981.git.perry.yuan@amd.com>
 <8a55135d10cfc906616d3cd4530f9aac487c5034.1706863981.git.perry.yuan@amd.com>
 <097c6d94-2add-4c59-9ab3-8e8dbc7605c7@amd.com>
 <CYYPR12MB865553ECA464FD9BFA57D1BB9C422@CYYPR12MB8655.namprd12.prod.outlook.com>
From: Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <CYYPR12MB865553ECA464FD9BFA57D1BB9C422@CYYPR12MB8655.namprd12.prod.outlook.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?WmtjN2o0cVg2a3U5L1VBeDZVb3ZjVWR5bS9ocmQzRTZnZitRQlgwR0EzZ0Ri?=
 =?utf-8?B?bUVjbTFDdWp4cGdmZnVJekdTaGJOWmxPRnZNTnhlMHdFeWVJSXNFdndpVUta?=
 =?utf-8?B?RXF4amZHM3VmMnF4YStNUkdLcE9oZ3hDWTNyYlFiZ2R4aGJCQlRrdWtKQ2ZF?=
 =?utf-8?B?KzZ3OGJsWjVLOWxsRnk0WDRHcmQrSXFtZVUyOStRMzF1ZHFYSnhVeWIxMmRx?=
 =?utf-8?B?VTEvQTV4QmduZnV6Q016QzJrTjY4UG5tT2NSNmpmbzRMekhCL0hlSHF3RENB?=
 =?utf-8?B?cTNQYUdMSk1tMFNwUjBOWUFoeTBRbnBVMGRXMGZtelQzQy9lSlVZUXh1T2RK?=
 =?utf-8?B?WnhGNi8zZVVzYzdrUG52dU05SEQ2Vmp3eTFES1RhalNoVmZ3VUVSZ0E4ZlFW?=
 =?utf-8?B?M1Q4NFRTNU43QXFBd20yYWh5aTNIdHBheDF4VE5CUXBubmt2a1FlRTBMNytm?=
 =?utf-8?B?cG9INXRwbU5WRmhsT0NpYW04ZkxMdjRCcmdaWnJnSlphQU5lK0NPSjB0cThP?=
 =?utf-8?B?RWs2UzhLTmpOa254Y0hMYnA4QlhtM0Q3QmM4U09oQStQQlZ0WThZQ0pSQjVi?=
 =?utf-8?B?Tk9pd05kSmhLL0hJMmZzWXVBMDNOQTNXL2ZsRVl2ME96UldrVWlnY1RWOVEv?=
 =?utf-8?B?UlR6TE1naEtZaGJmVXZOV3ByZm0zZldNYkY0Q21Gbjg2NjAxVmRiRE04cmdl?=
 =?utf-8?B?UzRxam0vYUZ2TTdWenlQMndPVm1Fb2tNeDM4NGdTODhQeVhPYk45T3NhV3p6?=
 =?utf-8?B?U29mck9ZYUkrcmY0a2lkaWN4dVBoaTQ4Y3FnSUtoM0xFT2hlNGVQNkI4cDRx?=
 =?utf-8?B?Zyt3OTVNS0xrRHRHYllDQXkyTmdBa1hYY2VwTU8yaW0vZzlCaHZnQkZmb1lr?=
 =?utf-8?B?VXo1N1FRQkJxc1k5WC95K0dxTFVlcGgzdzZEZFVJL1A0dE1aRHQvT0J1WTVa?=
 =?utf-8?B?cE55TDlzempIU1FhakVhZEJGOEJISG5ZRmh3eXpZckxadlVZSHNVQmNzSGhr?=
 =?utf-8?B?dS9rOU1UK3lCNkxGUWdSbFcyWkVpZEIxbWxHVmgrR1htNUVlQ3MvelF6TTlP?=
 =?utf-8?B?RDMrY0liWDNqcGNyRG5GS3o2eHFQWi8yeG5FUUR0dWJqOWRvSHFlTW1ucHRj?=
 =?utf-8?B?cmVFUm9VWnpFTnl5UUV4eWZ2RFk3clZWSitRN1JWVkJvU3M5dHQrOEJreHlL?=
 =?utf-8?B?ZG02QmFvOTMyQkxkOTg1MUZtWFRVTk42Yys4aG90dVhHdGlTMUpKUUdVTk1J?=
 =?utf-8?B?TkFsQXVmM0k4QWNmNDUzZHhNOG1GOG56MWVFcDA5RDgrU0hOWjhOb2VoWUs5?=
 =?utf-8?B?L2xPKys0b0dpVkVsVGtsUXhIbEpNcjdIT1Vtd2hlLzZjVm02cGU3dFpyblp4?=
 =?utf-8?B?T3VERnpoR0pkY1JhV1hNNXMwSzY2TTFPc21lMWdzQmhkbDk3QW1Pa0xGVDBG?=
 =?utf-8?B?THBDemhaNXpMRkdhd0NYV0x4RFhOdW9PWGNOK0d2YlJpdmFzNHJwK3o1RDg5?=
 =?utf-8?B?a21tQ1VqUi8vV0xnUkkrZ3ZJbE1vK3RWWEdPT05hOHFPOVVBcTNZUUptTDRj?=
 =?utf-8?B?M0hZQWFQODF4Zk1uN2ZqeEdnR29GdE9YRkhQR0ZXUGR5QlFMZ3Q1Vmt2RitS?=
 =?utf-8?B?T215ZThyZnUyWFNSQi94clkyN2NoZDhMM2xVbGg0bVBiUE1PekpIVFV4aVRM?=
 =?utf-8?B?QjFnRTVoaWNIaWhMMUI0aEVhNGJmQm8ySHF5VGJydnJlTCtwaEZDWlNoSzVC?=
 =?utf-8?B?VUVsRDZmZStTTmlNbWFEeS9jUlJqcTZCQThhY09RVFRTZm9obGpMOURIcU52?=
 =?utf-8?B?L3VsaEFHUU9WdWdYVVRBYlBqQ25SSE94SWRMUE5ZdURpbjdwUHpTZnVqVjRC?=
 =?utf-8?B?YXNiN3BvZ3B0VGhxTkdidFRVdmxRajlEQVZHS0FhUXQrbUlUOGVoYkQ5a3gw?=
 =?utf-8?B?TUlKUjBGRmVqUEdBNkdGMVoxeVZIcTIyaTZYenlTZE9JbFlqS2MwMnFOcDV5?=
 =?utf-8?B?L0Qrc0lmb3dCR2QzNmJNMkEybVN6bGhTbEh5MklaL0hWenV3c3diVHZuMlcr?=
 =?utf-8?B?K2RaVWdaUVRSNXVnNzYzVWx2R0JFZlBFNjFRZDRybUdkTStUZzA1YU1XaFZN?=
 =?utf-8?Q?l5anoEOAMgc6Uvv8iq+MlXNJe?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 19ab8c71-8f24-44d4-f938-08dc24075328
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:55:06.0230
 (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: ZE1gqq+ToRjoYRRCTQRWQ1N1DtUxSAVYBjIMYFNN3Txu6hkhZlkhyUymZD6naRwjLQr5QZZJ3jEjKnfVuOyhmA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5050

On 2/2/2024 09:35, Yuan, Perry wrote:
> [AMD Official Use Only - General]
> 
>   Hi Mario,
> 
>> -----Original Message-----
>> From: Limonciello, Mario <Mario.Limonciello@amd.com>
>> Sent: Friday, February 2, 2024 11:17 PM
>> To: Yuan, Perry <Perry.Yuan@amd.com>; rafael.j.wysocki@intel.com;
>> viresh.kumar@linaro.org; Huang, Ray <Ray.Huang@amd.com>; Shenoy,
>> Gautham Ranjal <gautham.shenoy@amd.com>; Petkov, Borislav
>> <Borislav.Petkov@amd.com>
>> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>; Huang, Shimmer
>> <Shimmer.Huang@amd.com>; Du, Xiaojian <Xiaojian.Du@amd.com>; Meng,
>> Li (Jassmine) <Li.Meng@amd.com>; linux-pm@vger.kernel.org; linux-
>> kernel@vger.kernel.org
>> Subject: Re: [PATCH v2 6/6] cpufreq:amd-pstate: add quirk for the pstate
>> CPPC capabilities missing
>>
>> 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.
> 
> How about change to match the BIOS version ?
> Actually, the issue should be impacting all the systems which have the same broken BIOS.
> 

Yeah it does sound like a BIOS defect; so this is a reasonable 
alternative.  Just make sure that you only apply it to the necessary 
systems with this change.

> Perry.
> 
> 
>>
>>> +           },
>>> +           .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 */
>