From patchwork Wed Jan 20 09:21:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 60022 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp3068724lbb; Wed, 20 Jan 2016 01:41:27 -0800 (PST) X-Received: by 10.140.28.69 with SMTP id 63mr44299179qgy.66.1453282887227; Wed, 20 Jan 2016 01:41:27 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x83si24695859qhc.68.2016.01.20.01.41.26; Wed, 20 Jan 2016 01:41:27 -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 C94716161E; Wed, 20 Jan 2016 09:41:26 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=hAt7txNA; 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_H3, RCVD_IN_MSPIKE_WL, 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 7CA7C617A6; Wed, 20 Jan 2016 09:36:44 +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 D51FA6177C; Wed, 20 Jan 2016 09:36:34 +0000 (UTC) Received: from mail-pa0-f54.google.com (mail-pa0-f54.google.com [209.85.220.54]) by lists.linaro.org (Postfix) with ESMTPS id 3F3C36178E for ; Wed, 20 Jan 2016 09:35:43 +0000 (UTC) Received: by mail-pa0-f54.google.com with SMTP id yy13so1962467pab.3 for ; Wed, 20 Jan 2016 01:35:43 -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=MjjXJrXz5lcWAiPzFybgUeNBKy8AZd5fs8GMoAIQabs=; b=hAt7txNANtXtl+3ZTiScW9JXW43OCsO9COK1L8ycInWIpwR35BkYHNm2v0XW0TXPDf TDpvA0L7lIwAtcbRBmALkse4+nk/kXnaPusff43cZ7GU+mJO/e44M0yKoPolzkwnxaH3 HxvhU+eDXCQ2SFjCs5tMumZniuEYIVgA3nGzQ= 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=MjjXJrXz5lcWAiPzFybgUeNBKy8AZd5fs8GMoAIQabs=; b=LCSHjtDPj09bnX+zQom1C28kavrfEPZVPqBZsFMns2TCaM5UEOBBDAf2092fCcdIy/ bjhjO1qWFhSRKVZPHoa07eUQ2qjjtHHZvoA+APCyVrdNMOJHVutvmp30rjsJwvkMBKXH 0vJtT7K2RykfIZG/G0ucn3Qp1I28r21CtCN3lRNL+PqPXtcDe6boNwAZvbI2jgg0qpny /GdiC09JglJi6/cJJ+K3KF/yWaQctEdzHDxpb56vPeodtTncXfLWW7EYpdG8qj4K5fKG 6ahV1cdmN4j4cvEj1sGm00hU4SLBNXLn1PDBuEIsdAccvKpwqHMME9xOsYopu4sQp4uH FTqg== X-Gm-Message-State: ALoCoQlKxmINx0kGVezikFI+RF6ehQMtEGytVJzaXlZCZQhcL2CURyYJlzwbRwsqmYk38YFfYs/xYj0vuKrJKP4SkqQeN9FPEg== X-Received: by 10.66.65.203 with SMTP id z11mr51038092pas.152.1453282542640; Wed, 20 Jan 2016 01:35:42 -0800 (PST) Received: from ubuntu1504.ap.freescale.net (gate-zmy3.freescale.com. [192.88.167.1]) by smtp.gmail.com with ESMTPSA id xz6sm47592797pab.42.2016.01.20.01.35.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jan 2016 01:35:42 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Wed, 20 Jan 2016 17:21:00 +0800 Message-Id: <1453281662-31499-11-git-send-email-hongbo.zhang@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453281662-31499-1-git-send-email-hongbo.zhang@linaro.org> References: <1453281662-31499-1-git-send-email-hongbo.zhang@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v7 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 | 28 +++++++++++++++------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c index dcecbb9..64d65d2 100644 --- a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c @@ -12,17 +12,23 @@ int odp_cpuinfo_parser(FILE *file, odp_system_info_t *sysinfo) char str[1024]; char *pos; double mhz = 0.0; + uint64_t hz; 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) - if (sscanf(pos, "BogoMIPS : %lf", &mhz) == 1) + if (sscanf(pos, "BogoMIPS : %lf", &mhz) == 1) { + /* bogomips seems to be 2x freq */ + hz = (uint64_t)(mhz * 1000000.0 / 2.0); + sysinfo->cpu_hz[id] = hz; count--; + } } if (!model) { @@ -32,18 +38,22 @@ int odp_cpuinfo_parser(FILE *file, odp_system_info_t *sysinfo) 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; }