From patchwork Wed Jan 20 09:20:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hongbo Zhang X-Patchwork-Id: 60020 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp3068257lbb; Wed, 20 Jan 2016 01:40:21 -0800 (PST) X-Received: by 10.140.109.33 with SMTP id k30mr43932349qgf.75.1453282820780; Wed, 20 Jan 2016 01:40:20 -0800 (PST) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id x69si42724419qha.127.2016.01.20.01.40.20; Wed, 20 Jan 2016 01:40:20 -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 4E6FE610F7; Wed, 20 Jan 2016 09:40:20 +0000 (UTC) Authentication-Results: lists.linaro.org; dkim=fail reason="verification failed; unprotected key" header.d=linaro.org header.i=@linaro.org header.b=bot0h87+; 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 3DD606178C; Wed, 20 Jan 2016 09:36:39 +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 ED5EA61786; Wed, 20 Jan 2016 09:36:33 +0000 (UTC) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by lists.linaro.org (Postfix) with ESMTPS id B97076178D for ; Wed, 20 Jan 2016 09:35:38 +0000 (UTC) Received: by mail-pa0-f43.google.com with SMTP id ho8so2003538pac.2 for ; Wed, 20 Jan 2016 01:35:38 -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=XfzkKn5bYL9mUSPSriiWrRflS3coTB1WfNTLOvPEygo=; b=bot0h87+5+kP/y0JBTmxj1IRdqHNEd+G/P4w3dr5mgQO0Iv+qsYLUZIt7nz0ETSKvO Z07YXyBPgaOeX7EGAYj4htP1RTlaPhirTFMPkrWyPXT1LO+BBxvlJ6p5thudcPiMtE5Z J0S5Ufz0fZlaVdrPomqoM6XasYFRm+N7XOJNE= 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=XfzkKn5bYL9mUSPSriiWrRflS3coTB1WfNTLOvPEygo=; b=FfDkSbHcAZUu6e/tzI1R/ClCz+tQctPhx8HtXJkm7FBL8LGwhxwk4oWmVxarxI/4T0 QWOYERLN/Rb0C3v+mj5mh4to8mbAFM+DjVbIMA7gHMsa6Y7fRymFXO25NzvXvOWl4Yq5 /8PxmQQT2jbFNUQFGOzvRvzqqfUgww8Dwr1NmQNmD3Rwn4hKho33NASOpkYe1+bMfXfQ r2jEkZICJzAozqVb4bZCXKUaL2PJLQK097hNMPyF2TCaOyOxjaGdrDAC9hNjdkRo37ah QmQEDZtV0qoOOzHRZnEMR4RSNhbxTZ0jAFW2B8AXS4kaTzPF102uRwE5UZ6If3qDidHk BEgw== X-Gm-Message-State: ALoCoQneoPLQc8sSNunw6WaWDf353yimx9DgCkPc4nEDTNN1JfKzyaJKE84WmWeNtlKp8vpY3Zhzg0gjR9SNnXhgChT97PxqFw== X-Received: by 10.66.232.170 with SMTP id tp10mr51237336pac.38.1453282538100; Wed, 20 Jan 2016 01:35:38 -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.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 20 Jan 2016 01:35:37 -0800 (PST) From: hongbo.zhang@linaro.org To: lng-odp@lists.linaro.org Date: Wed, 20 Jan 2016 17:20:58 +0800 Message-Id: <1453281662-31499-9-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: patch Subject: [lng-odp] [PATCH v7 API-NEXT 08/12] api: cpu: make frequency API return 0 on failure 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 All the CPU frequency API return value type is uint64_t, this patch makes them return 0 on failure instead of -1. Signed-off-by: Hongbo Zhang --- include/odp/api/cpu.h | 4 ++++ platform/linux-generic/arch/linux/odp_sysinfo_parse.c | 2 +- platform/linux-generic/arch/mips64/odp_sysinfo_parse.c | 2 +- platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c | 2 +- platform/linux-generic/arch/x86/odp_sysinfo_parse.c | 2 +- platform/linux-generic/odp_system_info.c | 2 +- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/include/odp/api/cpu.h b/include/odp/api/cpu.h index 4cbaf58..eaee24b 100644 --- a/include/odp/api/cpu.h +++ b/include/odp/api/cpu.h @@ -71,6 +71,7 @@ const char *odp_cpu_model_str_id(int id); * Returns current frequency of this CPU * * @return CPU frequency in Hz + * @retval 0 on failure */ uint64_t odp_cpu_hz(void); @@ -82,6 +83,7 @@ uint64_t odp_cpu_hz(void); * @param id CPU ID * * @return CPU frequency in Hz + * @retval 0 on failure */ uint64_t odp_cpu_hz_id(int id); @@ -91,6 +93,7 @@ uint64_t odp_cpu_hz_id(int id); * Returns maximum frequency of this CPU * * @return CPU frequency in Hz + * @retval 0 on failure */ uint64_t odp_cpu_hz_max(void); @@ -102,6 +105,7 @@ uint64_t odp_cpu_hz_max(void); * @param id CPU ID * * @return CPU frequency in Hz + * @retval 0 on failure */ uint64_t odp_cpu_hz_max_id(int id); diff --git a/platform/linux-generic/arch/linux/odp_sysinfo_parse.c b/platform/linux-generic/arch/linux/odp_sysinfo_parse.c index 881dd2d..8ff6f48 100644 --- a/platform/linux-generic/arch/linux/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/linux/odp_sysinfo_parse.c @@ -15,5 +15,5 @@ int odp_cpuinfo_parser(FILE *file ODP_UNUSED, uint64_t odp_cpu_hz_current(int id ODP_UNUSED) { - return -1; + return 0; } diff --git a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c index 264ab28..b6e0e2c 100644 --- a/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/mips64/odp_sysinfo_parse.c @@ -49,5 +49,5 @@ int odp_cpuinfo_parser(FILE *file, odp_system_info_t *sysinfo) uint64_t odp_cpu_hz_current(int id ODP_UNUSED) { - return -1; + return 0; } diff --git a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c index fe13f40..83d88ca 100644 --- a/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/powerpc/odp_sysinfo_parse.c @@ -48,5 +48,5 @@ int odp_cpuinfo_parser(FILE *file, odp_system_info_t *sysinfo) uint64_t odp_cpu_hz_current(int id ODP_UNUSED) { - return -1; + return 0; } diff --git a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c index e2931cb..831a53a 100644 --- a/platform/linux-generic/arch/x86/odp_sysinfo_parse.c +++ b/platform/linux-generic/arch/x86/odp_sysinfo_parse.c @@ -68,5 +68,5 @@ uint64_t odp_cpu_hz_current(int id) if (mhz) return (uint64_t)(mhz * 1000000.0); - return -1; + return 0; } diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index e4992b5..de187a0 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -241,7 +241,7 @@ uint64_t odp_cpu_hz_max_id(int id) if (id >= 0 && id < MAX_CPU_NUMBER) return odp_global_data.system_info.cpu_hz[id]; else - return -1; + return 0; } uint64_t odp_sys_huge_page_size(void)