Unverified Commit 5bd70440 authored Apr 14, 2020 by Pierre-Louis Bossart Committed by Mark Brown Apr 15, 2020

ASoC: soc-dai: revert all changes to DAI startup/shutdown sequence



On Baytrail/Cherrytrail, the Atom/SST driver fails miserably:

[    9.741953] intel_sst_acpi 80860F28:00: FW Version 01.0c.00.01
[    9.832992] intel_sst_acpi 80860F28:00: FW sent error response 0x40034
[    9.833019] intel_sst_acpi 80860F28:00: FW alloc failed ret -4
[    9.833028] intel_sst_acpi 80860F28:00: sst_get_stream returned err -5
[    9.833033] sst-mfld-platform sst-mfld-platform: ASoC: DAI prepare error: -5
[    9.833037]  Baytrail Audio Port: ASoC: prepare FE Baytrail Audio Port failed
[    9.853942] intel_sst_acpi 80860F28:00: FW sent error response 0x40034
[    9.853974] intel_sst_acpi 80860F28:00: FW alloc failed ret -4
[    9.853984] intel_sst_acpi 80860F28:00: sst_get_stream returned err -5
[    9.853990] sst-mfld-platform sst-mfld-platform: ASoC: DAI prepare error: -5
[    9.853994]  Baytrail Audio Port: ASoC: prepare FE Baytrail Audio Port failed

Commit b56be800 ("ASoC: soc-pcm: call
snd_soc_dai_startup()/shutdown() once") was the initial problematic
commit.

Commit 1ba616bd ("ASoC: soc-dai: fix DAI startup/shutdown sequence")
was an attempt to fix things but it does not work on Baytrail,
reverting all changes seems necessary for now.

Fixes: 1ba616bd ("ASoC: soc-dai: fix DAI startup/shutdown sequence")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20200415030437.23803-1-pierre-louis.bossart@linux.intel.com


Signed-off-by: Mark Brown <broonie@kernel.org>

parent 26d87881

include/sound/soc-dai.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -351,7 +351,6 @@ struct snd_soc_dai {

		/* bit field */
		unsigned int probed:1;
		unsigned int started[SNDRV_PCM_STREAM_LAST + 1];
		};

		static inline struct snd_soc_pcm_stream *

sound/soc/soc-dai.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -295,24 +295,17 @@ int snd_soc_dai_startup(struct snd_soc_dai *dai,
		{
		int ret = 0;

		if (!dai->started[substream->stream] &&
		dai->driver->ops->startup)
		if (dai->driver->ops->startup)
		ret = dai->driver->ops->startup(substream, dai);

		if (ret == 0)
		dai->started[substream->stream] = 1;

		return ret;
		}

		void snd_soc_dai_shutdown(struct snd_soc_dai *dai,
		struct snd_pcm_substream *substream)
		{
		if (dai->started[substream->stream] &&
		dai->driver->ops->shutdown)
		if (dai->driver->ops->shutdown)
		dai->driver->ops->shutdown(substream, dai);

		dai->started[substream->stream] = 0;
		}

		int snd_soc_dai_prepare(struct snd_soc_dai *dai,

Admin message