test/power: fix CPU frequency check

[dpdk.git] / app / test / test_power_cpufreq.c

diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index d47b3e0..52f58ef 100644 (file)
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -35,8 +35,14 @@ test_power_caps(void)
 #define TEST_POWER_LCORE_INVALID ((unsigned)RTE_MAX_LCORE)
 #define TEST_POWER_FREQS_NUM_MAX ((unsigned)RTE_MAX_LCORE_FREQS)
 
-#define TEST_POWER_SYSFILE_CUR_FREQ \
+/* macros used for rounding frequency to nearest 100000 */
+#define TEST_FREQ_ROUNDING_DELTA 50000
+#define TEST_ROUND_FREQ_TO_N_100000 100000
+
+#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];
@@ -54,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);
@@ -67,7 +80,17 @@ check_cur_freq(unsigned lcore_id, uint32_t idx)
                        goto fail_all;
 
                cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL);
-               ret = (freqs[idx] == cur_freq ? 0 : -1);
+
+               /* convert the frequency to nearest 100000 value
+                * Ex: if cur_freq=1396789 then freq_conv=1400000
+                * Ex: if cur_freq=800030 then freq_conv=800000
+                */
+               unsigned int freq_conv = 0;
+               freq_conv = (cur_freq + TEST_FREQ_ROUNDING_DELTA)
+                                       / TEST_ROUND_FREQ_TO_N_100000;
+               freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_100000;
+
+               ret = (freqs[idx] == freq_conv ? 0 : -1);
 
                if (ret == 0)
                        break;