From patchwork Wed Nov 18 18:15:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Shi X-Patchwork-Id: 56950 Delivered-To: patch@linaro.org Received: by 10.112.155.196 with SMTP id vy4csp2729240lbb; Wed, 18 Nov 2015 10:34:12 -0800 (PST) X-Received: by 10.66.232.170 with SMTP id tp10mr4226537pac.38.1447871652396; Wed, 18 Nov 2015 10:34:12 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qy7si5819292pab.169.2015.11.18.10.34.12; Wed, 18 Nov 2015 10:34:12 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756724AbbKRSeJ (ORCPT + 28 others); Wed, 18 Nov 2015 13:34:09 -0500 Received: from mail-pa0-f48.google.com ([209.85.220.48]:33384 "EHLO mail-pa0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756708AbbKRSeH (ORCPT ); Wed, 18 Nov 2015 13:34:07 -0500 Received: by pabfh17 with SMTP id fh17so54372417pab.0 for ; Wed, 18 Nov 2015 10:34:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=/N4QE1BdWD0/Tu2Bepngb5YDiIYHVBHXxW2h6X2WiL8=; b=O0kH/UYHOIkG5qi61rQ4Fvk3ewUQIiwH2JrWQhWBVGvognSk86Z99NCZSZFT+xY5Tl N5Ab+GvyAAHUfvYUv0gt++8bXvYeFl0j6G6FQHRsnUWsxqPvrrQKSOStcbvcmKTyKz0Z 14HJ4ngvUYj+Vp25tfAZ4+D5OaOlhfYXJIKewsebIliKlmZ/khGaa/UKOavJzcE2bhOC syS9Z9YkcscYDl3k4HJPJkUAO9ImveWQKPv0cd7tF7mvyo9zTbzKi5c8HO2l8RlyQD1i eYt7TgF62U509RkgUqTuC2dmztiFVhozSNUomWG34zvnAfM+8InWXrMzpT6h5VIGExyM TSmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=/N4QE1BdWD0/Tu2Bepngb5YDiIYHVBHXxW2h6X2WiL8=; b=RKW0oAe3Bp7wqhMXhOKQIOCbjbNbtWVCgkLntz0OgOOEbF6Cfdg5QRrcQhUaMNWDAI SkkRG9jIE12esG5BPH+Pez2Ku2BLjSxmZR8Vg0GmiQEdry7VB39RoELpi3i6Hi69bA1T 5x3E6Hy7goT0SQqvY7mBVxXF32q2ch+0Xa2MTVjAd50SfQZ8nS0uG2BRqV8m4QJNEe6A wA9/tWIV6tjhTPnhJ/tSucH1RWrA8PlPf0f5LAVOYKo2xeZdGz7tWcuSlO4N1UkQyMe0 KYzrSLGt3ZGvWsutIIWDELK48CY2IDWSbvj3trbfwvLnlVz8PgqinA5zUzAsLIWZjccs CvFg== X-Gm-Message-State: ALoCoQmRd6PDN3/mz0dmFrdxjGTLDS7mOX9q36iO2bqEL2m0L0ML8pohGZ+jjwxfvYiIZiSeUW87 X-Received: by 10.69.26.36 with SMTP id iv4mr4330774pbd.0.1447871646992; Wed, 18 Nov 2015 10:34:06 -0800 (PST) Received: from yshi-Precision-T5600.corp.ad.wrs.com (unknown-216-82.windriver.com. [147.11.216.82]) by smtp.gmail.com with ESMTPSA id qj4sm5622890pbc.21.2015.11.18.10.34.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Nov 2015 10:34:05 -0800 (PST) From: Yang Shi To: Will.Deacon@arm.com, Catalin.Marinas@arm.com Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linaro-kernel@lists.linaro.org, yang.shi@linaro.org Subject: [PATCH] arm64: restore bogomips information in /proc/cpuinfo Date: Wed, 18 Nov 2015 10:15:05 -0800 Message-Id: <1447870505-19319-1-git-send-email-yang.shi@linaro.org> X-Mailer: git-send-email 2.0.2 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/arm64/kernel/cpuinfo.c | 5 +++++ arch/arm64/kernel/smp.c | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) -- 2.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ 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 #include #include +#include /* * 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();