From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7AB37A0C4B; Wed, 14 Jul 2021 12:44:26 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6A4094131B; Wed, 14 Jul 2021 12:44:26 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id 2BFCF4130C; Wed, 14 Jul 2021 12:44:24 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 9C6B0D6E; Wed, 14 Jul 2021 03:44:23 -0700 (PDT) Received: from wls-arm-cavium06.shanghai.arm.com (wls-arm-cavium06.shanghai.arm.com [10.169.206.120]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 12E9A3F774; Wed, 14 Jul 2021 03:44:21 -0700 (PDT) From: Richael Zhuang To: dev@dpdk.org Cc: zhiminx.huang@intel.com, david.hunt@intel.com, stable@dpdk.org Date: Wed, 14 Jul 2021 18:44:05 +0800 Message-Id: <20210714104405.23917-2-richael.zhuang@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714104405.23917-1-richael.zhuang@arm.com> References: <20210714084407.51979-2-richael.zhuang@arm.com> <20210714104405.23917-1-richael.zhuang@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 1/1] test/power: fix CPU frequency check X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" For acpi_cpufreq and cppc_cpufreq, both cpuinfo_cur_freq and scaling_cur_freq exist. For pstate, only scaling_cur_freq exists. And value in scaling_cur_freq and cpuinfo_cur_freq may not be the same. For acpi_cpufreq and cppc_cpufreq, we should check cpuinfo_cur_freq but not scaling_cur_freq. So here change the check sequence to make sure it works for all cpufreq drivers. Besides, add rounding for pstate driver. Fixes: ff6dfb8e492f ("test/power: fix CPU frequency check") Cc: david.hunt@intel.com Cc: stable@dpdk.org Signed-off-by: Richael Zhuang --- app/test/test_power_cpufreq.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index b8fc53925c..1a9549527e 100644 --- a/app/test/test_power_cpufreq.c +++ b/app/test/test_power_cpufreq.c @@ -62,13 +62,13 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) int i; if (snprintf(fullpath, sizeof(fullpath), - TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) { + TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) { return 0; } f = fopen(fullpath, "r"); if (f == NULL) { if (snprintf(fullpath, sizeof(fullpath), - TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) { + TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) { return 0; } f = fopen(fullpath, "r"); @@ -85,7 +85,7 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) freq_conv = cur_freq; env = rte_power_get_env(); - if (env == PM_ENV_CPPC_CPUFREQ) { + if (env == PM_ENV_CPPC_CPUFREQ || env == PM_ENV_PSTATE_CPUFREQ) { /* convert the frequency to nearest 100000 value * Ex: if cur_freq=1396789 then freq_conv=1400000 * Ex: if cur_freq=800030 then freq_conv=800000 -- 2.20.1