From: Bruce Richardson <bruce.richardson@intel.com>
Date: Mon, 7 Apr 2014 12:57:28 +0000 (+0100)
Subject: timer: fix TSC frequency by not reading /proc/cpuinfo
X-Git-Tag: spdx-start~10903
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=d73d8f3ad4d42b04d6379dee830cc1726f9c94ef;p=dpdk.git

timer: fix TSC frequency by not reading /proc/cpuinfo

This reverts commit da6fd0759cbeb5fc14991a79e40105b9f6b99059.
	"timer: get TSC frequency from /proc/cpuinfo"

The use of cpuinfo to determine the frequency of the TSC is not
advisable and leads to incorrect results when power management is
in use. This is because, while the TSC frequency does not change
in modern cpus with constant_tsc support, the frequency of the core,
and hence the frequency of the core reported by cpuinfo *does* change.

Depending on the current frequency of core 0 when an application is
started, the EAL can get a wildly incorrect value for the TSC freq.
Since frequency is scaled down for power saving, any incorrect value
is likely to be lower than the default, which means that any delay
loops inside the code which rely on the TSC will be shorter than
planned. This can cause issues (reported on the mailing list by a number
of people) where ports are not initialized correctly due to delays being
too short.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
---

diff --git a/lib/librte_eal/linuxapp/eal/eal_timer.c b/lib/librte_eal/linuxapp/eal/eal_timer.c
index 1d10457b8d..64566d143d 100644
--- a/lib/librte_eal/linuxapp/eal/eal_timer.c
+++ b/lib/librte_eal/linuxapp/eal/eal_timer.c
@@ -278,35 +278,6 @@ check_tsc_flags(void)
 	fclose(stream);
 }
 
-static int
-set_tsc_freq_from_cpuinfo(void)
-{
-	char line[256];
-	FILE *stream;
-	double dmhz;
-
-	stream = fopen("/proc/cpuinfo", "r");
-	if (!stream) {
-		RTE_LOG(WARNING, EAL, "WARNING: Unable to open /proc/cpuinfo\n");
-		return -1;
-	}
-
-	while (fgets(line, sizeof line, stream)) {
-		if (sscanf(line, "cpu MHz\t: %lf", &dmhz) == 1) {
-			eal_tsc_resolution_hz = (uint64_t)(dmhz * 1000000UL);
-			break;
-		}
-	}
-
-	fclose(stream);
-
-	if (!eal_tsc_resolution_hz) {
-		RTE_LOG(WARNING, EAL, "WARNING: Cannot read CPU clock from cpuinfo\n");
-		return -1;
-	}
-	return 0;
-}
-
 static int
 set_tsc_freq_from_clock(void)
 {
@@ -355,9 +326,8 @@ set_tsc_freq_fallback(void)
 static void
 set_tsc_freq(void)
 {
-	if (set_tsc_freq_from_cpuinfo() < 0 &&
-	    set_tsc_freq_from_clock() < 0)
-	    set_tsc_freq_fallback();
+	if (set_tsc_freq_from_clock() < 0)
+		set_tsc_freq_fallback();
 
 	RTE_LOG(INFO, EAL, "TSC frequency is ~%"PRIu64" KHz\n",
 			eal_tsc_resolution_hz/1000);