Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff2354bc authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.15-rc5-intel' of... 

Merge tag 'asoc-v3.15-rc5-intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Intel fixes for v3.15

This is a relatively large batch of fixes for the newly added
Haswell/Baytrail drivers from Intel.  It's a bit larger than is good for
this point in the cycle but it's all for a newly added driver so not so
worrying as it might otherwise be.  Some of it's integration problems,
some of it's the sort of problem usually turned up in stress tests.
parents 7ca33c7a cffd6665

sound/soc/intel/sst-acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ static int sst_acpi_probe(struct platform_device *pdev) 


	sst_pdata = &sst_acpi->sst_pdata;

	sst_pdata->id = desc->sst_id;

	sst_pdata->dma_dev = dev;

	sst_acpi->desc = desc;

	sst_acpi->mach = mach;

sound/soc/intel/sst-baytrail-dsp.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ static int sst_byt_init(struct sst_dsp *sst, struct sst_pdata *pdata) 
	memcpy_toio(sst->addr.lpe + SST_BYT_MAILBOX_OFFSET,

	       &pdata->fw_base, sizeof(u32));



	ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));

	ret = dma_coerce_mask_and_coherent(sst->dma_dev, DMA_BIT_MASK(32));

	if (ret)

		return ret;

sound/soc/intel/sst-baytrail-ipc.c

+8 −0
Original line number Diff line number Diff line
@@ -542,16 +542,20 @@ struct sst_byt_stream *sst_byt_stream_new(struct sst_byt *byt, int id, 
	void *data)

{

	struct sst_byt_stream *stream;

	struct sst_dsp *sst = byt->dsp;

	unsigned long flags;



	stream = kzalloc(sizeof(*stream), GFP_KERNEL);

	if (stream == NULL)

		return NULL;



	spin_lock_irqsave(&sst->spinlock, flags);

	list_add(&stream->node, &byt->stream_list);

	stream->notify_position = notify_position;

	stream->pdata = data;

	stream->byt = byt;

	stream->str_id = id;

	spin_unlock_irqrestore(&sst->spinlock, flags);



	return stream;

}
@@ -630,6 +634,8 @@ int sst_byt_stream_free(struct sst_byt *byt, struct sst_byt_stream *stream) 
{

	u64 header;

	int ret = 0;

	struct sst_dsp *sst = byt->dsp;

	unsigned long flags;



	if (!stream->commited)

		goto out;
@@ -644,8 +650,10 @@ int sst_byt_stream_free(struct sst_byt *byt, struct sst_byt_stream *stream) 


	stream->commited = false;

out:

	spin_lock_irqsave(&sst->spinlock, flags);

	list_del(&stream->node);

	kfree(stream);

	spin_unlock_irqrestore(&sst->spinlock, flags);



	return ret;

}

sound/soc/intel/sst-dsp-priv.h

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ struct sst_dsp { 
	spinlock_t spinlock;	/* IPC locking */

	struct mutex mutex;	/* DSP FW lock */

	struct device *dev;

	struct device *dma_dev;

	void *thread_context;

	int irq;

	u32 id;

sound/soc/intel/sst-dsp.c

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ struct sst_dsp *sst_dsp_new(struct device *dev, 
	spin_lock_init(&sst->spinlock);

	mutex_init(&sst->mutex);

	sst->dev = dev;

	sst->dma_dev = pdata->dma_dev;

	sst->thread_context = sst_dev->thread_context;

	sst->sst_dev = sst_dev;

	sst->id = pdata->id;