soc: qcom: rpmh: Dirt can only make you dirtier, not cleaner

BugLink: https://bugs.launchpad.net/bugs/1889669
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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c
index ae2d1590a611bfd6ab29f8a7c4d562a3eb7a09ec..13e1b450f296736c941ac03c763e063c16e65beb 100644 (file)
--- 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);