ASoC: wm_adsp: Add VPU voice trigger compressed streams support

Change-Id: Iafc4ed961d39050530799fb959ec47c047e6ea42
Signed-off-by: Andrew Ford <[email protected]>

Author: afordcirrus

sound/soc/codecs/wm_adsp.c

@@ -580,6 +580,7 @@ struct wm_adsp_compr_buf {
 	u32 irq_count;
 	int read_index;
 	int avail;
+	int host_buf_mem_type;
 };
 
 struct wm_adsp_compr {
@@ -3431,6 +3432,12 @@ static void wm_vpu_boot_work(struct work_struct *work)
 	if (ret != 0)
 		goto err;
 
+	if (wm_adsp_fw[vpu->fw].num_caps != 0) {
+		ret = wm_adsp_buffer_init(vpu);
+		if (ret < 0)
+			goto err;
+	}
+
 	vpu->booted = true;
 
 err:
@@ -4203,14 +4210,14 @@ static int wm_adsp_write_data_word(struct wm_adsp *dsp, int mem_type,
 static inline int wm_adsp_buffer_read(struct wm_adsp_compr_buf *buf,
 				      unsigned int field_offset, u32 *data)
 {
-	return wm_adsp_read_data_word(buf->dsp, WMFW_ADSP2_XM,
+	return wm_adsp_read_data_word(buf->dsp, buf->host_buf_mem_type,
 				      buf->host_buf_ptr + field_offset, data);
 }
 
 static inline int wm_adsp_buffer_write(struct wm_adsp_compr_buf *buf,
 				       unsigned int field_offset, u32 data)
 {
-	return wm_adsp_write_data_word(buf->dsp, WMFW_ADSP2_XM,
+	return wm_adsp_write_data_word(buf->dsp, buf->host_buf_mem_type,
 				       buf->host_buf_ptr + field_offset, data);
 }
 
@@ -4260,6 +4267,8 @@ static int wm_adsp_legacy_host_buf_addr(struct wm_adsp_compr_buf *buf)
 	if (!buf->host_buf_ptr)
 		return -EIO;
 
+	buf->host_buf_mem_type = WMFW_ADSP2_XM;
+
 	adsp_dbg(dsp, "host_buf_ptr=%x\n", buf->host_buf_ptr);
 
 	return 0;
@@ -4278,6 +4287,7 @@ static struct wm_coeff_ctl *wm_adsp_find_host_buffer_ctrl(
 		if (!ctl->enabled)
 			continue;
 
+		buf->host_buf_mem_type = ctl->alg_region.type;
 		return ctl;
 	}