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 16727A0C47 for ; Tue, 10 Aug 2021 17:44:14 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 10FE14114F; Tue, 10 Aug 2021 17:44:14 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id F3FC2411C6 for ; Tue, 10 Aug 2021 17:44:12 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id D1D093F0A4 for ; Tue, 10 Aug 2021 15:44:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628610252; bh=0/iAlMVLzGZkg6zY4x5FcL2coy1543BT8C+CuQqor0c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ug1Zlu80PHNHsue0OO50tkRg8xOsKPcHJTd3pRNQohkwsashq+aErSaRc6Me8tOHU d91EVYr//9Q+bLw6C6c/xNDo5UquGTKRSp94Z2lzLNR6YIjMfR/AYoDpalwSJ262o2 sxekpQUyanMsa7LlnDe9VuoSTPJiZjHpaJGbiPSf5iwWE7V9rrmxISaSzQzMOINsr0 y1RHtYlv3BOO+zSF5uE0JGE9xPXo/bKwuB/6eXv1K80stZmxWZRllD1df1ovD+HIK7 +zpnXbBKqaBAjfcQrGxkQ582zocaFe8cE91ULwqAsVWR5R/gkw+pighATd3MWM0M/K Ipf9JU5efLAiQ== Received: by mail-ed1-f70.google.com with SMTP id v20-20020aa7d9d40000b02903be68450bf3so3156752eds.23 for ; Tue, 10 Aug 2021 08:44:12 -0700 (PDT) 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=0/iAlMVLzGZkg6zY4x5FcL2coy1543BT8C+CuQqor0c=; b=YBYE6jJ1IvIZAgmPAeKdl19KovNWaFOZ8HfF5ABrodTpWWZP7YU3aouGgpznFq/nHv xMbFwegyN1aRcNOvaS/vIJyrUE+ktqDHbPq+qq9fv4bHXAX04ctKkGtGjULv2RK4oeiy xHiJ+EXy7Pt9r4tq1Tf5j7JgcZH7uWvZD5eOAioXWualc6c5GylGBp7KT7rC/HDeBPqB OBIGV1Xcxjxp0swuDZT7kqFQwfwvFPQdxlVUKUG8GSzPNB7SgP2DtxfyjRnE1ZOV2dX9 7LRv0Qy7IamosTxa8pFHz1dAdZkZFtj3MDwz+RPsMYtm+BCCSJ51SE1o12IMWC577429 wIAA== X-Gm-Message-State: AOAM531IRQWL2Y5LpDq0GIpINKvT+yAWcYxn2ygvAoMzpCdh9FzLu7J5 Crz9/yUZac2P5fEPoKhhOyyTiWNE8CXhmWBOj5wrHZFH7AMpCWcf1rnlVXt58kFHs8bmsebHUdZ jHymyO/hsnbFxoaZSQtfDSSvh X-Received: by 2002:a05:6402:124e:: with SMTP id l14mr5891641edw.356.1628610252558; Tue, 10 Aug 2021 08:44:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNICxT1Vn0nSerbsRBIoyd8AGPOqfYK1Org9hTSW3In0AKPAGN33pk49/tgN0uEHkYepwBqA== X-Received: by 2002:a05:6402:124e:: with SMTP id l14mr5891626edw.356.1628610252403; Tue, 10 Aug 2021 08:44:12 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id fp5sm3646319ejc.6.2021.08.10.08.44.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Aug 2021 08:44:11 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Richael Zhuang Cc: David Hunt , dpdk stable Date: Tue, 10 Aug 2021 17:39:53 +0200 Message-Id: <20210810154022.749358-73-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810154022.749358-1-christian.ehrhardt@canonical.com> References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/power: fix CPU frequency check for intel_pstate' has been queued to stable release 19.11.10 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 19.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/12/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/ed9be54294b454945f73d70ba5989bd5cd1e7bcb Thanks. Christian Ehrhardt --- >From ed9be54294b454945f73d70ba5989bd5cd1e7bcb Mon Sep 17 00:00:00 2001 From: Richael Zhuang Date: Wed, 14 Jul 2021 18:44:05 +0800 Subject: [PATCH] test/power: fix CPU frequency check for intel_pstate [ upstream commit cf1e803508009917f41dd5bb347e4140043afe03 ] 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") Signed-off-by: Richael Zhuang Acked-by: David Hunt --- 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 e5bf3b3367..c0e0431c5f 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.32.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-08-10 15:11:15.838864480 +0200 +++ 0073-test-power-fix-CPU-frequency-check-for-intel_pstate.patch 2021-08-10 15:11:13.078638532 +0200 @@ -1 +1 @@ -From cf1e803508009917f41dd5bb347e4140043afe03 Mon Sep 17 00:00:00 2001 +From ed9be54294b454945f73d70ba5989bd5cd1e7bcb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cf1e803508009917f41dd5bb347e4140043afe03 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index b8fc53925c..1a9549527e 100644 +index e5bf3b3367..c0e0431c5f 100644