@@ -79,17 +79,13 @@ struct sof_vfe {
struct completion completion;
spinlock_t vq_lock;
- /* A shared capture / playback virtual queue data buffer */
- union {
- struct dsp_sof_data_req data_req;
- struct dsp_sof_data_resp data_resp;
- };
+ /* Pointers for virtual queue data buffers */
+ struct dsp_sof_data_req *playback_buf;
+ struct dsp_sof_data_resp *capture_buf;
/* Headers, used as a playback response or capture request */
- union {
- u8 hdr_req[HDR_SIZE_REQ];
- u8 hdr_resp[HDR_SIZE_RESP];
- };
+ u8 hdr_req[HDR_SIZE_REQ];
+ u8 hdr_resp[HDR_SIZE_RESP];
};
/* Firmware ready IPC. */
@@ -422,7 +418,7 @@ static int sof_vfe_pcm_read_part(struct snd_sof_dev *sdev,
void __user *buf, unsigned long chunk_size)
{
struct sof_vfe *vfe = sdev->pdata->vfe;
- struct dsp_sof_data_resp *data = &vfe->data_resp;
+ struct dsp_sof_data_resp *data = vfe->capture_buf;
struct scatterlist sg_out, sg_in, *sgs[] = {&sg_out, &sg_in};
struct dsp_sof_data_req *req = (struct dsp_sof_data_req *)vfe->hdr_req;
unsigned int len;
@@ -480,7 +476,7 @@ static int sof_vfe_pcm_write_part(struct snd_sof_dev *sdev,
void __user *buf, unsigned long chunk_size)
{
struct sof_vfe *vfe = sdev->pdata->vfe;
- struct dsp_sof_data_req *data = &vfe->data_req;
+ struct dsp_sof_data_req *data = vfe->playback_buf;
struct scatterlist sg_out, sg_in, *sgs[] = {&sg_out, &sg_in};
struct dsp_sof_data_resp *resp = (struct dsp_sof_data_resp *)vfe->hdr_resp;
unsigned int len;
@@ -596,9 +592,43 @@ static int sof_vfe_pcm_open(struct snd_sof_dev *sdev,
static int sof_vfe_pcm_close(struct snd_sof_dev *sdev,
struct snd_pcm_substream *substream)
{
+ struct sof_vfe *vfe = sdev->pdata->vfe;
+
pm_runtime_mark_last_busy(sdev->dev);
pm_runtime_put_autosuspend(sdev->dev);
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
+ kfree(vfe->playback_buf);
+ vfe->playback_buf = NULL;
+ } else {
+ kfree(vfe->capture_buf);
+ vfe->capture_buf = NULL;
+ }
+
+ return 0;
+}
+
+static int sof_vfe_pcm_hw_params(struct snd_sof_dev *sdev,
+ struct snd_pcm_substream *substream,
+ struct snd_pcm_hw_params *params,
+ struct sof_ipc_stream_params *ipc_params)
+{
+ struct sof_vfe *vfe = sdev->pdata->vfe;
+
+ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK &&
+ !vfe->playback_buf) {
+ vfe->playback_buf = kmalloc(sizeof(*vfe->playback_buf),
+ GFP_KERNEL);
+ if (!vfe->playback_buf)
+ return -ENOMEM;
+ } else if (substream->stream == SNDRV_PCM_STREAM_CAPTURE &&
+ !vfe->capture_buf) {
+ vfe->capture_buf = kmalloc(sizeof(*vfe->capture_buf),
+ GFP_KERNEL);
+ if (!vfe->capture_buf)
+ return -ENOMEM;
+ }
+
return 0;
}
@@ -629,6 +659,7 @@ struct snd_sof_dsp_ops snd_sof_vfe_ops = {
.pcm_open = sof_vfe_pcm_open,
.pcm_close = sof_vfe_pcm_close,
+ .pcm_hw_params = sof_vfe_pcm_hw_params,
.run = sof_vfe_run,
.block_read = sof_vfe_block_read,
Dynamically allocate separate playback and capture buffers to enable simultaneous playback and capture. Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com> --- sound/soc/sof/virtio-fe.c | 53 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 11 deletions(-)