public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Johan Hovold <johan+linaro@kernel.org>
To: Mark Brown <broonie@kernel.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
	Banajit Goswami <bgoswami@quicinc.com>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
	alsa-devel@alsa-project.org, linux-sound@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Johan Hovold <johan+linaro@kernel.org>,
	stable@vger.kernel.org
Subject: [PATCH v3 3/5] ASoC: qcom: sc8280xp: limit speaker volumes
Date: Thu, 18 Jan 2024 17:58:09 +0100	[thread overview]
Message-ID: <20240118165811.13672-4-johan+linaro@kernel.org> (raw)
In-Reply-To: <20240118165811.13672-1-johan+linaro@kernel.org>

The UCM configuration for the Lenovo ThinkPad X13s has up until now
been setting the speaker PA volume to -3 dB when enabling the speakers,
but this does not prevent the user from increasing the volume further.

Limit the PA volume to -3 dB in the machine driver to reduce the risk of
speaker damage until we have active speaker protection in place.

Note that this will probably need to be generalised using
machine-specific limits, but a common limit should do for now.

Cc: stable@vger.kernel.org	# 6.5
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
 sound/soc/qcom/sc8280xp.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c
index ed4bb551bfbb..a19bfa354af8 100644
--- a/sound/soc/qcom/sc8280xp.c
+++ b/sound/soc/qcom/sc8280xp.c
@@ -32,12 +32,14 @@ static int sc8280xp_snd_init(struct snd_soc_pcm_runtime *rtd)
 	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
+		 * Set limit of 0 dB on Digital Volume and -3 dB on PA Volume
+		 * to reduce the risk of speaker damage until we have active
+		 * speaker protection in place.
 		 */
 		snd_soc_limit_volume(card, "WSA_RX0 Digital Volume", 84);
 		snd_soc_limit_volume(card, "WSA_RX1 Digital Volume", 84);
+		snd_soc_limit_volume(card, "SpkrLeft PA Volume", 1);
+		snd_soc_limit_volume(card, "SpkrRight PA Volume", 1);
 		break;
 	default:
 		break;
-- 
2.41.0


  parent reply	other threads:[~2024-01-18 16:58 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-18 16:58 [PATCH v3 0/5] ASoC: qcom: volume fixes and codec cleanups Johan Hovold
2024-01-18 16:58 ` [PATCH v3 1/5] ASoC: codecs: wsa883x: fix PA volume control Johan Hovold
2024-01-18 17:24   ` Mark Brown
2024-01-19  7:34     ` Johan Hovold
2024-01-19  7:14   ` Srinivas Kandagatla
2024-01-19  7:49     ` Johan Hovold
2024-01-18 16:58 ` [PATCH v3 2/5] ASoC: codecs: wsa883x: lower default PA gain Johan Hovold
2024-01-18 17:21   ` Mark Brown
2024-01-19  7:57     ` Johan Hovold
2024-01-19  7:15   ` Srinivas Kandagatla
2024-01-19  8:00     ` Johan Hovold
2024-01-18 16:58 ` Johan Hovold [this message]
2024-01-19  7:37   ` [PATCH v3 3/5] ASoC: qcom: sc8280xp: limit speaker volumes Srinivas Kandagatla
2024-01-19  8:06     ` Johan Hovold
2024-01-18 16:58 ` [PATCH v3 4/5] ASoC: codecs: lpass-wsa-macro: fix compander volume hack Johan Hovold
2024-01-19  7:45   ` Srinivas Kandagatla
2024-01-19  8:10     ` Johan Hovold
2024-01-18 16:58 ` [PATCH v3 5/5] ASoC: codecs: wcd9335: drop unused gain hack remnant Johan Hovold
2024-01-19  7:46   ` Srinivas Kandagatla

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240118165811.13672-4-johan+linaro@kernel.org \
    --to=johan+linaro@kernel.org \
    --cc=alsa-devel@alsa-project.org \
    --cc=bgoswami@quicinc.com \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=stable@vger.kernel.org \
    --cc=tiwai@suse.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox