mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
Add support for linked list to store acp_stream and tdm support.
Merge series from Venkata Prasad Potturu <venkataprasad.potturu@amd.com>: This patch is to add support for linked list to store acp_stream instead static array and add tdm support for acp I2S stream.
This commit is contained in:
commit
2d7ea7635a
3 changed files with 113 additions and 23 deletions
|
@ -25,6 +25,65 @@
|
|||
|
||||
#define DRV_NAME "acp_i2s_playcap"
|
||||
|
||||
static int acp_i2s_set_fmt(struct snd_soc_dai *cpu_dai,
|
||||
unsigned int fmt)
|
||||
{
|
||||
struct acp_dev_data *adata = snd_soc_dai_get_drvdata(cpu_dai);
|
||||
int mode;
|
||||
|
||||
mode = fmt & SND_SOC_DAIFMT_FORMAT_MASK;
|
||||
switch (mode) {
|
||||
case SND_SOC_DAIFMT_I2S:
|
||||
adata->tdm_mode = TDM_DISABLE;
|
||||
break;
|
||||
case SND_SOC_DAIFMT_DSP_A:
|
||||
adata->tdm_mode = TDM_ENABLE;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int acp_i2s_set_tdm_slot(struct snd_soc_dai *dai, u32 tx_mask, u32 rx_mask,
|
||||
int slots, int slot_width)
|
||||
{
|
||||
struct device *dev = dai->component->dev;
|
||||
struct acp_dev_data *adata = snd_soc_dai_get_drvdata(dai);
|
||||
struct acp_stream *stream;
|
||||
int slot_len;
|
||||
|
||||
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:
|
||||
dev_err(dev, "Unsupported bitdepth %d\n", slot_width);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
spin_lock_irq(&adata->acp_lock);
|
||||
list_for_each_entry(stream, &adata->stream_list, list) {
|
||||
if (tx_mask && stream->dir == SNDRV_PCM_STREAM_PLAYBACK)
|
||||
adata->tdm_tx_fmt[stream->dai_id - 1] =
|
||||
FRM_LEN | (slots << 15) | (slot_len << 18);
|
||||
else if (rx_mask && stream->dir == SNDRV_PCM_STREAM_CAPTURE)
|
||||
adata->tdm_rx_fmt[stream->dai_id - 1] =
|
||||
FRM_LEN | (slots << 15) | (slot_len << 18);
|
||||
}
|
||||
spin_unlock_irq(&adata->acp_lock);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int acp_i2s_hwparams(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params,
|
||||
struct snd_soc_dai *dai)
|
||||
{
|
||||
|
@ -33,7 +92,7 @@ static int acp_i2s_hwparams(struct snd_pcm_substream *substream, struct snd_pcm_
|
|||
struct acp_resource *rsrc;
|
||||
u32 val;
|
||||
u32 xfer_resolution;
|
||||
u32 reg_val;
|
||||
u32 reg_val, fmt_reg, tdm_fmt;
|
||||
u32 lrclk_div_val, bclk_div_val;
|
||||
|
||||
adata = snd_soc_dai_get_drvdata(dai);
|
||||
|
@ -62,12 +121,15 @@ static int acp_i2s_hwparams(struct snd_pcm_substream *substream, struct snd_pcm_
|
|||
switch (dai->driver->id) {
|
||||
case I2S_BT_INSTANCE:
|
||||
reg_val = ACP_BTTDM_ITER;
|
||||
fmt_reg = ACP_BTTDM_TXFRMT;
|
||||
break;
|
||||
case I2S_SP_INSTANCE:
|
||||
reg_val = ACP_I2STDM_ITER;
|
||||
fmt_reg = ACP_I2STDM_TXFRMT;
|
||||
break;
|
||||
case I2S_HS_INSTANCE:
|
||||
reg_val = ACP_HSTDM_ITER;
|
||||
fmt_reg = ACP_HSTDM_TXFRMT;
|
||||
break;
|
||||
default:
|
||||
dev_err(dev, "Invalid dai id %x\n", dai->driver->id);
|
||||
|
@ -77,12 +139,15 @@ static int acp_i2s_hwparams(struct snd_pcm_substream *substream, struct snd_pcm_
|
|||
switch (dai->driver->id) {
|
||||
case I2S_BT_INSTANCE:
|
||||
reg_val = ACP_BTTDM_IRER;
|
||||
fmt_reg = ACP_BTTDM_RXFRMT;
|
||||
break;
|
||||
case I2S_SP_INSTANCE:
|
||||
reg_val = ACP_I2STDM_IRER;
|
||||
fmt_reg = ACP_I2STDM_RXFRMT;
|
||||
break;
|
||||
case I2S_HS_INSTANCE:
|
||||
reg_val = ACP_HSTDM_IRER;
|
||||
fmt_reg = ACP_HSTDM_RXFRMT;
|
||||
break;
|
||||
default:
|
||||
dev_err(dev, "Invalid dai id %x\n", dai->driver->id);
|
||||
|
@ -95,6 +160,16 @@ static int acp_i2s_hwparams(struct snd_pcm_substream *substream, struct snd_pcm_
|
|||
val = val | (xfer_resolution << 3);
|
||||
writel(val, adata->acp_base + reg_val);
|
||||
|
||||
if (adata->tdm_mode) {
|
||||
val = readl(adata->acp_base + reg_val);
|
||||
writel(val | BIT(1), adata->acp_base + reg_val);
|
||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
||||
tdm_fmt = adata->tdm_tx_fmt[dai->driver->id - 1];
|
||||
else
|
||||
tdm_fmt = adata->tdm_rx_fmt[dai->driver->id - 1];
|
||||
writel(tdm_fmt, adata->acp_base + fmt_reg);
|
||||
}
|
||||
|
||||
if (rsrc->soc_mclk) {
|
||||
switch (params_format(params)) {
|
||||
case SNDRV_PCM_FORMAT_S16_LE:
|
||||
|
@ -443,6 +518,7 @@ static int acp_i2s_startup(struct snd_pcm_substream *substream, struct snd_soc_d
|
|||
stream->id = dai->driver->id + dir;
|
||||
stream->dai_id = dai->driver->id;
|
||||
stream->irq_bit = irq_bit;
|
||||
stream->dir = substream->stream;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -452,6 +528,8 @@ const struct snd_soc_dai_ops asoc_acp_cpu_dai_ops = {
|
|||
.hw_params = acp_i2s_hwparams,
|
||||
.prepare = acp_i2s_prepare,
|
||||
.trigger = acp_i2s_trigger,
|
||||
.set_fmt = acp_i2s_set_fmt,
|
||||
.set_tdm_slot = acp_i2s_set_tdm_slot,
|
||||
};
|
||||
EXPORT_SYMBOL_NS_GPL(asoc_acp_cpu_dai_ops, SND_SOC_ACP_COMMON);
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ static irqreturn_t i2s_irq_handler(int irq, void *data)
|
|||
struct acp_resource *rsrc = adata->rsrc;
|
||||
struct acp_stream *stream;
|
||||
u16 i2s_flag = 0;
|
||||
u32 ext_intr_stat, ext_intr_stat1, i;
|
||||
u32 ext_intr_stat, ext_intr_stat1;
|
||||
|
||||
if (!adata)
|
||||
return IRQ_NONE;
|
||||
|
@ -104,14 +104,13 @@ static irqreturn_t i2s_irq_handler(int irq, void *data)
|
|||
|
||||
ext_intr_stat = readl(ACP_EXTERNAL_INTR_STAT(adata, rsrc->irqp_used));
|
||||
|
||||
for (i = 0; i < ACP_MAX_STREAM; i++) {
|
||||
stream = adata->stream[i];
|
||||
spin_lock(&adata->acp_lock);
|
||||
list_for_each_entry(stream, &adata->stream_list, list) {
|
||||
if (stream && (ext_intr_stat & stream->irq_bit)) {
|
||||
writel(stream->irq_bit,
|
||||
ACP_EXTERNAL_INTR_STAT(adata, rsrc->irqp_used));
|
||||
snd_pcm_period_elapsed(stream->substream);
|
||||
i2s_flag = 1;
|
||||
break;
|
||||
}
|
||||
if (adata->rsrc->no_of_ctrls == 2) {
|
||||
if (stream && (ext_intr_stat1 & stream->irq_bit)) {
|
||||
|
@ -119,10 +118,10 @@ static irqreturn_t i2s_irq_handler(int irq, void *data)
|
|||
(rsrc->irqp_used - 1)));
|
||||
snd_pcm_period_elapsed(stream->substream);
|
||||
i2s_flag = 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
spin_unlock(&adata->acp_lock);
|
||||
if (i2s_flag)
|
||||
return IRQ_HANDLED;
|
||||
|
||||
|
@ -146,9 +145,8 @@ static void config_pte_for_stream(struct acp_dev_data *adata, struct acp_stream
|
|||
writel(0x01, adata->acp_base + ACPAXI2AXI_ATU_CTRL);
|
||||
}
|
||||
|
||||
static void config_acp_dma(struct acp_dev_data *adata, int cpu_id, int size)
|
||||
static void config_acp_dma(struct acp_dev_data *adata, struct acp_stream *stream, int size)
|
||||
{
|
||||
struct acp_stream *stream = adata->stream[cpu_id];
|
||||
struct snd_pcm_substream *substream = stream->substream;
|
||||
struct acp_resource *rsrc = adata->rsrc;
|
||||
dma_addr_t addr = substream->dma_buffer.addr;
|
||||
|
@ -174,13 +172,10 @@ static void config_acp_dma(struct acp_dev_data *adata, int cpu_id, int size)
|
|||
|
||||
static int acp_dma_open(struct snd_soc_component *component, struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);
|
||||
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0);
|
||||
struct snd_pcm_runtime *runtime = substream->runtime;
|
||||
struct device *dev = component->dev;
|
||||
struct acp_dev_data *adata = dev_get_drvdata(dev);
|
||||
struct acp_stream *stream;
|
||||
int stream_id = cpu_dai->driver->id * 2 + substream->stream;
|
||||
int ret;
|
||||
|
||||
stream = kzalloc(sizeof(*stream), GFP_KERNEL);
|
||||
|
@ -188,7 +183,10 @@ static int acp_dma_open(struct snd_soc_component *component, struct snd_pcm_subs
|
|||
return -ENOMEM;
|
||||
|
||||
stream->substream = substream;
|
||||
adata->stream[stream_id] = stream;
|
||||
|
||||
spin_lock_irq(&adata->acp_lock);
|
||||
list_add_tail(&stream->list, &adata->stream_list);
|
||||
spin_unlock_irq(&adata->acp_lock);
|
||||
|
||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
|
||||
runtime->hw = acp_pcm_hardware_playback;
|
||||
|
@ -212,16 +210,13 @@ static int acp_dma_hw_params(struct snd_soc_component *component,
|
|||
struct snd_pcm_substream *substream,
|
||||
struct snd_pcm_hw_params *params)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);
|
||||
struct acp_dev_data *adata = snd_soc_component_get_drvdata(component);
|
||||
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0);
|
||||
struct acp_stream *stream = substream->runtime->private_data;
|
||||
int stream_id = cpu_dai->driver->id * 2 + substream->stream;
|
||||
u64 size = params_buffer_bytes(params);
|
||||
|
||||
/* Configure ACP DMA block with params */
|
||||
config_pte_for_stream(adata, stream);
|
||||
config_acp_dma(adata, stream_id, size);
|
||||
config_acp_dma(adata, stream, size);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -261,16 +256,15 @@ static int acp_dma_new(struct snd_soc_component *component,
|
|||
static int acp_dma_close(struct snd_soc_component *component,
|
||||
struct snd_pcm_substream *substream)
|
||||
{
|
||||
struct snd_soc_pcm_runtime *soc_runtime = asoc_substream_to_rtd(substream);
|
||||
struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(soc_runtime, 0);
|
||||
struct device *dev = component->dev;
|
||||
struct acp_dev_data *adata = dev_get_drvdata(dev);
|
||||
struct acp_stream *stream;
|
||||
int stream_id = cpu_dai->driver->id * 2 + substream->stream;
|
||||
struct acp_stream *stream = substream->runtime->private_data;
|
||||
|
||||
stream = adata->stream[stream_id];
|
||||
/* Remove entry from list */
|
||||
spin_lock_irq(&adata->acp_lock);
|
||||
list_del(&stream->list);
|
||||
spin_unlock_irq(&adata->acp_lock);
|
||||
kfree(stream);
|
||||
adata->stream[stream_id] = NULL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
@ -305,6 +299,10 @@ int acp_platform_register(struct device *dev)
|
|||
dev_err(dev, "Fail to register acp i2s component\n");
|
||||
return status;
|
||||
}
|
||||
|
||||
INIT_LIST_HEAD(&adata->stream_list);
|
||||
spin_lock_init(&adata->acp_lock);
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL_NS_GPL(acp_platform_register, SND_SOC_ACP_COMMON);
|
||||
|
|
|
@ -84,6 +84,14 @@
|
|||
|
||||
#define ACP_MAX_STREAM 8
|
||||
|
||||
#define TDM_ENABLE 1
|
||||
#define TDM_DISABLE 0
|
||||
|
||||
#define SLOT_WIDTH_8 0x8
|
||||
#define SLOT_WIDTH_16 0x10
|
||||
#define SLOT_WIDTH_24 0x18
|
||||
#define SLOT_WIDTH_32 0x20
|
||||
|
||||
struct acp_chip_info {
|
||||
char *name; /* Platform name */
|
||||
unsigned int acp_rev; /* ACP Revision id */
|
||||
|
@ -91,10 +99,12 @@ struct acp_chip_info {
|
|||
};
|
||||
|
||||
struct acp_stream {
|
||||
struct list_head list;
|
||||
struct snd_pcm_substream *substream;
|
||||
int irq_bit;
|
||||
int dai_id;
|
||||
int id;
|
||||
int dir;
|
||||
u64 bytescount;
|
||||
u32 reg_offset;
|
||||
u32 pte_offset;
|
||||
|
@ -119,11 +129,13 @@ struct acp_dev_data {
|
|||
void __iomem *acp_base;
|
||||
unsigned int i2s_irq;
|
||||
|
||||
bool tdm_mode;
|
||||
/* SOC specific dais */
|
||||
struct snd_soc_dai_driver *dai_driver;
|
||||
int num_dai;
|
||||
|
||||
struct acp_stream *stream[ACP_MAX_STREAM];
|
||||
struct list_head stream_list;
|
||||
spinlock_t acp_lock;
|
||||
|
||||
struct snd_soc_acpi_mach *machines;
|
||||
struct platform_device *mach_dev;
|
||||
|
@ -132,6 +144,8 @@ struct acp_dev_data {
|
|||
u32 lrclk_div;
|
||||
|
||||
struct acp_resource *rsrc;
|
||||
u32 tdm_tx_fmt[3];
|
||||
u32 tdm_rx_fmt[3];
|
||||
};
|
||||
|
||||
union acp_i2stdm_mstrclkgen {
|
||||
|
|
Loading…
Reference in a new issue