This is a backport of the following series:
https://lore.kernel.org/lkml/20231204124736.132185-1-srinivas.kandagatla@lin...
which did not build on 6.6 due a rename of the asoc_rtd_to_cpu() interface.
Johan
Srinivas Kandagatla (2): ASoC: ops: add correct range check for limiting volume ASoC: qcom: sc8280xp: Limit speaker digital volumes
sound/soc/qcom/sc8280xp.c | 17 +++++++++++++++++ sound/soc/soc-ops.c | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-)
From: Srinivas Kandagatla srinivas.kandagatla@linaro.org
commit fb9ad24485087e0f00d84bee7a5914640b2b9024 upstream.
Volume can have ranges that start with negative values, ex: -84dB to +40dB. Apply correct range check in snd_soc_limit_volume before setting the platform_max. Without this patch, for example setting a 0dB limit on a volume range of -84dB to +40dB would fail.
Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org Tested-by: Johan Hovold johan+linaro@kernel.org Reviewed-by: Johan Hovold johan+linaro@kernel.org Link: https://lore.kernel.org/r/20231204124736.132185-2-srinivas.kandagatla@linaro... Signed-off-by: Mark Brown broonie@kernel.org Signed-off-by: Johan Hovold johan+linaro@kernel.org --- sound/soc/soc-ops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index 55b009d3c681..2d25748ca706 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c @@ -661,7 +661,7 @@ int snd_soc_limit_volume(struct snd_soc_card *card, kctl = snd_soc_card_get_kcontrol(card, name); if (kctl) { struct soc_mixer_control *mc = (struct soc_mixer_control *)kctl->private_value; - if (max <= mc->max) { + if (max <= mc->max - mc->min) { mc->platform_max = max; ret = 0; }
From: Srinivas Kandagatla srinivas.kandagatla@linaro.org
commit 716d4e5373e9d1ae993485ab2e3b893bf7104fb1 upstream.
Limit the speaker digital gains to 0dB so that the users will not damage them. Currently there is a limit in UCM, but this does not stop the user form changing the digital gains from command line. So limit this in driver which makes the speakers more safer without active speaker protection in place.
Signed-off-by: Srinivas Kandagatla srinivas.kandagatla@linaro.org Reviewed-by: Johan Hovold johan+linaro@kernel.org Tested-by: Johan Hovold johan+linaro@kernel.org Link: https://lore.kernel.org/r/20231204124736.132185-3-srinivas.kandagatla@linaro... Signed-off-by: Mark Brown broonie@kernel.org [ johan: backport to 6.6; rename snd_soc_rtd_to_cpu() ] Signed-off-by: Johan Hovold johan+linaro@kernel.org --- sound/soc/qcom/sc8280xp.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c index 14d9fea33d16..c61cad0180c8 100644 --- a/sound/soc/qcom/sc8280xp.c +++ b/sound/soc/qcom/sc8280xp.c @@ -27,6 +27,23 @@ struct sc8280xp_snd_data { static int sc8280xp_snd_init(struct snd_soc_pcm_runtime *rtd) { struct sc8280xp_snd_data *data = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_card *card = rtd->card; + + switch (cpu_dai->id) { + case WSA_CODEC_DMA_RX_0: + case WSA_CODEC_DMA_RX_1: + /* + * set limit of 0dB on Digital Volume for Speakers, + * this can prevent damage of speakers to some extent without + * active speaker protection + */ + snd_soc_limit_volume(card, "WSA_RX0 Digital Volume", 84); + snd_soc_limit_volume(card, "WSA_RX1 Digital Volume", 84); + break; + default: + break; + }
return qcom_snd_wcd_jack_setup(rtd, &data->jack, &data->jack_setup); }
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#opti...
Rule: add the tag "Cc: stable@vger.kernel.org" in the sign-off area to have the patch automatically included in the stable tree. Subject: [PATCH 2/2] ASoC: qcom: sc8280xp: Limit speaker digital volumes Link: https://lore.kernel.org/stable/20231211132608.27861-3-johan%2Blinaro%40kerne...
On Tue, Dec 12, 2023 at 01:28:36AM +0800, kernel test robot wrote:
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#opti...
Rule: add the tag "Cc: stable@vger.kernel.org" in the sign-off area to have the patch automatically included in the stable tree. Subject: [PATCH 2/2] ASoC: qcom: sc8280xp: Limit speaker digital volumes Link: https://lore.kernel.org/stable/20231211132608.27861-3-johan%2Blinaro%40kerne...
Please fix your robot. This is a series of stable kernel backports so the above warning makes no sense.
Johan
On Mon, Dec 11, 2023 at 06:39:51PM +0100, Johan Hovold wrote:
On Tue, Dec 12, 2023 at 01:28:36AM +0800, kernel test robot wrote:
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#opti...
Rule: add the tag "Cc: stable@vger.kernel.org" in the sign-off area to have the patch automatically included in the stable tree. Subject: [PATCH 2/2] ASoC: qcom: sc8280xp: Limit speaker digital volumes
^
Link: https://lore.kernel.org/stable/20231211132608.27861-3-johan%2Blinaro%40kerne...
Please fix your robot. This is a series of stable kernel backports so the above warning makes no sense.
Sorry for this wrong report. We introduced b4 tool into the robot recently to help simplify patch processing, but seems that b4 automatically removed the "stable-6.6" prefix in the patch subject when grabbing the mail thread, and triggered this wrong report. We've fixed this issue for the bot just now.
$ b4 am https://lore.kernel.org/all/20231211132608.27861-3-johan+linaro@kernel.org/ Cover: ./20231211_johan_linaro_asoc_qcom_sc8280xp_limit_speaker_digital_volumes.cover Link: https://lore.kernel.org/r/20231211132608.27861-1-johan+linaro@kernel.org Base: not specified git am ./20231211_johan_linaro_asoc_qcom_sc8280xp_limit_speaker_digital_volumes.mbx
$ grep -h ^Subject *johan_linaro* Subject: [PATCH 0/2] ASoC: qcom: sc8280xp: Limit speaker digital volumes Subject: [PATCH 1/2] ASoC: ops: add correct range check for limiting volume Subject: [PATCH 2/2] ASoC: qcom: sc8280xp: Limit speaker digital volumes
Best Regards, Yujie
On Tue, Dec 12, 2023 at 04:48:54PM +0800, Yujie Liu wrote:
On Mon, Dec 11, 2023 at 06:39:51PM +0100, Johan Hovold wrote:
On Tue, Dec 12, 2023 at 01:28:36AM +0800, kernel test robot wrote:
Hi,
Thanks for your patch.
FYI: kernel test robot notices the stable kernel rule is not satisfied.
The check is based on https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#opti...
Rule: add the tag "Cc: stable@vger.kernel.org" in the sign-off area to have the patch automatically included in the stable tree. Subject: [PATCH 2/2] ASoC: qcom: sc8280xp: Limit speaker digital volumes
^Link: https://lore.kernel.org/stable/20231211132608.27861-3-johan%2Blinaro%40kerne...
Please fix your robot. This is a series of stable kernel backports so the above warning makes no sense.
Sorry for this wrong report. We introduced b4 tool into the robot recently to help simplify patch processing, but seems that b4 automatically removed the "stable-6.6" prefix in the patch subject when grabbing the mail thread, and triggered this wrong report. We've fixed this issue for the bot just now.
Perfect, thanks!
Johan
On Mon, Dec 11, 2023 at 02:26:06PM +0100, Johan Hovold wrote:
This is a backport of the following series:
https://lore.kernel.org/lkml/20231204124736.132185-1-srinivas.kandagatla@lin...
which did not build on 6.6 due a rename of the asoc_rtd_to_cpu() interface.
Johan
Srinivas Kandagatla (2): ASoC: ops: add correct range check for limiting volume ASoC: qcom: sc8280xp: Limit speaker digital volumes
sound/soc/qcom/sc8280xp.c | 17 +++++++++++++++++ sound/soc/soc-ops.c | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-)
-- 2.41.0
Now queued up, thanks.
greg k-h
linux-stable-mirror@lists.linaro.org
-
Greg Kroah-Hartman -
Johan Hovold -
Johan Hovold -
kernel test robot -
Yujie Liu