From patchwork Wed Jan 27 08:56:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 60596 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp2465991lbb; Wed, 27 Jan 2016 01:16:29 -0800 (PST) X-Received: by 10.55.77.2 with SMTP id a2mr33835878qkb.108.1453886189044; Wed, 27 Jan 2016 01:16:29 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id z139si3240891qka.98.2016.01.27.01.16.28; Wed, 27 Jan 2016 01:16: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 A0D94617B7; Wed, 27 Jan 2016 09:16:28 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=eOflhVdc; 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 42CC0617D3; Wed, 27 Jan 2016 09:15:52 +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 6F18461566; Wed, 27 Jan 2016 09:15:45 +0000 (UTC) Received: from mail-pf0-f175.google.com (mail-pf0-f175.google.com [209.85.192.175]) by lists.linaro.org (Postfix) with ESMTPS id 7BEFF61566 for ; Wed, 27 Jan 2016 09:15:44 +0000 (UTC) Received: by mail-pf0-f175.google.com with SMTP id 65so1788431pfd.2 for ; Wed, 27 Jan 2016 01:15:44 -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=IBJfT6wElVjCasiXNvLJa/dt2dITqnRZHDzEukEFHbA=; b=eOflhVdc6pe4YUlLGIBAL5Y46X/8X7cDXpTiAy/0QEQkDbYhORHucxoa9qkHahVUmd RBGN5SQvbahF0Naq7iGYjp93G8SlHTdF9D0UsemEHOs4pP8D5LfnGibCqqRdNN5x7pE8 QYK0p2fHA7gdvEV/cwEovn4tWAUS+elPoPJXU= 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=IBJfT6wElVjCasiXNvLJa/dt2dITqnRZHDzEukEFHbA=; b=PKcouCHAXatfvlCsLzPDACqUJ71t3Hd1n/9qrY8/F++y59ZGbQowzP3YJVMBfrJDRe MWmAlB6gJ2tZOyzFW2mrdrC4/2aepdxhzCiA42vGkeFJo2Ksh/tmLHBtgDDtxj0O5LI3 eToaDChnijPqGMJKrMzuY79BXjVEQThkgiGDj+xchvDP0EpSjc9buLQQCLO41glucOqI wmmX9A4RZGWvYmej7M8oKIm9jMsONvUgdAO8IzIU9SMhFbNqxo/FZ7/hGkzbsS1yYdQ6 C68melophmn9FP/799ImXW/C5zvU/NUxMAdCPeXL01uw46+T1rLq3gQmbkAlM0k5Ay05 PtAg== X-Gm-Message-State: AG10YOTtiFgXLcXjgKPWA0+p4Fd4VPvZ5dWujjxOOJpQDsozX3aafHwb1IOYb/ZeSx4HmAeaSM4= X-Received: by 10.98.86.67 with SMTP id k64mr41532935pfb.50.1453886143912; Wed, 27 Jan 2016 01:15:43 -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.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 27 Jan 2016 01:15:43 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Wed, 27 Jan 2016 16:56:03 +0800 Message-Id: <1453884974-24724-2-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: Architecture patch Subject: [lng-odp] [PATCH v8 API-NEXT 01/12] linux-generic: sysinfo: move cpu_arch_str to odp_system_info_t 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 is a pre-step for separating platform specific codes into their own arch files. Value of cpu_arch_str will be set later in separate arch parser code. Signed-off-by: Hongbo Zhang --- platform/linux-generic/include/odp_internal.h | 1 + platform/linux-generic/odp_system_info.c | 5 ----- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/platform/linux-generic/include/odp_internal.h b/platform/linux-generic/include/odp_internal.h index cdbed7d..39e6f78 100644 --- a/platform/linux-generic/include/odp_internal.h +++ b/platform/linux-generic/include/odp_internal.h @@ -31,6 +31,7 @@ typedef struct { uint64_t page_size; int cache_line_size; int cpu_count; + char cpu_arch_str[128]; char model_str[MAX_CPU_NUMBER][128]; } odp_system_info_t; diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index de28fab..2e3726e 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -27,7 +27,6 @@ typedef struct { - const char *cpu_arch_str; int (*cpuinfo_parser)(FILE *file, odp_system_info_t *sysinfo); } odp_compiler_info_t; @@ -292,19 +291,15 @@ static uint64_t arch_cpu_hz_current(int id ODP_UNUSED) static odp_compiler_info_t compiler_info = { #if defined __x86_64__ || defined __i386__ - .cpu_arch_str = "x86", .cpuinfo_parser = cpuinfo_x86 #elif defined __arm__ || defined __aarch64__ - .cpu_arch_str = "arm", .cpuinfo_parser = cpuinfo_arm #elif defined __OCTEON__ - .cpu_arch_str = "octeon", .cpuinfo_parser = cpuinfo_octeon #elif defined __powerpc__ - .cpu_arch_str = "powerpc", .cpuinfo_parser = cpuinfo_powerpc #else