From patchwork Mon Jan 18 10:10:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 59920 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1913114lbb; Mon, 18 Jan 2016 02:27:04 -0800 (PST) X-Received: by 10.140.35.115 with SMTP id m106mr29777099qgm.13.1453112824507; Mon, 18 Jan 2016 02:27:04 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id w187si30326530qka.61.2016.01.18.02.27.04; Mon, 18 Jan 2016 02:27:04 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 1D0A96162D; Mon, 18 Jan 2016 10:27:04 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=dHX7K50y; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,T_DKIM_INVALID,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id BF6E26173E; Mon, 18 Jan 2016 10:22:20 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 2374961720; Mon, 18 Jan 2016 10:22:15 +0000 (UTC) Received: from mail-pa0-f48.google.com (mail-pa0-f48.google.com [209.85.220.48]) by lists.linaro.org (Postfix) with ESMTPS id 0249161703 for ; Mon, 18 Jan 2016 10:20:28 +0000 (UTC) Received: by mail-pa0-f48.google.com with SMTP id yy13so339401707pab.3 for ; Mon, 18 Jan 2016 02:20:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZGTQZA0ATu0IiMCU+Liuy7j4btRojK/0hcVNXaafbCA=; b=dHX7K50yQWcKt8p91FmUSouDyc+os7OyMZ9bB8/lOuAUno8JYtWzsmXb40eKrBh/xh /i9bkL5jokZ53tVpFmNo+fiGM87Dxhbk0m1k33ejkZKil/4KFlt2FqBkHeNSs41jP1Gq 0gAPldy4W1QVbZplAr1ZOYxXw7UNwC4l7i8bU= 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:in-reply-to :references; bh=ZGTQZA0ATu0IiMCU+Liuy7j4btRojK/0hcVNXaafbCA=; b=BXrjEoNXPjGD3b0MQ/ncDR7Sz+lGR4rqhf5IsDIXhc2LAew1zX7lrWuo/eXvCglpd8 tmo+D+4JNSfmsDW0wB80TNht5dpGUMjWTdgcjtPtZb+WqxbxcSbsm1uNdSs8NuYzPM11 HvS8wA+bie4uMwn0OLiuDGBOi1/nFORhwD2H+sIqA6guNPGsTVqTyM0YnhxmBkAs3BTg 54j1cXigN/ZLbuyVx1KRdtnKGYMlowllJh0werfBRDBl7uHAXnxRE1Kl9HXb+kjPcEMr bhA+4C9HpjqPrSs8rdgaRf6Ko5Rzb9Drt3zrpBKkOSAEJkmW1FU/1us7znnhHdoMZVKp pzYw== X-Gm-Message-State: ALoCoQk2ytYIOvsI+IwZPKt7dOgjKzyjEh4+GAGdqf4EHt8dBZvrDECDMFq6IvVnrRQwEaoST6DKpvmw/1r1xiYGIrHzfME2TA== X-Received: by 10.66.232.74 with SMTP id tm10mr35737008pac.128.1453112427369; Mon, 18 Jan 2016 02:20:27 -0800 (PST) Received: from ubuntu1504.ap.freescale.net (gate-zmy3.freescale.com. [192.88.167.1]) by smtp.gmail.com with ESMTPSA id x10sm32844521pas.37.2016.01.18.02.20.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jan 2016 02:20:26 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Mon, 18 Jan 2016 18:10:06 +0800 Message-Id: <1453111808-15762-11-git-send-email-hongbo.zhang@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453111808-15762-1-git-send-email-hongbo.zhang@linaro.org> References: <1453111808-15762-1-git-send-email-hongbo.zhang@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v5 API-NEXT 10/12] linux-generic: sysinfo: apply per-CPU implementation to MIPS X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Hongbo Zhang When per-CPU framework was introduced, it was only implemented on x86, for other platforms, only the model_str[0] and cpu_hz[0] are set to pass compile, this patch set all values for model_str[] and cpu_hz[] on the MIPS platform. Signed-off-by: Hongbo Zhang --- .../linux-generic/arch/mips64/odp_sysinfo_parse.c | 24 ++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c index bb1d5d8..88c2066 100644 --- a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c @@ -14,14 +14,18 @@ int odp_cpuinfo_parser(FILE *file, odp_system_info_t *sysinfo) double mhz = 0.0; int model = 0; int count = 2; + int id = 0; strcpy(sysinfo->cpu_arch_str, "mips64"); - while (fgets(str, sizeof(str), file) != NULL && count > 0) { + while (fgets(str, sizeof(str), file) != NULL && id < MAX_CPU_NUMBER) { if (!mhz) { pos = strstr(str, "BogoMIPS"); if (pos) { sscanf(pos, "BogoMIPS : %lf", &mhz); + /* bogomips seems to be 2x freq */ + sysinfo->cpu_hz[id] = \ + (uint64_t)(mhz * 1000000.0 / 2.0); count--; } } @@ -32,18 +36,22 @@ int odp_cpuinfo_parser(FILE *file, odp_system_info_t *sysinfo) if (pos) { int len; pos = strchr(str, ':'); - strncpy(sysinfo->model_str[0], pos + 2, - sizeof(sysinfo->model_str[0])); - len = strlen(sysinfo->model_str[0]); - sysinfo->model_str[0][len - 1] = 0; + strncpy(sysinfo->model_str[id], pos + 2, + sizeof(sysinfo->model_str[id])); + len = strlen(sysinfo->model_str[id]); + sysinfo->model_str[id][len - 1] = 0; model = 1; count--; } } - } - /* bogomips seems to be 2x freq */ - sysinfo->cpu_hz[0] = (uint64_t)(mhz * 1000000.0 / 2.0); + if (count == 0) { + mhz = 0.0; + model = 0; + count = 2; + id++; + } + } return 0; }