soundwire: qcom: set continue execution flag for ignored commands
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Tue, 30 Mar 2021 14:47:13 +0000 (15:47 +0100)
committerVinod Koul <vkoul@kernel.org>
Tue, 30 Mar 2021 17:25:07 +0000 (22:55 +0530)
version 1.5.1 and higher IPs of this controller required to set
continue execution on ignored command flag. This patch sets this flag.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210330144719.13284-4-srinivas.kandagatla@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/soundwire/qcom.c

index fdcb8ff..edc77d1 100644 (file)
@@ -40,6 +40,7 @@
 #define SWRM_CMD_FIFO_CMD                                      0x308
 #define SWRM_CMD_FIFO_STATUS                                   0x30C
 #define SWRM_CMD_FIFO_CFG_ADDR                                 0x314
+#define SWRM_CONTINUE_EXEC_ON_CMD_IGNORE                       BIT(31)
 #define SWRM_RD_WR_CMD_RETRIES                                 0x7
 #define SWRM_CMD_FIFO_RD_FIFO_ADDR                             0x318
 #define SWRM_ENUMERATOR_CFG_ADDR                               0x500
@@ -343,7 +344,15 @@ static int qcom_swrm_init(struct qcom_swrm_ctrl *ctrl)
        ctrl->reg_write(ctrl, SWRM_MCP_CFG_ADDR, val);
 
        /* Configure number of retries of a read/write cmd */
-       ctrl->reg_write(ctrl, SWRM_CMD_FIFO_CFG_ADDR, SWRM_RD_WR_CMD_RETRIES);
+       if (ctrl->version > 0x01050001) {
+               /* Only for versions >= 1.5.1 */
+               ctrl->reg_write(ctrl, SWRM_CMD_FIFO_CFG_ADDR,
+                               SWRM_RD_WR_CMD_RETRIES |
+                               SWRM_CONTINUE_EXEC_ON_CMD_IGNORE);
+       } else {
+               ctrl->reg_write(ctrl, SWRM_CMD_FIFO_CFG_ADDR,
+                               SWRM_RD_WR_CMD_RETRIES);
+       }
 
        /* Set IRQ to PULSE */
        ctrl->reg_write(ctrl, SWRM_COMP_CFG_ADDR,