From patchwork Tue Dec 29 10:31:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 59046 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2197588lbb; Tue, 29 Dec 2015 02:36:50 -0800 (PST) X-Received: by 10.140.178.139 with SMTP id y133mr78497075qhy.92.1451385410148; Tue, 29 Dec 2015 02:36:50 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id k88si27468342qgf.120.2015.12.29.02.36.49; Tue, 29 Dec 2015 02:36:50 -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 DCA40616BD; Tue, 29 Dec 2015 10:36:48 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=ciiELIae; 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 BB7FA6166B; Tue, 29 Dec 2015 10:33:26 +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 5E2AD616F0; Tue, 29 Dec 2015 10:33:21 +0000 (UTC) Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by lists.linaro.org (Postfix) with ESMTPS id C17F26166B for ; Tue, 29 Dec 2015 10:31:47 +0000 (UTC) Received: by mail-pf0-f173.google.com with SMTP id 78so125426791pfw.2 for ; Tue, 29 Dec 2015 02:31:47 -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=2k+IHsPzOjq02TthnEjjEczAEbbA8L1YVBVEZIcUrIw=; b=ciiELIael+8JFfQOMTGOSNns5luM7Fm9g0Av8qaioB6eucf6G1SMCJ09OuluVzTLGN PCWCaSJX+unMwFUWmQdqM8A/Ee1cZGNOxHRBxN/8omqTUJN+0RivVGJeDXeFyukO2fDz vVP4QZH/LpaEJVkPTnztGCa8tvwIJFB0mGIM4= 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=2k+IHsPzOjq02TthnEjjEczAEbbA8L1YVBVEZIcUrIw=; b=hQ02dVR1rVQjcq9Qw9lOHwZMx0U4M+/jPbEOjjwxDDB951Yw/vQ3ApdS6zG9Ubs79e 8/rTgnECO4MaLmyPF53Dw1H/oWTxvP2tQd6q96GPQxMqptPSfBRR3KyeyOMYpzBywxC1 ytpzX+T/9oQP6vYsz+sKJHvbenXywukUyIjf0d7SkJ7WGaNUls/qAUArmxw9C2HnqKdd gcO4DEGdwP1aWVKLu1qjl9NhnSWhGNIcDiClgiZI3NTkFCK1wpOSAoznoWxsQWnzUpYh H5oEm0I2MCjWvDQD/rwDLhYxCmjD2HcST/RCzP3S9INdwW5OczcNdZpkB92+9pMWepMf 3pSA== X-Gm-Message-State: ALoCoQnB1xI75vEFJaBUFIOHdIasU00vydtU0K9tpDJXISPeCveZNWSMcbbF9B2KMcLTPgh6temVZy27gp6cf5mS7sSsRkuTqQ== X-Received: by 10.98.1.138 with SMTP id 132mr53037439pfb.0.1451385107161; Tue, 29 Dec 2015 02:31:47 -0800 (PST) Received: from ubuntu1504.ap.freescale.net (gate-zmy3.freescale.com. [192.88.167.1]) by smtp.gmail.com with ESMTPSA id 7sm82291757pfb.62.2015.12.29.02.31.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Dec 2015 02:31:46 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Tue, 29 Dec 2015 18:31:17 +0800 Message-Id: <1451385082-8364-7-git-send-email-hongbo.zhang@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1451385082-8364-1-git-send-email-hongbo.zhang@linaro.org> References: <1451385082-8364-1-git-send-email-hongbo.zhang@linaro.org> X-Topics: Architecture patch Subject: [lng-odp] [PATCH v3 API-NEXT 06/11] linux-generic: sysinfo: move ARM system info codes to default arch 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 ARM system info codes into the general arch file, ARM sysinfo isn't implemented now and there is no need to create specific arch file for it, but this can serve as the default implementaton instead. Signed-off-by: Hongbo Zhang --- platform/linux-generic/Makefile.am | 1 + .../linux-generic/arch/linux/odp_sysinfo_parse.c | 20 ++++++++++++++++++++ platform/linux-generic/odp_system_info.c | 15 +-------------- 3 files changed, 22 insertions(+), 14 deletions(-) create mode 100644 platform/linux-generic/arch/linux/odp_sysinfo_parse.c diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index bb0faf0..9bc96ff 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -163,6 +163,7 @@ __LIB__libodp_la_SOURCES = \ EXTRA_DIST = \ arch/linux/odp_cpu_cycles.c \ + arch/linux/odp_sysinfo_parse.c \ arch/mips64/odp_cpu_cycles.c \ arch/mips64/odp_sysinfo_parse.c \ arch/x86/odp_cpu_cycles.c \ diff --git a/platform/linux-generic/arch/linux/odp_sysinfo_parse.c b/platform/linux-generic/arch/linux/odp_sysinfo_parse.c new file mode 100644 index 0000000..ba792b2 --- /dev/null +++ b/platform/linux-generic/arch/linux/odp_sysinfo_parse.c @@ -0,0 +1,20 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include +#include +#include + +int odp_cpuinfo_parser(FILE *file ODP_UNUSED, +odp_system_info_t *sysinfo ODP_UNUSED) +{ + 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 8a151eb..158a6b9 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -109,20 +109,7 @@ static int huge_page_size(void) /* * HW specific /proc/cpuinfo file parsing */ -#if defined __arm__ || defined __aarch64__ - -static int odp_cpuinfo_parser(FILE *file ODP_UNUSED, -odp_system_info_t *sysinfo ODP_UNUSED) -{ - return 0; -} - -static uint64_t odp_cpu_hz_current(int id ODP_UNUSED) -{ - return -1; -} - -#elif defined __powerpc__ +#if defined __powerpc__ static int odp_cpuinfo_parser(FILE *file, odp_system_info_t *sysinfo) { char str[1024];