All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] arm64: restore bogomips information in /proc/cpuinfo
@ 2015-11-18 18:15 ` Yang Shi
  0 siblings, 0 replies; 27+ messages in thread
From: Yang Shi @ 2015-11-18 18:15 UTC (permalink / raw)
  To: linux-arm-kernel

As what Pavel Machek reported [1], some userspace applications depend on
bogomips showed by /proc/cpuinfo.

Although there is much less legacy impact on aarch64 than arm, but it does
break libvirt.

Basically, this patch reverts commit 326b16db9f69fd0d279be873c6c00f88c0a4aad5
("arm64: delay: don't bother reporting bogomips in /proc/cpuinfo"), but with
some tweak due to context change.

[1] https://lkml.org/lkml/2015/1/4/132

Signed-off-by: Yang Shi <yang.shi@linaro.org>
---
 arch/arm64/kernel/cpuinfo.c | 5 +++++
 arch/arm64/kernel/smp.c     | 7 ++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c
index 706679d..8d4ba77 100644
--- a/arch/arm64/kernel/cpuinfo.c
+++ b/arch/arm64/kernel/cpuinfo.c
@@ -30,6 +30,7 @@
 #include <linux/seq_file.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
+#include <linux/delay.h>
 
 /*
  * In case the boot CPU is hotpluggable, we record its initial state and
@@ -112,6 +113,10 @@ static int c_show(struct seq_file *m, void *v)
 		 */
 		seq_printf(m, "processor\t: %d\n", i);
 
+		seq_printf(m, "BogoMIPS\t: %lu.%02lu\n\n",
+			   loops_per_jiffy / (500000UL/HZ),
+			   loops_per_jiffy / (5000UL/HZ) % 100);
+
 		/*
 		 * Dump out the common processor features in a single line.
 		 * Userspace should read the hwcaps with getauxval(AT_HWCAP)
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index b1adc51..1bed772 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -326,7 +326,12 @@ static void __init hyp_mode_check(void)
 
 void __init smp_cpus_done(unsigned int max_cpus)
 {
-	pr_info("SMP: Total of %d processors activated.\n", num_online_cpus());
+	unsigned long bogosum = loops_per_jiffy * num_online_cpus();
+
+	pr_info("SMP: Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
+		num_online_cpus(), bogosum / (500000/HZ),
+		(bogosum / (5000/HZ)) % 100);
+
 	setup_cpu_features();
 	hyp_mode_check();
 	apply_alternatives_all();
-- 
2.0.2

^ permalink raw reply related	[flat|nested] 27+ messages in thread
* [PATCH] arm64: restore bogomips information in /proc/cpuinfo
@ 2016-01-27 12:14 Will Deacon
  0 siblings, 0 replies; 27+ messages in thread
From: Will Deacon @ 2016-01-27 12:14 UTC (permalink / raw)
  To: stable; +Cc: yang.shi, catalin.marinas, gregkh, Will Deacon

This is a backport of mainline commit 92e788b74986.

As previously reported, some userspace applications depend on bogomips
showed by /proc/cpuinfo. Although there is much less legacy impact on
aarch64 than arm, it does break libvirt.

This patch reverts commit 326b16db9f69 ("arm64: delay: don't bother
reporting bogomips in /proc/cpuinfo"), but with some tweak due to
context change and without the pr_info().

Fixes: 326b16db9f69 ("arm64: delay: don't bother reporting bogomips in /proc/cpuinfo")
Cc: <stable@vger.kernel.org> # 4.3 and earlier
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm64/kernel/setup.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index 232247945b1c..9f17dc72645a 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -558,6 +558,10 @@ static int c_show(struct seq_file *m, void *v)
 		 */
 		seq_printf(m, "processor\t: %d\n", i);
 
+		seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
+			   loops_per_jiffy / (500000UL/HZ),
+			   loops_per_jiffy / (5000UL/HZ) % 100);
+
 		/*
 		 * Dump out the common processor features in a single line.
 		 * Userspace should read the hwcaps with getauxval(AT_HWCAP)
-- 
2.1.4


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

end of thread, other threads:[~2016-01-27 12:14 UTC | newest]

Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-18 18:15 [PATCH] arm64: restore bogomips information in /proc/cpuinfo Yang Shi
2015-11-18 18:15 ` Yang Shi
2015-11-18 18:47 ` Will Deacon
2015-11-18 18:47   ` Will Deacon
2015-11-18 18:54   ` Shi, Yang
2015-11-18 18:54     ` Shi, Yang
2015-11-18 21:55   ` Nicolas Pitre
2015-11-18 21:55     ` Nicolas Pitre
2015-11-19 12:20     ` Will Deacon
2015-11-19 12:20       ` Will Deacon
2015-11-25  5:45 ` Jon Masters
2015-11-25  5:45   ` Jon Masters
2015-11-25 11:52   ` Catalin Marinas
2015-11-25 11:52     ` Catalin Marinas
2015-11-25 12:00   ` Russell King - ARM Linux
2015-11-25 12:00     ` Russell King - ARM Linux
2015-11-25 12:36   ` Riku Voipio
2015-11-25 12:36     ` Riku Voipio
2015-11-25 15:16   ` Nicolas Pitre
2015-11-25 15:16     ` Nicolas Pitre
2015-11-25 17:32     ` Shi, Yang
2015-11-25 17:32       ` Shi, Yang
2015-11-25 18:09       ` Nicolas Pitre
2015-11-25 18:09         ` Nicolas Pitre
2015-11-26 10:23         ` Jon Medhurst (Tixy)
2015-11-26 10:23           ` Jon Medhurst (Tixy)
  -- strict thread matches above, loose matches on Subject: below --
2016-01-27 12:14 Will Deacon

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.