4.19-stable patches

added patches:
	soc-qcom-rpmh-dirt-can-only-make-you-dirtier-not-cleaner.patch

diff --git a/queue-4.19/series b/queue-4.19/series
index 285528cebb40bd56c0038b78640a2e38cd24cae3..1202433b62ac19ea9669c013f5b90fa202afbc0c 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -1,3 +1,4 @@
+soc-qcom-rpmh-dirt-can-only-make-you-dirtier-not-cleaner.patch
 gpio-arizona-handle-pm_runtime_get_sync-failure-case.patch
 gpio-arizona-put-pm_runtime-in-case-of-failure.patch
 pinctrl-amd-fix-npins-for-uart0-in-kerncz_groups.patch

diff --git a/queue-4.19/soc-qcom-rpmh-dirt-can-only-make-you-dirtier-not-cleaner.patch b/queue-4.19/soc-qcom-rpmh-dirt-can-only-make-you-dirtier-not-cleaner.patch
new file mode 100644 (file)
index 0000000..99e5d02
--- /dev/null
+++ b/queue-4.19/soc-qcom-rpmh-dirt-can-only-make-you-dirtier-not-cleaner.patch
@@ -0,0 +1,43 @@
+From 35bb4b22f606c0cc8eedf567313adc18161b1af4 Mon Sep 17 00:00:00 2001
+From: Douglas Anderson <dianders@chromium.org>
+Date: Fri, 17 Apr 2020 14:15:47 -0700
+Subject: soc: qcom: rpmh: Dirt can only make you dirtier, not cleaner
+
+From: Douglas Anderson <dianders@chromium.org>
+
+commit 35bb4b22f606c0cc8eedf567313adc18161b1af4 upstream.
+
+Adding an item into the cache should never be able to make the cache
+cleaner.  Use "|=" rather than "=" to update the dirty flag.
+
+Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
+Reviewed-by: Maulik Shah <mkshah@codeaurora.org> Thanks, Maulik
+Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+Fixes: bb7000677a1b ("soc: qcom: rpmh: Update dirty flag only when data changes")
+Reported-by: Stephen Boyd <swboyd@chromium.org>
+Signed-off-by: Douglas Anderson <dianders@chromium.org>
+Link: https://lore.kernel.org/r/20200417141531.1.Ia4b74158497213eabad7c3d474c50bfccb3f342e@changeid
+Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/soc/qcom/rpmh.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/drivers/soc/qcom/rpmh.c
++++ b/drivers/soc/qcom/rpmh.c
+@@ -150,10 +150,10 @@ existing:
+               break;
+       }
+ 
+-      ctrlr->dirty = (req->sleep_val != old_sleep_val ||
+-                      req->wake_val != old_wake_val) &&
+-                      req->sleep_val != UINT_MAX &&
+-                      req->wake_val != UINT_MAX;
++      ctrlr->dirty |= (req->sleep_val != old_sleep_val ||
++                       req->wake_val != old_wake_val) &&
++                       req->sleep_val != UINT_MAX &&
++                       req->wake_val != UINT_MAX;
+ 
+ unlock:
+       spin_unlock_irqrestore(&ctrlr->cache_lock, flags);