From patchwork Fri Aug 13 14:18:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 96908 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id AE1F8A0C4D; Fri, 13 Aug 2021 16:18:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6BE5640DF4; Fri, 13 Aug 2021 16:18:49 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by mails.dpdk.org (Postfix) with ESMTP id 0A73F4069C; Fri, 13 Aug 2021 16:18:47 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10075"; a="215596207" X-IronPort-AV: E=Sophos;i="5.84,319,1620716400"; d="scan'208";a="215596207" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Aug 2021 07:18:47 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.84,319,1620716400"; d="scan'208";a="461407146" Received: from silpixa00399952.ir.intel.com ([10.55.129.13]) by orsmga007.jf.intel.com with ESMTP; 13 Aug 2021 07:18:45 -0700 From: David Hunt To: dev@dpdk.org Cc: david.hunt@intel.com, luca.boccassi@gmail.com, richael.zhuang@arm.com, stable@dpdk.org Date: Fri, 13 Aug 2021 15:18:30 +0100 Message-Id: <20210813141830.15397-1-david.hunt@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [20.11.3] test/power: fix CPU frequency when turbo enabled 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. This is a version of the patch for 20.11.3 that fixes this issue withouth the dependency of having the CPPC support applied first (modified version of 29343b9030e38e8c3519ba01cb66724d45b13dc8) Fixes: 606a234c6d360 ("test/power: round CPU frequency to check") Cc: stable@dpdk.org Signed-off-by: David Hunt Acked-by: Luca Boccassi --- app/test/test_power_cpufreq.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index 1c9d5cb48e..94a38010e2 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,20 @@ 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_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 + */ + 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; + } if (turbo) ret = (freqs[idx] <= freq_conv ? 0 : -1);