From patchwork Thu Jan 7 07:38:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 59269 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp393700lbb; Wed, 6 Jan 2016 23:43:19 -0800 (PST) X-Received: by 10.194.240.67 with SMTP id vy3mr113564188wjc.168.1452152599740; Wed, 06 Jan 2016 23:43:19 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id p20si18059984wmd.61.2016.01.06.23.43.19; Wed, 06 Jan 2016 23:43:19 -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 2883F61C94; Thu, 7 Jan 2016 07:43:13 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=EdxY/dgH; 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 E8A9961CC4; Thu, 7 Jan 2016 07:40:23 +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 B5FA661CB0; Thu, 7 Jan 2016 07:40:16 +0000 (UTC) Received: from mail-pa0-f53.google.com (mail-pa0-f53.google.com [209.85.220.53]) by lists.linaro.org (Postfix) with ESMTPS id DDFDC61CB0 for ; Thu, 7 Jan 2016 07:39:02 +0000 (UTC) Received: by mail-pa0-f53.google.com with SMTP id cy9so252164730pac.0 for ; Wed, 06 Jan 2016 23:39:02 -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=EdxY/dgHqxku/2xrZGSykM5JR1FPB7F+9Rxb4kEbRIpfRWHtYh+fs4PMP38JlfDWA+ c7MVj9ECK4JaWz7Thl/u2QoLDfgaCfqAED4t5R3i+zhy8ZPlLRCjhixthtTniXxn6UyC wGVkheL8aAM7ozLdFS7NxUcnVAAflR5qT6uNY= 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=SR09/UQWr+KFJ4K/OvOKRDkIKMq1KTAS6U0Vdrd/O8NtLzaWPcfw9Cw/3U3TzdzAjp zzW5hcPVvoP3T2yIecJZGF/g7tCicXQpMxb32ijrY9AcBkJx+A7Gy1TIBt8yYS1fW+6F INt+C7PVO5+8cPnJc48GdGMerFQk1IYpexBCaJWVXEdOhh3F/34fTf3/3Q5mISaaLlzb VjjuKQeC34De+82TFe3/kRA0RS4+AQu6pSbQZ6bJzMm//5I6nz8iYYPRNNkiGPmyUjRF 59lbOp5wo/zGt7leydHpVTfGp64q61kFmNpZk0HfmlQ2s0obbtxlEVAI2ZIJu9AZ+2Bb zUmA== X-Gm-Message-State: ALoCoQnH84FXAn/qc4nfp0/Y7b9WECqsS47qroTwbMSA4F7PBY8bAQ8Q+Dr1FkJ6R9IjLLV4xjLH7f1ypwCiD1CjcstNZ+2XEA== X-Received: by 10.66.163.196 with SMTP id yk4mr11118439pab.115.1452152342244; Wed, 06 Jan 2016 23:39:02 -0800 (PST) Received: from ubuntu1504.ap.freescale.net (gate-zmy3.freescale.com. [192.88.167.1]) by smtp.gmail.com with ESMTPSA id tb8sm150067484pab.22.2016.01.06.23.38.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Jan 2016 23:39:01 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Thu, 7 Jan 2016 15:38:27 +0800 Message-Id: <1452152313-27276-7-git-send-email-hongbo.zhang@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452152313-27276-1-git-send-email-hongbo.zhang@linaro.org> References: <1452152313-27276-1-git-send-email-hongbo.zhang@linaro.org> X-Topics: Architecture patch Subject: [lng-odp] [PATCH v4 API-NEXT 06/12] 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];