From patchwork Tue Feb 23 08:12:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 62676 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1703202lbl; Tue, 23 Feb 2016 00:16:48 -0800 (PST) X-Received: by 10.140.89.8 with SMTP id u8mr40701862qgd.77.1456215407895; Tue, 23 Feb 2016 00:16:47 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id 33si22013059qgj.71.2016.02.23.00.16.47; Tue, 23 Feb 2016 00:16:47 -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 Received: by lists.linaro.org (Postfix, from userid 109) id 8591762D22; Tue, 23 Feb 2016 08:16:47 +0000 (UTC) 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.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, 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 13DC562EB4; Tue, 23 Feb 2016 08:14:33 +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 78164622B5; Tue, 23 Feb 2016 08:14:26 +0000 (UTC) Received: from mail-pf0-f176.google.com (mail-pf0-f176.google.com [209.85.192.176]) by lists.linaro.org (Postfix) with ESMTPS id BC3FD622B5 for ; Tue, 23 Feb 2016 08:13:26 +0000 (UTC) Received: by mail-pf0-f176.google.com with SMTP id x65so108203984pfb.1 for ; Tue, 23 Feb 2016 00:13:26 -0800 (PST) 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=cQhI9n2WdpE7RkQZ6VnpNwGwe+1lS7iSzM7IHAEjXk8=; b=bsHKC7NWvJ/DykBCgpjSBSZJNXCvcGHhzSrEehKGKnffqeOWldBR2NCZeEK8sMVI+P vKwpZbS69Zd/W02WhujQlpoavuu15lfdjY/Uq2IP3pCc1/2LhOadJgTthgA/Qw/BsADl iPjkv8b6CO9s/K2IwN3m+Yc/wjO3bJXOIaWgJ2LTjYC11JiFWfEEtCIWOW1cXlomAz5k ZfIRODOS12sJX1RTH/OUBmnztIiB47KjjQ/BzTEzhsJMj9FyUh/Ej/gd6cEpZ1L2Grzu 4s+/BLRKkxFNKSCX2wjuyyUqktB6PJpSyGYqLUDy8KyLGm5Ss9xZHsrcUFUJmlsk1M9N IJzw== X-Gm-Message-State: AG10YOQAQA/lpUpex4etLua0Ztt887GIAUigipGWeMKavyb90YRVVIL3z0dSbxe/lKCWBaqq0Ik= X-Received: by 10.98.68.220 with SMTP id m89mr44060919pfi.65.1456215205894; Tue, 23 Feb 2016 00:13:25 -0800 (PST) Received: from ubuntu1504.ap.freescale.net (gate-zmy3.freescale.com. [192.88.167.1]) by smtp.gmail.com with ESMTPSA id 17sm41920352pfp.96.2016.02.23.00.13.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 Feb 2016 00:13:25 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Tue, 23 Feb 2016 16:12:50 +0800 Message-Id: <1456215173-4456-6-git-send-email-hongbo.zhang@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1456215173-4456-1-git-send-email-hongbo.zhang@linaro.org> References: <1456215173-4456-1-git-send-email-hongbo.zhang@linaro.org> X-Topics: patch Subject: [lng-odp] [PATCH v4 5/8] linux-generic: move CPU info dummy data to generic default 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 The dummy data of cpu_hz_max and model_str are used when platform is unknown or data cannot be acquired, but these variables should be set in function odp_cpuinfo_parser() instead of the systemcpu() which should cover only the cpu_count, huge_page_size and cache_line_size. Signed-off-by: Hongbo Zhang Reviewed-and-tested-by: Bill Fischofer --- platform/linux-generic/arch/linux/odp_sysinfo_parse.c | 13 +++++++++++-- platform/linux-generic/odp_system_info.c | 9 +-------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/platform/linux-generic/arch/linux/odp_sysinfo_parse.c b/platform/linux-generic/arch/linux/odp_sysinfo_parse.c index 8ff6f48..4a22a61 100644 --- a/platform/linux-generic/arch/linux/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/linux/odp_sysinfo_parse.c @@ -5,11 +5,20 @@ */ #include +#include #include -int odp_cpuinfo_parser(FILE *file ODP_UNUSED, - odp_system_info_t *sysinfo ODP_UNUSED) +int odp_cpuinfo_parser(FILE *file ODP_UNUSED, odp_system_info_t *sysinfo) { + int i; + + ODP_DBG("Warning: use dummy values for freq and model string\n"); + ODP_DBG("Refer to https://bugs.linaro.org/show_bug.cgi?id=1870\n"); + for (i = 0; i < MAX_CPU_NUMBER; i++) { + sysinfo->cpu_hz_max[i] = 1400000000; + strcpy(sysinfo->model_str[i], "UNKNOWN"); + } + return 0; } diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index 42aef8a..bedbbc8 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -151,7 +151,7 @@ static int systemcpu(odp_system_info_t *sysinfo) static int systemcpu(odp_system_info_t *sysinfo) { - int ret, i; + int ret; ret = sysconf_cpu_count(); if (ret == 0) { @@ -166,13 +166,6 @@ static int systemcpu(odp_system_info_t *sysinfo) /* Dummy values */ sysinfo->cache_line_size = 64; - ODP_DBG("Warning: use dummy values for freq and model string\n"); - ODP_DBG("Refer to https://bugs.linaro.org/show_bug.cgi?id=1870\n"); - for (i = 0; i < MAX_CPU_NUMBER; i++) { - sysinfo->cpu_hz_max[i] = 1400000000; - strcpy(sysinfo->model_str[i], "UNKNOWN"); - } - return 0; }