diff mbox series

[v2,1/4] test/power: fix check for cpu frequency

Message ID 20210512163254.9945-1-david.hunt@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [v2,1/4] test/power: fix check for cpu frequency |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Hunt, David May 12, 2021, 4:32 p.m. UTC 
  Different drivers present the current cpu core frequency in different
sysfs iles. Some present it in cpuinfo_cur_freq, some in scaling_cur_freq,
and some actually present it in both.

This patch attempts to open one, if that fails, tries the other.

Fixes: d550a8cc31f3 ("app/test: enhance power manager unit tests")
Cc: stable@dpdk.org

Signed-off-by: David Hunt <david.hunt@intel.com>

---
changes in v2
   none
---
 app/test/test_power_cpufreq.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index f753d24ac5..52f58ef8b2 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -39,8 +39,10 @@  test_power_caps(void)
 #define TEST_FREQ_ROUNDING_DELTA 50000
 #define TEST_ROUND_FREQ_TO_N_100000 100000
 
-#define TEST_POWER_SYSFILE_CUR_FREQ \
+#define TEST_POWER_SYSFILE_CPUINFO_FREQ \
 	"/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq"
+#define TEST_POWER_SYSFILE_SCALING_FREQ \
+	"/sys/devices/system/cpu/cpu%u/cpufreq/scaling_cur_freq"
 
 static uint32_t total_freq_num;
 static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
@@ -58,12 +60,19 @@  check_cur_freq(unsigned lcore_id, uint32_t idx)
 	int i;
 
 	if (snprintf(fullpath, sizeof(fullpath),
-		TEST_POWER_SYSFILE_CUR_FREQ, lcore_id) < 0) {
+		TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
 		return 0;
 	}
 	f = fopen(fullpath, "r");
 	if (f == NULL) {
-		return 0;
+		if (snprintf(fullpath, sizeof(fullpath),
+			TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
+			return 0;
+		}
+		f = fopen(fullpath, "r");
+		if (f == NULL) {
+			return 0;
+		}
 	}
 	for (i = 0; i < MAX_LOOP; i++) {
 		fflush(f);