soc: qcom: rpmh: Invalidate SLEEP and WAKE TCSes before flushing new data

commit f5ac95f9ca2f439179a5baf48e1c0f22f83d936e upstream.

TCSes have previously programmed data when rpmh_flush() is called.
This can cause old data to trigger along with newly flushed.

Fix this by cleaning SLEEP and WAKE TCSes before new data is flushed.

With this there is no need to invoke rpmh_rsc_invalidate() call from
rpmh_invalidate().

Simplify rpmh_invalidate() by moving invalidate_batch() inside.

Fixes: 600513dfeef3 ("drivers: qcom: rpmh: cache sleep/wake state requests")
Signed-off-by: Maulik Shah <mkshah@codeaurora.org>
Reviewed-by: Douglas Anderson <dianders@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Link: https://lore.kernel.org/r/1586703004-13674-4-git-send-email-mkshah@codeaurora.org
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/soc/qcom/rpmh.c b/drivers/soc/qcom/rpmh.c
index a71ee5c25255af23ac08bd8cb1d16143f5f74ef8..b208073e0ab6055d0a72b55836ad628fbbb88dbc 100644 (file)
--- a/drivers/soc/qcom/rpmh.c
+++ b/drivers/soc/qcom/rpmh.c
@@ -318,19 +318,6 @@ static int flush_batch(struct rpmh_ctrlr *ctrlr)
        return ret;
 }
 
-static void invalidate_batch(struct rpmh_ctrlr *ctrlr)
-{
-       struct batch_cache_req *req, *tmp;
-       unsigned long flags;
-
-       spin_lock_irqsave(&ctrlr->cache_lock, flags);
-       list_for_each_entry_safe(req, tmp, &ctrlr->batch_cache, list)
-               kfree(req);
-       INIT_LIST_HEAD(&ctrlr->batch_cache);
-       ctrlr->dirty = true;
-       spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
-}
-
 /**
  * rpmh_write_batch: Write multiple sets of RPMH commands and wait for the
  * batch to finish.
@@ -470,6 +457,13 @@ int rpmh_flush(const struct device *dev)
                return 0;
        }
 
+       /* Invalidate the TCSes first to avoid stale data */
+       do {
+               ret = rpmh_rsc_invalidate(ctrlr_to_drv(ctrlr));
+       } while (ret == -EAGAIN);
+       if (ret)
+               return ret;
+
        /* First flush the cached batch requests */
        ret = flush_batch(ctrlr);
        if (ret)
@@ -501,24 +495,25 @@ int rpmh_flush(const struct device *dev)
 EXPORT_SYMBOL(rpmh_flush);
 
 /**
- * rpmh_invalidate: Invalidate all sleep and active sets
- * sets.
+ * rpmh_invalidate: Invalidate sleep and wake sets in batch_cache
  *
  * @dev: The device making the request
  *
- * Invalidate the sleep and active values in the TCS blocks.
+ * Invalidate the sleep and wake values in batch_cache.
  */
 int rpmh_invalidate(const struct device *dev)
 {
        struct rpmh_ctrlr *ctrlr = get_rpmh_ctrlr(dev);
-       int ret;
-
-       invalidate_batch(ctrlr);
+       struct batch_cache_req *req, *tmp;
+       unsigned long flags;
 
-       do {
-               ret = rpmh_rsc_invalidate(ctrlr_to_drv(ctrlr));
-       } while (ret == -EAGAIN);
+       spin_lock_irqsave(&ctrlr->cache_lock, flags);
+       list_for_each_entry_safe(req, tmp, &ctrlr->batch_cache, list)
+               kfree(req);
+       INIT_LIST_HEAD(&ctrlr->batch_cache);
+       ctrlr->dirty = true;
+       spin_unlock_irqrestore(&ctrlr->cache_lock, flags);
 
-       return ret;
+       return 0;
 }
 EXPORT_SYMBOL(rpmh_invalidate);