From patchwork Wed Jan 20 09:20:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 60014 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp3066569lbb; Wed, 20 Jan 2016 01:36:03 -0800 (PST) X-Received: by 10.140.150.129 with SMTP id 123mr46437539qhw.14.1453282563093; Wed, 20 Jan 2016 01:36:03 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id l88si42825488qgf.84.2016.01.20.01.36.02; Wed, 20 Jan 2016 01:36:03 -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 A6793610E1; Wed, 20 Jan 2016 09:36:02 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=kI2cLpCT; 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 8C7F361784; Wed, 20 Jan 2016 09:35:31 +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 D5CF5610D5; Wed, 20 Jan 2016 09:35:23 +0000 (UTC) Received: from mail-pf0-f181.google.com (mail-pf0-f181.google.com [209.85.192.181]) by lists.linaro.org (Postfix) with ESMTPS id DD6DC610D5 for ; Wed, 20 Jan 2016 09:35:22 +0000 (UTC) Received: by mail-pf0-f181.google.com with SMTP id 65so1993001pff.2 for ; Wed, 20 Jan 2016 01:35:22 -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=M8XWy4oTvTEtIadwg6+cgWiqO3PM6Hk+nMrBx0K40mA=; b=kI2cLpCTm0Owr4CFagiBJkiEeRuwoJRrI/4WDNs1EdnJyaqvnaTjGZYIKJfIG0xpRZ Nc+ZtcrzINlyXoBVGTfxcmq8dBxCg67eO6zoAsjyLe9PdrVl9d1LgPIW1ATqRALE3Ggh V8ERk0gKCeuhilxSNaFbuuD9TNEYBlBxxIifc= 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=M8XWy4oTvTEtIadwg6+cgWiqO3PM6Hk+nMrBx0K40mA=; b=NQDRgP1RpL9lOGPKBzauMwxfchjwTbGBMEG/lrSWcz/92QheYqos8TStqJhsehWlc+ FOv6XcfIk4MF19JaXexr/NWI0FoFhkg1MkrIK0+So5Igdy5Yz26pnMptckUPUbwvRqwO RxdLZWB3LPUISk9DzH8CPr78qjclJ3rqU9aTtiqFZ1bPoC6eREvE1/Dwj0+k7JPgiDa9 Hrxqt4oyAvfQ5Zl/rs7vDHCFpKY0cfMXdqfNKq0d5AhzdUpntTO8i/5c9laYgZI0UvF7 tW6SADkZVQiLeaPDfhhZXIh/pfpy5ZrMKz54iCnwhIydkGlCoJfyKhNfpQafprd7CJpf +smg== X-Gm-Message-State: ALoCoQk3/aac77tXlgJpi2HL+fU+R6DOMIgWGJxAxND/qZcAMY3OQguuVxnqQ7SJloydii0y1l7wYnDcV9Gq2aLdEz3lyzm1MA== X-Received: by 10.98.64.83 with SMTP id n80mr51069211pfa.149.1453282522271; Wed, 20 Jan 2016 01:35:22 -0800 (PST) Received: from ubuntu1504.ap.freescale.net (gate-zmy3.freescale.com. [192.88.167.1]) by smtp.gmail.com with ESMTPSA id xz6sm47592797pab.42.2016.01.20.01.35.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jan 2016 01:35:21 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Wed, 20 Jan 2016 17:20:51 +0800 Message-Id: <1453281662-31499-2-git-send-email-hongbo.zhang@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1453281662-31499-1-git-send-email-hongbo.zhang@linaro.org> References: <1453281662-31499-1-git-send-email-hongbo.zhang@linaro.org> X-Topics: Architecture patch Subject: [lng-odp] [PATCH v7 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 bab3f44..f965023 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