Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp3395555ybc; Thu, 21 Nov 2019 07:44:10 -0800 (PST) X-Google-Smtp-Source: APXvYqwkm2ShoM5xV5jDeV6Mz1QzXuV6YKS63ZL4i0ggJKhRrV8QHZYQ2MsbhYW/bfMl139opgsI X-Received: by 2002:a17:906:f24d:: with SMTP id gy13mr14657349ejb.159.1574351050047; Thu, 21 Nov 2019 07:44:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574351050; cv=none; d=google.com; s=arc-20160816; b=UMPd/IPRdT26XG5KP0DOpWmAtfeZnLszLWwLtMRIaxuhcIdpVLcSGmlTkq0NfuGeZC OwXfCBq0NfQw5UBZFyq9TQg/aflkzMwhwZEVVTNNEE8KST7nF5y9ST0dMsxppjLVcbGc OadyrjP1rTjU/ZRVyR9f0CbX0pQJO/y3ulDAo21KrqnaB2B8e/oMTZvfLa7jYpkTspZ0 o6czC6tcMubMQwTOad+VsZDcUnnXT+CMt43QW4LDMIJTjhW2HdkC84U/6zoxKYpH6mRP Q837GrDcDDciY2MGnekXQzMFaCp6FK19+TXWx2pXgHq1rZ+beRkBouLwsUFS9IJrdCDw 7h+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject; bh=AH5rwJoghgkTqtWofnQQcEeNFyUDDCU3A085szfMXoA=; b=RvYXWHf3TOjWZmR4JTpY3iHeUhD1y57+6OVkbWh2rzuz1NTKfRkHxfJti4MBOYJMcF B59BlNJ4rUWlqfapA4tl/RHSuWjsk+/HPlqKHSRYLFSdAr3ZMuGEAK3FQO1jKbd1QlFO NfsYjXNPSiyZK8fiDGJweORz7BJaeILsygIwKXOohl+IeG9PBh8WWRUi0Q9rhICEq2WU /z16G25csKo4GD7rX9KAvOH1up6at+8U5wqRG8rC98yKwoJIMY+4puL5AGBg9UKvNtbo C8JXyoqjKy86DYi8mily3wEtpYkn3pvQPy4NQYd3Ovu/EEQ8re3TnQyBIxwSQiQEagDW GDzg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z33si2330786edb.183.2019.11.21.07.43.45; Thu, 21 Nov 2019 07:44:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726909AbfKUPln (ORCPT + 99 others); Thu, 21 Nov 2019 10:41:43 -0500 Received: from mga02.intel.com ([134.134.136.20]:56574 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726279AbfKUPlm (ORCPT ); Thu, 21 Nov 2019 10:41:42 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Nov 2019 07:41:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,226,1571727600"; d="scan'208";a="205105046" Received: from ptan2-mobl1.amr.corp.intel.com (HELO [10.255.231.235]) ([10.255.231.235]) by fmsmga008.fm.intel.com with ESMTP; 21 Nov 2019 07:41:38 -0800 Subject: Re: [alsa-devel] [PATCH v11 2/6] ASoC: amd: Refactoring of DAI from DMA driver To: Ravulapati Vishnu vardhan rao Cc: "moderated list:SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEM..." , Kuninori Morimoto , "Gustavo A. R. Silva" , open list , Takashi Iwai , YueHaibing , Liam Girdwood , Mark Brown , djkurtz@google.com, Vijendar Mukunda , Alexander.Deucher@amd.com, Akshu.Agrawal@amd.com, Dan Carpenter References: <1574336761-16717-1-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com> <1574336761-16717-3-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com> From: Pierre-Louis Bossart Message-ID: <43c2a3c2-42ae-001a-b281-8ce750368f94@linux.intel.com> Date: Thu, 21 Nov 2019 09:39:24 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.2 MIME-Version: 1.0 In-Reply-To: <1574336761-16717-3-git-send-email-Vishnuvardhanrao.Ravulapati@amd.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/21/19 5:45 AM, Ravulapati Vishnu vardhan rao wrote: > ASoC: PCM DMA driver should only have dma ops. > So, removed all DAI related functionality. > Refactoring the PCM DMA diver code.Added new file containing only DAI ops. CHECK: Please don't use multiple blank lines #246: FILE: sound/soc/amd/raven/acp3x-i2s.c:210: + + CHECK: Prefer kzalloc(sizeof(*i2s_data)...) over kzalloc(sizeof(struct i2s_stream_instance)...) #361: FILE: sound/soc/amd/raven/acp3x-pcm-dma.c:274: + i2s_data = kzalloc(sizeof(struct i2s_stream_instance), > > Signed-off-by: Ravulapati Vishnu vardhan rao > --- > sound/soc/amd/raven/Makefile | 2 + > sound/soc/amd/raven/acp3x-i2s.c | 263 +++++++++++++++++++++++++++++++ > sound/soc/amd/raven/acp3x-pcm-dma.c | 305 +++++++----------------------------- > sound/soc/amd/raven/acp3x.h | 43 +++++ > 4 files changed, 367 insertions(+), 246 deletions(-) > create mode 100644 sound/soc/amd/raven/acp3x-i2s.c > > diff --git a/sound/soc/amd/raven/Makefile b/sound/soc/amd/raven/Makefile > index 108d1ac..62c22b6 100644 > --- a/sound/soc/amd/raven/Makefile > +++ b/sound/soc/amd/raven/Makefile > @@ -2,5 +2,7 @@ > # Raven Ridge platform Support > snd-pci-acp3x-objs := pci-acp3x.o > snd-acp3x-pcm-dma-objs := acp3x-pcm-dma.o > +snd-acp3x-i2s-objs := acp3x-i2s.o > obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-pci-acp3x.o > obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-pcm-dma.o > +obj-$(CONFIG_SND_SOC_AMD_ACP3x) += snd-acp3x-i2s.o > diff --git a/sound/soc/amd/raven/acp3x-i2s.c b/sound/soc/amd/raven/acp3x-i2s.c > new file mode 100644 > index 0000000..1e2485e > --- /dev/null > +++ b/sound/soc/amd/raven/acp3x-i2s.c > @@ -0,0 +1,263 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +// > +// AMD ALSA SoC PCM Driver > +// > +//Copyright 2016 Advanced Micro Devices, Inc. > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +#include "acp3x.h" > + > +#define DRV_NAME "acp3x-i2s" > + > +static int acp3x_i2s_set_fmt(struct snd_soc_dai *cpu_dai, > + unsigned int fmt) > +{ > + struct i2s_dev_data *adata; > + int mode; > + > + adata = snd_soc_dai_get_drvdata(cpu_dai); > + mode = fmt & SND_SOC_DAIFMT_FORMAT_MASK; > + switch (mode) { > + case SND_SOC_DAIFMT_I2S: > + adata->tdm_mode = false; > + break; > + case SND_SOC_DAIFMT_DSP_A: > + adata->tdm_mode = true; > + break; > + default: > + return -EINVAL; > + } > + return 0; > +} > + > +static int acp3x_i2s_set_tdm_slot(struct snd_soc_dai *cpu_dai, > + u32 tx_mask, u32 rx_mask, int slots, int slot_width) > +{ > + struct i2s_dev_data *adata; > + u32 val, reg_val, frmt_val, frm_len; > + u16 slot_len; > + > + adata = snd_soc_dai_get_drvdata(cpu_dai); > + > + /* These values are as per Hardware Spec */ > + switch (slot_width) { > + case SLOT_WIDTH_8: > + slot_len = 8; > + break; > + case SLOT_WIDTH_16: > + slot_len = 16; > + break; > + case SLOT_WIDTH_24: > + slot_len = 24; > + break; > + case SLOT_WIDTH_32: > + slot_len = 0; > + break; > + default: > + return -EINVAL; > + } > + > + /* Enable I2S/BT channels TDM, respective TX/RX frame lengths.*/ > + > + frm_len = FRM_LEN | (slots << 15) | (slot_len << 18); > + if (adata->substream_type == SNDRV_PCM_STREAM_PLAYBACK) { > + reg_val = mmACP_BTTDM_ITER; > + frmt_val = mmACP_BTTDM_TXFRMT; > + } else { > + reg_val = mmACP_BTTDM_IRER; > + frmt_val = mmACP_BTTDM_RXFRMT; > + } > + val = rv_readl(adata->acp3x_base + reg_val); > + rv_writel(val | 0x2, adata->acp3x_base + reg_val); > + rv_writel(frm_len, adata->acp3x_base + frmt_val); > + adata->tdm_fmt = frm_len; > + return 0; > +} > + > +static int acp3x_i2s_hwparams(struct snd_pcm_substream *substream, > + struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) > +{ > + struct i2s_stream_instance *rtd; > + u32 val; > + u32 reg_val; > + > + rtd = substream->runtime->private_data; > + > + /* These values are as per Hardware Spec */ > + switch (params_format(params)) { > + case SNDRV_PCM_FORMAT_U8: > + case SNDRV_PCM_FORMAT_S8: > + rtd->xfer_resolution = 0x0; > + break; > + case SNDRV_PCM_FORMAT_S16_LE: > + rtd->xfer_resolution = 0x02; > + break; > + case SNDRV_PCM_FORMAT_S24_LE: > + rtd->xfer_resolution = 0x04; > + break; > + case SNDRV_PCM_FORMAT_S32_LE: > + rtd->xfer_resolution = 0x05; > + break; > + default: > + return -EINVAL; > + } > + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) > + reg_val = mmACP_BTTDM_ITER; > + else > + reg_val = mmACP_BTTDM_IRER; > + > + val = rv_readl(rtd->acp3x_base + reg_val); > + val = val | (rtd->xfer_resolution << 3); > + rv_writel(val, rtd->acp3x_base + reg_val); > + return 0; > +} > + > +static int acp3x_i2s_trigger(struct snd_pcm_substream *substream, > + int cmd, struct snd_soc_dai *dai) > +{ > + struct i2s_stream_instance *rtd; > + u32 val, period_bytes; > + int ret, reg_val; > + > + rtd = substream->runtime->private_data; > + period_bytes = frames_to_bytes(substream->runtime, > + substream->runtime->period_size); > + switch (cmd) { > + case SNDRV_PCM_TRIGGER_START: > + case SNDRV_PCM_TRIGGER_RESUME: > + case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: > + rtd->bytescount = acp_get_byte_count(rtd, > + substream->stream); > + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { > + reg_val = mmACP_BTTDM_ITER; > + rv_writel(period_bytes, rtd->acp3x_base + > + mmACP_BT_TX_INTR_WATERMARK_SIZE); > + } else { > + reg_val = mmACP_BTTDM_IRER; > + rv_writel(period_bytes, rtd->acp3x_base + > + mmACP_BT_RX_INTR_WATERMARK_SIZE); > + } > + val = rv_readl(rtd->acp3x_base + reg_val); > + val = val | BIT(0); > + rv_writel(val, rtd->acp3x_base + reg_val); > + rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); > + break; > + case SNDRV_PCM_TRIGGER_STOP: > + case SNDRV_PCM_TRIGGER_SUSPEND: > + case SNDRV_PCM_TRIGGER_PAUSE_PUSH: > + if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) > + reg_val = mmACP_BTTDM_ITER; > + else > + reg_val = mmACP_BTTDM_IRER; > + > + val = rv_readl(rtd->acp3x_base + reg_val); > + val = val & ~BIT(0); > + rv_writel(val, rtd->acp3x_base + reg_val); > + rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); > + break; > + default: > + ret = -EINVAL; > + break; > + } > + > + return ret; > +} > + > +static struct snd_soc_dai_ops acp3x_i2s_dai_ops = { > + .hw_params = acp3x_i2s_hwparams, > + .trigger = acp3x_i2s_trigger, > + .set_fmt = acp3x_i2s_set_fmt, > + .set_tdm_slot = acp3x_i2s_set_tdm_slot, > +}; > + > +static const struct snd_soc_component_driver acp3x_dai_component = { > + .name = "acp3x-i2s", > +}; > + > +static struct snd_soc_dai_driver acp3x_i2s_dai = { > + .playback = { > + .rates = SNDRV_PCM_RATE_8000_96000, > + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | > + SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | > + SNDRV_PCM_FMTBIT_S32_LE, > + .channels_min = 2, > + .channels_max = 8, > + .rate_min = 8000, > + .rate_max = 96000, > + }, > + .capture = { > + .rates = SNDRV_PCM_RATE_8000_48000, > + .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | > + SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S24_LE | > + SNDRV_PCM_FMTBIT_S32_LE, > + .channels_min = 2, > + .channels_max = 2, > + .rate_min = 8000, > + .rate_max = 48000, > + }, > + .ops = &acp3x_i2s_dai_ops, > +}; > + > + > +static int acp3x_dai_probe(struct platform_device *pdev) > +{ > + struct resource *res; > + struct i2s_dev_data *adata; > + int ret; > + > + adata = devm_kzalloc(&pdev->dev, sizeof(struct i2s_dev_data), > + GFP_KERNEL); > + if (!adata) > + return -ENOMEM; > + > + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + if (!res) { > + dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); > + return -ENOMEM; > + } > + adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, > + resource_size(res)); > + if (IS_ERR(adata->acp3x_base)) > + return PTR_ERR(adata->acp3x_base); > + > + adata->i2s_irq = res->start; > + dev_set_drvdata(&pdev->dev, adata); > + ret = devm_snd_soc_register_component(&pdev->dev, > + &acp3x_dai_component, &acp3x_i2s_dai, 1); > + if (ret) { > + dev_err(&pdev->dev, "Fail to register acp i2s dai\n"); > + return -ENODEV; > + } > + return 0; > +} > + > +static int acp3x_dai_remove(struct platform_device *pdev) > +{ > + /* As we use devm_ memory alloc there is nothing TBD here */ > + > + return 0; > +} > + > +static struct platform_driver acp3x_dai_driver = { > + .probe = acp3x_dai_probe, > + .remove = acp3x_dai_remove, > + .driver = { > + .name = "acp3x_i2s_playcap", > + }, > +}; > + > +module_platform_driver(acp3x_dai_driver); > + > +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati@amd.com"); > +MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); > +MODULE_LICENSE("GPL v2"); > +MODULE_ALIAS("platform:" DRV_NAME); > diff --git a/sound/soc/amd/raven/acp3x-pcm-dma.c b/sound/soc/amd/raven/acp3x-pcm-dma.c > index 60709e3..0202737 100644 > --- a/sound/soc/amd/raven/acp3x-pcm-dma.c > +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c > @@ -18,24 +18,6 @@ > > #define DRV_NAME "acp3x-i2s-audio" > > -struct i2s_dev_data { > - bool tdm_mode; > - unsigned int i2s_irq; > - u32 tdm_fmt; > - void __iomem *acp3x_base; > - struct snd_pcm_substream *play_stream; > - struct snd_pcm_substream *capture_stream; > -}; > - > -struct i2s_stream_instance { > - u16 num_pages; > - u16 channels; > - u32 xfer_resolution; > - u64 bytescount; > - dma_addr_t dma_addr; > - void __iomem *acp3x_base; > -}; > - > static const struct snd_pcm_hardware acp3x_pcm_hardware_playback = { > .info = SNDRV_PCM_INFO_INTERLEAVED | > SNDRV_PCM_INFO_BLOCK_TRANSFER | > @@ -178,10 +160,11 @@ static int acp3x_deinit(void __iomem *acp3x_base) > > static irqreturn_t i2s_irq_handler(int irq, void *dev_id) > { > + struct i2s_dev_data *rv_i2s_data; > u16 play_flag, cap_flag; > u32 val; > - struct i2s_dev_data *rv_i2s_data = dev_id; > > + rv_i2s_data = dev_id; > if (!rv_i2s_data) > return IRQ_NONE; > > @@ -278,11 +261,18 @@ static void config_acp3x_dma(struct i2s_stream_instance *rtd, int direction) > static int acp3x_dma_open(struct snd_soc_component *component, > struct snd_pcm_substream *substream) > { > - int ret = 0; > - struct snd_pcm_runtime *runtime = substream->runtime; > - struct i2s_dev_data *adata = dev_get_drvdata(component->dev); > - struct i2s_stream_instance *i2s_data = kzalloc(sizeof(struct i2s_stream_instance), > - GFP_KERNEL); > + struct snd_pcm_runtime *runtime; > + struct snd_soc_pcm_runtime *prtd; > + struct i2s_dev_data *adata; > + struct i2s_stream_instance *i2s_data; > + int ret; > + > + runtime = substream->runtime; > + prtd = substream->private_data; > + component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); > + adata = dev_get_drvdata(component->dev); > + i2s_data = kzalloc(sizeof(struct i2s_stream_instance), > + GFP_KERNEL); > if (!i2s_data) > return -EINVAL; > > @@ -312,33 +302,18 @@ static int acp3x_dma_open(struct snd_soc_component *component, > return 0; > } > > -static u64 acp_get_byte_count(struct i2s_stream_instance *rtd, int direction) > -{ > - u64 byte_count; > - > - if (direction == SNDRV_PCM_STREAM_PLAYBACK) { > - byte_count = rv_readl(rtd->acp3x_base + > - mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); > - byte_count |= rv_readl(rtd->acp3x_base + > - mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); > - } else { > - byte_count = rv_readl(rtd->acp3x_base + > - mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); > - byte_count |= rv_readl(rtd->acp3x_base + > - mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); > - } > - return byte_count; > -} > > static int acp3x_dma_hw_params(struct snd_soc_component *component, > struct snd_pcm_substream *substream, > struct snd_pcm_hw_params *params) > { > + struct snd_pcm_runtime *runtime; > + struct i2s_stream_instance *rtd; > int status; > u64 size; > - struct snd_pcm_runtime *runtime = substream->runtime; > - struct i2s_stream_instance *rtd = runtime->private_data; > > + runtime = substream->runtime; > + rtd = substream->private_data; > if (!rtd) > return -EINVAL; > > @@ -362,12 +337,12 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component, > static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, > struct snd_pcm_substream *substream) > { > - u32 pos = 0; > - u32 buffersize = 0; > - u64 bytescount = 0; > - struct i2s_stream_instance *rtd = > - substream->runtime->private_data; > + struct i2s_stream_instance *rtd; > + u32 pos; > + u32 buffersize; > + u64 bytescount; > > + rtd = substream->runtime->private_data; > buffersize = frames_to_bytes(substream->runtime, > substream->runtime->buffer_size); > bytescount = acp_get_byte_count(rtd, substream->stream); > @@ -380,7 +355,10 @@ static snd_pcm_uframes_t acp3x_dma_pointer(struct snd_soc_component *component, > static int acp3x_dma_new(struct snd_soc_component *component, > struct snd_soc_pcm_runtime *rtd) > { > - struct device *parent = component->dev->parent; > + struct device *parent; > + > + component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); > + parent = component->dev->parent; > snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_DEV, > parent, MIN_BUFFER, MAX_BUFFER); > return 0; > @@ -402,8 +380,12 @@ static int acp3x_dma_mmap(struct snd_soc_component *component, > static int acp3x_dma_close(struct snd_soc_component *component, > struct snd_pcm_substream *substream) > { > - struct i2s_stream_instance *rtd = substream->runtime->private_data; > - struct i2s_dev_data *adata = dev_get_drvdata(component->dev); > + struct snd_soc_pcm_runtime *prtd; > + struct i2s_dev_data *adata; > + > + prtd = substream->private_data; > + component = snd_soc_rtdcom_lookup(prtd, DRV_NAME); > + adata = dev_get_drvdata(component->dev); > > if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) > adata->play_stream = NULL; > @@ -415,186 +397,9 @@ static int acp3x_dma_close(struct snd_soc_component *component, > */ > if (!adata->play_stream && !adata->capture_stream) > rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); > - kfree(rtd); > - return 0; > -} > - > -static int acp3x_dai_i2s_set_fmt(struct snd_soc_dai *cpu_dai, unsigned int fmt) > -{ > - > - struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); > - > - switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { > - case SND_SOC_DAIFMT_I2S: > - adata->tdm_mode = false; > - break; > - case SND_SOC_DAIFMT_DSP_A: > - adata->tdm_mode = true; > - break; > - default: > - return -EINVAL; > - } > - > - return 0; > -} > - > -static int acp3x_dai_set_tdm_slot(struct snd_soc_dai *cpu_dai, u32 tx_mask, > - u32 rx_mask, int slots, int slot_width) > -{ > - u32 val = 0; > - u16 slot_len; > - > - struct i2s_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai); > - > - switch (slot_width) { > - case SLOT_WIDTH_8: > - slot_len = 8; > - break; > - case SLOT_WIDTH_16: > - slot_len = 16; > - break; > - case SLOT_WIDTH_24: > - slot_len = 24; > - break; > - case SLOT_WIDTH_32: > - slot_len = 0; > - break; > - default: > - return -EINVAL; > - } > - > - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_ITER); > - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_ITER); > - val = rv_readl(adata->acp3x_base + mmACP_BTTDM_IRER); > - rv_writel((val | 0x2), adata->acp3x_base + mmACP_BTTDM_IRER); > - > - val = (FRM_LEN | (slots << 15) | (slot_len << 18)); > - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_TXFRMT); > - rv_writel(val, adata->acp3x_base + mmACP_BTTDM_RXFRMT); > - > - adata->tdm_fmt = val; > return 0; > } > > -static int acp3x_dai_i2s_hwparams(struct snd_pcm_substream *substream, > - struct snd_pcm_hw_params *params, > - struct snd_soc_dai *dai) > -{ > - u32 val = 0; > - struct i2s_stream_instance *rtd = substream->runtime->private_data; > - > - switch (params_format(params)) { > - case SNDRV_PCM_FORMAT_U8: > - case SNDRV_PCM_FORMAT_S8: > - rtd->xfer_resolution = 0x0; > - break; > - case SNDRV_PCM_FORMAT_S16_LE: > - rtd->xfer_resolution = 0x02; > - break; > - case SNDRV_PCM_FORMAT_S24_LE: > - rtd->xfer_resolution = 0x04; > - break; > - case SNDRV_PCM_FORMAT_S32_LE: > - rtd->xfer_resolution = 0x05; > - break; > - default: > - return -EINVAL; > - } > - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); > - val = val | (rtd->xfer_resolution << 3); > - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) > - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); > - else > - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); > - > - return 0; > -} > - > -static int acp3x_dai_i2s_trigger(struct snd_pcm_substream *substream, > - int cmd, struct snd_soc_dai *dai) > -{ > - int ret = 0; > - struct i2s_stream_instance *rtd = substream->runtime->private_data; > - u32 val, period_bytes; > - > - period_bytes = frames_to_bytes(substream->runtime, > - substream->runtime->period_size); > - switch (cmd) { > - case SNDRV_PCM_TRIGGER_START: > - case SNDRV_PCM_TRIGGER_RESUME: > - case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: > - rtd->bytescount = acp_get_byte_count(rtd, substream->stream); > - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { > - rv_writel(period_bytes, rtd->acp3x_base + > - mmACP_BT_TX_INTR_WATERMARK_SIZE); > - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); > - val = val | BIT(0); > - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); > - } else { > - rv_writel(period_bytes, rtd->acp3x_base + > - mmACP_BT_RX_INTR_WATERMARK_SIZE); > - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); > - val = val | BIT(0); > - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); > - } > - rv_writel(1, rtd->acp3x_base + mmACP_BTTDM_IER); > - break; > - case SNDRV_PCM_TRIGGER_STOP: > - case SNDRV_PCM_TRIGGER_SUSPEND: > - case SNDRV_PCM_TRIGGER_PAUSE_PUSH: > - if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) { > - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_ITER); > - val = val & ~BIT(0); > - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_ITER); > - } else { > - val = rv_readl(rtd->acp3x_base + mmACP_BTTDM_IRER); > - val = val & ~BIT(0); > - rv_writel(val, rtd->acp3x_base + mmACP_BTTDM_IRER); > - } > - rv_writel(0, rtd->acp3x_base + mmACP_BTTDM_IER); > - break; > - default: > - ret = -EINVAL; > - break; > - } > - > - return ret; > -} > - > -static struct snd_soc_dai_ops acp3x_dai_i2s_ops = { > - .hw_params = acp3x_dai_i2s_hwparams, > - .trigger = acp3x_dai_i2s_trigger, > - .set_fmt = acp3x_dai_i2s_set_fmt, > - .set_tdm_slot = acp3x_dai_set_tdm_slot, > -}; > - > -static struct snd_soc_dai_driver acp3x_i2s_dai_driver = { > - .playback = { > - .rates = SNDRV_PCM_RATE_8000_96000, > - .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | > - SNDRV_PCM_FMTBIT_U8 | > - SNDRV_PCM_FMTBIT_S24_LE | > - SNDRV_PCM_FMTBIT_S32_LE, > - .channels_min = 2, > - .channels_max = 8, > - > - .rate_min = 8000, > - .rate_max = 96000, > - }, > - .capture = { > - .rates = SNDRV_PCM_RATE_8000_48000, > - .formats = SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S8 | > - SNDRV_PCM_FMTBIT_U8 | > - SNDRV_PCM_FMTBIT_S24_LE | > - SNDRV_PCM_FMTBIT_S32_LE, > - .channels_min = 2, > - .channels_max = 2, > - .rate_min = 8000, > - .rate_max = 48000, > - }, > - .ops = &acp3x_dai_i2s_ops, > -}; > - > static const struct snd_soc_component_driver acp3x_i2s_component = { > .name = DRV_NAME, > .open = acp3x_dma_open, > @@ -609,10 +414,10 @@ static const struct snd_soc_component_driver acp3x_i2s_component = { > > static int acp3x_audio_probe(struct platform_device *pdev) > { > - int status; > struct resource *res; > struct i2s_dev_data *adata; > unsigned int irqflags; > + int status, ret; > > if (!pdev->dev.platform_data) { > dev_err(&pdev->dev, "platform_data not retrieved\n"); > @@ -622,7 +427,7 @@ static int acp3x_audio_probe(struct platform_device *pdev) > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > if (!res) { > - dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n"); > + dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); > return -ENODEV; > } > > @@ -632,60 +437,64 @@ static int acp3x_audio_probe(struct platform_device *pdev) > > adata->acp3x_base = devm_ioremap(&pdev->dev, res->start, > resource_size(res)); > + if (!adata->acp3x_base) > + return -ENOMEM; > > res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > if (!res) { > dev_err(&pdev->dev, "IORESOURCE_IRQ FAILED\n"); > - return -ENODEV; > + return -ENOMEM; > } > > adata->i2s_irq = res->start; > - adata->play_stream = NULL; > - adata->capture_stream = NULL; > > dev_set_drvdata(&pdev->dev, adata); > /* Initialize ACP */ > status = acp3x_init(adata->acp3x_base); > if (status) > return -ENODEV; > + > status = devm_snd_soc_register_component(&pdev->dev, > &acp3x_i2s_component, > - &acp3x_i2s_dai_driver, 1); > + NULL, 0); > if (status) { > - dev_err(&pdev->dev, "Fail to register acp i2s dai\n"); > + dev_err(&pdev->dev, "Fail to register acp i2s component\n"); > + ret = -ENODEV; > goto dev_err; > } > status = devm_request_irq(&pdev->dev, adata->i2s_irq, i2s_irq_handler, > irqflags, "ACP3x_I2S_IRQ", adata); > if (status) { > dev_err(&pdev->dev, "ACP3x I2S IRQ request failed\n"); > + ret = -ENODEV; > goto dev_err; > } > > - pm_runtime_set_autosuspend_delay(&pdev->dev, 10000); > + pm_runtime_set_autosuspend_delay(&pdev->dev, 5000); > pm_runtime_use_autosuspend(&pdev->dev); > pm_runtime_enable(&pdev->dev); > return 0; > + > dev_err: > status = acp3x_deinit(adata->acp3x_base); > if (status) > dev_err(&pdev->dev, "ACP de-init failed\n"); > else > - dev_info(&pdev->dev, "ACP de-initialized\n"); > - /*ignore device status and return driver probe error*/ > - return -ENODEV; > + dev_dbg(&pdev->dev, "ACP de-initialized\n"); > + return ret; > } > > static int acp3x_audio_remove(struct platform_device *pdev) > { > + struct i2s_dev_data *adata; > int ret; > - struct i2s_dev_data *adata = dev_get_drvdata(&pdev->dev); > > + adata = dev_get_drvdata(&pdev->dev); > ret = acp3x_deinit(adata->acp3x_base); > if (ret) > dev_err(&pdev->dev, "ACP de-init failed\n"); > else > - dev_info(&pdev->dev, "ACP de-initialized\n"); > + dev_dbg(&pdev->dev, "ACP de-initialized\n"); > > pm_runtime_disable(&pdev->dev); > return 0; > @@ -693,10 +502,11 @@ static int acp3x_audio_remove(struct platform_device *pdev) > > static int acp3x_resume(struct device *dev) > { > + struct i2s_dev_data *adata; > int status; > u32 val; > - struct i2s_dev_data *adata = dev_get_drvdata(dev); > > + adata = dev_get_drvdata(dev); > status = acp3x_init(adata->acp3x_base); > if (status) > return -ENODEV; > @@ -738,14 +548,15 @@ static int acp3x_resume(struct device *dev) > > static int acp3x_pcm_runtime_suspend(struct device *dev) > { > + struct i2s_dev_data *adata; > int status; > - struct i2s_dev_data *adata = dev_get_drvdata(dev); > + adata = dev_get_drvdata(dev); > > status = acp3x_deinit(adata->acp3x_base); > if (status) > dev_err(dev, "ACP de-init failed\n"); > else > - dev_info(dev, "ACP de-initialized\n"); > + dev_dbg(dev, "ACP de-initialized\n"); > > rv_writel(0, adata->acp3x_base + mmACP_EXTERNAL_INTR_ENB); > > @@ -754,8 +565,9 @@ static int acp3x_pcm_runtime_suspend(struct device *dev) > > static int acp3x_pcm_runtime_resume(struct device *dev) > { > + struct i2s_dev_data *adata; > int status; > - struct i2s_dev_data *adata = dev_get_drvdata(dev); > + adata = dev_get_drvdata(dev); > > status = acp3x_init(adata->acp3x_base); > if (status) > @@ -774,13 +586,14 @@ static struct platform_driver acp3x_dma_driver = { > .probe = acp3x_audio_probe, > .remove = acp3x_audio_remove, > .driver = { > - .name = "acp3x_rv_i2s", > + .name = "acp3x_rv_i2s_dma", > .pm = &acp3x_pm_ops, > }, > }; > > module_platform_driver(acp3x_dma_driver); > > +MODULE_AUTHOR("Vishnuvardhanrao.Ravulapati@amd.com"); > MODULE_AUTHOR("Maruthi.Bayyavarapu@amd.com"); > MODULE_AUTHOR("Vijendar.Mukunda@amd.com"); > MODULE_DESCRIPTION("AMD ACP 3.x PCM Driver"); > diff --git a/sound/soc/amd/raven/acp3x.h b/sound/soc/amd/raven/acp3x.h > index 2f15fe1..a6c6d63 100644 > --- a/sound/soc/amd/raven/acp3x.h > +++ b/sound/soc/amd/raven/acp3x.h > @@ -51,6 +51,30 @@ > #define SLOT_WIDTH_24 0x18 > #define SLOT_WIDTH_32 0x20 > > +struct acp3x_platform_info { > + u16 play_i2s_instance; > + u16 cap_i2s_instance; > + u16 capture_channel; > +}; > + > +struct i2s_dev_data { > + bool tdm_mode; > + unsigned int i2s_irq; > + u32 tdm_fmt; > + u32 substream_type; > + void __iomem *acp3x_base; > + struct snd_pcm_substream *play_stream; > + struct snd_pcm_substream *capture_stream; > +}; > + > +struct i2s_stream_instance { > + u16 num_pages; > + u16 channels; > + u32 xfer_resolution; > + u64 bytescount; > + dma_addr_t dma_addr; > + void __iomem *acp3x_base; > +}; > > static inline u32 rv_readl(void __iomem *base_addr) > { > @@ -61,3 +85,22 @@ static inline void rv_writel(u32 val, void __iomem *base_addr) > { > writel(val, base_addr - ACP3x_PHY_BASE_ADDRESS); > } > + > +static inline u64 acp_get_byte_count(struct i2s_stream_instance *rtd, > + int direction) > +{ > + u64 byte_count; > + > + if (direction == SNDRV_PCM_STREAM_PLAYBACK) { > + byte_count = rv_readl(rtd->acp3x_base + > + mmACP_BT_TX_LINEARPOSITIONCNTR_HIGH); > + byte_count |= rv_readl(rtd->acp3x_base + > + mmACP_BT_TX_LINEARPOSITIONCNTR_LOW); > + } else { > + byte_count = rv_readl(rtd->acp3x_base + > + mmACP_BT_RX_LINEARPOSITIONCNTR_HIGH); > + byte_count |= rv_readl(rtd->acp3x_base + > + mmACP_BT_RX_LINEARPOSITIONCNTR_LOW); > + } > + return byte_count; > +} >