test/power: add turbo mode to frequency check

With the intel_pstate driver and turbo enabled, the top frequency in
the frequency array is the P1+1, i.e. 2300001, whereas the frequency
shown in scaling_cur_freq could be a lot higher.

This patch adds a flag to the check_cur_freq function so that we can
specify if a frequency is greater than expected (turbo mode), in which
case the check should be successful.

Fixes: aeaeaf5f2d62 ("test/power: add cases for turbo feature")
Cc: stable@dpdk.org
Signed-off-by: David Hunt <david.hunt@intel.com>

diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index 52f58ef..2b4728d 100644 (file)
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -48,7 +48,7 @@ static uint32_t total_freq_num;
 static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
 
 static int
-check_cur_freq(unsigned lcore_id, uint32_t idx)
+check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
 {
 #define TEST_POWER_CONVERT_TO_DECIMAL 10
 #define MAX_LOOP 100
@@ -90,7 +90,10 @@ check_cur_freq(unsigned lcore_id, uint32_t idx)
                                        / TEST_ROUND_FREQ_TO_N_100000;
                freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_100000;
 
-               ret = (freqs[idx] == freq_conv ? 0 : -1);
+               if (turbo)
+                       ret = (freqs[idx] <= freq_conv ? 0 : -1);
+               else
+                       ret = (freqs[idx] == freq_conv ? 0 : -1);
 
                if (ret == 0)
                        break;
@@ -183,7 +186,7 @@ check_power_get_freq(void)
        }
 
        /* Check the current frequency */
-       ret = check_cur_freq(TEST_POWER_LCORE_ID, count);
+       ret = check_cur_freq(TEST_POWER_LCORE_ID, count, false);
        if (ret < 0)
                return -1;
 
@@ -233,7 +236,7 @@ check_power_set_freq(void)
        }
 
        /* Check the current frequency */
-       ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1);
+       ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1, false);
        if (ret < 0)
                return -1;
 
@@ -269,7 +272,7 @@ check_power_freq_down(void)
        }
 
        /* Check the current frequency */
-       ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1);
+       ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1, false);
        if (ret < 0)
                return -1;
 
@@ -288,7 +291,7 @@ check_power_freq_down(void)
        }
 
        /* Check the current frequency */
-       ret = check_cur_freq(TEST_POWER_LCORE_ID, 1);
+       ret = check_cur_freq(TEST_POWER_LCORE_ID, 1, false);
        if (ret < 0)
                return -1;
 
@@ -324,7 +327,7 @@ check_power_freq_up(void)
        }
 
        /* Check the current frequency */
-       ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 2);
+       ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 2, false);
        if (ret < 0)
                return -1;
 
@@ -343,7 +346,7 @@ check_power_freq_up(void)
        }
 
        /* Check the current frequency */
-       ret = check_cur_freq(TEST_POWER_LCORE_ID, 0);
+       ret = check_cur_freq(TEST_POWER_LCORE_ID, 0, true);
        if (ret < 0)
                return -1;
 
@@ -371,7 +374,7 @@ check_power_freq_max(void)
        }
 
        /* Check the current frequency */
-       ret = check_cur_freq(TEST_POWER_LCORE_ID, 0);
+       ret = check_cur_freq(TEST_POWER_LCORE_ID, 0, true);
        if (ret < 0)
                return -1;
 
@@ -399,7 +402,7 @@ check_power_freq_min(void)
        }
 
        /* Check the current frequency */
-       ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1);
+       ret = check_cur_freq(TEST_POWER_LCORE_ID, total_freq_num - 1, false);
        if (ret < 0)
                return -1;
 
@@ -433,7 +436,7 @@ check_power_turbo(void)
        }
 
        /* Check the current frequency */
-       ret = check_cur_freq(TEST_POWER_LCORE_ID, 0);
+       ret = check_cur_freq(TEST_POWER_LCORE_ID, 0, true);
        if (ret < 0)
                return -1;
 
@@ -452,7 +455,7 @@ check_power_turbo(void)
        }
 
        /* Check the current frequency */
-       ret = check_cur_freq(TEST_POWER_LCORE_ID, 1);
+       ret = check_cur_freq(TEST_POWER_LCORE_ID, 1, false);
        if (ret < 0)
                return -1;