From patchwork Mon Jan 18 10:10:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 59916 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1912051lbb; Mon, 18 Jan 2016 02:24:30 -0800 (PST) X-Received: by 10.140.170.212 with SMTP id q203mr31893457qhq.32.1453112669846; Mon, 18 Jan 2016 02:24:29 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id d126si30311183qkb.84.2016.01.18.02.24.29; Mon, 18 Jan 2016 02:24:29 -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 7250261703; Mon, 18 Jan 2016 10:24:29 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=HK8qgltb; 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 480CC61719; Mon, 18 Jan 2016 10:21:35 +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 11EB761725; Mon, 18 Jan 2016 10:21:27 +0000 (UTC) Received: from mail-pf0-f172.google.com (mail-pf0-f172.google.com [209.85.192.172]) by lists.linaro.org (Postfix) with ESMTPS id 49F9561717 for ; Mon, 18 Jan 2016 10:20:18 +0000 (UTC) Received: by mail-pf0-f172.google.com with SMTP id e65so156228801pfe.0 for ; Mon, 18 Jan 2016 02:20:18 -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=m8Avik4DShWfjg2evuKXyC1/Qndu+loKta1CVhzC1RY=; b=HK8qgltbJqWI0/6ploWBWyKMWbYd/aTPVCWP/TGGKHrKVWzTskVY1H6h0YRN57svXv hlvnSwiXK7JYs0Bm2uQ4BJy5FIL2fQkJCDh9CmsRWVMJXBZN6QzQFJaQV6bUg5X57XBq PznnDaV3879yB/Lg8DO6lFod2sIhmtetEtIuA= 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=m8Avik4DShWfjg2evuKXyC1/Qndu+loKta1CVhzC1RY=; b=V7+PZ9PMSko9Wg8NS/baCyYxUR+tz7XpnO2tM2CS5IrVKILYBWJk2PzmXjw9gwum9j UePiCOcz8KWIaIMY2dbJoNzjp0zu4EJPCTX+g9iqflfzZHs53d2S9IKTj0BvmCOjoETC b+pjsTy+EGGu+ilm4WflI3KqlkZRheBKl/oIzL8Tns97wRKifDDJn1NW+zBYCfu54nLp 82lF6MNIcOdtj2g4vXORpdS39NELHTMPin0QQJpbBTtHD7wivEzbWAgVS19G0U/eJCsV Kub+cxWqFHQWw8sZGAzcOivUq4Y0r9TZn6brCAgLWoYBTVZ6E9H+VjGu+0tJJWNdst+e q6pQ== X-Gm-Message-State: ALoCoQnT+EZwZn1+x9mkgynbGgh6i+GRU2ZVMSX8onToCHgvUGE2fisr/xo2Ne4xZbcJNZnw853WEksqXIyatz//TJDw7wdu7w== X-Received: by 10.98.69.209 with SMTP id n78mr34488700pfi.81.1453112417639; Mon, 18 Jan 2016 02:20:17 -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.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jan 2016 02:20:17 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Mon, 18 Jan 2016 18:10:02 +0800 Message-Id: <1453111808-15762-7-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: Architecture patch Subject: [lng-odp] [PATCH v5 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 + platform/linux-generic/arch/linux/odp_sysinfo_parse.c | 19 +++++++++++++++++++ platform/linux-generic/odp_system_info.c | 15 +-------------- 3 files changed, 21 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 d3802f8..b737135 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -164,6 +164,7 @@ __LIB__libodp_la_SOURCES = \ EXTRA_DIST = \ arch/linux/odp_cpu_arch.c \ + arch/linux/odp_sysinfo_parse.c \ arch/mips64/odp_cpu_arch.c \ arch/mips64/odp_sysinfo_parse.c \ arch/x86/odp_cpu_arch.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..d8f36a4 --- /dev/null +++ b/platform/linux-generic/arch/linux/odp_sysinfo_parse.c @@ -0,0 +1,19 @@ +/* Copyright (c) 2015, Linaro Limited + * All rights reserved. + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#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 854bad0..5ff95e8 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -108,20 +108,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];