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 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.41.0

On Fri, 19 Jan 2024 12:24:16 +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!

[1/4] ASoC: codecs: wsa883x: fix PA volume control
      (no commit info)
[2/4] ASoC: qcom: sc8280xp: limit speaker volumes
      commit: c481016bb4f8a9c059c39ac06e7b65e233a61f6a
[3/4] ASoC: codecs: lpass-wsa-macro: fix compander volume hack
      (no commit info)
[4/4] ASoC: codecs: wcd9335: drop unused gain hack remnant
      (no commit info)

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

On Mon, Jan 22, 2024 at 09:54:10PM +0000, Mark Brown wrote:
> On Fri, 19 Jan 2024 12:24:16 +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!
> 
> [1/4] ASoC: codecs: wsa883x: fix PA volume control
>       (no commit info)
> [2/4] ASoC: qcom: sc8280xp: limit speaker volumes
>       commit: c481016bb4f8a9c059c39ac06e7b65e233a61f6a
> [3/4] ASoC: codecs: lpass-wsa-macro: fix compander volume hack
>       (no commit info)
> [4/4] ASoC: codecs: wcd9335: drop unused gain hack remnant
>       (no commit info)

Thanks, Mark. 

Could you consider applying at least patches 1/4 and 3/4 for 6.8 as
well?

The former is needed for proper hardware volume control with the fixed
UCM files, and the latter avoids ending up with the digital gain setting
set too low or too high while by-passing the volume limit set by the
machine driver.

Johan

On Tue, Jan 23, 2024 at 08:58:20AM +0100, Johan Hovold wrote:

> Could you consider applying at least patches 1/4 and 3/4 for 6.8 as
> well?

Please check git and resend anything you think has been missed.  When
you resent the whole series rather than just the problematic patch that
most likely confused b4.

On Tue, Jan 23, 2024 at 01:05:21PM +0000, Mark Brown wrote:
> On Tue, Jan 23, 2024 at 08:58:20AM +0100, Johan Hovold wrote:
> 
> > Could you consider applying at least patches 1/4 and 3/4 for 6.8 as
> > well?
> 
> Please check git and resend anything you think has been missed.  When
> you resent the whole series rather than just the problematic patch that
> most likely confused b4.

Everything appears to be in your for-6.8 branch now, thanks!

The merge commit for the series does not include the volume limit patch,
so it looks like that one got applied separately before you applied the
rest of the series:

	https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?h=for-6.8&id=7c70825d1603001e09907b383ed5d1bd283d61a0

But all four patches are there now.

Johan

On Tue, Jan 23, 2024 at 02:30:54PM +0100, Johan Hovold wrote:

> The merge commit for the series does not include the volume limit patch,
> so it looks like that one got applied separately before you applied the
> rest of the series:

> 	https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git/commit/?h=for-6.8&id=7c70825d1603001e09907b383ed5d1bd283d61a0

Yes, loose patches go before serieses.