To reduce the risk of speaker damage the PA gain needs to be limited on
machines like the Lenovo Thinkpad X13s until we have active speaker
protection in place.

Limit the gain to the current default setting provided by the UCM
configuration which most user have so far been using (due to a bug in
the configuration files which prevented hardware volume control [1]).

The wsa883x PA volume control also turned out to be broken, which meant
that the default setting used by UCM configuration is actually the
lowest level (-3 dB). With the codec driver fixed, hardware volume
control also works as expected.

Note that the new wsa884x driver most likely suffers from a similar bug,
I'll send a fix for that once I've got that confirmed.

Included is also a related fix for the LPASS WSA macro driver, which
was changing the digital gain setting behind the back of user space and
which can result in excessive (or too low) digital gain.

There are further Qualcomm codec drivers that similarly appear to
manipulate various gain settings, but on closer inspection it turns out
that they only write back the current settings. Tests reveal that these
writes are indeed needed for any prior updates to take effect (at least
for the WSA and RX macros).

Johan

[1] https://github.com/alsa-project/alsa-ucm-conf/pull/382


Changes in v5
 - rebase on v6.8-rc1 

Changes in v4
 - keep the full PA volume control range and only fix the exported dB
   values
 - use a combined -3 dB machine limit as limiting just the PA volume
   confuses PulseAudio
 - drop the PA gain initialisation which is no longer needed

Changes in v3
 - fix the wsa883x PA volume control and update the machine limits
   accordingly

Changes in v2
 - keep the volume register write on power-on in lpass-wsa-macro
 - drop the other patches removing volume register writes on DAPM events
 - only drop the constant-zero gain offsets in wcd9335


Johan Hovold (4):
  ASoC: codecs: wsa883x: fix PA volume control
  ASoC: qcom: sc8280xp: limit speaker volumes
  ASoC: codecs: lpass-wsa-macro: fix compander volume hack
  ASoC: codecs: wcd9335: drop unused gain hack remnant

 sound/soc/codecs/lpass-wsa-macro.c |  7 -------
 sound/soc/codecs/wcd9335.c         |  4 ----
 sound/soc/codecs/wsa883x.c         |  6 +++++-
 sound/soc/qcom/sc8280xp.c          | 12 +++++++-----
 4 files changed, 12 insertions(+), 17 deletions(-)

-- 
2.43.0

On Mon, 22 Jan 2024 19:18:15 +0100, Johan Hovold wrote:
> To reduce the risk of speaker damage the PA gain needs to be limited on
> machines like the Lenovo Thinkpad X13s until we have active speaker
> protection in place.
> 
> Limit the gain to the current default setting provided by the UCM
> configuration which most user have so far been using (due to a bug in
> the configuration files which prevented hardware volume control [1]).
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[2/4] ASoC: qcom: sc8280xp: limit speaker volumes
      commit: c481016bb4f8a9c059c39ac06e7b65e233a61f6a

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

Hi Mark and Takashi,

On Mon, Jan 22, 2024 at 09:54:15PM +0000, Mark Brown wrote:
> On Mon, 22 Jan 2024 19:18:15 +0100, Johan Hovold wrote:
> > To reduce the risk of speaker damage the PA gain needs to be limited on
> > machines like the Lenovo Thinkpad X13s until we have active speaker
> > protection in place.
> > 
> > Limit the gain to the current default setting provided by the UCM
> > configuration which most user have so far been using (due to a bug in
> > the configuration files which prevented hardware volume control [1]).
> > 
> > [...]
> 
> Applied to
> 
>    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

alsa-ucm-conf 1.2.11 was released yesterday, which means that it is now
very urgent to get the speaker volume limitation backported to the
stable trees.

Could you please try to make sure that these fixes get to Linus this
week?

Johan

Hi Greg and Sasha,

On Tue, Jan 30, 2024 at 01:53:37PM +0100, Johan Hovold wrote:
> On Mon, Jan 22, 2024 at 09:54:15PM +0000, Mark Brown wrote:
> > On Mon, 22 Jan 2024 19:18:15 +0100, Johan Hovold wrote:
> > > To reduce the risk of speaker damage the PA gain needs to be limited on
> > > machines like the Lenovo Thinkpad X13s until we have active speaker
> > > protection in place.
> > > 
> > > Limit the gain to the current default setting provided by the UCM
> > > configuration which most user have so far been using (due to a bug in
> > > the configuration files which prevented hardware volume control [1]).
> > > 
> > > [...]
> > 
> > Applied to
> > 
> >    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
> 
> alsa-ucm-conf 1.2.11 was released yesterday, which means that it is now
> very urgent to get the speaker volume limitation backported to the
> stable trees.
> 
> Could you please try to make sure that these fixes get to Linus this
> week?

This series (and a related headphone codec fix) were merged into Linus's
tree yesterday.

I saw that the 6.7.4 stable patches were sent out for review over night,
but could it be possible to squeeze in also the following four fixes in
6.7.4 (and 6.6.16)?

	c481016bb4f8 ASoC: qcom: sc8280xp: limit speaker volumes
	4d0e8bdfa4a5 ASoC: codecs: wcd938x: fix headphones volume controls
	46188db080bd ASoC: codecs: lpass-wsa-macro: fix compander volume hack
	b53cc6144a3f ASoC: codecs: wsa883x: fix PA volume control

These are needed for proper volume control and, importantly, to prevent
users of the Lenovo ThinkPad X13s from potentially damaging their
speakers when the distros ship the latest UCM configuration files which
were released on Monday.

Johan

On Sat, Feb 03, 2024 at 09:36:14AM +0100, Johan Hovold wrote:
> Hi Greg and Sasha,
> 
> On Tue, Jan 30, 2024 at 01:53:37PM +0100, Johan Hovold wrote:
> > On Mon, Jan 22, 2024 at 09:54:15PM +0000, Mark Brown wrote:
> > > On Mon, 22 Jan 2024 19:18:15 +0100, Johan Hovold wrote:
> > > > To reduce the risk of speaker damage the PA gain needs to be limited on
> > > > machines like the Lenovo Thinkpad X13s until we have active speaker
> > > > protection in place.
> > > > 
> > > > Limit the gain to the current default setting provided by the UCM
> > > > configuration which most user have so far been using (due to a bug in
> > > > the configuration files which prevented hardware volume control [1]).
> > > > 
> > > > [...]
> > > 
> > > Applied to
> > > 
> > >    https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
> > 
> > alsa-ucm-conf 1.2.11 was released yesterday, which means that it is now
> > very urgent to get the speaker volume limitation backported to the
> > stable trees.
> > 
> > Could you please try to make sure that these fixes get to Linus this
> > week?
> 
> This series (and a related headphone codec fix) were merged into Linus's
> tree yesterday.
> 
> I saw that the 6.7.4 stable patches were sent out for review over night,
> but could it be possible to squeeze in also the following four fixes in
> 6.7.4 (and 6.6.16)?
> 
> 	c481016bb4f8 ASoC: qcom: sc8280xp: limit speaker volumes
> 	4d0e8bdfa4a5 ASoC: codecs: wcd938x: fix headphones volume controls
> 	46188db080bd ASoC: codecs: lpass-wsa-macro: fix compander volume hack
> 	b53cc6144a3f ASoC: codecs: wsa883x: fix PA volume control
> 
> These are needed for proper volume control and, importantly, to prevent
> users of the Lenovo ThinkPad X13s from potentially damaging their
> speakers when the distros ship the latest UCM configuration files which
> were released on Monday.

All now queued up for this round, thanks.

greg k-h

On Sat, Feb 03, 2024 at 08:04:01AM -0800, Greg Kroah-Hartman wrote:
> On Sat, Feb 03, 2024 at 09:36:14AM +0100, Johan Hovold wrote:

> > I saw that the 6.7.4 stable patches were sent out for review over night,
> > but could it be possible to squeeze in also the following four fixes in
> > 6.7.4 (and 6.6.16)?
> > 
> > 	c481016bb4f8 ASoC: qcom: sc8280xp: limit speaker volumes
> > 	4d0e8bdfa4a5 ASoC: codecs: wcd938x: fix headphones volume controls
> > 	46188db080bd ASoC: codecs: lpass-wsa-macro: fix compander volume hack
> > 	b53cc6144a3f ASoC: codecs: wsa883x: fix PA volume control

> All now queued up for this round, thanks.

Thanks, much appreciated!

Johan