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 7EEDBA0C4C for ; Mon, 12 Jul 2021 15:15:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 79B5C4119E; Mon, 12 Jul 2021 15:15:49 +0200 (CEST) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mails.dpdk.org (Postfix) with ESMTP id 1102A40685 for ; Mon, 12 Jul 2021 15:15:48 +0200 (CEST) Received: by mail-wr1-f45.google.com with SMTP id t5so11711737wrw.12 for ; Mon, 12 Jul 2021 06:15:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=bSFUGixagzBO/VQRKq99MhCoOm1XPA8m9Osy7NmICYU=; b=WDDYezPghUSdcY3sySvBKU9AGdn9zgOUQjyoIVBu2iaBBJliN6NTjrDBQZeokYy7kg Ni9ZNJz4Smn1DURL/20ugXQwd37SgfHN1vKc2l+vNByhJ8bIdhcouwJT2z5m3k3s9f5w q5M+HaFIiEz+6aAjzYMeNa4cwA0D6p/WPzMtzz2JKpqEWQhoZ4ea31sQFvAv/RH5G2Ot RJi1wwZ7VlgblPtjZQaToxiViJmoY3MNuSvELnP7xf1+RV83Lx+/OkPT9yE67YjAR7A6 xrPa9/1BHiuTON6jI2hrVLlytFP4Lx7ZazXcs78Y423SGTEPhiPZX7yk7MauzMj5IwQ8 rSww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bSFUGixagzBO/VQRKq99MhCoOm1XPA8m9Osy7NmICYU=; b=G9eJ+4vh+e+myPQVecA1WdJiXWkf5CKTq5fx0znbHc7EXSS0hFuZmnBJKGeduRQvbO a5vJWxdHKxmv2miYbE3MRcvK+/AdCOYw9KwWO+K6Gjn/50+WU+/oJK4uSoz8x8EIwUMF uM9itXnTuLyom7bMYLwT87w7gs9i03c300vYFcvwjnGBReYQ0dMU3o3B7TQmsitnf8P/ nBsue11OX2Xkci4jXWCe9HmqbZcACL+Ur8xxC3T6bL6J8YZEXt63BP92wiXliT4KnJ1P 96XiU3AWT6sofidGHOWNHL7ACQEyzbnYxmwiooBbJp1ifOigWU1IZacM3ukSjKIzKV4D QFJA== X-Gm-Message-State: AOAM5314Az+NBOIJRSbV9t/DxULBTW61loX/jMg7r+1qY0v0H8KH6qio SxaU8CqudbQOen5eeh6O3Fw= X-Google-Smtp-Source: ABdhPJxb7fkuhac4NgP+wvvv5+/uMdevnl8TfkcoysflhxW6zpU1QQxQ6vzpAIHAkfGnlyLf/1SkcA== X-Received: by 2002:adf:e5ce:: with SMTP id a14mr57531391wrn.226.1626095747879; Mon, 12 Jul 2021 06:15:47 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id p15sm12058287wmq.43.2021.07.12.06.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:15:47 -0700 (PDT) From: luca.boccassi@gmail.com To: Richael Zhuang Cc: David Hunt , dpdk stable Date: Mon, 12 Jul 2021 14:05:44 +0100 Message-Id: <20210712130551.2462159-109-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/power: fix CPU frequency when turbo enabled' has been queued to stable release 20.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/b9599ebada5a044d4e143ce641cd32a49c4db19b Thanks. Luca Boccassi --- >From b9599ebada5a044d4e143ce641cd32a49c4db19b Mon Sep 17 00:00:00 2001 From: Richael Zhuang Date: Fri, 9 Jul 2021 18:55:48 +0800 Subject: [PATCH] test/power: fix CPU frequency when turbo enabled [ upstream commit 29343b9030e38e8c3519ba01cb66724d45b13dc8 ] 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") Signed-off-by: Richael Zhuang Acked-by: David Hunt --- app/test/test_power_cpufreq.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index 0c3adc5f33..ac71babcce 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); + freq_conv = cur_freq; - /* 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; + 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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:42.266755442 +0100 +++ 0109-test-power-fix-CPU-frequency-when-turbo-enabled.patch 2021-07-12 13:41:36.918131526 +0100 @@ -1 +1 @@ -From 29343b9030e38e8c3519ba01cb66724d45b13dc8 Mon Sep 17 00:00:00 2001 +From b9599ebada5a044d4e143ce641cd32a49c4db19b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 29343b9030e38e8c3519ba01cb66724d45b13dc8 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 8516df4ca6..b8fc53925c 100644 +index 0c3adc5f33..ac71babcce 100644