Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-13 23:51:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: qcom: sc7280: Fix missing Soundwire runtime stream alloc

Browse Source 
Commit 15c7fab0e0 ("ASoC: qcom: Move Soundwire runtime stream alloc to
soundcards") moved the allocation of Soundwire stream runtime from the
Qualcomm Soundwire driver to each individual machine sound card driver,
except that it forgot to update SC7280 card.

Just like for other Qualcomm sound cards using Soundwire, the card
driver should allocate and release the runtime.  Otherwise sound
playback will result in a NULL pointer dereference or other effect of
uninitialized memory accesses (which was confirmed on SDM845 having
similar issue).

Cc: stable@vger.kernel.org
Cc: Alexey Klimov <alexey.klimov@linaro.org>
Cc: Steev Klimaszewski <steev@kali.org>
Fixes: 15c7fab0e0 ("ASoC: qcom: Move Soundwire runtime stream alloc to soundcards")
Link: https://lore.kernel.org/r/20241010054109.16938-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20241012101108.129476-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2024-10-12 12:11:08 +02:00 committed by Mark Brown
parent b9a8ecf810
commit db7e59e6a3
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sound/soc/qcom/Kconfig
View File

@ -209,6 +209,7 @@ config SND_SOC_SC7280
tristate "SoC Machine driver for SC7280 boards" tristate "SoC Machine driver for SC7280 boards"
depends on I2C && SOUNDWIRE depends on I2C && SOUNDWIRE
select SND_SOC_QCOM_COMMON select SND_SOC_QCOM_COMMON
select SND_SOC_QCOM_SDW
select SND_SOC_LPASS_SC7280 select SND_SOC_LPASS_SC7280
select SND_SOC_MAX98357A select SND_SOC_MAX98357A
select SND_SOC_WCD938X_SDW select SND_SOC_WCD938X_SDW

10
sound/soc/qcom/sc7280.c
View File

@ -23,6 +23,7 @@
#include "common.h" #include "common.h"
#include "lpass.h" #include "lpass.h"
#include "qdsp6/q6afe.h" #include "qdsp6/q6afe.h"
#include "sdw.h"
#define DEFAULT_MCLK_RATE 19200000 #define DEFAULT_MCLK_RATE 19200000
#define RT5682_PLL_FREQ (48000 * 512) #define RT5682_PLL_FREQ (48000 * 512)
@ -316,6 +317,7 @@ static void sc7280_snd_shutdown(struct snd_pcm_substream *substream)
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct sc7280_snd_data *data = snd_soc_card_get_drvdata(card); struct sc7280_snd_data *data = snd_soc_card_get_drvdata(card);
struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0); struct snd_soc_dai *cpu_dai = snd_soc_rtd_to_cpu(rtd, 0);
struct sdw_stream_runtime *sruntime = data->sruntime[cpu_dai->id];
switch (cpu_dai->id) { switch (cpu_dai->id) {
case MI2S_PRIMARY: case MI2S_PRIMARY:
@ -333,6 +335,9 @@ static void sc7280_snd_shutdown(struct snd_pcm_substream *substream)
default: default:
break; break;
} }
data->sruntime[cpu_dai->id] = NULL;
sdw_release_stream(sruntime);
} }
static int sc7280_snd_startup(struct snd_pcm_substream *substream) static int sc7280_snd_startup(struct snd_pcm_substream *substream)
@ -347,6 +352,8 @@ static int sc7280_snd_startup(struct snd_pcm_substream *substream)
switch (cpu_dai->id) { switch (cpu_dai->id) {
case MI2S_PRIMARY: case MI2S_PRIMARY:
ret = sc7280_rt5682_init(rtd); ret = sc7280_rt5682_init(rtd);
if (ret)
return ret;
break; break;
case SECONDARY_MI2S_RX: case SECONDARY_MI2S_RX:
codec_dai_fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_I2S; codec_dai_fmt |= SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_I2S;
@ -360,7 +367,8 @@ static int sc7280_snd_startup(struct snd_pcm_substream *substream)
default: default:
break; break;
} }
return ret;
return qcom_snd_sdw_startup(substream);
} }
static const struct snd_soc_ops sc7280_ops = { static const struct snd_soc_ops sc7280_ops = {