Received-SPF: pass (google.com: domain of linux-kernel+bounces-53007-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: <7023f250-8278-41a5-ad44-684e83283814@amd.com>
Date: Mon, 5 Feb 2024 10:26:52 -0600
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v3 6/6] cpufreq:amd-pstate: add quirk for the pstate CPPC
 capabilities missing
To: "Yuan, Perry" <Perry.Yuan@amd.com>,
 Oleksandr Natalenko <oleksandr@natalenko.name>,
 "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.1707016927.git.perry.yuan@amd.com>
 <dc7fc753b596a4e262b21d2c2e8eec3570e4a97c.1707016927.git.perry.yuan@amd.com>
 <2719030.mvXUDI8C0e@natalenko.name>
 <CH3PR12MB8657029084397762A2ADD6249C472@CH3PR12MB8657.namprd12.prod.outlook.com>
Content-Language: en-US
From: Mario Limonciello <mario.limonciello@amd.com>
In-Reply-To: <CH3PR12MB8657029084397762A2ADD6249C472@CH3PR12MB8657.namprd12.prod.outlook.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?SndGdE5MQkMrc01DMTc2b1VzVjFxbUxOMUUzN0RaRGhSSGoxbVo5LzlUTFpx?=
 =?utf-8?B?RFpCOXlLN1ZBejQvYVdvS01rQTlpODFNM1NPSjhxWGgvdXkzamgxTWxFSzRE?=
 =?utf-8?B?VGt6bmRyRDJmT2FNVzJ5L1Aya2RsU1NGUnRiMjhIWlIrMHNtYlJJdENRdGdK?=
 =?utf-8?B?T3lZQzRvbHFQbEZJVUVNald5RHJ6aEtPSVFJTWFVRW9NWnltMUZGekRTZmlR?=
 =?utf-8?B?Vlp2aUc2MjVVTzcrL0xZbHdVd0EwZWd2eUtFVEhYQlBqZ3BiQzMwR0g4Tm96?=
 =?utf-8?B?S3pvNnlzQkhyUG5KbGtPQ0IwVTA3dndSVDNabUdveWtUWW1rZGQwSmNYQjlL?=
 =?utf-8?B?VFlqZzQwUGprUnluR2poVk42aVF4Q1RhcW9sdjI5bm9yZ0NlVHpSR1cwYm9V?=
 =?utf-8?B?ZzRpSVA1Yno0TGxpZlFDMzNlQlNPMFhEOTRSdHJGam42bkw4a3FxSWF3SmFB?=
 =?utf-8?B?R0pibjN5dnBxSVRsMVEwbXBBZExUR0VLT0dFUU5xdC9udHNZczI1ajZOUUx0?=
 =?utf-8?B?Sjh5dTBwT0RzaXZOWlpTTnc4TVJzSUN1SlNKNDV4ZDY2emxNZzNOckFVTzI2?=
 =?utf-8?B?aUtoVDNqTm9ONHRRSThRZ2IwVGdQVUxFcVNQSlJBVVNPQVloaStzYk1DYVpk?=
 =?utf-8?B?YXdhWDdhVUJiUFlwejVzVW5ZQjJlYkhyVkFkM0VCVWFvejg1OHd3Nm1WNk9D?=
 =?utf-8?B?VUlDN2RudWFVNmR0aXFCcFJ6eUZBMXFVNC9GbkZkL2V0UEZ6OGVMUkw1WkZY?=
 =?utf-8?B?TER2RHRET3VJbU0wVmNocHdyZmVlcmhhb0hzYmtNL3k5TmxVdWhiWTVIWW5X?=
 =?utf-8?B?bVQ4QzNtMVVXV3RsNDM0L1ZsMWlVaTVYT3NYZjJOUVBvczFYYW4yUjZ4Wlg4?=
 =?utf-8?B?MXJHbi82YXk1L016M3BZSEpBQS9tNlhEeHUvWHlOcjl4cG1ScENMTEJJNFdq?=
 =?utf-8?B?MmVEY0UxQmt3RitsczVBeXk0byt3cTdLT051R2xxUGJoZ2hXZFpUclV0cTN3?=
 =?utf-8?B?Vzd0NkdWWnFlRXNZWHNyaXY5cWQ3NlpUTFNSQUdpYlk4em1vbFYyUmN2K05O?=
 =?utf-8?B?WVNmeXNUK29yNWh0WENrZFBIb2xHU1c5Y0MwcDFwamR0bkI0Q2tFZjNvdzVw?=
 =?utf-8?B?a2hpWi90UU9TTnhYNTQ3QTZSRlNtRGY3YUM0d0FWS3NiclppaVNhaXoxRXJB?=
 =?utf-8?B?eWdGaUNnbng5c0NNVHNNczRscEVOcDcyUWVDdFpYOFhmM3RuL05QTmpVbTJQ?=
 =?utf-8?B?SWNLTmp1V2xVWitVOXpRdTdsOXE1ZE11S21EOGpCWnlrYldKTkN1UEVuSkFq?=
 =?utf-8?B?QXdmUHdwN1VCRzJBS1hRcTM4YUkyQjNYZDErUC9zOXlvQU92SlV4K1d6aVZm?=
 =?utf-8?B?akJ1dW0wZjB6RmRxSzduM0ZqR0lRbnQ4UldEQzlaQjRDVDIzMWJINmFPUEZ3?=
 =?utf-8?B?cXZxQmIxUmNEZ0xCTVNhZG1EWlpkb3BBVjF1dzRXZ0NTdGNHM0VrTFljVVdE?=
 =?utf-8?B?Z0Y5NW55R2lDSTZ1b0tZSURxN3FnRXBjQnJYNjk5L2xUM3ZtVnBkRk8vSjJl?=
 =?utf-8?B?TlFESys4cDB2clg1OFltR1p2QVNkV2ltdEJIZWRBTjVEOTllRmVlTy9URzR6?=
 =?utf-8?B?SzZBNjlKR29KWVBUM1k1RnVGd2ZnZnRsS0YrdXNQS0tCLzlTTnM3THRwQlAz?=
 =?utf-8?B?Mk0rMzZjSHkydGlPelVJSFYzdDRnNXBQMExKdldRT0JEUm5ma1ZQRWVNZWpL?=
 =?utf-8?B?TlFJZUE1Qlk0YURqdmF0ZjdZaThCQmoxSFJzamdJSlhHdkhhNmNVaVZNUlI1?=
 =?utf-8?B?eFNKM3J6YlFUTk9LVFcvWUI0T0NFeHczRWcyMjVtS3p4Y3J1UnJKSnZtQTBu?=
 =?utf-8?B?bno1QkRBVGRoTk1BNEZiT2w0cGgvNFEvaFRjR0h5RDc1a0RSRndUcTZDcVYr?=
 =?utf-8?B?TEM2ZHRISHVvd3dhS1VmblhFdkZ3KzRTRldEeFJaY2FUY2FYMEY3VU14Wmgz?=
 =?utf-8?B?MU5UdStISTV0L3kra3BnRVBQZEpzak1XcDlQYnVNck5VYkdxNU9JMUlHYkha?=
 =?utf-8?B?OXZJZWoxbWJwUnBxTUliYmZnTThHeTFWT1craWFRT0h3U2pTUDZXRXJ6NVRj?=
 =?utf-8?Q?X2wqhl1Lqj/JaV4VxjT0xcO8a?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: df891862-7d68-46f3-fb2c-08dc266744b7
X-MS-Exchange-CrossTenant-AuthSource: MN0PR12MB6101.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2024 16:26:55.7428
 (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: 4j+ykfQqojjZfrVQO/AHk36PyDO7aXvcoyqxzdxYP9ZX0/rzQIxsoUA9CR18ay/S6scqK2ZwwY+/hC3o9AQHag==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB9276

On 2/4/2024 20:29, Yuan, Perry wrote:
> [AMD Official Use Only - General]
> 
>> -----Original Message-----
>> From: Oleksandr Natalenko <oleksandr@natalenko.name>
>> Sent: Sunday, February 4, 2024 10:45 PM
>> To: rafael.j.wysocki@intel.com; Limonciello, Mario
>> <Mario.Limonciello@amd.com>; viresh.kumar@linaro.org; Huang, Ray
>> <Ray.Huang@amd.com>; Shenoy, Gautham Ranjal
>> <gautham.shenoy@amd.com>; Petkov, Borislav
>> <Borislav.Petkov@amd.com>; Yuan, Perry <Perry.Yuan@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 v3 6/6] cpufreq:amd-pstate: add quirk for the pstate
>> CPPC capabilities missing
>>
>> Hello.
>>
>> On neděle 4. února 2024 4:26:14 CET Perry Yuan 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
>>>
>>> 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..25a6d8a808c4 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_BIOS_VERSION, "5.14"),
>>> +                   DMI_MATCH(DMI_BIOS_RELEASE, "12/12/2019");
>>
>> I think this is incorrect, and there should be a comma "," instead of
>> semicolon ";" at the end of the string. Otherwise the build will fail.
> 
> Good catch, I made a mistake here, I found this after I sent it out,  have it fixed in V4.
> Thanks for the review.

I'm still wondering if this is the right level of narrowness.  Does the 
quirk only apply to a single BIOS vendor?  Or any other sysfs attributes 
that can be generic to all affected systems?

Also would it perhaps make sense to rename dmi_matched to 
dmi_matched_7k62_bios_bug and then in dmi_matched_7k62_bios_bug check 
the model/family match.  In that function you can only set
quirks = dmi->driver_data

If the right CPU applies then too.

> 
> 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 */
>>>
>>
>>
>> --
>> Oleksandr Natalenko (post-factum)