From patchwork Fri Dec 25 08:29:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 58991 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp213120lbb; Fri, 25 Dec 2015 00:30:58 -0800 (PST) X-Received: by 10.50.30.100 with SMTP id r4mr36188779igh.23.1451032258659; Fri, 25 Dec 2015 00:30:58 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id f18si25699746igt.48.2015.12.25.00.30.58; Fri, 25 Dec 2015 00:30:58 -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 DADCA616D4; Fri, 25 Dec 2015 08:30:57 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=YUxg98UZ; 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 EEFDB616BA; Fri, 25 Dec 2015 08:30: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 81B8F6166B; Fri, 25 Dec 2015 08:30:18 +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 598F96166B for ; Fri, 25 Dec 2015 08:30:17 +0000 (UTC) Received: by mail-pf0-f176.google.com with SMTP id e65so25778907pfe.1 for ; Fri, 25 Dec 2015 00:30:17 -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=xIj3SLqgAD5m+N+nBaeAEDfcoXNCRi1AsibgqCAWqwg=; b=YUxg98UZzrFUS/g+IslhtjS/ponll/fZFuHi7GosCqBtN+oJTD4zKWnYHoNZYHRocL OwareLx5tbO2aAEZxLU7Sl8s1Saq7UKLweb2MWk+3yG+H/WpK7ShVGK0Chal0ss2kkJ5 JOun4O4rELciMuPzgK2RwcA7eiEBLBfxunsdw= 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=xIj3SLqgAD5m+N+nBaeAEDfcoXNCRi1AsibgqCAWqwg=; b=GCaexQaKmfv+mRr1tHr61yu7pDJZbnz7paskgVEY1KKMJLyciCjNbxs70AuM9x9zRq vrfme++XrfM7Nd3iRwueDvMI+bGwSevY1vhF1333J1Xsy1l9sWHkouikZfMq7z7ZnE0t mg52vQqDJhAV04H+LhKvJaUJpddXwv6X5Gpr84xLjEx0IG41xiOq2CxyOYJ1K3A3Ta7E vUn4jPpjM/VcW2+LvU+V5zbNjC51G+iGiKW9rV36D7blgDQvF2Fo0rDJxG2FPazjLNSG aSiuOO6hfc4T27h31LWNwDYCeHA9wa3vD2LllS74Idq5kVFBA+5WV64mEAAAVLAnVgl8 FAHw== X-Gm-Message-State: ALoCoQnI6ujL8BUZI09HvEu2AqQs+CrJJvP5/f0WsdlKGIKd9OLRJ30wQWsgYSvI66gDpE7NDJLU4Qeqt2MrWi21jnGJd04U9Q== X-Received: by 10.98.8.212 with SMTP id 81mr57240046pfi.165.1451032216700; Fri, 25 Dec 2015 00:30:16 -0800 (PST) Received: from ubuntu1504.ap.freescale.net (gate-zmy3.freescale.com. [192.88.167.1]) by smtp.gmail.com with ESMTPSA id p80sm33503452pfi.12.2015.12.25.00.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 Dec 2015 00:30:16 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Fri, 25 Dec 2015 16:29:55 +0800 Message-Id: <1451032201-19954-2-git-send-email-hongbo.zhang@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1451032201-19954-1-git-send-email-hongbo.zhang@linaro.org> References: <1451032201-19954-1-git-send-email-hongbo.zhang@linaro.org> X-Topics: Architecture patch Subject: [lng-odp] [PATCH API-NEXT 1/7] 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 49e23d9..2eeba42 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 6a05501..8cbdd58 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -26,7 +26,6 @@ typedef struct { - const char *cpu_arch_str; int (*cpuinfo_parser)(FILE *file, odp_system_info_t *sysinfo); } odp_compiler_info_t; @@ -291,19 +290,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