ASoC: q6dsp: q6afe: add lpass hw voting support

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200910101732.23484-6-srinivas.kandagatla@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/qcom/qdsp6/q6afe.c b/sound/soc/qcom/qdsp6/q6afe.c
index 2a8e3c3..51c94dd 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6afe.c
+++ b/sound/soc/qcom/qdsp6/q6afe.c
@@ -43,6 +43,9 @@
 #define AFE_PARAM_ID_TDM_CONFIG        0x0001029D
 #define AFE_PARAM_ID_PORT_SLOT_MAPPING_CONFIG  0x00010297
 #define AFE_PARAM_ID_CODEC_DMA_CONFIG  0x000102B8
+#define AFE_CMD_REMOTE_LPASS_CORE_HW_VOTE_REQUEST      0x000100f4
+#define AFE_CMD_RSP_REMOTE_LPASS_CORE_HW_VOTE_REQUEST   0x000100f5
+#define AFE_CMD_REMOTE_LPASS_CORE_HW_DEVOTE_REQUEST    0x000100f6
 
 /* I2S config specific */
 #define AFE_API_VERSION_I2S_CONFIG     0x1
@@ -545,6 +548,18 @@ struct q6afe_port {
        struct list_head node;
 };
 
+struct afe_cmd_remote_lpass_core_hw_vote_request {
+        uint32_t  hw_block_id;
+        char client_name[8];
+} __packed;
+
+struct afe_cmd_remote_lpass_core_hw_devote_request {
+        uint32_t  hw_block_id;
+        uint32_t client_handle;
+} __packed;
+
+
+
 struct afe_port_map {
        int port_id;
        int token;
@@ -880,6 +895,11 @@ static int q6afe_callback(struct apr_device *adev, struct apr_resp_pkt *data)
                }
        }
                break;
+       case AFE_CMD_RSP_REMOTE_LPASS_CORE_HW_VOTE_REQUEST:
+               afe->result.opcode = hdr->opcode;
+               afe->result.status = res->status;
+               wake_up(&afe->wait);
+               break;
        default:
                break;
        }
@@ -1593,6 +1613,85 @@ void q6afe_port_put(struct q6afe_port *port)
 }
 EXPORT_SYMBOL_GPL(q6afe_port_put);
 
+int q6afe_unvote_lpass_core_hw(struct device *dev, uint32_t hw_block_id,
+                              uint32_t client_handle)
+{
+       struct q6afe *afe = dev_get_drvdata(dev->parent);
+       struct afe_cmd_remote_lpass_core_hw_devote_request *vote_cfg;
+       struct apr_pkt *pkt;
+       int ret = 0;
+       int pkt_size;
+       void *p;
+
+       pkt_size = APR_HDR_SIZE + sizeof(*vote_cfg);
+       p = kzalloc(pkt_size, GFP_KERNEL);
+       if (!p)
+               return -ENOMEM;
+
+       pkt = p;
+       vote_cfg = p + APR_HDR_SIZE;
+
+       pkt->hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD,
+                                          APR_HDR_LEN(APR_HDR_SIZE),
+                                          APR_PKT_VER);
+       pkt->hdr.pkt_size = pkt_size;
+       pkt->hdr.src_port = 0;
+       pkt->hdr.dest_port = 0;
+       pkt->hdr.token = hw_block_id;
+       pkt->hdr.opcode = AFE_CMD_REMOTE_LPASS_CORE_HW_DEVOTE_REQUEST;
+       vote_cfg->hw_block_id = hw_block_id;
+       vote_cfg->client_handle = client_handle;
+
+       ret = apr_send_pkt(afe->apr, pkt);
+       if (ret < 0)
+               dev_err(afe->dev, "AFE failed to unvote (%d)\n", hw_block_id);
+
+       kfree(pkt);
+       return ret;
+}
+EXPORT_SYMBOL(q6afe_unvote_lpass_core_hw);
+
+int q6afe_vote_lpass_core_hw(struct device *dev, uint32_t hw_block_id,
+                            char *client_name, uint32_t *client_handle)
+{
+       struct q6afe *afe = dev_get_drvdata(dev->parent);
+       struct afe_cmd_remote_lpass_core_hw_vote_request *vote_cfg;
+       struct apr_pkt *pkt;
+       int ret = 0;
+       int pkt_size;
+       void *p;
+
+       pkt_size = APR_HDR_SIZE + sizeof(*vote_cfg);
+       p = kzalloc(pkt_size, GFP_KERNEL);
+       if (!p)
+               return -ENOMEM;
+
+       pkt = p;
+       vote_cfg = p + APR_HDR_SIZE;
+
+       pkt->hdr.hdr_field = APR_HDR_FIELD(APR_MSG_TYPE_SEQ_CMD,
+                                          APR_HDR_LEN(APR_HDR_SIZE),
+                                          APR_PKT_VER);
+       pkt->hdr.pkt_size = pkt_size;
+       pkt->hdr.src_port = 0;
+       pkt->hdr.dest_port = 0;
+       pkt->hdr.token = hw_block_id;
+       pkt->hdr.opcode = AFE_CMD_REMOTE_LPASS_CORE_HW_VOTE_REQUEST;
+       vote_cfg->hw_block_id = hw_block_id;
+       strlcpy(vote_cfg->client_name, client_name,
+                       sizeof(vote_cfg->client_name));
+
+       ret = afe_apr_send_pkt(afe, pkt, NULL,
+                              AFE_CMD_RSP_REMOTE_LPASS_CORE_HW_VOTE_REQUEST);
+       if (ret)
+               dev_err(afe->dev, "AFE failed to vote (%d)\n", hw_block_id);
+
+
+       kfree(pkt);
+       return ret;
+}
+EXPORT_SYMBOL(q6afe_vote_lpass_core_hw);
+
 static int q6afe_probe(struct apr_device *adev)
 {
        struct q6afe *afe;

diff --git a/sound/soc/qcom/qdsp6/q6afe.h b/sound/soc/qcom/qdsp6/q6afe.h
index 1f7cbed..9359267 100644 (file)
--- a/sound/soc/qcom/qdsp6/q6afe.h
+++ b/sound/soc/qcom/qdsp6/q6afe.h
@@ -133,6 +133,10 @@
 /* Clock ID for INT MCLK1 */
 #define Q6AFE_LPASS_CLK_ID_INT_MCLK_1                             0x306
 
+#define Q6AFE_LPASS_CORE_AVTIMER_BLOCK                 0x2
+#define Q6AFE_LPASS_CORE_HW_MACRO_BLOCK                        0x3
+#define Q6AFE_LPASS_CORE_HW_DCODEC_BLOCK               0x4
+
 /* Clock attribute for invalid use (reserved for internal usage) */
 #define Q6AFE_LPASS_CLK_ATTRIBUTE_INVALID              0x0
 /* Clock attribute for no couple case */
@@ -220,4 +224,8 @@ void q6afe_cdc_dma_port_prepare(struct q6afe_port *port,
 int q6afe_port_set_sysclk(struct q6afe_port *port, int clk_id,
                          int clk_src, int clk_root,
                          unsigned int freq, int dir);
+int q6afe_vote_lpass_core_hw(struct device *dev, uint32_t hw_block_id,
+                            char *client_name, uint32_t *client_handle);
+int q6afe_unvote_lpass_core_hw(struct device *dev, uint32_t hw_block_id,
+                              uint32_t client_handle);
 #endif /* __Q6AFE_H__ */