ASoC: es8316: limit headphone mixer volume
diff mbox series

Message ID 20190824210426.16218-1-katsuhiro@katsuster.net
State New
Headers show
Series
  • ASoC: es8316: limit headphone mixer volume
Related show

Commit Message

Katsuhiro Suzuki Aug. 24, 2019, 9:04 p.m. UTC
This patch limits Headphone mixer volume to 4 from 7.
Because output sound suddenly becomes very loudly with many noise if
set volume over 4.

Signed-off-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>
---
 sound/soc/codecs/es8316.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Hans de Goede Aug. 25, 2019, 5:38 p.m. UTC | #1
Hi,

On 24-08-19 23:04, Katsuhiro Suzuki wrote:
> This patch limits Headphone mixer volume to 4 from 7.
> Because output sound suddenly becomes very loudly with many noise if
> set volume over 4.
> 
> Signed-off-by: Katsuhiro Suzuki <katsuhiro@katsuster.net>

Higher then 4 not working matches my experience, see this comment from
the UCM file: alsa-lib/src/conf/ucm/codecs/es8316/EnableSeq.conf :

# Set HP mixer vol to -6 dB (4/7) louder does not work
cset "name='Headphone Mixer Volume' 4"

Limiting this to the actual working range at the kernel level seems
sensible:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans



> ---
>   sound/soc/codecs/es8316.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
> index 8dfb5dbeebbf..bc4141e1eb7f 100644
> --- a/sound/soc/codecs/es8316.c
> +++ b/sound/soc/codecs/es8316.c
> @@ -91,7 +91,7 @@ static const struct snd_kcontrol_new es8316_snd_controls[] = {
>   	SOC_DOUBLE_TLV("Headphone Playback Volume", ES8316_CPHP_ICAL_VOL,
>   		       4, 0, 3, 1, hpout_vol_tlv),
>   	SOC_DOUBLE_TLV("Headphone Mixer Volume", ES8316_HPMIX_VOL,
> -		       0, 4, 7, 0, hpmixer_gain_tlv),
> +		       0, 4, 4, 0, hpmixer_gain_tlv),
>   
>   	SOC_ENUM("Playback Polarity", dacpol),
>   	SOC_DOUBLE_R_TLV("DAC Playback Volume", ES8316_DAC_VOLL,
>
Daniel Drake Aug. 26, 2019, 2:53 a.m. UTC | #2
On Mon, Aug 26, 2019 at 1:38 AM Hans de Goede <hdegoede@redhat.com> wrote:
> On 24-08-19 23:04, Katsuhiro Suzuki wrote:
> > This patch limits Headphone mixer volume to 4 from 7.
> > Because output sound suddenly becomes very loudly with many noise if
> > set volume over 4.

That sounds like something that should be limited in UCM.

> Higher then 4 not working matches my experience, see this comment from
> the UCM file: alsa-lib/src/conf/ucm/codecs/es8316/EnableSeq.conf :
>
> # Set HP mixer vol to -6 dB (4/7) louder does not work
> cset "name='Headphone Mixer Volume' 4"

What does "does not work" mean more precisely?

I checked the spec, there is indeed something wrong in the kernel driver here.
The db scale is not a simple scale as the kernel source suggests.

Instead it is:
0000 – -12dB
0001 – -10.5dB
0010 – -9dB
0011 – -7.5dB
0100 – -6dB
1000 – -4.5dB
1001 – -3dB
1010 – -1.5dB
1011 – 0dB

So perhaps we can fix the kernel to follow this table and then use UCM
to limit the volume if its too high on a given platform?

Thanks
Daniel
Katsuhiro Suzuki Aug. 26, 2019, 8:41 a.m. UTC | #3
Hello Daniel,

On 2019/08/26 11:53, Daniel Drake wrote:
> On Mon, Aug 26, 2019 at 1:38 AM Hans de Goede <hdegoede@redhat.com> wrote:
>> On 24-08-19 23:04, Katsuhiro Suzuki wrote:
>>> This patch limits Headphone mixer volume to 4 from 7.
>>> Because output sound suddenly becomes very loudly with many noise if
>>> set volume over 4.
> 
> That sounds like something that should be limited in UCM.
> 
>> Higher then 4 not working matches my experience, see this comment from
>> the UCM file: alsa-lib/src/conf/ucm/codecs/es8316/EnableSeq.conf :
>>
>> # Set HP mixer vol to -6 dB (4/7) louder does not work
>> cset "name='Headphone Mixer Volume' 4"
> 
> What does "does not work" mean more precisely?
> 
> I checked the spec, there is indeed something wrong in the kernel driver here.
> The db scale is not a simple scale as the kernel source suggests.
> 
> Instead it is:
> 0000 – -12dB
> 0001 – -10.5dB
> 0010 – -9dB
> 0011 – -7.5dB
> 0100 – -6dB
> 1000 – -4.5dB
> 1001 – -3dB
> 1010 – -1.5dB
> 1011 – 0dB
> 
 > So perhaps we can fix the kernel to follow this table and then use UCM
 > to limit the volume if its too high on a given platform?
 >

Thank you very important information. So you mean value 5, 6, 7 are
illegal settings for ES8316. Correct codes are

static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv,
	0, 4, TLV_DB_SCALE_ITEM(-1200, 150, 0),
	8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0),
);

and...

	SOC_DOUBLE_TLV("Headphone Mixer Volume", ES8316_HPMIX_VOL,
		       0, 4, 15, 0, hpmixer_gain_tlv),

Is my understanding correct? If so I'll test it on my board
(RockPro64) and re-send patch.

BTW, do you know how to get ES8316 I2C registers spec?
I want to see it for understanding current code, but I cannot find...


> Thanks
> Daniel
> 
> 

Best Regards,
Katsuhiro Suzuki
Katsuhiro Suzuki Aug. 26, 2019, 9 a.m. UTC | #4
Hello,

Oops... I got mistake,

 >      SOC_DOUBLE_TLV("Headphone Mixer Volume", ES8316_HPMIX_VOL,
 >                 0, 4, 15, 0, hpmixer_gain_tlv),

is wrong,

 >      SOC_DOUBLE_TLV("Headphone Mixer Volume", ES8316_HPMIX_VOL,
 >                 0, 4, 11, 0, hpmixer_gain_tlv),

is correct.

Best Regards,
Katsuhiro Suzuki


On 2019/08/26 17:41, Katsuhiro Suzuki wrote:
> Hello Daniel,
> 
> On 2019/08/26 11:53, Daniel Drake wrote:
>> On Mon, Aug 26, 2019 at 1:38 AM Hans de Goede <hdegoede@redhat.com> 
>> wrote:
>>> On 24-08-19 23:04, Katsuhiro Suzuki wrote:
>>>> This patch limits Headphone mixer volume to 4 from 7.
>>>> Because output sound suddenly becomes very loudly with many noise if
>>>> set volume over 4.
>>
>> That sounds like something that should be limited in UCM.
>>
>>> Higher then 4 not working matches my experience, see this comment from
>>> the UCM file: alsa-lib/src/conf/ucm/codecs/es8316/EnableSeq.conf :
>>>
>>> # Set HP mixer vol to -6 dB (4/7) louder does not work
>>> cset "name='Headphone Mixer Volume' 4"
>>
>> What does "does not work" mean more precisely?
>>
>> I checked the spec, there is indeed something wrong in the kernel 
>> driver here.
>> The db scale is not a simple scale as the kernel source suggests.
>>
>> Instead it is:
>> 0000 – -12dB
>> 0001 – -10.5dB
>> 0010 – -9dB
>> 0011 – -7.5dB
>> 0100 – -6dB
>> 1000 – -4.5dB
>> 1001 – -3dB
>> 1010 – -1.5dB
>> 1011 – 0dB
>>
>  > So perhaps we can fix the kernel to follow this table and then use UCM
>  > to limit the volume if its too high on a given platform?
>  >
> 
> Thank you very important information. So you mean value 5, 6, 7 are
> illegal settings for ES8316. Correct codes are
> 
> static const SNDRV_CTL_TLVD_DECLARE_DB_RANGE(hpmixer_gain_tlv,
>      0, 4, TLV_DB_SCALE_ITEM(-1200, 150, 0),
>      8, 11, TLV_DB_SCALE_ITEM(-450, 150, 0),
> );
> 
> and...
> 
>      SOC_DOUBLE_TLV("Headphone Mixer Volume", ES8316_HPMIX_VOL,
>                 0, 4, 15, 0, hpmixer_gain_tlv),
> 
> Is my understanding correct? If so I'll test it on my board
> (RockPro64) and re-send patch.
> 
> BTW, do you know how to get ES8316 I2C registers spec?
> I want to see it for understanding current code, but I cannot find...
> 
> 
>> Thanks
>> Daniel
>>
>>
> 
> Best Regards,
> Katsuhiro Suzuki
>
Hans de Goede Aug. 26, 2019, 9:09 a.m. UTC | #5
Hi,

On 26-08-19 04:53, Daniel Drake wrote:
> On Mon, Aug 26, 2019 at 1:38 AM Hans de Goede <hdegoede@redhat.com> wrote:
>> On 24-08-19 23:04, Katsuhiro Suzuki wrote:
>>> This patch limits Headphone mixer volume to 4 from 7.
>>> Because output sound suddenly becomes very loudly with many noise if
>>> set volume over 4.
> 
> That sounds like something that should be limited in UCM.
> 
>> Higher then 4 not working matches my experience, see this comment from
>> the UCM file: alsa-lib/src/conf/ucm/codecs/es8316/EnableSeq.conf :
>>
>> # Set HP mixer vol to -6 dB (4/7) louder does not work
>> cset "name='Headphone Mixer Volume' 4"
> 
> What does "does not work" mean more precisely?

IIRC garbled sound.

> I checked the spec, there is indeed something wrong in the kernel driver here.
> The db scale is not a simple scale as the kernel source suggests.
> 
> Instead it is:
> 0000 – -12dB
> 0001 – -10.5dB
> 0010 – -9dB
> 0011 – -7.5dB
> 0100 – -6dB
> 1000 – -4.5dB
> 1001 – -3dB
> 1010 – -1.5dB
> 1011 – 0dB
> 
> So perhaps we can fix the kernel to follow this table and then use UCM
> to limit the volume if its too high on a given platform?

Yes that sounds like the right thing to do. Katsuhiro can you confirm that
using this table allows using the full scale ? note that the full scale now
has 9 steps rather then 8.

Regards,

Hans
Katsuhiro Suzuki Aug. 26, 2019, 3:25 p.m. UTC | #6
Hello Hans, Daniel,

Thank you for reviewing and comment.

On 2019/08/26 18:09, Hans de Goede wrote:
> Hi,
> 
> On 26-08-19 04:53, Daniel Drake wrote:
>> On Mon, Aug 26, 2019 at 1:38 AM Hans de Goede <hdegoede@redhat.com> 
>> wrote:
>>> On 24-08-19 23:04, Katsuhiro Suzuki wrote:
>>>> This patch limits Headphone mixer volume to 4 from 7.
>>>> Because output sound suddenly becomes very loudly with many noise if
>>>> set volume over 4.
>>
>> That sounds like something that should be limited in UCM.
>>
>>> Higher then 4 not working matches my experience, see this comment from
>>> the UCM file: alsa-lib/src/conf/ucm/codecs/es8316/EnableSeq.conf :
>>>
>>> # Set HP mixer vol to -6 dB (4/7) louder does not work
>>> cset "name='Headphone Mixer Volume' 4"
>>
>> What does "does not work" mean more precisely?
> 
> IIRC garbled sound.
> 
>> I checked the spec, there is indeed something wrong in the kernel 
>> driver here.
>> The db scale is not a simple scale as the kernel source suggests.
>>
>> Instead it is:
>> 0000 – -12dB
>> 0001 – -10.5dB
>> 0010 – -9dB
>> 0011 – -7.5dB
>> 0100 – -6dB
>> 1000 – -4.5dB
>> 1001 – -3dB
>> 1010 – -1.5dB
>> 1011 – 0dB
>>
>> So perhaps we can fix the kernel to follow this table and then use UCM
>> to limit the volume if its too high on a given platform?
> 
> Yes that sounds like the right thing to do. Katsuhiro can you confirm that
> using this table allows using the full scale ? note that the full scale now
> has 9 steps rather then 8.
> 

I've finished testing this table on my board (RockPro64).
Every values work well without garbled sound.

I checked address 0x16 register via /sys/kernel/debug/regmap too.
The register values and dB (get from alsamixer) are the following if
I increase headphone volume to max from min.

   reg   dB
   0x16  scale
   ------------
   0x00  -12.00
   0x11  -10.50
   0x22  -9.00
   0x33  -7.50
   0x44  -6.00
   0x88  -4.50
   0x99  -3.00
   0xaa  -1.50
   0xbb  0.00


And I found other problem, current code is inverted L/R volume.
It's only in Headphone "mixer" volume. It seems Headphone "master"
volume works correctly.

I'll fix these problems and send V2 patch set.


> Regards,
> 
> Hans
> 
> 

Best Regards,
Katsuhiro Suzuki

Patch
diff mbox series

diff --git a/sound/soc/codecs/es8316.c b/sound/soc/codecs/es8316.c
index 8dfb5dbeebbf..bc4141e1eb7f 100644
--- a/sound/soc/codecs/es8316.c
+++ b/sound/soc/codecs/es8316.c
@@ -91,7 +91,7 @@  static const struct snd_kcontrol_new es8316_snd_controls[] = {
 	SOC_DOUBLE_TLV("Headphone Playback Volume", ES8316_CPHP_ICAL_VOL,
 		       4, 0, 3, 1, hpout_vol_tlv),
 	SOC_DOUBLE_TLV("Headphone Mixer Volume", ES8316_HPMIX_VOL,
-		       0, 4, 7, 0, hpmixer_gain_tlv),
+		       0, 4, 4, 0, hpmixer_gain_tlv),
 
 	SOC_ENUM("Playback Polarity", dacpol),
 	SOC_DOUBLE_R_TLV("DAC Playback Volume", ES8316_DAC_VOLL,