patch 'test/power: fix CPU frequency when turbo enabled' has been queued to stable release 19.11.11

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/910f2fa408a8f794db74ab215cc3c588e11692ea

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 910f2fa408a8f794db74ab215cc3c588e11692ea Mon Sep 17 00:00:00 2001
From: David Hunt <david.hunt at intel.com>
Date: Fri, 3 Sep 2021 09:37:36 +0100
Subject: [PATCH] test/power: fix CPU frequency when turbo enabled

[ upstream commit 29343b9030e38e8c3519ba01cb66724d45b13dc8 ]

On arm platform, the value in "/sys/.../cpuinfo_cur_freq" may not
be exactly the same as what was set when using CPPC cpufreq driver.
For other cpufreq driver, no need to round it currently, or else
this check will fail with turbo enabled. For example, with acpi_cpufreq,
cpuinfo_cur_freq can be 2401000 which is equal to freqs[0].It should
not be rounded to 2400000.

Backport-Note:
This is a version of the patch for 19.11.9 that fixes this issue
without the dependency of having the CPPC support applied first.

Fixes: 606a234c6d360 ("test/power: round CPU frequency to check")
Cc: stable at dpdk.org

Signed-off-by: David Hunt <david.hunt at intel.com>
Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
---
 app/test/test_power_cpufreq.c | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index d0c7e60ca5..51105f35be 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -55,18 +55,20 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
 	FILE *f;
 	char fullpath[PATH_MAX];
 	char buf[BUFSIZ];
+	enum power_management_env env;
 	uint32_t cur_freq;
+	uint32_t freq_conv;
 	int ret = -1;
 	int i;
 
 	if (snprintf(fullpath, sizeof(fullpath),
-		TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
+		TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
 		return 0;
 	}
 	f = fopen(fullpath, "r");
 	if (f == NULL) {
 		if (snprintf(fullpath, sizeof(fullpath),
-			TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
+			TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
 			return 0;
 		}
 		f = fopen(fullpath, "r");
@@ -80,15 +82,20 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
 			goto fail_all;
 
 		cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL);
-
-		/* 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;
+		freq_conv = cur_freq;
+
+		env = rte_power_get_env();
+
+		if (env == PM_ENV_PSTATE_CPUFREQ) {
+			/* 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;
+		}
 
 		if (turbo)
 			ret = (freqs[idx] <= freq_conv ? 0 : -1);
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:06.340336560 +0100
+++ 0002-test-power-fix-CPU-frequency-when-turbo-enabled.patch	2021-11-30 16:50:05.482871270 +0100
@@ -1,3 +1,3 @@
-From 29343b9030e38e8c3519ba01cb66724d45b13dc8 Mon Sep 17 00:00:00 2001
-From: Richael Zhuang <richael.zhuang at arm.com>
-Date: Fri, 9 Jul 2021 18:55:48 +0800
+From 910f2fa408a8f794db74ab215cc3c588e11692ea Mon Sep 17 00:00:00 2001
+From: David Hunt <david.hunt at intel.com>
+Date: Fri, 3 Sep 2021 09:37:36 +0100
@@ -5,0 +6,2 @@
+[ upstream commit 29343b9030e38e8c3519ba01cb66724d45b13dc8 ]
+
@@ -12,0 +15,4 @@
+Backport-Note:
+This is a version of the patch for 19.11.9 that fixes this issue
+without the dependency of having the CPPC support applied first.
+
@@ -16,2 +22,2 @@
-Signed-off-by: Richael Zhuang <richael.zhuang at arm.com>
-Acked-by: David Hunt <david.hunt at intel.com>
+Signed-off-by: David Hunt <david.hunt at intel.com>
+Signed-off-by: Christian Ehrhardt <christian.ehrhardt at canonical.com>
@@ -19,2 +25,2 @@
- app/test/test_power_cpufreq.c | 23 ++++++++++++++---------
- 1 file changed, 14 insertions(+), 9 deletions(-)
+ app/test/test_power_cpufreq.c | 29 ++++++++++++++++++-----------
+ 1 file changed, 18 insertions(+), 11 deletions(-)
@@ -23 +29 @@
-index 8516df4ca6..b8fc53925c 100644
+index d0c7e60ca5..51105f35be 100644
@@ -26 +32 @@
-@@ -55,7 +55,9 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
+@@ -55,18 +55,20 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
@@ -36 +42,14 @@
-@@ -80,15 +82,18 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
+ 	if (snprintf(fullpath, sizeof(fullpath),
+-		TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
++		TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
+ 		return 0;
+ 	}
+ 	f = fopen(fullpath, "r");
+ 	if (f == NULL) {
+ 		if (snprintf(fullpath, sizeof(fullpath),
+-			TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
++			TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
+ 			return 0;
+ 		}
+ 		f = fopen(fullpath, "r");
+@@ -80,15 +82,20 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
@@ -52 +71,2 @@
-+		if (env == PM_ENV_CPPC_CPUFREQ) {
++
++		if (env == PM_ENV_PSTATE_CPUFREQ) {
@@ -56,0 +77 @@
++			unsigned int freq_conv = 0;