From patchwork Wed Jan 27 08:56:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 60603 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2468003lbb; Wed, 27 Jan 2016 01:21:16 -0800 (PST) X-Received: by 10.140.102.11 with SMTP id v11mr34776523qge.39.1453886476636; Wed, 27 Jan 2016 01:21:16 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id d2si3295311qkb.17.2016.01.27.01.21.16; Wed, 27 Jan 2016 01:21:16 -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 3A0266179F; Wed, 27 Jan 2016 09:21:16 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=OVnJrgwV; 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 BB3F3617C7; Wed, 27 Jan 2016 09:17:29 +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 D05C4617D7; Wed, 27 Jan 2016 09:16:57 +0000 (UTC) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by lists.linaro.org (Postfix) with ESMTPS id B0C8E61945 for ; Wed, 27 Jan 2016 09:15:58 +0000 (UTC) Received: by mail-pa0-f42.google.com with SMTP id ho8so1754940pac.2 for ; Wed, 27 Jan 2016 01:15:58 -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=kpOHpgMSjKuZLkt7Sz8qDJHhxjBw67m7UsreOO0IZ3g=; b=OVnJrgwVSkqnuR+86o9T11jR2NfxkpscdVgYkFaMoQCZFNL1HJXSj4JXGlsqQWA7OY GcFcbssg2o5k84QnJCUQ2tZhtTBd6E6XfpVZemXgaScKLu9j6lVERT7G/06CnyYY7Jg9 qYiiH3f2Thmkmvq5KkwI62TXXmYxjx/6V+XCY= 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=kpOHpgMSjKuZLkt7Sz8qDJHhxjBw67m7UsreOO0IZ3g=; b=B7P/Bnc3BkriukfcuX6z+tLCe2ro/99W6pHGO6YD15ZeoxKSL5hxV99gguGTq45nu+ +hPxegk7iYtTJO7HInZShLL8l14Hr0c23xtNr0fE8m6PNnT7jEYRC1NRpAmJ8AY7JuoP zn+P04R4MOYgzMrVUT12usbJnZVDNIIMgfjswYLXQfEqCkIW9Kg/P/8/n6oJ8oYnNUJ8 8+JBwyHkZxrC0+cQ/0zePBWhYebnQqUWcZhTHcysJYma2G/U/+LITFnrvIt5PNct1gMm PkMeFEzbBhlFUYGyR4Mfl6XfVt+/AUwwDUkEjIy6TAmzhxUVaSxSEKf0TUeqSje+DKrJ W6nw== X-Gm-Message-State: AG10YORQZFUUO/EKWGh2AekbkR41nlfXPsYAb9Lb7TE1Dqf+7hu9hTxLpK5AMA7V4+Y3/K0hoHs= X-Received: by 10.66.65.109 with SMTP id w13mr40669778pas.142.1453886157993; Wed, 27 Jan 2016 01:15:57 -0800 (PST) Received: from ubuntu1504.ap.freescale.net (gate-zmy3.freescale.com. [192.88.167.1]) by smtp.gmail.com with ESMTPSA id f27sm7407314pfj.0.2016.01.27.01.15.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jan 2016 01:15:57 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Wed, 27 Jan 2016 16:56:09 +0800 Message-Id: <1453884974-24724-8-git-send-email-hongbo.zhang@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453884974-24724-1-git-send-email-hongbo.zhang@linaro.org> References: <1453884974-24724-1-git-send-email-hongbo.zhang@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v8 API-NEXT 07/12] linux-generic: sysinfo: move PowerPC system info codes to its plarform file 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 This patch moves the PowerPC system info codes into the newly added PowerPC specific platform file. This patch also creates syslink to arch/linux/odp_cpu_cycles.c for PowerPC. Signed-off-by: Hongbo Zhang --- configure.ac | 1 + platform/linux-generic/Makefile.am | 2 + platform/linux-generic/arch/powerpc/odp/cpu_arch.h | 1 + platform/linux-generic/arch/powerpc/odp_cpu_arch.c | 1 + .../linux-generic/arch/powerpc/odp_sysinfo_parse.c | 52 +++++++++++++++++++++ platform/linux-generic/odp_system_info.c | 53 ---------------------- 6 files changed, 57 insertions(+), 53 deletions(-) create mode 120000 platform/linux-generic/arch/powerpc/odp/cpu_arch.h create mode 120000 platform/linux-generic/arch/powerpc/odp_cpu_arch.c create mode 100644 platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c diff --git a/configure.ac b/configure.ac index fbe7c08..14a025e 100644 --- a/configure.ac +++ b/configure.ac @@ -55,6 +55,7 @@ AX_VALGRIND_CHECK AS_CASE([$host], [x86*], [ARCH=x86], [mips64*], [ARCH=mips64], + [powerpc*], [ARCH=powerpc], [ARCH=linux] ) AC_SUBST([ARCH]) diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index f4bc58e..fded462 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -169,6 +169,8 @@ EXTRA_DIST = \ arch/linux/odp_sysinfo_parse.c \ arch/mips64/odp_cpu_arch.c \ arch/mips64/odp_sysinfo_parse.c \ + arch/powerpc/odp_cpu_arch.c \ + arch/powerpc/odp_sysinfo_parse.c \ arch/x86/odp_cpu_arch.c \ arch/x86/odp_sysinfo_parse.c diff --git a/platform/linux-generic/arch/powerpc/odp/cpu_arch.h b/platform/linux-generic/arch/powerpc/odp/cpu_arch.h new file mode 120000 index 0000000..0617d7f --- /dev/null +++ b/platform/linux-generic/arch/powerpc/odp/cpu_arch.h @@ -0,0 +1 @@ +../../linux/odp/cpu_arch.h \ No newline at end of file diff --git a/platform/linux-generic/arch/powerpc/odp_cpu_arch.c b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c new file mode 120000 index 0000000..c5fe400 --- /dev/null +++ b/platform/linux-generic/arch/powerpc/odp_cpu_arch.c @@ -0,0 +1 @@ +../linux/odp_cpu_arch.c \ No newline at end of file diff --git a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c new file mode 100644 index 0000000..fe13f40 --- /dev/null +++ b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c @@ -0,0 +1,52 @@ +/* Copyright (c) 2016, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include +#include + +int odp_cpuinfo_parser(FILE *file, odp_system_info_t *sysinfo) +{ + char str[1024]; + char *pos; + double mhz = 0.0; + int model = 0; + int count = 2; + + while (fgets(str, sizeof(str), file) != NULL && count > 0) { + if (!mhz) { + pos = strstr(str, "clock"); + + if (pos) + if (sscanf(pos, "clock : %lf", &mhz) == 1) + count--; + } + + if (!model) { + pos = strstr(str, "cpu"); + + 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; + model = 1; + count--; + } + } + + sysinfo->cpu_hz[0] = (uint64_t)(mhz * 1000000.0); + } + + return 0; +} + +uint64_t odp_cpu_hz_current(int id ODP_UNUSED) +{ + return -1; +} diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index 7d68c2e..210dd1d 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -105,59 +105,6 @@ static int huge_page_size(void) } - -/* - * HW specific /proc/cpuinfo file parsing - */ -#if defined __powerpc__ -static int odp_cpuinfo_parser(FILE *file, odp_system_info_t *sysinfo) -{ - char str[1024]; - char *pos; - double mhz = 0.0; - int model = 0; - int count = 2; - - while (fgets(str, sizeof(str), file) != NULL && count > 0) { - if (!mhz) { - pos = strstr(str, "clock"); - - if (pos) { - sscanf(pos, "clock : %lf", &mhz); - count--; - } - } - - if (!model) { - pos = strstr(str, "cpu"); - - 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; - model = 1; - count--; - } - } - - sysinfo->cpu_hz[0] = (uint64_t)(mhz * 1000000.0); - } - - - return 0; -} - -static uint64_t odp_cpu_hz_current(int id ODP_UNUSED) -{ - return -1; -} - -#endif - - #if defined __x86_64__ || defined __i386__ || defined __OCTEON__ || \ defined __powerpc__