soundwire: qcom: check for outanding writes before doing a read

[ Upstream commit 49a467310dc4fae591a3547860ee04d8730780f4 ]

Reading will increase the fifo count, so check for outstanding cmd wrt.
write fifo depth to avoid overflow as read will also increase
write fifo cnt.

Fixes: a661308c34de ("soundwire: qcom: wait for fifo space to be available before read/write")
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20221026110210.6575-3-srinivas.kandagatla@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c
index 87ccaebc8453a8dacf0223d7272c89666e71151c..6e5990611d834220354c92e50acab011220ffe33 100644 (file)
--- a/drivers/soundwire/qcom.c
+++ b/drivers/soundwire/qcom.c
@@ -380,6 +380,12 @@ static int qcom_swrm_cmd_fifo_rd_cmd(struct qcom_swrm_ctrl *swrm,
 
        val = swrm_get_packed_reg_val(&swrm->rcmd_id, len, dev_addr, reg_addr);
 
+       /*
+        * Check for outstanding cmd wrt. write fifo depth to avoid
+        * overflow as read will also increase write fifo cnt.
+        */
+       swrm_wait_for_wr_fifo_avail(swrm);
+
        /* wait for FIFO RD to complete to avoid overflow */
        usleep_range(100, 105);
        swrm->reg_write(swrm, SWRM_CMD_FIFO_RD_CMD, val);