4.14-stable patches

added patches:
	thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch

diff --git a/queue-4.14/series b/queue-4.14/series
index b8704132c047e66e80269f1d0c08eaf172695ee8..10b01371184775f44e01afabc6f637fb2e01916b 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -190,3 +190,4 @@ bluetooth-hci_sock-purge-socket-queues-in-the-destruct-callback.patch
 s390-maccess-add-no-dat-mode-to-kernel_write.patch
 s390-setup-init-jump-labels-before-command-line-parsing.patch
 tcp-fix-listen-regression-in-5.15.88.patch
+thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch

diff --git a/queue-4.14/thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch b/queue-4.14/thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch
new file mode 100644 (file)
index 0000000..cebf62d
--- /dev/null
+++ b/queue-4.14/thermal-intel-powerclamp-fix-cur_state-for-multi-package-system.patch
@@ -0,0 +1,97 @@
+From 8e47363588377e1bdb65e2b020b409cfb44dd260 Mon Sep 17 00:00:00 2001
+From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
+Date: Wed, 1 Feb 2023 12:39:41 -0800
+Subject: thermal: intel: powerclamp: Fix cur_state for multi package system
+
+From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
+
+commit 8e47363588377e1bdb65e2b020b409cfb44dd260 upstream.
+
+The powerclamp cooling device cur_state shows actual idle observed by
+package C-state idle counters. But the implementation is not sufficient
+for multi package or multi die system. The cur_state value is incorrect.
+On these systems, these counters must be read from each package/die and
+somehow aggregate them. But there is no good method for aggregation.
+
+It was not a problem when explicit CPU model addition was required to
+enable intel powerclamp. In this way certain CPU models could have
+been avoided. But with the removal of CPU model check with the
+availability of Package C-state counters, the driver is loaded on most
+of the recent systems.
+
+For multi package/die systems, just show the actual target idle state,
+the system is trying to achieve. In powerclamp this is the user set
+state minus one.
+
+Also there is no use of starting a worker thread for polling package
+C-state counters and applying any compensation for multiple package
+or multiple die systems.
+
+Fixes: b721ca0d1927 ("thermal/powerclamp: remove cpu whitelist")
+Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
+Cc: 4.14+ <stable@vger.kernel.org> # 4.14+
+Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/thermal/intel_powerclamp.c |   20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+--- a/drivers/thermal/intel_powerclamp.c
++++ b/drivers/thermal/intel_powerclamp.c
+@@ -72,6 +72,7 @@
+ 
+ static unsigned int target_mwait;
+ static struct dentry *debug_dir;
++static bool poll_pkg_cstate_enable;
+ 
+ /* user selected target */
+ static unsigned int set_target_ratio;
+@@ -280,6 +281,9 @@ static unsigned int get_compensation(int
+ {
+       unsigned int comp = 0;
+ 
++      if (!poll_pkg_cstate_enable)
++              return 0;
++
+       /* we only use compensation if all adjacent ones are good */
+       if (ratio == 1 &&
+               cal_data[ratio].confidence >= CONFIDENCE_OK &&
+@@ -552,7 +556,8 @@ static int start_power_clamp(void)
+       control_cpu = cpumask_first(cpu_online_mask);
+ 
+       clamping = true;
+-      schedule_delayed_work(&poll_pkg_cstate_work, 0);
++      if (poll_pkg_cstate_enable)
++              schedule_delayed_work(&poll_pkg_cstate_work, 0);
+ 
+       /* start one kthread worker per online cpu */
+       for_each_online_cpu(cpu) {
+@@ -621,11 +626,15 @@ static int powerclamp_get_max_state(stru
+ static int powerclamp_get_cur_state(struct thermal_cooling_device *cdev,
+                                unsigned long *state)
+ {
+-      if (true == clamping)
+-              *state = pkg_cstate_ratio_cur;
+-      else
++      if (clamping) {
++              if (poll_pkg_cstate_enable)
++                      *state = pkg_cstate_ratio_cur;
++              else
++                      *state = set_target_ratio;
++      } else {
+               /* to save power, do not poll idle ratio while not clamping */
+               *state = -1; /* indicates invalid state */
++      }
+ 
+       return 0;
+ }
+@@ -770,6 +779,9 @@ static int __init powerclamp_init(void)
+               goto exit_unregister;
+       }
+ 
++      if (topology_max_packages() == 1)
++              poll_pkg_cstate_enable = true;
++
+       cooling_dev = thermal_cooling_device_register("intel_powerclamp", NULL,
+                                               &powerclamp_cooling_ops);
+       if (IS_ERR(cooling_dev)) {