Re: [PATCH 1/2] cpupower: Fix amd cpu (family < 0x17) active state issue

From: Shuah Khan
Date: Fri Apr 23 2021 - 18:26:37 EST


On 4/19/21 8:27 PM, 徐福海 wrote:
From: xufuhai<xufuhai@xxxxxxxxxxxx>

For the old AMD processor (family < 0x17), cpupower will call the
amd_pci_get_num_boost_states function, but for the non-root user
pci_read_byte function (implementation comes from the psutil library),
val will be set to 0xff, indicating that there is no read function
callback. At this time, the original logic will set the cpupower turbo
active state to yes. This is an obvious issue~

Reproduce procedure:
cpupower frequency-info

Reported-by: yangrui<yangrui@xxxxxxxxxxxx>
Signed-off-by: xufuhai<xufuhai@xxxxxxxxxxxx>

Also your Signed-off-by should match the from address.
There is a mismatch between the two.

Signed-off-by: chenguanqiao<chenguanqiao@xxxxxxxxxxxx>
Signed-off-by: lishujin<lishujin@xxxxxxxxxxxx>
Reviewed-by: Thomas Renninger<trenn@xxxxxxxx>
---
tools/power/cpupower/utils/helpers/amd.c | 7 +++++++
1 file changed, 7 insertions(+)

diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c
index 97f2c857048e..6f9504906afa 100644
--- a/tools/power/cpupower/utils/helpers/amd.c
+++ b/tools/power/cpupower/utils/helpers/amd.c
@@ -137,6 +137,13 @@ int amd_pci_get_num_boost_states(int *active, int *states)
return -ENODEV;
val = pci_read_byte(device, 0x15c);
+
+ /* If val is 0xff, meaning has no permisson to
+ * get the boost states, return -1
+ */
+ if (val == 0xff)
+ return -1;
+
if (val & 3)
*active = 1;
else
--
2.24.3 (Apple Git-128)


I am seeing two patches with the same commit summary,
should these two be a singles patch?

https://patchwork.kernel.org/project/linux-pm/patch/6e35df20-753a-6c9c-8786-3fc87cdd17ba@xxxxxxxxx/

Please combine the two and send single patch if they fix the
same problem. If not, please change the commit log to reflect
the difference.

thanks,
-- Shuah