ASoC sst: Add mid platform driver
PATCH 2/4 ASoC sst: Add mid platform driver
This patch adds the platform driver for mid asoc drivers
This platfrom driver sends commands to sst dsp engine driver for the dai operations. For this purpose it depends on intel_sst driver which is currently in staging tree
--- sound/soc/mid-x86/mid_platform.c | 365 ++++++++++++++++++++++++++++++++++ sound/soc/mid-x86/mid_platform.h | 71 +++++++ sound/soc/mid-x86/mid_platform_lib.c | 122 +++++++++++ 3 files changed, 558 insertions(+), 0 deletions(-) create mode 100644 sound/soc/mid-x86/mid_platform.c create mode 100644 sound/soc/mid-x86/mid_platform.h create mode 100644 sound/soc/mid-x86/mid_platform_lib.c
sound/soc/mid-x86/mid_platform.c new file +365 -0
@@ -0,0 +1,365 @@ +/* +* mid_platform.c - Intel MID common Platform driver +* +* Copyright (C) 2010 Intel Corp +* Author: Vinod Koul <[email protected]> +* Author: Harsha Priya <[email protected]> +* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; version 2 of the License. +* +* This program is distributed in the hope that it will be useful, but +* WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* General Public License for more details. +* +* You should have received a copy of the GNU General Public License along +* with this program; if not, write to the Free Software Foundation, Inc., +* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. +* +* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* +* +*/ +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt + +#include <linux/slab.h> +#include <sound/core.h> +#include <sound/pcm.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include "../../../drivers/staging/intel_sst/intel_sst.h" +#include "mid_platform.h" + +static struct snd_pcm_hardware snd_intelmad_pcm_hw = { + .info = (SNDRV_PCM_INFO_INTERLEAVED | +SNDRV_PCM_INFO_DOUBLE | +SNDRV_PCM_INFO_PAUSE | +SNDRV_PCM_INFO_RESUME | +SNDRV_PCM_INFO_MMAP | +SNDRV_PCM_INFO_MMAP_VALID | +SNDRV_PCM_INFO_BLOCK_TRANSFER | +SNDRV_PCM_INFO_SYNC_START ), + .formats = (SNDRV_PCM_FMTBIT_S16 |SNDRV_PCM_FMTBIT_U16 | +SNDRV_PCM_FMTBIT_S24 |SNDRV_PCM_FMTBIT_U24 | +SNDRV_PCM_FMTBIT_S32 |SNDRV_PCM_FMTBIT_U32 ), + .rates = (SNDRV_PCM_RATE_8000 | +SNDRV_PCM_RATE_44100 | +SNDRV_PCM_RATE_48000 ), + .rate_min =MID_MIN_RATE , + .rate_max =MID_MAX_RATE , + .channels_min =MID_MIN_CHANNEL , + .channels_max =MID_MAX_CHANNEL , + .buffer_bytes_max =MID_MAX_BUFFER , + .period_bytes_min =MID_MIN_PERIOD_BYTES , + .period_bytes_max =MID_MAX_PERIOD_BYTES , + .periods_min =MID_MIN_PERIODS , + .periods_max =MID_MAX_PERIODS , + .fifo_size =MID_FIFO_SIZE , +}; + +/*MFLD - MSIC*/ +struct snd_soc_dai_driver mfld_dai[] = { +{ + .name ="Headset-cpu-dai" , + .id =0 , + .playback = { + .channels_min =MID_STEREO , + .channels_max =MID_STEREO , + .rates =SNDRV_PCM_RATE_48000 , + .formats =SNDRV_PCM_FMTBIT_S24_LE , + }, +}, +{ + .name ="Speaker-cpu-dai" , + .id =1 , + .playback = { + .channels_min =MID_MONO , + .channels_max =MID_STEREO , + .rates =SNDRV_PCM_RATE_48000 , + .formats =SNDRV_PCM_FMTBIT_S24_LE , + }, +}, +{ + .name ="Vibra 1-cpu-dai" , + .id =2 , + .playback = { + .channels_min =MID_MONO , + .channels_max =MID_MONO , + .rates =SNDRV_PCM_RATE_48000 , + .formats =SNDRV_PCM_FMTBIT_S24_LE , + }, +}, +{ + .name ="Vibra 2-cpu-dai" , + .id =3 , + .playback = { + .channels_min =MID_MONO , + .channels_max =MID_STEREO , + .rates =SNDRV_PCM_RATE_48000 , + .formats =SNDRV_PCM_FMTBIT_S24_LE , + }, +}, +}; + +static int mid_platform_open (struct snd_pcm_substream *substream) +{ +struct snd_pcm_runtime *runtime; +struct mid_runtime_stream *stream; +int ret_val =0 ; + +pr_debug ("mid_platform_open called\n" ); + + runtime = substream->runtime; + runtime->hw = snd_intelmad_pcm_hw; + + stream =kzalloc (sizeof (*stream),GFP_KERNEL ); +if (!stream) +return -ENOMEM ; + stream->stream_info.str_id =0 ; + stream->stream_status =INIT ; + stream->stream_info.mad_substream = substream; +/* allocate memory for SST API set */ + stream->sstdrv_ops =kzalloc (sizeof (*stream->sstdrv_ops), +GFP_KERNEL ); +if (!stream->sstdrv_ops) { +pr_err ("sst: mem allocation for ops fail\n" ); +kfree (stream); +return -ENOMEM ; + } + stream->sstdrv_ops->scard_ops =NULL ; + stream->sstdrv_ops->vendor_id =MSIC_VENDOR_ID ; + stream->sstdrv_ops->module_name ="msic_audio" ; + +/* registering with SST driver to get access to SST APIs to use */ + ret_val =register_sst_card (stream->sstdrv_ops); +if (ret_val) { +pr_err ("sst: sst card registration failed\n" ); +return ret_val; + } + runtime->private_data = stream; +return snd_pcm_hw_constraint_integer (runtime, +SNDRV_PCM_HW_PARAM_PERIODS ); +} + +static int mid_platform_close (struct snd_pcm_substream *substream) +{ +struct mid_runtime_stream *stream; +int ret_val =0 , str_id; + +pr_debug ("mid_platform_close called\n" ); + + stream = substream->runtime->private_data; + str_id = stream->stream_info.str_id; + +if (str_id) + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_FREE , &str_id); +kfree (stream->sstdrv_ops); +kfree (stream); +return ret_val; +} + +static int mid_platform_pcm_prepare (struct snd_pcm_substream *substream) +{ +struct mid_runtime_stream *stream; +int ret_val =0 , str_id; + +pr_debug ("mid_platform_pcm_prepare called\n" ); + + stream = substream->runtime->private_data; + str_id = stream->stream_info.str_id; +if (stream->stream_info.str_id) { + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_DROP , &str_id); +return ret_val; + } + + ret_val =snd_intelmad_alloc_stream (substream); +if (ret_val <0 ) +return ret_val; +snprintf (substream->pcm->id,sizeof (substream->pcm->id), +"%d" , stream->stream_info.str_id); + + ret_val =snd_intelmad_init_stream (substream); +if (ret_val) +return ret_val; + substream->runtime->hw.info =SNDRV_PCM_INFO_BLOCK_TRANSFER ; +return ret_val; +} + +static int mid_platform_pcm_trigger (struct snd_pcm_substream *substream, +int cmd) +{ +int ret_val =0 , str_id; +struct mid_runtime_stream *stream; + +pr_debug ("mid_platform_pcm_trigger called\n" ); + + stream = substream->runtime->private_data; + + str_id = stream->stream_info.str_id; + +switch (cmd) { +case SNDRV_PCM_TRIGGER_START : +pr_debug ("sst: Trigger Start\n" ); + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_START , &str_id); +if (ret_val) +return ret_val; + stream->stream_status =RUNNING ; + stream->stream_info.mad_substream = substream; +break ; +case SNDRV_PCM_TRIGGER_STOP : +pr_debug ("sst: in stop\n" ); + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_DROP , &str_id); +if (ret_val) +return ret_val; + stream->stream_status =DROPPED ; +break ; +case SNDRV_PCM_TRIGGER_PAUSE_PUSH : +pr_debug ("sst: in pause\n" ); + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_PAUSE , &str_id); +if (ret_val) +return ret_val; + stream->stream_status =PAUSED ; +break ; +case SNDRV_PCM_TRIGGER_PAUSE_RELEASE : +pr_debug ("sst: in pause release\n" ); + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_RESUME , &str_id); +if (ret_val) +return ret_val; + stream->stream_status =RUNNING ; +break ; +default : +return -EINVAL ; + } +return ret_val; +} + + +static snd_pcm_uframes_t mid_platform_pcm_pointer + (struct snd_pcm_substream *substream) +{ +/* struct snd_pcm_runtime *runtime = substream->runtime; */ +struct mid_runtime_stream *stream; +int ret_val; +struct pcm_stream_info *str_info; + +pr_debug ("mid_platform_pcm_pointer called\n" ); + + stream = substream->runtime->private_data; +if (stream->stream_status ==INIT ) +return 0 ; + str_info = &stream->stream_info; + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_BUFFER_POINTER , &str_info); +if (ret_val) { +pr_err ("sst: error code = 0x%x\n" , ret_val); +return ret_val; + } + +return stream->stream_info.buffer_ptr; +} + + +static struct snd_pcm_ops intel_mid_platform_ops = { + .open = mid_platform_open, + .close = mid_platform_close, + .ioctl = snd_pcm_lib_ioctl, + .prepare = mid_platform_pcm_prepare, + .trigger = mid_platform_pcm_trigger, + .pointer = mid_platform_pcm_pointer, +}; + +static void intel_mid_pcm_free (struct snd_pcm *pcm) +{ +pr_debug ("intel_mid_pcm_free called\n" ); +snd_pcm_lib_preallocate_free_for_all (pcm); +} + +int intel_mid_pcm_new (struct snd_card *card,struct snd_soc_dai *dai, +struct snd_pcm *pcm) +{ +int retval =0 ; + +pr_debug ("intel_mid_pcm_new called\n" ); + +if (dai->driver->playback.channels_min || + dai->driver->capture.channels_min) { + retval =snd_pcm_lib_preallocate_pages_for_all (pcm, +SNDRV_DMA_TYPE_CONTINUOUS , +snd_dma_continuous_data (GFP_KERNEL ), +MID_MIN_BUFFER ,MID_MAX_BUFFER ); +if (retval) { +pr_err ("dma buffer allocationf fail\n" ); +return retval; + } + } + +return retval; +} +struct snd_soc_platform_driver intelmid_soc_platform_drv = { + .ops = &intel_mid_platform_ops, + .pcm_new = intel_mid_pcm_new, + .pcm_free = intel_mid_pcm_free, +}; + +static int intelmid_platform_probe (struct platform_device *pdev) +{ +int ret; + +pr_debug ("intelmid_platform_probe called\n" ); + ret =snd_soc_register_platform (&pdev->dev, &intelmid_soc_platform_drv); +if (ret) { +pr_err ("registering soc platform failed\n" ); +return ret; + } +return snd_soc_register_dais (&pdev->dev, + mfld_dai,ARRAY_SIZE (mfld_dai)); +} + +static int intelmid_platform_remove (struct platform_device *pdev) +{ + +snd_soc_unregister_dais (&pdev->dev,ARRAY_SIZE (mfld_dai)); + +snd_soc_unregister_platform (&pdev->dev); +pr_debug ("intelmid_platform_remove sucess\n" ); + +return 0 ; +} + +static struct platform_driver intelmid_platform_driver = { + .driver = { + .name ="mid-audio-platform" , + .owner =THIS_MODULE , + }, + .probe = intelmid_platform_probe, + .remove = intelmid_platform_remove, +}; + +static int __init intel_mid_soc_platform_init (void ) +{ +pr_debug ("intel_mid_soc_platform_init called\n" ); +return platform_driver_register (&intelmid_platform_driver); +} +module_init (intel_mid_soc_platform_init); + +static void __exit intel_mid_soc_platform_exit(void) +{ +platform_driver_unregister (&intelmid_platform_driver); +pr_debug ("intel_mid_soc_platform_exit sucess\n" ); +} +module_exit (intel_mid_soc_platform_exit); + +MODULE_DESCRIPTION ("ASoC Intel(R) MID Platform driver" ); +MODULE_AUTHOR ("Vinod Koul <[email protected]>" ); +MODULE_AUTHOR ("Harsha Priya <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("mid-platform" );
sound/soc/mid-x86/mid_platform.h new file +71 -0
71 lines not on this page · raw message
sound/soc/mid-x86/mid_platform_lib.c new file +122 -0
122 lines not on this page · raw message
Signature · 1 line
1.7.2.3
sound/soc/mid-x86/mid_platform.c line 214
Quoted 9 lines · Vinod Koul
sound/soc/mid-x86/mid_platform.c new file +9
-0+case SNDRV_PCM_TRIGGER_START : +pr_debug ("sst: Trigger Start\n" ); + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_START , &str_id); +if (ret_val) +return ret_val; + stream->stream_status =RUNNING ; + stream->stream_info.mad_substream = substream; +break ;
You've no locking in the rest of the driver protecting the variables you're updating here.
sound/soc/mid-x86/mid_platform.c line 267
Quoted 13 lines
sound/soc/mid-x86/mid_platform.c new file +13
-0+ + stream = substream->runtime->private_data; +if (stream->stream_status ==INIT ) +return 0 ; + str_info = &stream->stream_info; + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_BUFFER_POINTER , &str_info); +if (ret_val) { +pr_err ("sst: error code = 0x%x\n" , ret_val); +return ret_val; + } + +return stream->stream_info.buffer_ptr;
I suspect you need to return bytes_to_frames() of this...
sound/soc/mid-x86/mid_platform.c line 324
Quoted 8 lines
sound/soc/mid-x86/mid_platform.c new file +8
-0+pr_debug ("intelmid_platform_probe called\n" ); + ret =snd_soc_register_platform (&pdev->dev, &intelmid_soc_platform_drv); +if (ret) { +pr_err ("registering soc platform failed\n" ); +return ret; + } +return snd_soc_register_dais (&pdev->dev, + mfld_dai,ARRAY_SIZE (mfld_dai));
You're not unwinding the platform register if the DAI registration fail.s
sound/soc/mid-x86/mid_platform.c line 365
Quoted 2 lines
sound/soc/mid-x86/mid_platform.c new file +2
-0+MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("mid-platform" );
Same issue as with the CODEC driver here.
sound/soc/mid-x86/mid_platform.h line 49
Quoted 2 lines
sound/soc/mid-x86/mid_platform.h new file +2
-0+int snd_intelmad_alloc_stream (struct snd_pcm_substream *substream); +int snd_intelmad_init_stream (struct snd_pcm_substream *substream);
Why are these exposed here?
sound/soc/mid-x86/mid_platform.h line 69
Quoted 7 lines
sound/soc/mid-x86/mid_platform.h new file +7
-0+enum mid_drv_status { +INIT =1 , +STARTED , +RUNNING , +PAUSED , +DROPPED , +};
Namespacing.
Quoted 13 lines
sound/soc/mid-x86/mid_platform.c line 214
Quoted 10 lines
sound/soc/mid-x86/mid_platform.c new file +9
-0+case SNDRV_PCM_TRIGGER_START : +pr_debug ("sst: Trigger Start\n" ); + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_START , &str_id); +if (ret_val) +return ret_val; + stream->stream_status =RUNNING ; + stream->stream_info.mad_substream = substream; +break ;You've no locking in the rest of the driver protecting the variables you're updating here.
Will fix this
Quoted 7 lines
Quoted 7 lines
sound/soc/mid-x86/mid_platform.c new file +7
-0+ + stream = substream->runtime->private_data; +if (stream->stream_status ==INIT ) +return 0 ; + str_info = &stream->stream_info; + ret_val = stream->sstdrv_ops->control_set ( +SST_SND_BUFFER_POINTER , &str_info);
Quoted 8 lines
sound/soc/mid-x86/mid_platform.c line 267
Quoted 6 lines
sound/soc/mid-x86/mid_platform.c new file +6
-0+if (ret_val) { +pr_err ("sst: error code = 0x%x\n" , ret_val); +return ret_val; + } + +return stream->stream_info.buffer_ptr;I suspect you need to return
bytes_to_frames()of this...
No as the DSP FW returns the frame value for the pointer
Quoted 12 lines
sound/soc/mid-x86/mid_platform.c line 324
Quoted 9 lines
sound/soc/mid-x86/mid_platform.c new file +8
-0+pr_debug ("intelmid_platform_probe called\n" ); + ret =snd_soc_register_platform (&pdev->dev, &intelmid_soc_platform_drv); +if (ret) { +pr_err ("registering soc platform failed\n" ); +return ret; + } +return snd_soc_register_dais (&pdev->dev, + mfld_dai,ARRAY_SIZE (mfld_dai));You're not unwinding the platform register if the DAI registration fail.s
Will fix
Quoted 5 lines
sound/soc/mid-x86/mid_platform.c line 365
Quoted 3 lines
sound/soc/mid-x86/mid_platform.c new file +2
-0+MODULE_LICENSE ("GPL v2" ); +MODULE_ALIAS ("mid-platform" );Same issue as with the CODEC driver here.
Okay
Quoted 4 lines
sound/soc/mid-x86/mid_platform.h line 49
Quoted 2 lines
sound/soc/mid-x86/mid_platform.h new file +2
-0+int snd_intelmad_alloc_stream (struct snd_pcm_substream *substream); +int snd_intelmad_init_stream (struct snd_pcm_substream *substream);Why are these exposed here?
These function are implemented in platform_lib.c and called in mid_platform.c
Quoted 9 lines
sound/soc/mid-x86/mid_platform.h line 69
Quoted 7 lines
sound/soc/mid-x86/mid_platform.h new file +7
-0+enum mid_drv_status { +INIT =1 , +STARTED , +RUNNING , +PAUSED , +DROPPED , +};Namespacing.
Will fix
~Vinod
Quoted 5 lines · Vinod
Quoted 3 lines
sound/soc/mid-x86/mid_platform.c line 267
Quoted 1 line
sound/soc/mid-x86/mid_platform.c new file +1
-0+return stream->stream_info.buffer_ptr;I suspect you need to return
bytes_to_frames()of this...No as the DSP FW returns the frame value for the pointer
In that case your buffer_ptr name is not at all clear - it's not a pointer, it's a frame index.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
sound/soc/mid-x86/mid_platform.c line 267
Quoted 1 line
sound/soc/mid-x86/mid_platform.c new file +1
-0+return stream->stream_info.buffer_ptr;I suspect you need to return
bytes_to_frames()of this...No as the DSP FW returns the frame value for the pointer
In that case your
buffer_ptrname is not at all clear - it's not a pointer, it's a frame index.
Fair enough, will rename to appropriately
~Vinod