Re: [PATCH v2 4/7] ASoC: hda - add Skylake platform driver

[Takashi Iwai <tiwai@suse.de>]

At Fri, 17 Apr 2015 14:43:17 +0530,
Vinod Koul wrote:
> 
> From: Jeeja KP <jeeja.kp@intel.com>
> 
> Defines SoC cpu dais, DMA driver ops and
> implements ALSA operations for SKL.
> 
> Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
> Signed-off-by: Subhransu S. Prusty <subhransu.s.prusty@intel.com>
> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
> ---
>  sound/soc/hda/hda_skl_pcm.c |  498 +++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 498 insertions(+)
>  create mode 100644 sound/soc/hda/hda_skl_pcm.c
> 
> diff --git a/sound/soc/hda/hda_skl_pcm.c b/sound/soc/hda/hda_skl_pcm.c
> new file mode 100644
> index 000000000000..a9d908257eaf
> --- /dev/null
> +++ b/sound/soc/hda/hda_skl_pcm.c
> @@ -0,0 +1,498 @@
> +/*
> + *  hda_skl_pcm.c -ASOC HDA Platform driver file implementing PCM functionality
> + *
> + *  Copyright (C) 2015 Intel Corp
> + *  Author:  Jeeja KP <jeeja.kp@intel.com>
> + *
> + *  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> + *
> + *  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.
> + *
> + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> + *
> + */
> +#include <linux/pci.h>
> +#include <sound/core.h>
> +#include <sound/pcm.h>
> +#include <sound/pcm_params.h>
> +#include <sound/soc.h>
> +#include "hda_skl.h"
> +
> +static struct snd_pcm_hardware azx_pcm_hw = {
> +	.info =			(SNDRV_PCM_INFO_MMAP |
> +				 SNDRV_PCM_INFO_INTERLEAVED |
> +				 SNDRV_PCM_INFO_BLOCK_TRANSFER |
> +				 SNDRV_PCM_INFO_MMAP_VALID |
> +				 /* No full-resume yet implemented */
> +				 /* SNDRV_PCM_INFO_RESUME |*/
> +				 SNDRV_PCM_INFO_PAUSE |
> +				 SNDRV_PCM_INFO_SYNC_START |
> +				 SNDRV_PCM_INFO_HAS_WALL_CLOCK | /* legacy */
> +				 SNDRV_PCM_INFO_HAS_LINK_ATIME |
> +				 SNDRV_PCM_INFO_NO_PERIOD_WAKEUP),
> +	.formats =		SNDRV_PCM_FMTBIT_S16_LE,
> +	.rates =		SNDRV_PCM_RATE_48000,
> +	.rate_min =		48000,
> +	.rate_max =		48000,
> +	.channels_min =		2,
> +	.channels_max =		2,
> +	.buffer_bytes_max =	AZX_MAX_BUF_SIZE,
> +	.period_bytes_min =	128,
> +	.period_bytes_max =	AZX_MAX_BUF_SIZE / 2,
> +	.periods_min =		2,
> +	.periods_max =		AZX_MAX_FRAG,
> +	.fifo_size =		0,
> +};
> +static inline
> +struct hdac_stream *get_azx_dev(struct snd_pcm_substream *substream)
> +{
> +	return substream->runtime->private_data;
> +}
> +
> +static struct hdac_bus *get_chip_ctx(struct snd_pcm_substream *substream)
> +{
> +	struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream);
> +	struct device *dev = rtd->cpu_dai->dev;
> +	struct hdac_bus *chip = dev_get_drvdata(dev);
> +	return chip;
> +}
> +
> +static int substream_alloc_pages(struct hdac_bus *chip,
> +				 struct snd_pcm_substream *substream,
> +				 size_t size)
> +{
> +	struct hdac_stream *azx_dev = get_azx_dev(substream);
> +	int ret;
> +
> +	azx_dev->bufsize = 0;
> +	azx_dev->period_bytes = 0;
> +	azx_dev->format_val = 0;
> +	ret = snd_pcm_lib_malloc_pages(substream, size);
> +	if (ret < 0)
> +		return ret;
> +	return 0;
> +}
> +
> +static int substream_free_pages(struct hdac_bus *chip,
> +				struct snd_pcm_substream *substream)
> +{
> +	return snd_pcm_lib_free_pages(substream);
> +}
> +
> +void soc_hda_set_pcm_constrains(struct hdac_bus *bus,
> +				 struct snd_pcm_runtime *runtime)

Missing static.

> +{
> +	snd_pcm_hw_constraint_integer(runtime, SNDRV_PCM_HW_PARAM_PERIODS);
> +
> +	/* avoid wrap-around with wall-clock */
> +	snd_pcm_hw_constraint_minmax(runtime, SNDRV_PCM_HW_PARAM_BUFFER_TIME,
> +				     20,
> +				     178000000);
> +
> +}
> +
> +static int soc_hda_pcm_open(struct snd_pcm_substream *substream,
> +		struct snd_soc_dai *dai)
> +{
> +	struct hdac_bus *chip = dev_get_drvdata(dai->dev);
> +	struct hdac_stream *azx_dev;
> +	struct snd_pcm_runtime *runtime = substream->runtime;
> +	struct soc_hda_dma_params *dma_params;
> +
> +	dev_dbg(dai->dev, "%s: %s\n", __func__, dai->name);
> +	azx_dev = snd_hdac_stream_assign(chip, substream);
> +	if (azx_dev == NULL)
> +		return -EBUSY;
> +
> +	soc_hda_set_pcm_constrains(chip, runtime);
> +
> +	/* disable WALLCLOCK timestamps for capture streams
> +	*  until we figure out how to handle digital inputs
> +	*/
> +	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE) {
> +		runtime->hw.info &= ~SNDRV_PCM_INFO_HAS_WALL_CLOCK; /* legacy */
> +		runtime->hw.info &= ~SNDRV_PCM_INFO_HAS_LINK_ATIME;
> +	}
> +
> +	runtime->private_data = azx_dev;
> +
> +	dma_params = kzalloc(sizeof(*dma_params), GFP_KERNEL);

Missing NULL check.

> +	dma_params->stream_tag = azx_dev->stream_tag;
> +	snd_soc_dai_set_dma_data(dai, substream, (void *)dma_params);
> +
> +	dev_dbg(dai->dev, "stream tag set in dma params=%d\n",
> +				 dma_params->stream_tag);
> +	snd_pcm_set_sync(substream);
> +	return 0;
> +}
> +static int soc_hda_pcm_prepare(struct snd_pcm_substream *substream,
> +		struct snd_soc_dai *dai)
> +{
> +	struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream);
> +	struct hdac_stream *azx_dev = get_azx_dev(substream);
> +	unsigned int format_val;
> +	int err;
> +	struct soc_hda_dma_params *dma_params;
> +	struct snd_soc_dai *codec_dai = rtd->codec_dai;
> +
> +	dev_dbg(dai->dev, "%s: %s\n", __func__, dai->name);
> +	if (azx_dev->prepared) {

Oh, I didn't add prepared flag in hdac_stream.  If your driver needs
it, too, I'll put this flag into core, too (as it's used in legacy
driver, too).

> +		dev_dbg(dai->dev, "already stream is prepared - returning\n");
> +		return 0;
> +	}
> +
> +	dma_params  = (struct soc_hda_dma_params *)
> +			snd_soc_dai_get_dma_data(codec_dai, substream);
> +	format_val = dma_params->format;
> +
> +	dev_dbg(dai->dev, "stream_tag=%d formatvalue=%d\n",
> +				azx_dev->stream_tag, format_val);
> +	snd_hdac_stream_reset(azx_dev);
> +
> +	err = snd_hdac_stream_set_params(azx_dev, format_val);
> +
> +	if (err < 0)
> +		return err;
> +	snd_hdac_stream_setup(azx_dev);
> +	azx_dev->prepared = 1;
> +	return err;
> +}
> +
> +static int soc_hda_pcm_hw_params(struct snd_pcm_substream *substream,
> +				struct snd_pcm_hw_params *params,
> +				struct snd_soc_dai *dai)
> +{
> +	struct hdac_bus *chip = dev_get_drvdata(dai->dev);
> +	int ret;
> +	struct snd_pcm_runtime *runtime = substream->runtime;
> +
> +	dev_dbg(dai->dev, "%s: %s\n", __func__, dai->name);
> +	ret = substream_alloc_pages(chip, substream,
> +					  params_buffer_bytes(params));
> +
> +	memset(substream->runtime->dma_area, 0, params_buffer_bytes(params));

Do check error before memset.  The buffer might be not allocated.

> +
> +	dev_dbg(dai->dev, "format_val, rate=%d, ch=%d, format=%d\n",
> +			runtime->rate, runtime->channels, runtime->format);
> +
> +	return ret;
> +}
> +
> +static void soc_hda_pcm_close(struct snd_pcm_substream *substream,
> +		struct snd_soc_dai *dai)
> +{
> +	struct hdac_stream *azx_dev = get_azx_dev(substream);
> +	struct soc_hda_dma_params *dma_params;
> +
> +	dev_dbg(dai->dev, "%s: %s\n", __func__, dai->name);
> +	snd_hdac_stream_release(azx_dev);
> +	dma_params  = (struct soc_hda_dma_params *)
> +			snd_soc_dai_get_dma_data(dai, substream);
> +	kfree(dma_params);
> +}
> +
> +static int soc_hda_pcm_hw_free(struct snd_pcm_substream *substream,
> +		struct snd_soc_dai *dai)
> +{
> +	struct hdac_bus *chip = dev_get_drvdata(dai->dev);
> +	struct hdac_stream *azx_dev = get_azx_dev(substream);
> +
> +	dev_dbg(dai->dev, "%s: %s\n", __func__, dai->name);
> +
> +	snd_hdac_stream_cleanup(azx_dev);
> +
> +	azx_dev->prepared = 0;
> +
> +	return substream_free_pages(chip, substream);
> +}
> +
> +static struct snd_soc_dai_ops hda_pcm_dai_ops = {
> +	.startup = soc_hda_pcm_open,
> +	.shutdown = soc_hda_pcm_close,
> +	.prepare = soc_hda_pcm_prepare,
> +	.hw_params = soc_hda_pcm_hw_params,
> +	.hw_free = soc_hda_pcm_hw_free,
> +};
> +
> +static struct snd_soc_dai_driver soc_hda_platform_dai[] = {
> +{
> +	.name = "System Pin",
> +	.ops = &hda_pcm_dai_ops,
> +	.playback = {
> +		.stream_name = "System Playback",
> +		.channels_min = 2,
> +		.channels_max = 2,
> +		.rates = SNDRV_PCM_RATE_48000,
> +		.formats = SNDRV_PCM_FMTBIT_S16_LE,
> +	},
> +	.capture = {
> +		.stream_name = "System Capture",
> +		.channels_min = 1,
> +		.channels_max = 2,
> +		.rates = SNDRV_PCM_RATE_48000,
> +		.formats = SNDRV_PCM_FMTBIT_S16_LE,
> +	},
> +},
> +};
> +
> +static int soc_hda_platform_open(struct snd_pcm_substream *substream)
> +{
> +	struct snd_pcm_runtime *runtime;
> +	struct snd_soc_pcm_runtime *rtd = substream->private_data;
> +	struct snd_soc_dai_link *dai_link = rtd->dai_link;
> +
> +	dev_dbg(rtd->cpu_dai->dev, "In %s:%s\n", __func__,
> +					dai_link->cpu_dai_name);
> +
> +	runtime = substream->runtime;
> +	snd_soc_set_runtime_hwparams(substream, &azx_pcm_hw);
> +	return 0;
> +}
> +
> +static int soc_hda_platform_pcm_trigger(struct snd_pcm_substream *substream,
> +					int cmd)
> +{
> +	struct hdac_bus *chip = get_chip_ctx(substream);
> +	struct hdac_stream *azx_dev;
> +	struct snd_pcm_substream *s;
> +	int rstart = 0, start, nsync = 0, sbits = 0;
> +	unsigned long cookie;
> +
> +	azx_dev = get_azx_dev(substream);
> +
> +	dev_dbg(chip->dev, "In %s cmd=%d\n", __func__, cmd);
> +
> +	if (!azx_dev->prepared)
> +		return -EPIPE;
> +
> +	switch (cmd) {
> +	case SNDRV_PCM_TRIGGER_START:
> +		rstart = 1;
> +	case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
> +	case SNDRV_PCM_TRIGGER_RESUME:
> +		start = 1;
> +		break;
> +	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
> +	case SNDRV_PCM_TRIGGER_SUSPEND:
> +	case SNDRV_PCM_TRIGGER_STOP:
> +		start = 0;
> +		break;
> +	default:
> +		return -EINVAL;
> +	}
> +
> +	snd_pcm_group_for_each_entry(s, substream) {
> +		if (s->pcm->card != substream->pcm->card)
> +			continue;
> +		azx_dev = get_azx_dev(s);
> +		sbits |= 1 << azx_dev->index;
> +		nsync++;
> +		snd_pcm_trigger_done(s, substream);
> +	}
> +
> +	spin_lock_irqsave(&chip->reg_lock, cookie);
> +
> +	/* first, set SYNC bits of corresponding streams */
> +	snd_hdac_stream_sync_trigger(azx_dev, start, sbits, 0);

The second argument must be true here...

> +	snd_pcm_group_for_each_entry(s, substream) {
> +		if (s->pcm->card != substream->pcm->card)
> +			continue;
> +		azx_dev = get_azx_dev(s);
> +		if (start)
> +			snd_hdac_stream_start(azx_dev, rstart);

I think it's start.

> +		else
> +			snd_hdac_stream_clear(azx_dev);
> +	}
> +	spin_unlock_irqrestore(&chip->reg_lock, cookie);
> +	snd_hdac_stream_sync(azx_dev, start, sbits);
> +	spin_lock_irqsave(&chip->reg_lock, cookie);
> +
> +	/* reset SYNC bits */
> +	snd_hdac_stream_sync_trigger(azx_dev, start, sbits, 0);

.... and false here.

> +
> +	if (start)
> +		snd_hdac_stream_timecounter_init(azx_dev, sbits);
> +	spin_unlock_irqrestore(&chip->reg_lock, cookie);
> +	return 0;
> +}
> +
> +unsigned int azx_get_position(struct hdac_stream *azx_dev, int codec_delay)

Missing static.


Takashi

> +{
> +	struct snd_pcm_substream *substream = azx_dev->substream;
> +	struct hdac_bus *hbus = get_chip_ctx(substream);
> +	unsigned int pos;
> +	int delay = 0;
> +
> +	/* use the position buffer as default */
> +	pos = snd_hdac_stream_get_pos_posbuf(azx_dev);
> +
> +	if (pos >= azx_dev->bufsize)
> +		pos = 0;
> +
> +	if (substream->runtime) {
> +		delay = azx_get_delay_from_lpib(hbus, azx_dev, pos) +
> +					codec_delay;
> +		substream->runtime->delay += delay;
> +	}
> +
> +	return pos;
> +}
> +
> +static snd_pcm_uframes_t soc_hda_platform_pcm_pointer
> +			(struct snd_pcm_substream *substream)
> +{
> +	struct hdac_stream *azx_dev = get_azx_dev(substream);
> +
> +	return bytes_to_frames(substream->runtime,
> +			       azx_get_position(azx_dev, 0));
> +}
> +
> +static int soc_hda_platform_pcm_mmap(struct snd_pcm_substream *substream,
> +			struct vm_area_struct *area)
> +{
> +	return snd_pcm_lib_default_mmap(substream, area);
> +}
> +
> +static u64 soc_azx_adjust_codec_delay(struct snd_pcm_substream *substream,
> +				u64 nsec)
> +{
> +	struct snd_soc_pcm_runtime *rtd = snd_pcm_substream_chip(substream);
> +	struct snd_soc_dai *codec_dai = rtd->codec_dai;
> +	u64 codec_frames, codec_nsecs;
> +
> +	if (!codec_dai->driver->ops->delay)
> +		return nsec;
> +
> +	codec_frames = codec_dai->driver->ops->delay(substream, codec_dai);
> +	codec_nsecs = div_u64(codec_frames * 1000000000LL,
> +			      substream->runtime->rate);
> +
> +	if (substream->stream == SNDRV_PCM_STREAM_CAPTURE)
> +		return nsec + codec_nsecs;
> +
> +	return (nsec > codec_nsecs) ? nsec - codec_nsecs : 0;
> +}
> +
> +static int soc_hda_get_time_info(struct snd_pcm_substream *substream,
> +			struct timespec *system_ts, struct timespec *audio_ts,
> +			struct snd_pcm_audio_tstamp_config *audio_tstamp_config,
> +			struct snd_pcm_audio_tstamp_report *audio_tstamp_report)
> +{
> +	struct hdac_stream *azx_dev = get_azx_dev(substream);
> +	u64 nsec;
> +
> +	if ((substream->runtime->hw.info & SNDRV_PCM_INFO_HAS_LINK_ATIME) &&
> +		(audio_tstamp_config->type_requested == SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK)) {
> +
> +		snd_pcm_gettime(substream->runtime, system_ts);
> +
> +		nsec = timecounter_read(&azx_dev->tc);
> +		nsec = div_u64(nsec, 3); /* can be optimized */
> +		if (audio_tstamp_config->report_delay)
> +			nsec = soc_azx_adjust_codec_delay(substream, nsec);
> +
> +		*audio_ts = ns_to_timespec(nsec);
> +
> +		audio_tstamp_report->actual_type = SNDRV_PCM_AUDIO_TSTAMP_TYPE_LINK;
> +		audio_tstamp_report->accuracy_report = 1; /* rest of struct is valid */
> +		audio_tstamp_report->accuracy = 42; /* 24MHzWallClk == 42ns resolution */
> +
> +	} else
> +		audio_tstamp_report->actual_type = SNDRV_PCM_AUDIO_TSTAMP_TYPE_DEFAULT;
> +
> +	return 0;
> +}
> +
> +static struct snd_pcm_ops soc_hda_platform_ops = {
> +	.open = soc_hda_platform_open,
> +	.ioctl = snd_pcm_lib_ioctl,
> +	.trigger = soc_hda_platform_pcm_trigger,
> +	.pointer = soc_hda_platform_pcm_pointer,
> +	.get_time_info =  soc_hda_get_time_info,
> +	.mmap = soc_hda_platform_pcm_mmap,
> +	.page = snd_pcm_sgbuf_ops_page,
> +};
> +
> +static void soc_hda_pcm_free(struct snd_pcm *pcm)
> +{
> +	snd_pcm_lib_preallocate_free_for_all(pcm);
> +}
> +
> +#define MAX_PREALLOC_SIZE	(32 * 1024 * 1024)
> +
> +static int soc_hda_pcm_new(struct snd_soc_pcm_runtime *rtd)
> +{
> +	struct snd_soc_dai *dai = rtd->cpu_dai;
> +	struct hdac_bus *chip = dev_get_drvdata(dai->dev);
> +	struct snd_pcm *pcm = rtd->pcm;
> +	unsigned int size;
> +	int retval = 0;
> +	struct hda_soc_bus *hda =
> +			container_of(chip, struct hda_soc_bus, chip);
> +
> +	dev_dbg(chip->dev, "In %s\n", __func__);
> +	if (dai->driver->playback.channels_min ||
> +		dai->driver->capture.channels_min) {
> +		/* buffer pre-allocation */
> +		size = CONFIG_SND_SOC_HDA_PREALLOC_SIZE * 1024;
> +		if (size > MAX_PREALLOC_SIZE)
> +			size = MAX_PREALLOC_SIZE;
> +		retval = snd_pcm_lib_preallocate_pages_for_all(pcm,
> +						SNDRV_DMA_TYPE_DEV_SG,
> +						snd_dma_pci_data(hda->pci),
> +						size, MAX_PREALLOC_SIZE);
> +		if (retval) {
> +			dev_err(chip->dev, "dma buffer allocationf fail\n");
> +			return retval;
> +		}
> +	}
> +	return retval;
> +}
> +
> +static struct snd_soc_platform_driver soc_hda_platform_drv  = {
> +	.ops		= &soc_hda_platform_ops,
> +	.pcm_new	= soc_hda_pcm_new,
> +	.pcm_free	= soc_hda_pcm_free,
> +};
> +
> +static const struct snd_soc_component_driver soc_hda_component = {
> +	.name           = "pcm",
> +};
> +
> +int soc_hda_platform_register(struct device *dev)
> +{
> +	int ret = 0;
> +
> +	ret = snd_soc_register_platform(dev,
> +					 &soc_hda_platform_drv);
> +	if (ret) {
> +		dev_err(dev, "soc platform registration failed\n");
> +		return ret;
> +	}
> +	ret = snd_soc_register_component(dev, &soc_hda_component,
> +				soc_hda_platform_dai,
> +				ARRAY_SIZE(soc_hda_platform_dai));
> +	if (ret) {
> +		dev_err(dev, "soc component registration failed\n");
> +		snd_soc_unregister_platform(dev);
> +	}
> +
> +	dev_dbg(dev, "In%s platform registration completed\n", __func__);
> +	return ret;
> +
> +}
> +
> +int soc_hda_platform_unregister(struct device *dev)
> +{
> +	snd_soc_unregister_component(dev);
> +	snd_soc_unregister_platform(dev);
> +	return 0;
> +}
> -- 
> 1.7.9.5
>