| From 73ddebb4a747871772678d801da9bfabfeaa54de Mon Sep 17 00:00:00 2001 |
| From: Douglas Anderson <dianders@chromium.org> |
| Date: Fri, 17 Apr 2020 14:15:47 -0700 |
| Subject: [PATCH] soc: qcom: rpmh: Dirt can only make you dirtier, not cleaner |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c |
| index ae2d1590a611..13e1b450f296 100644 |
| --- a/drivers/soc/qcom/rpmh.c |
| +++ b/drivers/soc/qcom/rpmh.c |
| @@ -150,10 +150,10 @@ static struct cache_req *cache_rpm_request(struct rpmh_ctrlr *ctrlr, |
| 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); |
| -- |
| 2.27.0 |
| |
