cpupower: Fix querying boost support for amd-pstate-epp mode

[PATCH] cpupower: Fix querying boost support for amd-pstate-epp mode

Posted by Mario Limonciello 2 years, 4 months ago

When running in active mode the driver for amd-pstate has -epp appended.
This throws off amd-pstate detection.

To detect amd-pstate look for the prefix instead.

Fixes: ffa5096a7c33 ("cpufreq: amd-pstate: implement Pstate EPP support for the AMD processors")
Reported-by: chenhq2005@gmail.com
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217755
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
 tools/power/cpupower/utils/helpers/misc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/power/cpupower/utils/helpers/misc.c b/tools/power/cpupower/utils/helpers/misc.c
index 9547b29254a7f..01c0440efe850 100644
--- a/tools/power/cpupower/utils/helpers/misc.c
+++ b/tools/power/cpupower/utils/helpers/misc.c
@@ -95,7 +95,7 @@ bool cpupower_amd_pstate_enabled(void)
 	if (!driver)
 		return ret;
 
-	if (!strcmp(driver, "amd-pstate"))
+	if (!strncmp(driver, "amd-pstate", 10))
 		ret = true;
 
 	cpufreq_put_driver(driver);
-- 
2.34.1

Re: [PATCH] cpupower: Fix querying boost support for amd-pstate-epp mode

Posted by Huang Rui 2 years, 4 months ago

On Sat, Aug 12, 2023 at 05:35:01AM +0800, Limonciello, Mario wrote:
> When running in active mode the driver for amd-pstate has -epp appended.
> This throws off amd-pstate detection.
> 
> To detect amd-pstate look for the prefix instead.
> 
> Fixes: ffa5096a7c33 ("cpufreq: amd-pstate: implement Pstate EPP support for the AMD processors")
> Reported-by: chenhq2005@gmail.com
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217755
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>

Acked-by: Huang Rui <ray.huang@amd.com>

> ---
>  tools/power/cpupower/utils/helpers/misc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/power/cpupower/utils/helpers/misc.c b/tools/power/cpupower/utils/helpers/misc.c
> index 9547b29254a7f..01c0440efe850 100644
> --- a/tools/power/cpupower/utils/helpers/misc.c
> +++ b/tools/power/cpupower/utils/helpers/misc.c
> @@ -95,7 +95,7 @@ bool cpupower_amd_pstate_enabled(void)
>  	if (!driver)
>  		return ret;
>  
> -	if (!strcmp(driver, "amd-pstate"))
> +	if (!strncmp(driver, "amd-pstate", 10))
>  		ret = true;
>  
>  	cpufreq_put_driver(driver);
> -- 
> 2.34.1
>

Re: [PATCH] cpupower: Fix querying boost support for amd-pstate-epp mode

Posted by Shuah Khan 2 years, 4 months ago

On 8/13/23 22:14, Huang Rui wrote:
> On Sat, Aug 12, 2023 at 05:35:01AM +0800, Limonciello, Mario wrote:
>> When running in active mode the driver for amd-pstate has -epp appended.
>> This throws off amd-pstate detection.
>>
>> To detect amd-pstate look for the prefix instead.
>>
>> Fixes: ffa5096a7c33 ("cpufreq: amd-pstate: implement Pstate EPP support for the AMD processors")
>> Reported-by: chenhq2005@gmail.com
>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217755
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> 
> Acked-by: Huang Rui <ray.huang@amd.com>
> 

This patch doesn't apply on top of cpupower latest:

https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git coupower

Please rebase and send it.

thanks,
-- Shuah

Re: [PATCH] cpupower: Fix querying boost support for amd-pstate-epp mode

Posted by Limonciello, Mario 2 years, 4 months ago


On 8/14/2023 4:28 PM, Shuah Khan wrote:
> On 8/13/23 22:14, Huang Rui wrote:
>> On Sat, Aug 12, 2023 at 05:35:01AM +0800, Limonciello, Mario wrote:
>>> When running in active mode the driver for amd-pstate has -epp appended.
>>> This throws off amd-pstate detection.
>>>
>>> To detect amd-pstate look for the prefix instead.
>>>
>>> Fixes: ffa5096a7c33 ("cpufreq: amd-pstate: implement Pstate EPP 
>>> support for the AMD processors")
>>> Reported-by: chenhq2005@gmail.com
>>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217755
>>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>>
>> Acked-by: Huang Rui <ray.huang@amd.com>
>>
> 
> This patch doesn't apply on top of cpupower latest:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git coupower
> 
> Please rebase and send it.
> 
> thanks,
> -- Shuah
> 

It looks like a variation of it is already in your tree as:

a1cf97c2d43ae ("cpupower: Recognise amd-pstate active mode driver")

Considering it was also reported to a kernel bugzilla, perhaps this 
should be considered for fixes?

Re: [PATCH] cpupower: Fix querying boost support for amd-pstate-epp mode

Posted by Shuah Khan 2 years, 4 months ago

On 8/14/23 15:50, Limonciello, Mario wrote:
> 
> 
> On 8/14/2023 4:28 PM, Shuah Khan wrote:
>> On 8/13/23 22:14, Huang Rui wrote:
>>> On Sat, Aug 12, 2023 at 05:35:01AM +0800, Limonciello, Mario wrote:
>>>> When running in active mode the driver for amd-pstate has -epp appended.
>>>> This throws off amd-pstate detection.
>>>>
>>>> To detect amd-pstate look for the prefix instead.
>>>>
>>>> Fixes: ffa5096a7c33 ("cpufreq: amd-pstate: implement Pstate EPP support for the AMD processors")
>>>> Reported-by: chenhq2005@gmail.com
>>>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217755
>>>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>>>
>>> Acked-by: Huang Rui <ray.huang@amd.com>
>>>
>>
>> This patch doesn't apply on top of cpupower latest:
>>
>> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git coupower
>>
>> Please rebase and send it.
>>
>> thanks,
>> -- Shuah
>>
> 
> It looks like a variation of it is already in your tree as:
> 
> a1cf97c2d43ae ("cpupower: Recognise amd-pstate active mode driver")
> 
> Considering it was also reported to a kernel bugzilla, perhaps this should be considered for fixes?

If it is already fixed, there is no need to revert and apply your fix.
Please close the bugzilla bug as fixed with the above commit.

thanks,
-- Shuah

Re: [PATCH] cpupower: Fix querying boost support for amd-pstate-epp mode

Posted by Limonciello, Mario 2 years, 4 months ago


On 8/14/2023 6:22 PM, Shuah Khan wrote:
> On 8/14/23 15:50, Limonciello, Mario wrote:
>>
>>
>> On 8/14/2023 4:28 PM, Shuah Khan wrote:
>>> On 8/13/23 22:14, Huang Rui wrote:
>>>> On Sat, Aug 12, 2023 at 05:35:01AM +0800, Limonciello, Mario wrote:
>>>>> When running in active mode the driver for amd-pstate has -epp 
>>>>> appended.
>>>>> This throws off amd-pstate detection.
>>>>>
>>>>> To detect amd-pstate look for the prefix instead.
>>>>>
>>>>> Fixes: ffa5096a7c33 ("cpufreq: amd-pstate: implement Pstate EPP 
>>>>> support for the AMD processors")
>>>>> Reported-by: chenhq2005@gmail.com
>>>>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217755
>>>>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>>>>
>>>> Acked-by: Huang Rui <ray.huang@amd.com>
>>>>
>>>
>>> This patch doesn't apply on top of cpupower latest:
>>>
>>> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git coupower
>>>
>>> Please rebase and send it.
>>>
>>> thanks,
>>> -- Shuah
>>>
>>
>> It looks like a variation of it is already in your tree as:
>>
>> a1cf97c2d43ae ("cpupower: Recognise amd-pstate active mode driver")
>>
>> Considering it was also reported to a kernel bugzilla, perhaps this 
>> should be considered for fixes?
> 
> If it is already fixed, there is no need to revert and apply your fix.
> Please close the bugzilla bug as fixed with the above commit.

Sorry I was unclear. My suggestion was that perhaps a1cf97c2d43ae 
should be considered alone for 6.5-rc7 instead of waiting for 6.6-rc1 as 
it fixes the Bugzilla issue.  Otherwise we should wait until it's in 
Linus' tree for 6.6-rc1 to close the Bugzilla.

Re: [PATCH] cpupower: Fix querying boost support for amd-pstate-epp mode

Posted by Shuah Khan 2 years, 4 months ago

On 8/14/23 17:33, Limonciello, Mario wrote:
> 
> 
> On 8/14/2023 6:22 PM, Shuah Khan wrote:
>> On 8/14/23 15:50, Limonciello, Mario wrote:
>>>
>>>
>>> On 8/14/2023 4:28 PM, Shuah Khan wrote:
>>>> On 8/13/23 22:14, Huang Rui wrote:
>>>>> On Sat, Aug 12, 2023 at 05:35:01AM +0800, Limonciello, Mario wrote:
>>>>>> When running in active mode the driver for amd-pstate has -epp appended.
>>>>>> This throws off amd-pstate detection.
>>>>>>
>>>>>> To detect amd-pstate look for the prefix instead.
>>>>>>
>>>>>> Fixes: ffa5096a7c33 ("cpufreq: amd-pstate: implement Pstate EPP support for the AMD processors")
>>>>>> Reported-by: chenhq2005@gmail.com
>>>>>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217755
>>>>>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>>>>>
>>>>> Acked-by: Huang Rui <ray.huang@amd.com>
>>>>>
>>>>
>>>> This patch doesn't apply on top of cpupower latest:
>>>>
>>>> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git coupower
>>>>
>>>> Please rebase and send it.
>>>>
>>>> thanks,
>>>> -- Shuah
>>>>
>>>
>>> It looks like a variation of it is already in your tree as:
>>>
>>> a1cf97c2d43ae ("cpupower: Recognise amd-pstate active mode driver")
>>>
>>> Considering it was also reported to a kernel bugzilla, perhaps this should be considered for fixes?
>>
>> If it is already fixed, there is no need to revert and apply your fix.
>> Please close the bugzilla bug as fixed with the above commit.
> 
> Sorry I was unclear. My suggestion was that perhaps a1cf97c2d43ae should be considered alone for 6.5-rc7 instead of waiting for 6.6-rc1 as it fixes the Bugzilla issue.  Otherwise we should wait until it's in Linus' tree for 6.6-rc1 to close the Bugzilla.

Got it. There isn't enough time now to get this to flow through
my workflow and then into pm workflow. Since the bug is fixed
in linux-next, it will go inot Linux 6.6-rc1. Then it can go into
stables.

thanks,
-- Shuah

Re: [PATCH] cpupower: Fix querying boost support for amd-pstate-epp mode

Posted by Limonciello, Mario 2 years, 4 months ago


On 8/14/2023 7:03 PM, Shuah Khan wrote:
> On 8/14/23 17:33, Limonciello, Mario wrote:
>>
>>
>> On 8/14/2023 6:22 PM, Shuah Khan wrote:
>>> On 8/14/23 15:50, Limonciello, Mario wrote:
>>>>
>>>>
>>>> On 8/14/2023 4:28 PM, Shuah Khan wrote:
>>>>> On 8/13/23 22:14, Huang Rui wrote:
>>>>>> On Sat, Aug 12, 2023 at 05:35:01AM +0800, Limonciello, Mario wrote:
>>>>>>> When running in active mode the driver for amd-pstate has -epp 
>>>>>>> appended.
>>>>>>> This throws off amd-pstate detection.
>>>>>>>
>>>>>>> To detect amd-pstate look for the prefix instead.
>>>>>>>
>>>>>>> Fixes: ffa5096a7c33 ("cpufreq: amd-pstate: implement Pstate EPP 
>>>>>>> support for the AMD processors")
>>>>>>> Reported-by: chenhq2005@gmail.com
>>>>>>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217755
>>>>>>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>>>>>>
>>>>>> Acked-by: Huang Rui <ray.huang@amd.com>
>>>>>>
>>>>>
>>>>> This patch doesn't apply on top of cpupower latest:
>>>>>
>>>>> https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git 
>>>>> coupower
>>>>>
>>>>> Please rebase and send it.
>>>>>
>>>>> thanks,
>>>>> -- Shuah
>>>>>
>>>>
>>>> It looks like a variation of it is already in your tree as:
>>>>
>>>> a1cf97c2d43ae ("cpupower: Recognise amd-pstate active mode driver")
>>>>
>>>> Considering it was also reported to a kernel bugzilla, perhaps this 
>>>> should be considered for fixes?
>>>
>>> If it is already fixed, there is no need to revert and apply your fix.
>>> Please close the bugzilla bug as fixed with the above commit.
>>
>> Sorry I was unclear. My suggestion was that perhaps a1cf97c2d43ae 
>> should be considered alone for 6.5-rc7 instead of waiting for 6.6-rc1 
>> as it fixes the Bugzilla issue.  Otherwise we should wait until it's 
>> in Linus' tree for 6.6-rc1 to close the Bugzilla.
> 
> Got it. There isn't enough time now to get this to flow through
> my workflow and then into pm workflow. Since the bug is fixed
> in linux-next, it will go inot Linux 6.6-rc1. Then it can go into
> stables.
> 

Got it.  In that case can you add the Fixes and CC: 
stable@vger.kernel.org tags to the correct commit in your branch so that 
all that happens automatically during 6.6's merge window?