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 C2A58A0C4C 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 A1189411A1; Mon, 12 Jul 2021 15:15:49 +0200 (CEST) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mails.dpdk.org (Postfix) with ESMTP id 29DD240685 for ; Mon, 12 Jul 2021 15:15:49 +0200 (CEST) Received: by mail-wr1-f54.google.com with SMTP id d12so24940428wre.13 for ; Mon, 12 Jul 2021 06:15:49 -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=zf9vhyPRDu+JvRpzpG9gd9xZVf/KBrmzPs5lIApw4gI=; b=h08CEaPcQ3kTTqJ1v8WPi/iQ9vh9sBS0wOOlH1r/AJtGbqxKMKnKExO37jpC7l7CtP ThxzctEM9XKReCye2uugKHkYQqRJE0O7cgkJDja9UALR5hjiFQoiFUPa+KynsP9ZwU/O DfTgY1+4LF2zJ95M9t4IrbjCtzu/WyWq3X4bKlymUNvBMEtyporp8briQJ4MeLGFfoEe Dg7Y16Fl5pPkAmn5Z/PdBUaJrwVsONr1C+TqWtKT6SPOwnfQy8/Nj1oFeSoPWUXZ+tIT QjO3tjpHmtPhVRQhg287wm7OE9gLfnO95tYpW04HgLIAyllmrZNcDrmjqRAqRGtd2Pz7 aaTg== 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=zf9vhyPRDu+JvRpzpG9gd9xZVf/KBrmzPs5lIApw4gI=; b=F6595mlnBZO+5y9hbu5zeeZokKNBvc3mS6UfNHRYgrp/K7iAWYoPJ9lQi+kscbspPX 8wIjH547OHutwWiuWC/gpwIO5gxySUMyAue2Me4Tqsb4SEJQbF+UUUspGujLaDmaGnb+ CxmqvtPWdl9YT+7X26NGc4XN18gXRtUgBdP/gpQw3uWGI0OiBimDLQE3M9iP9e9CT3Zc mqpf0aptCsT/K+fJGiDYw808ufPb88yCuXEtHYnOGpv97FEQrM/EIwK8d+xcCfUXsTpJ m1meXkdiW3TyTp7IJuZ4m++J0Weo/CKOVlS2HxutYAdhpnr6DurSQ4ZUdt06BXEG61uC W63g== X-Gm-Message-State: AOAM530KAC1S2lqnaqrLZg4sQtm3pI+e0hTCvXw39+vikb2R4gIkDkow IfxW3d3RkBuek+WuonjwuOY= X-Google-Smtp-Source: ABdhPJwslAbcde580NLuyA9I4isVEXZLY74wFkEEZ2ue4gNrKBT7Q3o7DlzLLS0j3cyc6730D0UcxQ== X-Received: by 2002:adf:f710:: with SMTP id r16mr57406159wrp.124.1626095748934; Mon, 12 Jul 2021 06:15:48 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id v14sm4816497wru.77.2021.07.12.06.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:15:48 -0700 (PDT) From: luca.boccassi@gmail.com To: Luca Boccassi Cc: dpdk stable Date: Mon, 12 Jul 2021 14:05:45 +0100 Message-Id: <20210712130551.2462159-110-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 'Revert "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/234cd7c51de33f16d3ab6eeb4b3b3906155ae12d Thanks. Luca Boccassi --- >From 234cd7c51de33f16d3ab6eeb4b3b3906155ae12d Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 12 Jul 2021 12:53:43 +0100 Subject: [PATCH] Revert "test/power: fix CPU frequency when turbo enabled" This reverts commit b9599ebada5a044d4e143ce641cd32a49c4db19b. --- app/test/test_power_cpufreq.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index ac71babcce..0c3adc5f33 100644 --- a/app/test/test_power_cpufreq.c +++ b/app/test/test_power_cpufreq.c @@ -55,9 +55,7 @@ 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; @@ -82,18 +80,15 @@ 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; - 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; - } + /* 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); -- 2.30.2