ASoC: fix hw_params/hw_free validity checks
cover ASoC: fix hw_params/hw_free validity checks
While working on a codec, I have found an odd situation. The hw_params callback which was provided by the codec dai was not called as expected. However, the hw_free callback was called, even if hw_params was skipped.
After debugging, I found out that the dai was considered invalid because it did not specify any rates, only rate_min and rate_max. That's a first problem.
If a codec dai is considered invalid, hw_free should probably not be called either, that's a 2nd issue.
This patchset is meant to solve both issues.
Jerome Brunet (2):
ASoC: fix valid stream condition
ASoC: skip hw_free on codec dai for which the stream is invalid
sound/soc/soc-pcm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 ASoC: fix valid stream condition
A stream may specify a rate range using 'rate_min' and 'rate_max', so a stream may be valid and not specify any rates. However, as stream cannot be valid and not have any channel. Let's use this condition instead to determine if a stream is valid or not.
--- sound/soc/soc-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-pcm.c +2 -2
@@ -42,8 +42,8 @@ static bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream)else codec_stream = &dai->driver->capture; -/* If the codec specifies any rate at all, it supports the stream. */ -return codec_stream->rates; +/* If the codec specifies any channels at all, it supports the stream */ +return codec_stream->channels_min; }/**
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: fix valid stream condition" to the asoc tree
The patch
ASoC: fix valid stream condition
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
6a7c59c6d9f3b280e81d7a04bbe4e55e90152dceMon Sep 17 00:00:00 2001
From: Jerome Brunet <[email protected]>
Date: Mon, 29 Apr 2019 11:47:49 +0200
Subject: [PATCH] ASoC: fix valid stream condition
A stream may specify a rate range using 'rate_min' and 'rate_max', so a stream may be valid and not specify any rates. However, as stream cannot be valid and not have any channel. Let's use this condition instead to determine if a stream is valid or not.
--- sound/soc/soc-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-pcm.c +2 -2
@@ -43,8 +43,8 @@ static bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream)else codec_stream = &dai->driver->capture; -/* If the codec specifies any rate at all, it supports the stream. */ -return codec_stream->rates; +/* If the codec specifies any channels at all, it supports the stream */ +return codec_stream->channels_min; }/**
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: fix valid stream condition" to the asoc tree
In reply to Jerome BrunetThe patch
ASoC: fix valid stream condition
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
6a7c59c6d9f3b280e81d7a04bbe4e55e90152dceMon Sep 17 00:00:00 2001
From: Jerome Brunet <[email protected]>
Date: Mon, 29 Apr 2019 11:47:49 +0200
Subject: [PATCH] ASoC: fix valid stream condition
A stream may specify a rate range using 'rate_min' and 'rate_max', so a stream may be valid and not specify any rates. However, as stream cannot be valid and not have any channel. Let's use this condition instead to determine if a stream is valid or not.
--- sound/soc/soc-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-pcm.c +2 -2
@@ -43,8 +43,8 @@ static bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream)else codec_stream = &dai->driver->capture; -/* If the codec specifies any rate at all, it supports the stream. */ -return codec_stream->rates; +/* If the codec specifies any channels at all, it supports the stream */ +return codec_stream->channels_min; }/**
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: fix valid stream condition" to the asoc tree
In reply to Jerome BrunetThe patch
ASoC: fix valid stream condition
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
6a7c59c6d9f3b280e81d7a04bbe4e55e90152dceMon Sep 17 00:00:00 2001
From: Jerome Brunet <[email protected]>
Date: Mon, 29 Apr 2019 11:47:49 +0200
Subject: [PATCH] ASoC: fix valid stream condition
A stream may specify a rate range using 'rate_min' and 'rate_max', so a stream may be valid and not specify any rates. However, as stream cannot be valid and not have any channel. Let's use this condition instead to determine if a stream is valid or not.
--- sound/soc/soc-pcm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/soc-pcm.c +2 -2
@@ -43,8 +43,8 @@ static bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int stream)else codec_stream = &dai->driver->capture; -/* If the codec specifies any rate at all, it supports the stream. */ -return codec_stream->rates; +/* If the codec specifies any channels at all, it supports the stream */ +return codec_stream->channels_min; }/**
Signature · 1 line
2.20.1
PATCH 2/2 ASoC: skip hw_free on codec dai for which the stream is invalid
In reply to Jerome BrunetLike for hw_params, hw_free should not be called on codec dai for which the current stream is invalid.
--- sound/soc/soc-pcm.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/soc-pcm.c +6 -0
@@ -1020,6 +1020,9 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, codec_err:for_each_rtd_codec_dai_rollback (rtd, i, codec_dai) { +if (!snd_soc_dai_stream_valid (codec_dai, substream->stream)) +continue ; +if (codec_dai->driver->ops->hw_free) codec_dai->driver->ops->hw_free (substream, codec_dai); codec_dai->rate =0 ;
@@ -1077,6 +1080,9 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)/* now free hw params for the DAIs */ for_each_rtd_codec_dai (rtd, i, codec_dai) { +if (!snd_soc_dai_stream_valid (codec_dai, substream->stream)) +continue ; +if (codec_dai->driver->ops->hw_free) codec_dai->driver->ops->hw_free (substream, codec_dai); }
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: skip hw_free on codec dai for which the stream is invalid" to the asoc tree
The patch
ASoC: skip hw_free on codec dai for which the stream is invalid
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
f47b9ad927c6370b80922af434dda98764a43804Mon Sep 17 00:00:00 2001
From: Jerome Brunet <[email protected]>
Date: Mon, 29 Apr 2019 11:47:50 +0200
Subject: [PATCH] ASoC: skip hw_free on codec dai for which the stream is
invalid
Like for hw_params, hw_free should not be called on codec dai for which the current stream is invalid.
--- sound/soc/soc-pcm.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/soc-pcm.c +6 -0
@@ -1031,6 +1031,9 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, codec_err:for_each_rtd_codec_dai_rollback (rtd, i, codec_dai) { +if (!snd_soc_dai_stream_valid (codec_dai, substream->stream)) +continue ; +if (codec_dai->driver->ops->hw_free) codec_dai->driver->ops->hw_free (substream, codec_dai); codec_dai->rate =0 ;
@@ -1088,6 +1091,9 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)/* now free hw params for the DAIs */ for_each_rtd_codec_dai (rtd, i, codec_dai) { +if (!snd_soc_dai_stream_valid (codec_dai, substream->stream)) +continue ; +if (codec_dai->driver->ops->hw_free) codec_dai->driver->ops->hw_free (substream, codec_dai); }
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: skip hw_free on codec dai for which the stream is invalid" to the asoc tree
In reply to Jerome BrunetThe patch
ASoC: skip hw_free on codec dai for which the stream is invalid
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
f47b9ad927c6370b80922af434dda98764a43804Mon Sep 17 00:00:00 2001
From: Jerome Brunet <[email protected]>
Date: Mon, 29 Apr 2019 11:47:50 +0200
Subject: [PATCH] ASoC: skip hw_free on codec dai for which the stream is
invalid
Like for hw_params, hw_free should not be called on codec dai for which the current stream is invalid.
--- sound/soc/soc-pcm.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/soc-pcm.c +6 -0
@@ -1031,6 +1031,9 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, codec_err:for_each_rtd_codec_dai_rollback (rtd, i, codec_dai) { +if (!snd_soc_dai_stream_valid (codec_dai, substream->stream)) +continue ; +if (codec_dai->driver->ops->hw_free) codec_dai->driver->ops->hw_free (substream, codec_dai); codec_dai->rate =0 ;
@@ -1088,6 +1091,9 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)/* now free hw params for the DAIs */ for_each_rtd_codec_dai (rtd, i, codec_dai) { +if (!snd_soc_dai_stream_valid (codec_dai, substream->stream)) +continue ; +if (codec_dai->driver->ops->hw_free) codec_dai->driver->ops->hw_free (substream, codec_dai); }
Signature · 1 line
2.20.1
Mark Brown
maintainerApplied "ASoC: skip hw_free on codec dai for which the stream is invalid" to the asoc tree
In reply to Jerome BrunetThe patch
ASoC: skip hw_free on codec dai for which the stream is invalid
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
f47b9ad927c6370b80922af434dda98764a43804Mon Sep 17 00:00:00 2001
From: Jerome Brunet <[email protected]>
Date: Mon, 29 Apr 2019 11:47:50 +0200
Subject: [PATCH] ASoC: skip hw_free on codec dai for which the stream is
invalid
Like for hw_params, hw_free should not be called on codec dai for which the current stream is invalid.
--- sound/soc/soc-pcm.c | 6 ++++++ 1 file changed, 6 insertions(+)
sound/soc/soc-pcm.c +6 -0
@@ -1031,6 +1031,9 @@ static int soc_pcm_hw_params(struct snd_pcm_substream *substream, codec_err:for_each_rtd_codec_dai_rollback (rtd, i, codec_dai) { +if (!snd_soc_dai_stream_valid (codec_dai, substream->stream)) +continue ; +if (codec_dai->driver->ops->hw_free) codec_dai->driver->ops->hw_free (substream, codec_dai); codec_dai->rate =0 ;
@@ -1088,6 +1091,9 @@ static int soc_pcm_hw_free(struct snd_pcm_substream *substream)/* now free hw params for the DAIs */ for_each_rtd_codec_dai (rtd, i, codec_dai) { +if (!snd_soc_dai_stream_valid (codec_dai, substream->stream)) +continue ; +if (codec_dai->driver->ops->hw_free) codec_dai->driver->ops->hw_free (substream, codec_dai); }
Signature · 1 line
2.20.1