patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH v1 1/4] test/power: fix check for cpu frequency
@ 2021-04-22 14:40 David Hunt
  2021-04-22 14:40 ` [dpdk-stable] [PATCH v1 2/4] test/power: add turbo mode to freq check function David Hunt
                   ` (4 more replies)
  0 siblings, 5 replies; 16+ messages in thread
From: David Hunt @ 2021-04-22 14:40 UTC (permalink / raw)
  To: dev; +Cc: david.hunt, stable

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>
---
 app/test/test_power_cpufreq.c | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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);
-- 
2.17.1


^ permalink raw reply	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2021-05-12 20:05 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-22 14:40 [dpdk-stable] [PATCH v1 1/4] test/power: fix check for cpu frequency David Hunt
2021-04-22 14:40 ` [dpdk-stable] [PATCH v1 2/4] test/power: add turbo mode to freq check function David Hunt
2021-04-22 16:13   ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly
2021-05-12 15:34     ` Thomas Monjalon
2021-05-12 16:38       ` David Hunt
2021-04-22 14:40 ` [dpdk-stable] [PATCH v1 3/4] test/power: fix low freq test when turbo enabled David Hunt
2021-04-22 14:40 ` [dpdk-stable] [PATCH v1 4/4] test/power: fix turbo test David Hunt
2021-04-29 10:34 ` [dpdk-stable] [dpdk-dev] [PATCH v1 1/4] test/power: fix check for cpu frequency Pattan, Reshma
2021-05-11 13:27   ` Thomas Monjalon
2021-05-11 14:41   ` David Hunt
2021-05-11 14:46     ` Pattan, Reshma
2021-05-12 16:32 ` [dpdk-stable] [PATCH v2 " David Hunt
2021-05-12 16:32   ` [dpdk-stable] [PATCH v2 2/4] test/power: add turbo mode to freq check function David Hunt
2021-05-12 16:32   ` [dpdk-stable] [PATCH v2 3/4] test/power: fix low freq test when turbo enabled David Hunt
2021-05-12 16:32   ` [dpdk-stable] [PATCH v2 4/4] test/power: fix turbo test David Hunt
2021-05-12 20:05     ` Thomas Monjalon

patches for DPDK stable branches

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/stable/0 stable/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 stable stable/ https://inbox.dpdk.org/stable \
		stable@dpdk.org
	public-inbox-index stable

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.stable


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git