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 873A0A0A0C; Fri, 9 Jul 2021 12:56:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A74F3416A4; Fri, 9 Jul 2021 12:56:15 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id 5C6E5416AC; Fri, 9 Jul 2021 12:56:14 +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 C0CC6ED1; Fri, 9 Jul 2021 03:56:13 -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 ED6653F5A1; Fri, 9 Jul 2021 03:56:11 -0700 (PDT) From: Richael Zhuang To: dev@dpdk.org Cc: yux.jiang@intel.com, richael.zhuang@arm.com, stable@dpdk.org, David Hunt Date: Fri, 9 Jul 2021 18:55:48 +0800 Message-Id: <20210709105548.8389-3-richael.zhuang@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210709105548.8389-1-richael.zhuang@arm.com> References: <20210709033416.46199-2-richael.zhuang@arm.com> <20210709105548.8389-1-richael.zhuang@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v8 2/2] test/power: round cpuinfo cur freq only in CPPC cpufreq 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" On arm platform, the value in "/sys/.../cpuinfo_cur_freq" may not be exactly the same as what was set when using CPPC cpufreq driver. For other cpufreq driver, no need to round it currently, or else this check will fail with turbo enabled. For example, with acpi_cpufreq, cpuinfo_cur_freq can be 2401000 which is equal to freqs[0].It should not be rounded to 2400000. Fixes: 606a234c6d360 ("test/power: round CPU frequency to check") Cc: richael.zhuang@arm.com Cc: stable@dpdk.org Signed-off-by: Richael Zhuang Acked-by: David Hunt --- app/test/test_power_cpufreq.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index 8516df4ca6..b8fc53925c 100644 --- a/app/test/test_power_cpufreq.c +++ b/app/test/test_power_cpufreq.c @@ -55,7 +55,9 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) FILE *f; char fullpath[PATH_MAX]; char buf[BUFSIZ]; + enum power_management_env env; uint32_t cur_freq; + uint32_t freq_conv; int ret = -1; int i; @@ -80,15 +82,18 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) goto fail_all; cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL); - - /* 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 - */ - unsigned int freq_conv = 0; - freq_conv = (cur_freq + TEST_FREQ_ROUNDING_DELTA) - / TEST_ROUND_FREQ_TO_N_100000; - freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_100000; + freq_conv = cur_freq; + + env = rte_power_get_env(); + if (env == PM_ENV_CPPC_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 + */ + freq_conv = (cur_freq + TEST_FREQ_ROUNDING_DELTA) + / TEST_ROUND_FREQ_TO_N_100000; + freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_100000; + } if (turbo) ret = (freqs[idx] <= freq_conv ? 0 : -1); -- 2.20.1