[dpdk-stable] patch 'power: handle frequency increase with turbo disabled' has been queued to LTS release 18.11.6

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/17/19. 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/kevintraynor/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/65ce5cdd91f8c1ac302ce4e07c797b07f37142bc

Thanks.

Kevin.

---
>From 65ce5cdd91f8c1ac302ce4e07c797b07f37142bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= <mattias.ronnblom at ericsson.com>
Date: Thu, 14 Nov 2019 15:10:36 +0100
Subject: [PATCH] power: handle frequency increase with turbo disabled
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

[ upstream commit 388c4c03eca316698d2bb55435ec5c804c67c844 ]

Calling pstate's or acpi's rte_power_freq_up() when on the highest
non-turbo frequency results in an error, if turbo is enabled in the BIOS,
but disabled via the power library.
The error is in the form of a return code and a RTE_LOG() entry
on the ERR level.

According to the API documentation, the frequency is scaled up
"according to the available frequencies". In case turbo is disabled,
that frequency is not available. This patch's rte_power_freq_up()
behaviour is also consistent with how rte_power_freq_max() is
implemented (i.e. the highest non-turbo frequency is set, in case
turbo is disabled).

Fixes: 445c6528b55f ("power: common interface for guest and host")
Fixes: e6c6dc0f96c8 ("power: add p-state driver compatibility")

Signed-off-by: Mattias Rönnblom <mattias.ronnblom at ericsson.com>
Tested-by: David Hunt <david.hunt at intel.com>
Acked-by: David Hunt <david.hunt at intel.com>
Reviewed-by: Liang Ma <liang.j.ma at intel.com>
---
 lib/librte_power/power_acpi_cpufreq.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/librte_power/power_acpi_cpufreq.c
index 6051e02d9..85edb9aec 100644
--- a/lib/librte_power/power_acpi_cpufreq.c
+++ b/lib/librte_power/power_acpi_cpufreq.c
@@ -506,5 +506,6 @@ power_acpi_cpufreq_freq_up(unsigned int lcore_id)
 
 	pi = &lcore_power_info[lcore_id];
-	if (pi->curr_idx == 0)
+	if (pi->curr_idx == 0 ||
+	    (pi->curr_idx == 1 && pi->turbo_available && !pi->turbo_enable))
 		return 0;
 
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-12-11 21:24:16.359836590 +0000
+++ 0046-power-handle-frequency-increase-with-turbo-disabled.patch	2019-12-11 21:24:12.705650432 +0000
@@ -1 +1 @@
-From 388c4c03eca316698d2bb55435ec5c804c67c844 Mon Sep 17 00:00:00 2001
+From 65ce5cdd91f8c1ac302ce4e07c797b07f37142bc Mon Sep 17 00:00:00 2001
@@ -8,0 +9,2 @@
+[ upstream commit 388c4c03eca316698d2bb55435ec5c804c67c844 ]
+
@@ -24 +25,0 @@
-Cc: stable at dpdk.org
@@ -31,3 +32,2 @@
- lib/librte_power/power_acpi_cpufreq.c   | 3 ++-
- lib/librte_power/power_pstate_cpufreq.c | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
+ lib/librte_power/power_acpi_cpufreq.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
@@ -36 +36 @@
-index 22989244a..f443fce69 100644
+index 6051e02d9..85edb9aec 100644
@@ -39,13 +39 @@
-@@ -516,5 +516,6 @@ power_acpi_cpufreq_freq_up(unsigned int lcore_id)
- 
- 	pi = &lcore_power_info[lcore_id];
--	if (pi->curr_idx == 0)
-+	if (pi->curr_idx == 0 ||
-+	    (pi->curr_idx == 1 && pi->turbo_available && !pi->turbo_enable))
- 		return 0;
- 
-diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/power_pstate_cpufreq.c
-index 8f095e0ab..2d8a9499d 100644
---- a/lib/librte_power/power_pstate_cpufreq.c
-+++ b/lib/librte_power/power_pstate_cpufreq.c
-@@ -697,5 +697,6 @@ power_pstate_cpufreq_freq_up(unsigned int lcore_id)
+@@ -506,5 +506,6 @@ power_acpi_cpufreq_freq_up(unsigned int lcore_id)